mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-02-01 05:01:14 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,279 Commits 37 Branches 39 Tags
f3a08eab3bfbb1be266edc32b72dfbb2cabbd9f9
Commit Graph

85 Commits

Author SHA1 Message Date
FrancescoUK
863988d2ab Regen ApiGen documentation 2017-07-06 22:13:18 +01:00
FrancescoUK
e524593a15 Minor fixes 2017-07-06 20:38:41 +01:00
FrancescoUK
181d904360 Visualise the taxes according to the selected number of decimals (#1133) 2017-07-06 20:31:35 +01:00
Steve Ireland
4448348f7c Improve sale status reporting 2017-07-04 22:02:27 -04:00
FrancescoUK
3f73e449f0 Fix summary report and detailed sale report different tax issue (#1133) 2017-07-03 20:13:37 +01:00
FrancescoUK
5ea0324bc0 Fix rounding issues in reports (#1336) 2017-07-02 15:32:06 +01:00
FrancescoUK
c8499599ab General code tidy up, added documentation 2017-07-02 11:15:57 +01:00
FrancescoUK
15e0da4515 Minor fixes 2017-06-30 19:10:43 +01:00
Steve Ireland
c71ce1e8ae Fix discount issue on checkout in VAT tax scenario 2017-06-30 19:05:03 +01:00
Steve Ireland
69e56d06ae Correction to update inventory only if item type is standard and sale type is standard. 2017-06-25 22:11:06 -04:00
Steve Ireland
acd003a44c Fix undeifined table_status error in Sale.php 2017-06-13 20:43:47 -04:00
Jorge Colmenarez
55bf5eddda Fixed Dinner Tables feature 2017-06-07 11:15:46 -04:00
Steve Ireland
1f2218bbc9 Upgrades sales tax reporting 2017-06-03 21:51:02 +01:00
Steve Ireland
c0a9349b60 Add support for database migration 2017-05-09 20:45:25 -04:00
FrancescoUK
c4a76ad01c Fixed Takings filters bug (#1286) 2017-05-01 13:12:25 +01:00
FrancescoUK
daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history" 
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
 2017-05-01 11:50:13 +01:00
Steve Ireland
27d5fd882b Remove debug code 2017-04-30 23:31:31 -04:00
Steve Ireland
c710ec938f Sales tax history migration 2017-04-30 11:30:39 -04:00
FrancescoUK
7e7c068c90 Add only_check filter to takings (#1244) 2017-04-17 12:00:56 +01:00
Steve Ireland
effba9d102 Add support for customer sales tax and cash rounding 2017-04-14 21:21:44 -04:00
FrancescoUK
387b0004a8 Fix typo in !empty 2017-03-13 12:26:53 +00:00
Joshua Fernandes
cdc401dd7e review change empty check 2017-03-13 15:40:00 +05:30
Joshua Fernandes
74681e78e3 fixed issues with enable reward points 2017-03-13 10:58:34 +05:30
Joshua Fernandes
deea43ce67 customer reward points first phase work 2017-03-04 16:13:56 +05:30
FrancescoUK
3d9665c0a9 Merge pull request #1169 from jlctmaster/dinner-tables 
Support for Configurable Dinner Tables Feature
 2017-03-01 22:17:16 +00:00
FrancescoUK
4528436fd5 Fixed tax calculation issues (#1094, #1163) 2017-02-26 23:56:12 +00:00
Jorge Colmenarez
6826115b2d Support for Configurable Dinner Tables Feature 2017-02-26 15:35:21 -04:00
Steve Ireland
9bf8989960 This will add support for preparing quotes and generating invoices prior 
to payments
 2017-02-19 13:37:32 -05:00
FrancescoUK
5aeb1234a2 Fixed POS or pos issue in sale register (#1081) 2017-02-13 22:14:00 +00:00
Steve Ireland
85983cd17a Fix merge issues related to line_sequence for receipts and invoices 2017-01-30 19:03:57 -05:00
FrancescoUK
df9b776d56 Add support for MySQL 5.7 (#630) and PHP7 (#591), better Item Kits (#625) 2017-01-30 20:10:17 +00: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
FrancescoUK
f359c475d3 Fix Takings issue (#932) 2017-01-29 19:31:02 +00:00
Steve Ireland
476db84e86 Change SUM to MAX and a couple of indent issues. 2017-01-22 16:40:20 -05:00
Steve Ireland
dc638c74b5 Resolves Item view and Takings view issues that odiea spotted. 2017-01-22 10:57:59 -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
root
305d9dd55e Support for Date or Time Format 2016-11-30 14:32:25 -04:00
jekkos
1666a3e689 Fix detailed sale + receiving report row update + currency sorting (#1003) 2016-11-25 22:24:46 +01:00
FrancescoUK
b66827b0ff Fix Detailed sale tax rounding, reorder reports to subtotal, tax, total, cost, profit (#976) 2016-11-20 12:15:50 +00:00
FrancescoUK
540c4f3ec0 Make Sale get_info consistent with the other queries (#976) 2016-11-19 19:30:38 +00:00
FrancescoUK
9e1064979a Solve detailed sale rounding issue (#976) 2016-11-19 16:27:55 +00:00
FrancescoUK
5047ca0f41 Fix Sales Takings multiple taxes issue and swap table columns (#976) 2016-11-19 15:15:43 +00:00
FrancescoUK
577e5b2db4 Fix wrong tax and subtotal calculation in Summary reports (#976) 2016-11-17 23:13:56 +00:00
FrancescoUK
5a4c27cf87 Set correct Employee in Sales receipt and invoice (#967) 2016-11-13 11:21:09 +00:00
FrancescoUK
e1035ff54b Optimise Reports usage of temp database tables (#964) 2016-11-10 17:42:17 +00:00
FrancescoUK
ed80627ddd Takings, sale edit, receipt database performance improvement - no temp table - (#964) 2016-11-09 18:06:23 +00:00
FrancescoUK
d380524f9d Sales and Receivings code refactoring 2016-11-09 10:06:09 +00:00
FrancescoUK
5ecc6ead7d Temporary tables optimisation: add indexes (#951) 2016-10-30 17:05:41 +00:00
FrancescoUK
816fcd9203 Temporary tables optimisation: improve sales_items_temp (#951) 2016-10-30 17:04:59 +00:00