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
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
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
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
ff7b305058
Added tax inclusive pricing to sales and receivings
2014-09-15 21:27:11 +02:00
jekkos-t520
ed15532cc4
Merge branch 'merge/padungsak'
...
Conflicts:
database/database.sql
2014-08-17 01:22:12 +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
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
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
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
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
jekkos
bae6f10d7d
Added edit/delete functionality in detailed sales report
...
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@95 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-03-17 16:29:13 +00:00
