mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-01 05:57:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
196 Commits 35 Branches 40 Tags
4893da0e43cfec94a819fa02ebf217fa041d8c8f
Commit Graph

35 Commits

Author SHA1 Message Date
jekkos-t520
4893da0e43 Added enable invoice checkbox 2014-11-13 13:28:42 +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
pappastech
a7ac6e84b3 Adding the additional fields to database.sql to get the database up to date with this version of code. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@82 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-28 01:47:48 +00:00
objecttothis
53e385084e Not sure if this SQL dump accurately reflects the changes made to the dB or not. 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@73 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:17:02 +00:00
pappastech
4c580d13ff Incorporated changes proposed to fix '6 items in cart limit'. This limit was due to the 4kB limit imposed on cookies. The change pushes cart item storage to the database instead of in cookies. A database change was also made in this version to work with the code change. 
Version updated to 2.0_RC7.

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@52 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-08-07 23:09:09 +00:00
pappastech
d1e6e1c571 Tax rate fix for bug ID 3313927. Changed tax rate fields in three tables in the database.sql file. You'll have to manually make the same changes or use the sql file to create a new set of tables and copy your data over. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@44 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-28 21:37:25 +00:00
pappastech
1d9cf76d8b Version 2.0_RC1. Upgrade to CI 2.1.0. 
Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@26 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:16:21 +00:00
pappastech
335982638e Upgrading to CI 2.1.0 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@23 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-01-16 02:11:50 +00:00
pappastech
a9af0eccf3 Updated code so that the version number only has to be changed in one place. 
~Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@19 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-07-10 15:30:59 +00:00
pappastech
9697d7eeba Initial commit of release 1.0. 
~ Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@7 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2011-06-08 13:22:09 +00:00