mirror/opensourcepos
1
0 Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-10-09 02:52:47 -04:00
Code Issues Packages Projects Releases Wiki Activity
1,996 Commits 58 Branches 40 Tags
cc2fd1876de4b4aed20ae5fa8c0b6178607d13e8
Commit Graph
87 Commits
Author SHA1 Message Date
Steve Ireland 2719c43e3d Fix for issue where the warning messages for out of stock or below reorder level were not being sent to the user. 2017-01-30 20:38:24 -05:00
Steve Ireland 85983cd17a Fix merge issues related to line_sequence for receipts and invoices 2017-01-30 19:03:57 -05:00
Steve Ireland 68cf3bf68b Merge remote-tracking branch 'jekkos/item-kit' into item-kit 2017-01-29 23:10:37 -05:00
Steve Ireland f9c1dde054 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-29 22:23:46 -05:00
Steve Ireland dd6bd1cf11 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-21 23:26:01 -05:00
FrancescoUK 5a4c27cf87 Set correct Employee in Sales receipt and invoice (#967) 2016-11-13 11:21:09 +00:00
FrancescoUK d380524f9d Sales and Receivings code refactoring 2016-11-09 10:06:09 +00:00
jekkos 6dfb24e6f1 Fix query performance for Item->exists (receivings) (#924) 2016-11-05 21:03:32 +01:00
FrancescoUK 872aa7b829 Improve sales register scan item performance (#924) + Fix statistics 2016-11-05 15:07:25 +00:00
FrancescoUK e21f25c15b Fix typo causing an error in Sales register (#904) 2016-10-17 08:39:35 +01:00
FrancescoUK 2d8bd2d307 Show deleted items in Receiving receipt (#904) 2016-10-17 08:32:03 +01:00
FrancescoUK 20a6c6ec0a Show deleted items in receipts and invoices (#904) 2016-10-16 23:14:01 +01:00
FrancescoUK 0cb68d47cb Apply Customer discount to item kit items too (#910) 2016-10-16 09:24:42 +01:00
FrancescoUK 04a77dff7d Apply customer default discount even if customer added later (#910) 2016-10-14 21:19:52 +01:00
jekkos 956f18e55c Round amount due before comparing with zero (#759) 
Bump version chartist tooltip
 2016-07-30 10:23:30 +02:00
jekkos 28129ef075 Set calculation precision to currency + tax decimals (#759) 2016-07-25 21:28:56 +02:00
jekkos d8e4bf48d8 Check if payments cover sale with exact precision (#733) 
Set bc-operation style scale globally
Add location filtering in graphical and summary reports (#742)
 2016-07-20 20:43:31 +02:00
FrancescoUK 38d234fa5f Fixed receipt, change due and total cash issues with no payment cases (#707) 2016-07-09 10:04:04 +01:00
jekkos 0f88d6462d Add fixes for register + receiving validation (#458) 2016-07-07 21:11:33 +02:00
FrancescoUK c136832db1 Fixed issue with negative tendered amount in sales (#707), improved sales_items_temp table and usage in various parts 2016-07-03 14:07:46 +01:00
FrancescoUK b7cb5c5873 make consistent use of elseif in place of else if 2016-07-01 17:08:01 +01:00
FrancescoUK cf860be1fc Small refactoring of library classes 2016-06-23 18:12:18 +01:00
FrancescoUK 2ca3911d56 No autoload and refactoring of SMS lib and Message Controller to be consistent with the rest of libraries (#693) 2016-06-23 09:05:30 +01:00
FrancescoUK 9a1def21cc Code tidy up (#635) 2016-06-21 18:34:24 +01:00
FrancescoUK b96ebeed22 XSS clean Sales (#39), refactored Sales Controller (#639), added Send Email in Receipt & Invoice (#475) 2016-06-12 18:15:43 +01:00
jekkos aae02dc060 Disable invoice creation after sale / receiving completion (#619) 2016-06-09 22:29:41 +02:00
FrancescoUK 1453b5e21d Fixed return of only invoice receipt if the searched number matches an invoice, disable the invoice search if not set in config (#606) 2016-06-03 19:23:43 +01:00
FrancescoUK 83d93464bc Added ability to update payment type when editing a sale (#314) 2016-04-17 21:51:52 +01:00
FrancescoUK afcb1641b7 Added decimals to taxes (#327), added totals rounding matching decimals (#327 #307, #429) 2016-04-02 13:59:01 +01:00
FrancescoUK f6be7cdf23 Merge branch 'master' into bootstrapUI 2016-03-13 16:19:44 +00:00
FrancescoUK 0bd5bbec77 remove encode/decode base64 causing issues with web hosting providers (#374) 2016-03-13 10:52:32 +00:00
FrancescoUK d2565009d8 fix wrong behaviour with due amount and Complete button on "sale" <=0 and "return" >=0 (#116) 2016-03-12 09:23:54 +00:00
FrancescoUK 2df8645c5f code comments, various bits and bobs (#116) 2016-03-11 17:20:07 +00:00
jekkos a201d18938 Add specific warning when stock goes below reorder level in sales (#365, #336) 2016-03-02 08:28:50 +01:00
jekkos 9e2d89c528 Show discounted price instead of discount itself on receipt 2016-01-04 17:19:50 +01:00
jekkos 1779685d31 Encode text before storing it as session variable (#254) 2015-12-30 08:10:14 +01:00
jekkos bf0622d7fa Show discounted price per item line 2015-12-26 15:26:32 +01:00
jekkos da25281df9 Show discounted price per item line 2015-12-26 15:21:54 +01:00
jekkos 7c2cc9646d Don't override custom invoice numbers (#223) 2015-11-09 10:46:35 +01:00
jekkos 43b8d32efc Don't use empty on php expression (#196) 
Signed-off-by: jekkos <jeroen.peelaerts@gmail.com>
 2015-10-09 17:11:24 +02:00
jekkos 1fd7fda645 Fix totals calculation when adding item multiple times (issue #165) 
Fix typo in script comments
 2015-10-09 10:24:38 +02:00
jekkos 64023f6eec Avoid comments coercion to 0 when suspending sales (#192) 
Invoice number in suspended sales should not be unique
 2015-10-08 18:29:55 +02:00
FrancescoUK 763a9e73fa #192 Remove 0 from comments 
Checked in library get_comment if the string is null and return a '' if that's the case. That removes the 0 from sale comments
 2015-10-07 09:37:27 +01:00
FrancescoUK 80fcede1ca #152 Remove Alain name and add it to the COPYING under the Copyright section 2015-09-19 17:40:00 +01:00
jekkos e1ddcbbb5b Rename Item_quantities model to Item_quantity 
Rename Stock_locations model to Stock_location
Fix barcode generation in receipts (sales + receivings)
 2015-09-17 21:59:33 +02:00
FrancescoUK c88f37f8e7 Change Sale Overview to become a daily takings view with totals. 2015-09-01 23:37:26 +01:00
jekkos 658792c1fc Fix invoice return 2015-05-22 19:26:56 +02:00
jekkos 46f6824199 Fix rounding issues with tax inclusive pricing 
Add autocomplete in return mode
 2015-05-19 20:46:42 +02:00
jekkos b85b9d37a1 Add company_name field to customers for invoicing purposes 
Total discount is now shown as one amount in receipt

Conflicts:

	application/controllers/sales.php

Conflicts:

	database/migrate_phppos.sql
 2015-04-06 15:15:34 +02:00
jekkos 8ff742085a Multiple total disconuts are shown correctly now 2015-03-31 21:56:44 +02:00