170 Commits

Author SHA1 Message Date
jekkos-t520
fc4db6553e Update README and WHATS NEW 2.3 2014-08-19 23:37:37 +02:00
jekkos-t520
1487afb19b Merge branch 'sourceforge-svn'
Conflicts:
	database/database.sql
2014-08-19 22:19:37 +02:00
jekkos
6e6cfb3fb1 Database script renamed
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@129 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:18 +00:00
jekkos
04e3c13dd1 Default stock name is the same as in update script
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@128 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:14 +00:00
jekkos
cd209d50f3 Location column is kept in database
Added a data migration script for stock_locations and item_quantities tables

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@127 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:12 +00:00
jekkos
9556500813 Clear sale and receiving libs (sessoin state) when changing stock locations
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@126 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:08 +00:00
jekkos
18517c47e8 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

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@125 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:05 +00:00
jekkos
6663de83f8 Fix barcode generation (removed whitespace from stock_locations model)
Fix error in receivings receipt
Update database migration script (needs more review)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@124 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:56:01 +00:00
jekkos
a1b2d99581 Add migration script for 2.2.2 to 2.3
Update database script (add extra foreign keys + minor cleanup)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@123 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:57 +00:00
jekkos
0a2b6e2d41 Fix requisitions report (can be found under receiving type = requisitions)
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@122 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:55 +00:00
jekkos
5ef5006577 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

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@121 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:52 +00:00
jekkos
4ca452ef12 Fixed sale suspending / unsuspending (adapt db scripts)
Cleanup old code
More code review
Update item_quantities database model (composite pk)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@120 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:46 +00:00
jekkos
249274e5f5 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

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@119 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:40 +00:00
jekkos
37e4eb8bd2 Add quantity column in item page
Fix bug about validating stock location config

PS

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@118 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:34 +00:00
jekkos
2ce140f6d3 Added empty check in stock_locations config
Rework database script (contains stock_locations + item_quantities tables)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@117 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:30 +00:00
jekkos
40cecaf571 Fix quantity removal in items page
PS

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@116 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:27 +00:00
jekkos
1c6e44af0f 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

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@115 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:24 +00:00
jekkos
b6012ae2ca Fix: Qty. column is not show in requisition report
Padungsak

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@114 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:16 +00:00
jekkos
6ff1cb007c 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)

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@113 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 19:55:13 +00:00
jekkos
eeb01a3717 Add database migration script for 2.2.0
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@112 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 13:04:01 +00:00
jekkos
490f0c89dd Remove old db script
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@111 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-19 13:03:26 +00:00
jekkos
faaf2b4e99 Add database migration script for 2.2.0
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@110 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-16 23:57:25 +00: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
0742a666b1 Bump version to 2.2.2
Rename database script

git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@109 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-08 15:48:51 +00:00
jekkos
1b61af783c Add database migration script for 2.2.0
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@108 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-08-08 15:42:19 +00: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
jekkos
fb244b629e Add extra escape sequences for french
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@102 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-06-30 08:38:27 +00:00
jekkos
3ce608737e Added french as a language
git-svn-id: svn+ssh://svn.code.sf.net/p/opensourcepos/code/@101 c3eb156b-1dc0-44e1-88ae-e38439141b53
2014-06-28 09:56:54 +00: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