Commit Graph

2098 Commits

Author SHA1 Message Date
langlais
cbda2dae13 Translated using Weblate (French)
Currently translated at 100.0% (29 of 29 strings)
2017-03-22 20:55:31 +00:00
langlais
1abdd765de Translated using Weblate (French)
Currently translated at 100.0% (66 of 66 strings)
2017-03-22 20:55:31 +00:00
Xyko Arteiro
2f4d0986d9 Translated using Weblate (Portuguese (Brazil))
Currently translated at 100.0% (196 of 196 strings)
2017-03-22 20:55:31 +00:00
langlais
bbac0f16bf Translated using Weblate (French)
Currently translated at 98.4% (193 of 196 strings)
2017-03-22 20:55:31 +00:00
FrancescoUK
b986ad437a Fix composer.lock 2017-03-19 11:04:40 +00:00
jekkos
68883230e8 Make encryption key configurable in docker (#1189) 2017-03-19 11:04:07 +01:00
jekkos
5cb8141641 Regenerate langauge files 2017-03-18 16:12:57 +01:00
Emin Tufan Çetin
e6d6bf0392 Translated using Weblate (Turkish)
Currently translated at 87.9% (117 of 133 strings)
2017-03-16 07:04:38 +00:00
Jorge Colmenarez
85d2cf9e68 Translated using Weblate (English)
Currently translated at 100.0% (95 of 95 strings)
2017-03-16 07:04:38 +00:00
FrancescoUK
91f33d14b7 Merge pull request #1188 from Langlais115/Langlais115-Item-by-Article
French translations
2017-03-15 20:41:00 +00:00
Langlais115
5e004309f0 Minor change 2017-03-15 17:11:25 +01:00
Langlais115
aa8351c147 Improve translation 2017-03-15 15:51:02 +01:00
Langlais115
adacc2ab5f Improve translation 2017-03-15 15:42:26 +01:00
Langlais115
8bb4171265 Improve translation 2017-03-15 15:33:58 +01:00
Langlais115
87bd59a6bf Improve translation 2017-03-15 15:15:53 +01:00
Langlais115
488fc58a03 Translate the file 2017-03-15 15:12:00 +01:00
Langlais115
8cd521c6d1 Improve translation 2017-03-15 15:05:55 +01:00
Langlais115
faaac45653 Change Item by Article 2017-03-15 14:47:20 +01:00
Langlais115
d8e19ceeca Change Item by Article 2017-03-15 14:42:39 +01:00
FrancescoUK
00f99c524a Updated LICENSE, upgraded js plugin and regen dist files 2017-03-13 14:38:27 +00:00
FrancescoUK
91d5157765 Fixed Dinner Table support in suspended (#886) 2017-03-13 14:17:03 +00:00
FrancescoUK
b8414cc969 Merge branch 'joshua1234511-hotfix/enable-reward-points-issue'
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2017-03-13 12:29:45 +00: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
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