jekkos-t520
a809807288
jsPrintSetup plugin integration
...
All receipt print configuration options present now
2015-02-17 16:46:57 +01:00
jekkos-t520
a8e15f7db0
Add company logo upload feature in config (will show on receipts)
2015-02-12 15:47:31 +01:00
jekkos-t520
4e6a6d6434
Add gender to people + employees form
2015-02-11 14:29:46 +01:00
jekkos-t520
ec6455647f
Merge branch 'feature/item_pics'
...
Conflicts:
database/2.3_to_2.3.1.sql
database/database.sql
translations/items_lang.csv
2015-02-05 17:05:51 +01:00
jekkos-t520
7081fe0338
Remove non free barcodegen library
...
Add width and height parameters for code39 barcode generation
2015-02-05 17:00:41 +01:00
jekkos-t520
7efb1428f5
Basic image upload working now
2015-02-04 13:27:09 +01:00
jekkos-t520
46cfe0b18a
Add databse upgrade script for 2.3.2
2015-02-03 17:33:43 +01:00
jekkos-t520
1bf839601a
Barcode patch applied (using barcodegen)
2015-02-02 12:44:58 +01:00
jekkos-t520
08325c8cf7
Fix last stock_locations config quirks
2015-01-28 19:25:18 +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
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
868721c6f5
Adapt sql scripts for new barcode label options
2015-01-24 15:18:00 +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
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
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
27e1bfe871
Merge pull request #11 from flodef/master
...
Add record time to giftcard
2014-11-26 08:55:49 +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
44515ee999
Update database.sql
2014-11-24 20:06:44 +01:00
jekkos-t520
2c706dc752
Rename receivings_quantity to receiving_quantity
2014-11-13 16:50:52 +01:00
jekkos-t520
4893da0e43
Added enable invoice checkbox
2014-11-13 13:28:42 +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
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
96c349b099
Add invoice numbering to sales module
2014-10-30 19:22:49 +01:00
jekkos-t520
20fed1d457
Update database script to latest version again
2014-10-13 19:09:42 +02:00
jekkos-t520
bc514889a8
Add detailed reports again (permission_id wasn't set properly)
...
Finish updqate script
2014-10-13 18:57:07 +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
54fbb4e7d7
Refactor stock location save
...
Add config to permissions and grants in database script
2014-10-11 17:55:00 +02:00
jekkos-t520
cda41622e4
Merge branch 'refactor/module_permissions' into feature/invoice_numbering
...
Conflicts:
database/database.sql
2014-10-10 16:38:07 +02:00
jekkos-t520
77222c1989
Fix supplier selection
2014-10-08 19:27:07 +02:00
jekkos-t520
a1eb735d96
Remove empty check for item_id and quantity_id when saving item_quantities
...
Add configuration key to database script
2014-10-07 08:27:31 +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
bac80e3a92
Added invoice_number field to receivings table
...
Save comments field in receivings as in sales
Add translations for cancel button in receivings
Add cascading deletes for ospos_permissions
2014-10-04 13:19:24 +02:00
jekkos-t520
eb51b680aa
Show stock location names in employee form
2014-10-03 00:27:50 +02:00
jekkos-t520
5cf73130c5
Modules are not accessible if employee has no permissions on at least one of it's submodules
...
Some more db script modifications
2014-09-23 19:14:25 +02:00
jekkos-t520
4b16b68f24
Added more granular permissions for report module
...
Extend permission system to allow 'submodule' permissions
Add permissions for stock locations (multistore support)
2014-09-22 20:41:53 +02:00
jekkos-t520
2cb322f88f
Default stock name is the same as in update script
2014-08-17 01:45:36 +02:00
jekkos-t520
ed15532cc4
Merge branch 'merge/padungsak'
...
Conflicts:
database/database.sql
2014-08-17 01:22:12 +02:00
jekkos-t520
cf20194e23
Fixed sale suspending / unsuspending (adapt db scripts)
...
Cleanup old code
More code review
Update item_quantities database model (composite pk)
2014-08-07 02:07:09 +02:00
jekkos-t520
8802831831
Add foregin key constraints to stock_locations and item_quantities tables
...
Requisition options is only shown when multiple stock locations are configured
Fix stock locations config in the configuration page
Rename item_quantitys to item_quantities
Fix a missing label (need to check if present in master)
Fix display of the stock quantities in items/manage view
2014-07-25 00:15:34 +02:00
jekkos-t520
9607300514
Added empty check in stock_locations config
...
Rework database script (contains stock_locations + item_quantities tables)
2014-07-05 13:47:33 +02:00
jekkos
3838147bb9
All database types used in amount calculations changes to decimal(15,2)
...
Removed round() statements in sale temp table, precision is defined by datatypes
Removed round() statement in receiving temp table, precision is defined by datatypes
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@105 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-04 21:01:47 +00:00
Padungsak
25fa78eedb
Add multi-stock feature
...
Finished task
1. User can add stock location in config page. Adding format is StockA,StockB,StockC for example
2. Item page, there is no more quantity column show in cert table. The quantity tracking is integrated in inventory detail
3. Receiving page, There is a stock location for user to select before receiving or returning stuff
4. Sale page, There is a stock location which is for user to select a stock location they sell from
Remain task
1. Requisition work flow
2. Language editing
3. Remove unuse code
PS
2014-07-02 11:58:08 +07:00
jekkos-t520
4f367eb168
Merge branch 'master' into merge/padungsak
...
Conflicts:
application/views/config.php
2014-06-30 11:30:08 +02:00
jekkos
7688a1c0e5
Upgrade to CodeIgniter 2.2
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@100 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-06-27 22:12:48 +00:00
jekkos-t520
e1bfac5eae
requisition receipt fixed
...
database.sql script merged with current ospos one
remaining problems in reporting (sale_type to add in sales_temp query?)
data model should be refactored to allow more genericity for custom item locations (2+)
inventory tracking should be adapted to use multiple locations (instead of duplicating items for different locations)
2014-06-15 15:30:32 +02:00
pappastech
2570f28242
Fix missing comma in database.sql.
...
Tom
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@89 c3eb156b-1dc0-44e1-88ae-e38439141b53
2013-11-06 21:04:33 +00:00
