Commit Graph

105 Commits

Author SHA1 Message Date
jekkos-t520
8b6182dded Further fine tuning address autocompletion 2015-02-05 15:26:37 +01:00
jekkos-t520
f2fd360d23 Minimal working OpenStreetMap autocomplete
Refactor jkey F-key bindings
2015-02-05 14:08:40 +01:00
jekkos-t520
08325c8cf7 Fix last stock_locations config quirks 2015-01-28 19:25:18 +01:00
jekkos-t520
f497ac54f1 Review stock location management in config screen (merged old refactor
branch)
Remove some obsolete labels from tranlations csv's
2015-01-27 23:27:43 +01:00
jekkos-t520
f323bec9ca Merge branch 'refactor/edit_stock_locations'
Conflicts:
	application/controllers/config.php
	application/models/stock_locations.php
2015-01-27 19:24:59 +01:00
jekkos-t520
24a6c9c34f Config location editing works now 2015-01-27 19:03:57 +01:00
jekkos-t520
8705b91bd3 Start refactoring the stock locations configuration screen 2015-01-26 08:11:21 +01:00
jekkos-t520
344cb5c749 Add route for no_access controller with just one parameter
Remove permission dependency between sales, receivings and items module
Add explicit stock permission to sales and receiving modules
2015-01-25 15:46:42 +01:00
jekkos-t520
a2b7ff688d Merge branch 'master' of https://github.com/jekkos/opensourcepos 2015-01-25 14:13:38 +01:00
Martes Erede
927dbbabb6 Feature #27: Changing cost price while receiving items 2015-01-24 21:40:07 +01:00
jekkos-t520
868721c6f5 Adapt sql scripts for new barcode label options 2015-01-24 15:18:00 +01:00
jekkos-t520
1d9661d0b0 Add name, price and company name as possible barcode labels 2015-01-24 15:06:29 +01:00
jekkos-t520
ad51278ba5 UPC config option now adds UPC content to barcodes as well 2015-01-22 23:36:56 +01:00
jekkos-t520
94287ddec4 Make barcode text configurable 2015-01-21 13:14:16 +01:00
jekkos-t520
3d6d473145 Add item field autofocus in sales module
auto submit payment form when hitting enter in amount_tendered input
field
2015-01-19 12:35:09 +01:00
jekkos-t520
b0aa62b044 Add turkish language (patch #24 Turkish Language) 2015-01-16 18:29:57 +01:00
jekkos-t520
0f34a6ace4 Ignore receiving_quantity = 0 for receivings 2014-12-26 11:39:26 +01:00
jekkos-t520
58dc5e3062 Newly created item in sales module is auto added to sale again 2014-12-19 08:47:40 +01:00
jekkos-t520
c00c604c21 Fix tax inclusive pricing for non taxable customer
Show receiving quantity in receiving receipt
Allow to use invoice number as zero (a bug prevented 0 to be saved to
db, causing it to stop incrementing next time)
2014-12-18 19:55:20 +01:00
jekkos-t520
efff9d20c1 Add giftcard number autogeneration 2014-12-16 18:36:26 +01:00
jekkos-t520
07a32a0deb Remove invoice / sale format enable option
Add giftcards -> person_id foreign key constraint
Fix tax calculation for non taxable customers
Improve giftcard person autocompletion
2014-12-16 08:49:49 +01:00
jekkos-t520
b546883d2a Dashes are allowed now in barcode text
Update barcode with newer drop in version (thanks Odie)
2014-12-15 00:09:44 +01:00
jekkos-t520
0569275c4e Add receivings invoice number enable/disable
Ignore invoice number unique constraint when invoice is disabled
2014-12-06 10:46:16 +01:00
jekkos-t520
e3288ae759 Revert newly added receivings functionality 2014-12-04 23:23:10 +01:00
jekkos-t520
64f1b4191a Invoice number can now be enabled/disabled
Invoice unique constraint only applies when enabling invoice
Correct several HTML structure errors in sale and order modules
Make the top module bar a bit wider
Fix payment details css when hiding/showing invoice number field
2014-12-04 22:01:40 +01:00
jekkos-t520
d7a61080e2 Add duplicate invoice number error message in sales module
Fix colspan width for receivings (one column was added for
receiving_quantity)
2014-11-26 21:56:18 +01:00
jekkos
7d70fa70a6 Merge pull request #13 from flodef/patch-3
Update register.php
2014-11-26 08:54:44 +01:00
jekkos-t520
6bd6080ccc Fix customer field focus in register screen 2014-11-26 08:25:45 +01:00
jekkos-t520
b311eca62e Fix receiving_quantity error in receivings page 2014-11-26 08:17:43 +01:00
Florian
08368b6279 Update register.php
Correct an HTML mistake : replace </tr> by </td>
2014-11-25 20:24:46 +01:00
jekkos-t520
97d37b5ad9 Merge branch 'feature/sale_numbering'
Conflicts:
	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
	js/manage_tables.js
2014-11-25 17:20:05 +01:00
jekkos-t520
5a40c31af3 Merge branch 'fix/recv_amount_multiplication' 2014-11-25 08:43:10 +01:00
jekkos
bb3fbb03b1 Merge pull request #9 from flodef/patch-2
Update register.php
2014-11-20 10:17:39 +01:00
flodef
ba47d5e4ff Update register.php
- Correct previous commit when it was impossible to set any value anymore (oooops, I went too quickly on this one)
- Use .val instead of .attr("value") because the latter is deprecated
2014-11-14 22:40:36 +01:00
flodef
fe14180ec5 Update register.php
- Remove unused variable : $cur_item_info
- Change .click for .focus : correct a bug when the text doesn't disappear on chrome after changing tab
2014-11-14 22:30:16 +01:00
flodef
15d15b9750 Update register.php
Price should have it's currency
2014-11-14 20:31:04 +01:00
jekkos-t520
4893da0e43 Added enable invoice checkbox 2014-11-13 13:28:42 +01:00
jekkos-t520
035f2ad946 Review receivings quantity mulitplier 2014-11-04 08:14:16 +01:00
jekkos-t520
54fe0c4c30 Fix sales/receivings deletion 2014-11-03 19:22:36 +01:00
jekkos-t520
7a46078734 Add receivings_quantity to item form
Conflicts:

	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
2014-11-03 18:07:50 +01:00
jekkos-t520
3007173833 Add invoice numbering to sales module 2014-10-31 07:58:46 +01:00
jekkos-t520
96c349b099 Add invoice numbering to sales module 2014-10-30 19:22:49 +01:00
jekkos-t520
9d765efc94 Add invoice number duplication check in receivings screen
Add invoice number duplication check in receivings detailed report
2014-10-23 18:02:33 +02:00
jekkos-t520
fe6820920b Add edit form in detailed receivings report
Add language lines for detailed sale & receiving validation
Add permission for getting updated sale & receiving detail row
2014-10-21 21:39:22 +02:00
jekkos-t520
08dcd9e384 Fix totals calculation in receivings module 2014-10-20 18:31:33 +02:00
jekkos-t520
0863b4ebba Add extra permissiosn checks to report methods
Adapt no_access page to show missing grant
Adapt Email library to customize return_path header
2014-10-16 08:20:36 +02:00
jekkos-t520
dad16b7a71 Receivings comments and recv_invoice_format fields are updated on keyup now 2014-10-12 12:47:45 +02:00
jekkos-t520
ac667a23dc Refactor report listing (again)
All reports have proper permissions now (categories, taxes, discounts,..)
Minor refactoring and code cleanup
2014-10-12 02:54:54 +02:00
jekkos-t520
802a0e6a59 Refactor report listing (move sales specific grants to employee model) 2014-10-09 17:56:24 +02:00
jekkos-t520
bb9ab9bd9c Finish stock location refactoring
Modules are inaccessible if permissions not configured correctly
2014-10-07 21:47:07 +02:00