Commit Graph

2123 Commits

Author SHA1 Message Date
FrancescoUK
3f489d6f53 Fix payment issue (#1182) regen sql script files 2017-03-12 22:12:42 +00:00
FrancescoUK
55350b8bf8 Merge pull request #1178 from joshua1234511/feature/reward-points-customer
Feature/reward points customer (#1179)
2017-03-12 18:58:21 +00:00
Joshua Fernandes
f52b61ae36 removed the sepearte sql after adding to migrate and table 2017-03-12 19:20:30 +05:30
Joshua Fernandes
e131cda843 sql queires added 2017-03-12 19:18:02 +05:30
Joshua Fernandes
991854f0f2 Removed my key 2017-03-04 22:58:39 +05:30
Joshua Fernandes
af7d2f27aa fix for display reports 2017-03-04 17:38:03 +05:30
Joshua Fernandes
3650b47d8b reports display added for detailed sale and customer 2017-03-04 17:17:03 +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
ae90dfa333 Fixed receipt total mistake with double taxation (#1163) 2017-02-27 23:25:49 +00:00
Valentin Seipt
02dcb4dc90 Translated using Weblate (German)
Currently translated at 100.0% (178 of 178 strings)
2017-02-27 19:54:18 +00:00
jekkos
4dc3c49d9d Merge pull request #1171 from RuleDomain/fix-undefined-property
Fix for undefined property in Sale_lib.php #1166
2017-02-27 12:15:19 +01:00
Steve Ireland
a77d63fad8 Fix for undefined property in Sale_lib.php #1166 2017-02-26 21:42:12 -05:00
FrancescoUK
b487573b05 Fix line removal mistake (#1166) 2017-02-26 23:59:09 +00:00
FrancescoUK
4528436fd5 Fixed tax calculation issues (#1094, #1163) 2017-02-26 23:56:12 +00:00
jekkos
5876efbbee Merge pull request #1170 from RuleDomain/fix-undefined-property
Fix for undefined property in Sale_lib.php #1166
2017-02-26 22:24:11 +01:00
Steve Ireland
1e1b0cd06b Fix for undefined property in Sale_lib.php #1166 2017-02-26 15:35:13 -05:00
Jorge Colmenarez
6826115b2d Support for Configurable Dinner Tables Feature 2017-02-26 15:35:21 -04:00
jekkos
032bb34131 Merge pull request #1149 from RuleDomain/tokens-quotes
Tokens quotes
2017-02-26 12:05:47 +01:00
jekkos
e9aa0068fe Enable auto refresh for serialnumber and description (#1154) 2017-02-23 08:03:37 +01:00
jekkos
e55b5a743a Add realtime cart update in sale and receiving (#1154) 2017-02-21 23:28:22 +01:00
Steve Ireland
e4955027d1 Hide stock_type and item_type if the employee isn't authorized to item kits. On register if item type is non-stock don't display the zero stock balance message, and correct the default quote format when initializing the field. 2017-02-19 13:41:04 -05: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
53dcdc02cf Fixed payment issue in return mode (#1081) 2017-02-18 21:48:21 +00:00
FrancescoUK
69391eb434 Added to composer.json PHP7.0 support 2017-02-18 17:27:18 +00:00
FrancescoUK
aff7e6df3b Fixed composer.json name format (required by Packagist) 2017-02-18 16:50:18 +00:00
Luc Gagnier
9bf24fee5f Translated using Weblate (French)
Currently translated at 100.0% (178 of 178 strings)

Translated using Weblate (French)

Currently translated at 100.0% (22 of 22 strings)

Translated using Weblate (French)

Currently translated at 98.8% (88 of 89 strings)

Translated using Weblate (French)

Currently translated at 86.0% (43 of 50 strings)

Translated using Weblate (French)

Currently translated at 99.1% (116 of 117 strings)
2017-02-15 23:54:00 +01:00
FrancescoUK
2c53f0e585 Fixed typo in README and added more info 2017-02-14 09:09:12 +00:00
FrancescoUK
5aeb1234a2 Fixed POS or pos issue in sale register (#1081) 2017-02-13 22:14:00 +00:00
FrancescoUK
6e62a3fe15 Update README with latest System Requirement 2017-02-13 18:55:36 +00:00
jekkos
67594190fc Merge pull request #1140 from RuleDomain/item-kit-git-info-fix
This fixes an error with Item_kit.get_info
2017-02-13 08:16:24 +01:00
Steve Ireland
c6597ba6ce This fixes an error with Item_kit.get_info that occurs in developer test mode. 2017-02-12 21:16:53 -05:00
FrancescoUK
2187898b04 Add CI language support 2017-02-12 13:39:37 +00:00
FrancescoUK
a6b5220047 Updated to CI version 3.1.3 2017-02-11 22:08:00 +00:00
FrancescoUK
78cb4822c2 Updated js plugins and composer 2017-02-11 20:51:32 +00:00
FrancescoUK
ae4ff80974 Fix encryption key generation issue (#1110) 2017-02-07 20:49:19 +00:00
jekkos
df2d616566 Merge pull request #1128 from RuleDomain/fixes-item-kit-discount-not-working
Fix for discount assignment not working
2017-02-07 20:27:08 +01:00
Steve Ireland
353fa8e95c Fix for discount assignment bug 2017-02-06 18:37:34 -05:00
FrancescoUK
699236bca0 Merge pull request #1122 from i92guboj/pic_filename
Preliminary fix for dot corruption in pic_filename (#1026)
2017-02-05 21:34:48 +00:00
FrancescoUK
4ca862ba9f Refactor code (#1110) 2017-02-05 21:24:29 +00:00
i92guboj
7222df3551 Remove unnecessary/redundant check 2017-02-05 21:30:17 +01:00
i92guboj
72e1158847 Cleanup and tabs 2017-02-05 21:25:00 +01:00
i92guboj
145d97737f Preliminary fix for dot corruption in pic_filename 2017-02-05 17:10:34 +01:00
FrancescoUK
8140d1aee4 Update language files (#932) 2017-02-04 12:15:40 +00:00
FrancescoUK
5f5394b18f Fix correct database upgrade script (#632) 2017-02-03 22:24:38 +00:00
FrancescoUK
ceb9687e5e Merge pull request #1115 from jlctmaster/date_or_time_format
Fixed bug sales data preview of day (#932)
2017-02-03 22:04:30 +00:00
Jorge Colmenarez
7a4525319a Fixed bug sales data preview of day when date or time field is checked into config location tab 2017-02-03 15:39:11 -04:00
jekkos
a175111b59 Merge pull request #1114 from RuleDomain/this-fixes-add-item-kit
This will fix the issue with the PHP error when adding a new item kit…
2017-02-03 10:54:22 +01:00
Steve Ireland
4cda5343aa This will fix the issue with the PHP error when adding a new item kit. It also initializes the line_sequence config option. 2017-02-02 23:25:04 -05:00
FrancescoUK
e7cbacaae6 Merge pull request #1111 from RuleDomain/fix-kit-item-selection
Change kit item selection from the Item Kit maintenance to only selec…
2017-02-01 20:07:48 +00:00