FrancescoUK
28d89c685b
Merge branch 'RuleDomain-fix-database-creation-dup-config-val' ( #1192 )
...
# 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-04-16 08:48:55 +01:00
FrancescoUK
d59b79e4b6
Fix database creation duplicate config value error
2017-04-16 08:37:03 +01:00
Steve Ireland
e0bc9bb8f7
Fix database creation duplicate config value error
2017-04-15 16:22:20 -04:00
FrancescoUK
86afbf0d30
Merge branch 'RuleDomain-customer-sales-tax-feature' ( #1133 #1192 )
...
# 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-04-15 10:29:48 +01:00
FrancescoUK
26d5605de5
Regen db, js, css files
2017-04-15 10:21:52 +01:00
FrancescoUK
6c0124cd17
Minor fixes
2017-04-15 10:04:48 +01:00
Steve Ireland
effba9d102
Add support for customer sales tax and cash rounding
2017-04-14 21:21:44 -04:00
FrancescoUK
15b13e1a3d
Merge pull request #1225 from RuleDomain/fix-item-import
...
Fix for item excel import
2017-04-10 06:24:32 +01:00
Steve Ireland
1a0a3fbeba
Fix for item excel import
2017-04-09 21:40:56 -04:00
Aril Apria Susanto
b7e0c0eba6
Translated using Weblate (Indonesian)
...
Currently translated at 87.2% (116 of 133 strings)
2017-04-05 20:58:17 +00:00
Aril Apria Susanto
354076f8c3
Translated using Weblate (Indonesian)
...
Currently translated at 95.7% (91 of 95 strings)
2017-04-05 20:58:15 +00:00
Aril Apria Susanto
6e9e7abcff
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (66 of 66 strings)
2017-04-05 20:58:15 +00:00
Aril Apria Susanto
cf314f98a6
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (26 of 26 strings)
2017-04-05 20:58:14 +00:00
Aril Apria Susanto
a316e250de
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (196 of 196 strings)
2017-04-05 20:58:13 +00:00
Aril Apria Susanto
33b9f97bce
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (61 of 61 strings)
2017-04-05 20:58:13 +00:00
Weblate
3677b61dd9
Merge with master
2017-04-02 21:25:26 +00:00
Aril Apria Susanto
e592040962
Translated using Weblate (Indonesian)
...
Currently translated at 87.2% (116 of 133 strings)
2017-04-02 19:51:27 +00:00
Aril Apria Susanto
e51c79c423
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (8 of 8 strings)
2017-04-02 19:51:24 +00:00
Aril Apria Susanto
f556361ade
Update Indonesian Translation
2017-04-02 21:49:03 +02:00
FrancescoUK
a317c32d1e
Removed php-enum composer package ( #1198 )
2017-04-01 13:04:45 +01:00
FrancescoUK
0e60d5e6e1
Updated js plugins
2017-03-25 19:17:43 +00:00
FrancescoUK
6fda5d63fe
Updated CodeIgniter to 3.1.4
2017-03-25 19:15:18 +00:00
FrancescoUK
7c9a2dee37
Added php-enum composer package ( #1198 )
2017-03-25 19:14:11 +00:00
FrancescoUK
06f404ddc4
Fixed wrong id reference in js script ( #1194 )
2017-03-25 11:42:47 +00:00
langlais
562a43a942
Translated using Weblate (French)
...
Currently translated at 96.0% (48 of 50 strings)
2017-03-22 20:55:31 +00:00
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
