mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-24 09:17:54 -05:00
Code Issues Packages Projects Releases Wiki Activity
2,105 Commits 37 Branches 39 Tags
f556361ade2af35aadef050ba2baf7b059e020eb
Commit Graph

65 Commits

Author SHA1 Message Date
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
FrancescoUK
38d234fa5f Fixed receipt, change due and total cash issues with no payment cases (#707) 2016-07-09 10:04:04 +01:00
FrancescoUK
0cbd19353c Rename temp table creation functions to simply be create_temp_table 2016-07-06 19:22:32 +01:00
FrancescoUK
3c969858cf Performance improvement for Inventory reports after XSS clean addition (#39) 2016-07-06 19:11:54 +01:00
FrancescoUK
a74e7565bf Change " to ' in sale model queries 2016-07-05 22:21:12 +01:00
FrancescoUK
df6f118a79 Fixed search customer bug in sales Takings (#654) 2016-07-05 21:51:39 +01:00
FrancescoUK
0ba5cadbb7 More models/Sale refactoring, fix button order in sales/form, make inventory count button a close one 2016-07-03 20:23:06 +01: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
ac968e21e6 Additional tidy up (#667) 2016-06-19 12:35:52 +01:00
FrancescoUK
ad1b3aeaac Allowed search box and filters to be contextual to selected date range (#667) 2016-06-19 11:57:53 +01:00
jekkos
4b0badfb30 Fix customer search in takings (#654) 
Replace payment type label with amount tendered (#513)
 2016-06-15 17:18:31 +02:00
FrancescoUK
3a5b88d51c Added configuration order of payment options available in Sales Register (#456 #646) 2016-06-13 19:39:02 +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
bced04ca88 Split up exsiting docker image in mulitple containers (mysql, php-apache, npm) (#616) 
Add company_name to searchable fields in Takings overview (#594)
Change tests to use elementBy instead of wait functions
 2016-06-08 22:36:33 +02:00
FrancescoUK
6ad547049e Further model checks, improved success result, made code style consistent (#598) 2016-05-29 15:04:21 +01:00
FrancescoUK
404fc5b548 Sanity checked SQL escaping in all the models, improved code under different aspects (#598) 2016-05-28 22:41:27 +01:00
FrancescoUK
6e14dfb6d5 Sanity checked SQL insert and update, minor fixes (#598) 2016-05-27 18:40:16 +01:00
jekkos
c3f2f41888 Fix barcode generation in items and item_kits (#537, #538) 
Enable sorting in takings (with static row below the table) (#293, #507)
 2016-05-09 18:40:13 +02:00
jekkos
b37f984eb6 Fixes for item kits (new, update) (#507) 
Fixes for takings overview (pagination, sorting) (#293)
Fixes for item tax bulk update (#507)
Table rows are highlighted again before delete (#507)
 2016-05-03 08:10:38 +02:00
jekkos
c9142ca69b Fix payment summary in sales (#293) 
Add glyphicons to buttons in register + receiving views
Refactor table_support init function
Various bugfixes
 2016-05-03 08:10:36 +02:00