FrancescoUK
fd3fecbd76
Update README
2017-07-02 21:31:56 +01:00
FrancescoUK
ad690c9ca6
Add odiea to the hall of fame :-)
2017-07-02 21:27:09 +01:00
FrancescoUK
ab29527619
Fix (yet again) registry "complete" issue with rounding
2017-07-02 21:07:55 +01:00
FrancescoUK
12b5ed43c6
Regen ApiGen documentation
2017-07-02 20:26:45 +01:00
FrancescoUK
a78f053c80
Fix config Table and Reward errors
2017-07-02 19:48:58 +01:00
FrancescoUK
5ea0324bc0
Fix rounding issues in reports ( #1336 )
2017-07-02 15:32:06 +01:00
FrancescoUK
005193e3e0
Update CodeIgniter to vs 3.1.5
2017-07-02 13:05:12 +01:00
FrancescoUK
95733ea476
Regen Apigen documentation
2017-07-02 11:23:09 +01:00
FrancescoUK
c8499599ab
General code tidy up, added documentation
2017-07-02 11:15:57 +01:00
FrancescoUK
2f44a9d5c2
Update ISSUE_TEMPLATE.md
2017-07-02 09:00:34 +01:00
FrancescoUK
d28e95208b
Update TEMPLATE_ISSUES.md to reflect the latest
2017-07-01 10:06:05 +01:00
FrancescoUK
c4bda0e1fe
Merge branch 'RuleDomain-vat-discount-amount-issues'
...
# 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-06-30 19:11:41 +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
FrancescoUK
d5e2b6cb0d
Regen files
2017-06-30 19:03:15 +01:00
FrancescoUK
d25b1408c9
Merge pull request #1362 from RuleDomain/discard-quote-fix
...
Fix #1340 - failure to discard quotes
2017-06-27 06:22:09 +01:00
Steve Ireland
c3f83202a8
Fix failure to discard quotes
2017-06-26 23:32:35 -04:00
FrancescoUK
643c5d91a6
Merge pull request #1360 from RuleDomain/suspended-sale-inventory-fix
...
Fix for #1354 , inventory update issue for suspended sales
2017-06-26 05:55:38 +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
FrancescoUK
ee2f66aa61
Merge pull request #1359 from odiea/master
...
Fix Detailed Reports to show table content.
2017-06-25 20:35:31 +01:00
odiea
16502065fa
Fix Detailed Reports to show table content.
2017-06-25 09:53:57 -06:00
FrancescoUK
1a7ed8a69b
Fix line duplication mistake ( #1358 )
2017-06-24 17:44:58 +01:00
FrancescoUK
d2eaaab92c
Merge pull request #1358 from odiea/master
...
Update Receiving.php
2017-06-24 16:37:17 +01:00
odiea
55666caac5
Update Receiving.php
2017-06-24 09:29:01 -06:00
FrancescoUK
841c8166a2
Fixed missing English translation ( #1355 )
2017-06-24 13:39:35 +01:00
FrancescoUK
4e5ac5c521
Merge branch 'odiea-receivingquantity'
...
# 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-06-24 13:03:54 +01:00
FrancescoUK
d59e713f1f
move receiving database update to common database update script
2017-06-24 13:03:00 +01:00
odiea
78877094fb
Update receipt.php
2017-06-24 13:03:00 +01:00
odiea
e2e0ade259
Update for Items receiving_quantity
2017-06-24 13:03:00 +01:00
FrancescoUK
e61e409bfe
Fix name Title Case issue ( #1301 ) using a composer lib
2017-06-24 12:25:46 +01:00
jekkos
5d22e41fe2
Fix refresh on focusout ( #1351 , #1328 )
2017-06-20 22:39:32 +02:00
jekkos
0d82db42da
Show string placeholders if translations are missing ( #1349 )
2017-06-19 22:14:01 +02:00
jekkos
ff7848dcff
Fix escape error in french ( #1344 )
2017-06-19 22:06:57 +02:00
FrancescoUK
4866457164
Merge pull request #1342 from RuleDomain/fix-undefined-table-status
...
Fix undefined table_status error in Sale.php
2017-06-18 09:51:35 +01:00
Steve Ireland
acd003a44c
Fix undeifined table_status error in Sale.php
2017-06-13 20:43:47 -04:00
jekkos
f407702dbe
Add database.php to docker image ( #1297 )
2017-06-13 19:17:34 +02:00
FrancescoUK
d129610b24
Merge pull request #1335 from Frontuari/master
...
Fixed Dinner Tables feature
2017-06-07 19:44:18 +01:00
Jorge Colmenarez
55bf5eddda
Fixed Dinner Tables feature
2017-06-07 11:15:46 -04:00
FrancescoUK
94ea15bc18
Fixed notification pop up issues in Config with tables & rewards
2017-06-04 14:31:50 +01:00
FrancescoUK
91fd435cca
Fixes to reports tax summary and rewards regressions
2017-06-04 10:46:24 +01:00
FrancescoUK
8f019b4631
Merge branch 'RuleDomain-sales-tax-reporting'
...
# 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-06-03 23:09:15 +01:00
FrancescoUK
51e160982e
Upgrades sales tax reporting
2017-06-03 23:08:09 +01:00
Steve Ireland
1f2218bbc9
Upgrades sales tax reporting
2017-06-03 21:51:02 +01:00
jekkos
77145d29a8
Regnerate language files ( #1330 )
2017-06-02 19:47:13 +02:00
jekkos
3a447561eb
Merge pull request #1330 from rotrico/master
...
Improve spanish translation
2017-06-02 19:43:21 +02:00
rotrico
6ee545d6eb
Improve spanish translation to master version
2017-06-01 13:56:48 +02:00
FrancescoUK
afbf714bd2
Revert "Translated using Weblate (English)" mistakes
2017-05-30 21:04:22 +01:00
FrancescoUK
1a2bc1cc42
Merge pull request #1327 from joshua1234511/hotfix/giftcard-stuck-at-10-issue
...
fix for Giftcard issue both display and count (#1315 )
2017-05-30 07:07:05 +01:00
Joshua Fernandes
4268a70388
fix for that issue both display and count
2017-05-30 07:36:57 +05:30
Almubaraq Ratomi
189b189e08
Translated using Weblate (Indonesian)
...
Currently translated at 100.0% (16 of 16 strings)
2017-05-29 22:22:30 +00:00
