Compare commits

...

24 Commits
2.3.3 ... 2.3

Author SHA1 Message Date
jekkos-t520
fc4db6553e Update README and WHATS NEW 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
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
5 changed files with 43 additions and 24 deletions

View File

@@ -1,4 +1,17 @@
ospos
=====
Open Source Point of Sale is a web based point of sale system written in the PHP language. It uses MySQL as the data storage back-end and has a simple user interface.
Open Source Point of Sale
How to Install
--------------
1. Create/locate a new mysql database to install open source point of sale into
2. Execute the file database/database.sql to create the tables needed
3. unzip and upload Open Source Point of Sale files to web server
4. Copy application/config/database.php.tmpl to application/config/database.php
5. Modify application/config/database.php to connect to your database
6. Modify application/config/config.php encryption key with your own
7. Go to your point of sale install via the browser
8. LOGIN using
username: admin
password:pointofsale
9. Enjoy
A more extensive setup guide can be found at [this site](http://www.opensourceposguide.com/guide/gettingstarted/installation)

View File

@@ -1,13 +0,0 @@
How to Install
-------------------------
1. Create/locate a new mysql database to install open source point of sale into
2. Execute the file database/database.sql to create the tables needed
3. unzip and upload Open Source Point of Sale files to web server
4. Copy application/config/database.php.tmpl to application/config/database.php
5. Modify application/config/database.php to connect to your database
6. Modify application/config/config.php encryption key with your own
7. Go to your point of sale install via the browser
8. LOGIN using
username: admin
password:pointofsale
9. Enjoy

View File

@@ -1,4 +1,4 @@
How to Upgrade
-------------------------
1. Replace all code from your point of sale installation with the code downloaded
2. Run the necessary database upgrades from the database folder
2. Run the necessary database upgrades from the database folder

View File

@@ -1,12 +1,33 @@
* Ver. 2.1.0
Version 2.2.2
-------------
+ French language added
+ Thai language added
+ Upgrade to CodeIgniter 2.2 (contains several security fixes)
+ Database types for amounts all changed to decimal types (this will fix rounding errors in the sales and receivings reports) the rest of the application
+ Fix duplicated session cookies in http headers (this broke the application when running on nginx)
Version 2.1.1
-------------
+ Barcodes on the order receipt weren't generated correctly
+ Sales edit screen for detailed sales reports is now available with thickbox as in the rest of the application
+ Indonesian language files updated (Oktafianus)
+ Default language set to 'en' in config.php
+ Fix some css bugs in suspended sales section
+ Default cookie sess_time_expire set to 86400 (24h)
Version 2.1.0
-------------
+ Various upgrades, too numerous to list here.
+ Removed dependancy on ofc upload library due to vulnerability found.
-------------------------------------------------------------------------------
* Ver. 2.0.2
Version 2.0.2
-------------
+ Fixed multiple giftcards issue per Bug #4 reported on Sourceforge where a
second giftcard added would have its balance set to $0 even if the sale did
not require the total of the second giftcard to pay the remaining amount due.
+ Small code cleanup
-------------------------------------------------------------------------------
Version 2.1.0
-------------
* Upgrade to CodeIgniter 2.1.0
* Various small improvements
* Various small improvements

View File

@@ -142,7 +142,6 @@ CREATE TABLE `ospos_items` (
`unit_price` decimal(15,2) NOT NULL,
`quantity` decimal(15,2) NOT NULL DEFAULT '0.00',
`reorder_level` decimal(15,2) NOT NULL DEFAULT '0.00',
`location` varchar(255) NOT NULL,
`item_id` int(10) NOT NULL AUTO_INCREMENT,
`allow_alt_description` tinyint(1) NOT NULL,
`is_serialized` tinyint(1) NOT NULL,
@@ -588,7 +587,6 @@ CREATE TABLE `ospos_stock_locations` (
PRIMARY KEY (`location_id`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1 AUTO_INCREMENT=8;
--
-- Dumping data for table `ospos_stock_locations`
--