mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-02 13:41:05 -05:00
Code Issues Packages Projects Releases Wiki Activity
383 Commits 37 Branches 39 Tags
cf2ca1e6c7faf7d5daeeba7d1fe89c381f583b21
Commit Graph

55 Commits

Author SHA1 Message Date
jekkos-t520
9e9a9a80a9 Fix tax percentage calculations (issue #42) 
Use bcadd calculations for payment totals
Add tax inclusive option back into general_config
 2015-02-12 14:57:39 +01:00
jekkos-t520
fe081779c5 Fix number_format bug when entering an empty payment amount 
Add giftcard balance to final receipt (if giftcard payment present)
 2015-02-12 14:34:08 +01:00
jekkos-t520
8b1186c4f9 Fix barcode generation for item kits 2015-02-11 13:31:08 +01:00
jekkos-t520
d208e6dccb set menubar font sizes to px instead of pt 
add item_number duplication check when adding new items
fix barcode on receivings receipt (after completion)
change backup db download format to gz
 2015-02-10 10:56:37 +01:00
jekkos-t520
84ffe5d4eb Add try catch to barcode generation (so errors are displayed in case of 
config problems)
 2015-02-10 00:05:42 +01:00
jekkos-t520
0a29809f7a Add item code as barcode label 2015-02-09 19:56:16 +01:00
jekkos-t520
4332bce401 Replace old code39 generator for receipts with new barcode_lib 
functionality
 2015-02-09 18:08:46 +01:00
jekkos-t520
42f4eb9c7b Add code128 as barcode_type 2015-02-09 17:32:45 +01:00
jekkos-t520
bd5e5b0b94 Remove item code as barcode parameter 
Always show barcode itself as a second row
 2015-02-09 17:03:52 +01:00
jekkos-t520
377284f491 Add company name to barcode layout options 2015-02-08 18:05:29 +01:00
jekkos-t520
7081fe0338 Remove non free barcodegen library 
Add width and height parameters for code39 barcode generation
 2015-02-05 17:00:41 +01:00
jekkos-t520
215a2104a1 Add item_id/upc barcode content option 
Fix tabcontent width
Improve location config screen
 2015-02-02 15:48:41 +01:00
jekkos-t520
48867d44be Remove barcode.png 
Set correct permissions on Arial.ttf
 2015-02-02 13:24:26 +01:00
jekkos-t520
1bf839601a Barcode patch applied (using barcodegen) 2015-02-02 12:44:58 +01:00
jekkos-t520
c00c604c21 Fix tax inclusive pricing for non taxable customer 
Show receiving quantity in receiving receipt
Allow to use invoice number as zero (a bug prevented 0 to be saved to
db, causing it to stop incrementing next time)
 2014-12-18 19:55:20 +01:00
jekkos-t520
0132c9092c Remove clear enable functions 2014-12-16 19:00:15 +01:00
jekkos-t520
07a32a0deb Remove invoice / sale format enable option 
Add giftcards -> person_id foreign key constraint
Fix tax calculation for non taxable customers
Improve giftcard person autocompletion
 2014-12-16 08:49:49 +01:00
jekkos-t520
0569275c4e Add receivings invoice number enable/disable 
Ignore invoice number unique constraint when invoice is disabled
 2014-12-06 10:46:16 +01:00
jekkos-t520
64f1b4191a Invoice number can now be enabled/disabled 
Invoice unique constraint only applies when enabling invoice
Correct several HTML structure errors in sale and order modules
Make the top module bar a bit wider
Fix payment details css when hiding/showing invoice number field
 2014-12-04 22:01:40 +01:00
jekkos-t520
ee30b178b4 Remove duplicate statement from 2.3.1 sql upgrade script 
Remove quantity column from database.sql
Update item import example with correct location id
Fix detailed report receipt links
 2014-11-28 08:51:08 +01:00
jekkos-t520
44b5404fe7 Fix missing invoice number in sales receipt 2014-11-27 08:48:15 +01:00
jekkos-t520
b311eca62e Fix receiving_quantity error in receivings page 2014-11-26 08:17:43 +01:00
jekkos-t520
5f3a81ee5c Merge branch 'master' of https://github.com/jekkos/opensourcepos 2014-11-25 23:04:25 +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
flodef
26bee3e5a6 Update Sale_lib.php 
Clean "add_payment" to be simpler : don't need to declare $payment in the main as it used only to add to an existing array
Fix "edit_payment" that was trying to set a payment on the $payment_id (expected payment data : $payments)
 2014-11-11 13:04:27 +01:00
jekkos-t520
035f2ad946 Review receivings quantity mulitplier 2014-11-04 08:14:16 +01:00
jekkos-t520
7a46078734 Add receivings_quantity to item form 
Conflicts:

	application/libraries/Receiving_lib.php
	database/2.3_to_2.3.1.sql
 2014-11-03 18:07:50 +01:00
jekkos-t520
96c349b099 Add invoice numbering to sales module 2014-10-30 19:22:49 +01:00
jekkos-t520
4e071c9fbb Fix blank page when returning receivings 
Conflicts:

	application/libraries/Receiving_lib.php
 2014-10-22 07:11:37 +02:00
jekkos-t520
08dcd9e384 Fix totals calculation in receivings module 2014-10-20 18:31:33 +02:00
jekkos-t520
7bcb1d7531 Fix totals calculation in sales register 2014-10-16 08:23:47 +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
5e8367681b Fix default location in items, sales and receivings 2014-10-04 13:38:52 +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
eb51b680aa Show stock location names in employee form 2014-10-03 00:27:50 +02:00
jekkos-t520
2929dfe9dd Add stock location filtering on items 2014-10-02 19:33:35 +02:00
jekkos-t520
ff7b305058 Added tax inclusive pricing to sales and receivings 2014-09-15 21:27:11 +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
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
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
Padungsak
d020b53215 Fix: Qty. column is not show in requisition report 
Padungsak
 2014-06-17 23:47:16 +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-t520
e01f29b1b3 This commit will fix a common problem in CodeIgniter. 
After $config['sess_time_to_update']  expires the session will be destroyed if concurrent AJAX calls are made to the framework.
Original discussion on this problem can be found on the following URL

http://stackoverflow.com/questions/7980193/codeigniter-session-bugging-out-with-ajax-calls
 2013-11-26 18:58:45 +01:00
pappastech
c1254138d6 Due to a remote code execution vulnerability found in PHP Point of Sale, I'm removing the ofc_upload_image.php file to prevent exploitation of Open Source Point of Sale. 
All users are strongly encouraged to upgrade to version 2.0.3.

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@79 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-10-22 00:28:54 +00:00
objecttothis
b75fe4b8d2 Not sure if this was removed after download or not. Should it be merged? 
git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@67 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-07-05 20:13:09 +00:00
pappastech
a8dfa2dbe8 * Ver. 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

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@58 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2013-03-05 03:09:38 +00:00
pappastech
a61e9ab274 Fixed last item on the list which was to get the language selection working from the config area of the site versus having to change the language in the application/config/config.php file. 
We're now at version 2.0!

Tom

git-svn-id: svn+ssh://jekkos@svn.code.sf.net/p/opensourcepos/code/@55 c3eb156b-1dc0-44e1-88ae-e38439141b53
 2012-09-06 19:48:40 +00:00