jekkos-t520
f2fd360d23
Minimal working OpenStreetMap autocomplete
...
Refactor jkey F-key bindings
2015-02-05 14:08:40 +01:00
Martes Erede
839849bf8d
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-01-29 16:16:55 +01:00
Martes Erede
b4ac74aa55
Bugfix #28 if invoice number is empty, set it to null, so no error occurs
2015-01-29 16:14:12 +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
4556938154
Add cookie cleanup after search() and get_row()
2015-01-25 14:32:15 +01:00
jekkos-t520
a2b7ff688d
Merge branch 'master' of https://github.com/jekkos/opensourcepos
2015-01-25 14:13:38 +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
e7fd57afdf
Cleanup duplicate cookies when browsing items module
2015-01-23 00:18:43 +01:00
jekkos-t520
ad51278ba5
UPC config option now adds UPC content to barcodes as well
2015-01-22 23:36:56 +01:00
Malte Srocke
606eb01a67
- fixed excel import: if there was missing a location-id in the import-csv, then there would not have been created an entry into item_quantities for the item and location.
...
- fixed also the inventory info-part: before in the inventory-table there was no quantity inserted and data[10] as the location_id
2015-01-22 22:19:23 +01:00
jekkos-t520
94287ddec4
Make barcode text configurable
2015-01-21 13:14:16 +01:00
jekkos-t520
c959d97fd1
Fix for bug #39 : item with 0 stock is not listed in item-list
2015-01-19 12:02:53 +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
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
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
ee30b178b4
Remove duplicate statement from 2.3.1 sql upgrade script
...
Remove quantity column from database.sql
Update item import example with correct location id
Fix detailed report receipt links
2014-11-28 08:51:08 +01:00
jekkos-t520
44b5404fe7
Fix missing invoice number in sales receipt
2014-11-27 08:48:15 +01:00
jekkos-t520
78ca94e036
Fix detailed report editing
2014-11-27 08:44:50 +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
27e1bfe871
Merge pull request #11 from flodef/master
...
Add record time to giftcard
2014-11-26 08:55:49 +01:00
jekkos-t520
b311eca62e
Fix receiving_quantity error in receivings page
2014-11-26 08:17:43 +01:00
jekkos-t520
99a804c1ac
Fix item quantity after edit
2014-11-26 08:10:15 +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
Florian
27de99fe78
Update giftcards.php
...
Add a "record_time" to the giftcard saving function to be know when a new giftcard has been added.
2014-11-24 20:11:47 +01:00
jekkos
90c1934d92
Merge pull request #6 from curthauta/import_items
...
fixed quantities on items import
2014-11-20 10:19:41 +01:00
jekkos-t520
4893da0e43
Added enable invoice checkbox
2014-11-13 13:28:42 +01:00
jekkos-t520
094a293c78
Fix invoice number insert in receivings
2014-11-06 07:35:54 +01:00
Curt Hauta
8ae21bbcb7
fixed quantities on items import
2014-11-05 20:01:25 -07:00
jekkos-t520
54fe0c4c30
Fix sales/receivings deletion
2014-11-03 19:22:36 +01:00
jekkos-t520
d43015e8c9
Set default receivings value for items to 1 in database
...
Fix item quantity save
2014-11-03 18:08:57 +01:00
jekkos-t520
96c349b099
Add invoice numbering to sales module
2014-10-30 19:22:49 +01:00
jekkos-t520
cc9adeef47
Set supplier_info to default value (fix warning with empty supplier)
...
Conflicts:
application/controllers/receivings.php
2014-10-23 21:32:19 +02:00
jekkos-t520
37c80deb83
Show error message correctly in receivings
2014-10-23 18:35:34 +02: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
31877528b1
Security update for report subpermissions
2014-10-17 08:29:46 +02:00
jekkos-t520
7fad710277
Reports module now has checks on the required submodules when entering direct urls
2014-10-16 18:31:35 +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
868de15fcb
Invoice number is now substituted correctly after complete
...
Fix payments summary report
Update upgrade script (not tested yet)
2014-10-13 12:30:37 +02:00
jekkos-t520
de06b64e4e
Fix warning in specific discount report (add category to query)
...
Add grant for default stock location in sql
2014-10-12 03:18:19 +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
77222c1989
Fix supplier selection
2014-10-08 19:27:07 +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
jekkos-t520
aee5f3d27e
Add ospos_grants table
...
Refactor permission and module system
2014-10-07 00:47:30 +02:00
jekkos-t520
97ff190ba5
Receivings can now use invoice numbers with a specified format (in config section)
...
Fix some more stock location related bugs
Some refactoring todo for creating/updating stock locations
2014-10-05 22:53:42 +02:00
jekkos-t520
1afbc03304
Merge branch 'feature/multistore_support' into feature/invoice_numbering
2014-10-04 16:49:22 +02:00
