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
802a0e6a59
Refactor report listing (move sales specific grants to employee model)
2014-10-09 17:56:24 +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
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
1afbc03304
Merge branch 'feature/multistore_support' into feature/invoice_numbering
2014-10-04 16:49:22 +02:00
jekkos-t520
5e8367681b
Fix default location in items, sales and receivings
2014-10-04 13:38:52 +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
5a4ac8dde3
Fix comments in receivings
2014-10-03 17:41:39 +02:00
jekkos-t520
e994cd5444
Fix default location selected (now uses allowed locations only)
2014-10-03 10:33:34 +02:00
jekkos-t520
d486202c4f
Merge branch 'feature/multistore_support' into feature/invoice_numbering
2014-10-03 08:03:59 +02:00
jekkos-t520
298135dabc
Remove obsolete item_unit method
2014-10-03 08:03:37 +02:00
jekkos-t520
eb51b680aa
Show stock location names in employee form
2014-10-03 00:27:50 +02:00
jekkos-t520
48acd204f1
Show stock location names in employee form
2014-10-02 23:26:29 +02:00
jekkos-t520
2929dfe9dd
Add stock location filtering on items
2014-10-02 19:33:35 +02:00
jekkos-t520
290533612e
Fix submodules in header
2014-09-29 21:06:06 +02:00
jekkos-t520
13127c4dc7
Deny access to report submodules on which employee doesn't have permissions
2014-09-24 08:47:00 +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
e03611080e
Merge branch 'feature/tax_included_pricing'
2014-09-15 21:27:33 +02:00
jekkos-t520
ff7b305058
Added tax inclusive pricing to sales and receivings
2014-09-15 21:27:11 +02:00
jekkos-t520
0d76974e69
Discount field in receiving made editable again
2014-09-15 20:18:24 +02:00
jekkos-t520
87c242b35f
Discount field in receiving made editable again
2014-09-15 20:14:37 +02:00
jekkos-t520
e43f7ac7bb
Add deleted checkbox filter in items page (was remove due to wrong merge)
2014-09-10 19:03:19 +02:00
jekkos
c9c389e9f3
Update README and WHATS NEW
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@132 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-09-10 18:58:56 +02:00
jekkos-t520
b06e103895
Database script renamed
2014-08-17 01:55:51 +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
a61bc10dde
Location column is kept in database
...
Added a data migration script for stock_locations and item_quantities tables
2014-08-17 00:49:48 +02:00
jekkos-t520
43189d0748
Clear sale and receiving libs (sessoin state) when changing stock locations
2014-08-13 01:16:37 +02:00
jekkos-t520
e1e5434e2a
Stock locations are now shown on receivings and sales receipts
...
Database migration script now defines a default stock location name
Rmeove obsolete constraints from migration script
2014-08-11 13:10:29 +02:00
jekkos-t520
aed9fb8dd7
Fix barcode generation (removed whitespace from stock_locations model)
...
Fix error in receivings receipt
Update database migration script (needs more review)
2014-08-10 17:51:14 +02:00
jekkos-t520
b3b19ab4c5
Add migration script for 2.2.2 to 2.3
...
Update database script (add extra foreign keys + minor cleanup)
2014-08-09 10:16:12 +02:00
jekkos-t520
a65f2f41b8
Add database migration script for 2.2.0
2014-08-08 17:40:50 +02:00
jekkos-t520
55ad3a20c2
Fix requisitions report (can be found under receiving type = requisitions)
2014-08-07 13:15:21 +02:00
jekkos-t520
e53265cca8
Requisition is now registered as receiving for destination stock and return for source stock
...
Remove specific requisition report and code
Adapt receivings report to show requisitions in a generic way
2014-08-07 12:50:42 +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
Padungsak
a1e1883ddc
Add quantity column in item page
...
Fix bug about validating stock location config
PS
2014-07-11 22:32:47 +07:00
jekkos
dfaa3692e0
Remove multiple ci_session cookies from headers in sales and recevings
...
Fix nginx compatibility (spurious 502 bad gateway)
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@107 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-05 23:54:50 +00: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
ed1be14e06
Remove swap file
...
Update .gitignore to ignore .swp files
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@106 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-04 21:02:53 +00: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
8e8b5d84dc
Fix quantity removal in items page
...
PS
2014-07-02 20:50:32 +07: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
015392c8b7
Add delete checkbox to item form view
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@104 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-07-01 20:46:37 +00:00
jekkos-t520
4f367eb168
Merge branch 'master' into merge/padungsak
...
Conflicts:
application/views/config.php
2014-06-30 11:30:08 +02:00
jekkos
75bb5595c0
Add thai language
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@103 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-06-30 09:28:03 +00:00
