Commit Graph

2307 Commits

Author SHA1 Message Date
FrancescoUK
afca2882f8 Regen dist and database files 2017-07-27 19:47:14 +01:00
jekkos
eb610fccb5 Add missing bootswatch themes (#1408) 2017-07-25 22:20:02 +02:00
Steve Ireland
641e2f414c Add missing language element for rounding code "Unknown" and eliminate duplicate statements in upgrade statement, and fix issue with 0 tax_category_id 2017-07-25 00:56:59 +02:00
jekkos
5d49728c74 Don't add csrf token if cookie expired (#1392) 2017-07-18 08:51:36 +02:00
FrancescoUK
858845f4f5 Merge pull request #1397 from RuleDomain/tax-category-cleanup
Improve tax category maintenance.
2017-07-15 22:08:09 +01:00
Steve Ireland
eccf08cf8f Improve tax category maintenance. 2017-07-15 16:42:27 -04:00
FrancescoUK
623572b0f5 Update js plugin and regen dist files 2017-07-14 16:29:47 +01:00
FrancescoUK
dc0d580d05 Fix exceptions in invoice and receipt emails (#1325) 2017-07-14 11:28:08 +01:00
FrancescoUK
fe05845bd4 Fix invoice code indentation 2017-07-14 09:57:55 +01:00
Weblate
1798b4553b Update weblate translations 2017-07-14 07:02:39 +00:00
AELHOFY
e59a3372a9 Translated using Weblate (Arabic)
Currently translated at 100.0% (214 of 214 strings)
2017-07-14 07:00:06 +00:00
jekkos
8a7b93f1b9 Sync language files (#1242) 2017-07-14 08:34:30 +02:00
jekkos
61a3fee4a6 Fix sales / token substitution 2017-07-14 08:30:35 +02:00
jekkos
a92d60d99f Minor refactoring tax story 2017-07-14 00:07:13 +02:00
FrancescoUK
47486b980f Fix Store Config Tax category, Reward, Locations and Tables add and remove of entries 2017-07-13 22:43:49 +01:00
FrancescoUK
dc14cbd7ab Merge pull request #1395 from RuleDomain/fix-quotes-in-takings-2
Remove redundant where clause in Sale.php
2017-07-13 18:54:57 +01:00
Steve Ireland
d7b7f5510c Remove redundant where clause in Sales.php 2017-07-13 13:15:54 -04:00
FrancescoUK
323b7900e9 Merge pull request #1393 from RuleDomain/fix-quotes-in-takings
Remove quotes from the list of takings.
2017-07-13 15:02:17 +01:00
Steve Ireland
eb4d0c8c88 Remove quotes from the list of takings. 2017-07-12 23:15:34 -04:00
FrancescoUK
b0e3600ea6 Fix stock location update (#1389) 2017-07-12 22:22:05 +01:00
FrancescoUK
41ae935223 Merge branch 'RuleDomain-long-alt-description'
# 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-07-11 22:53:37 +01:00
FrancescoUK
60db2cc4b0 Fixes 2017-07-11 22:43:08 +01:00
Steve Ireland
b7951ea5b2 Consolidate tax configuration. 2017-07-11 22:36:32 +01:00
Steve Ireland
cb31ebb06e Extend alternate item description to 255 characters. 2017-07-11 22:32:51 +01:00
FrancescoUK
3f0a53933c Merge branch 'RuleDomain-tax-configuration'
# 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-07-11 22:23:42 +01:00
FrancescoUK
f92b06cff2 Fixes 2017-07-11 22:23:14 +01:00
Steve Ireland
bab4791b5e Consolidate tax configuration. 2017-07-09 18:48:47 -04:00
FrancescoUK
421468f6d8 Update README.md 2017-07-07 21:25:55 +01:00
FrancescoUK
f3a08eab3b Update ISSUE_TEMPLATE.md 2017-07-07 21:23:10 +01:00
FrancescoUK
863988d2ab Regen ApiGen documentation 2017-07-06 22:13:18 +01:00
FrancescoUK
e524593a15 Minor fixes 2017-07-06 20:38:41 +01:00
FrancescoUK
181d904360 Visualise the taxes according to the selected number of decimals (#1133) 2017-07-06 20:31:35 +01:00
Steve Ireland
4448348f7c Improve sale status reporting 2017-07-04 22:02:27 -04:00
FrancescoUK
bb762efac7 Merge pull request #1376 from odiea/master
Update Items.php . Changed receiving_quantity to 1
2017-07-04 08:55:48 +01:00
FrancescoUK
c5697edf76 Fix payment summary report missing return and location (#1133) 2017-07-03 22:07:58 +01:00
FrancescoUK
3f73e449f0 Fix summary report and detailed sale report different tax issue (#1133) 2017-07-03 20:13:37 +01:00
odiea
a18745b3af Update Items.php 2017-07-03 06:23:05 -06:00
FrancescoUK
0057c77721 Replace UPC/EAN/ISBN with Barcode label (#1370) 2017-07-02 21:52:07 +01:00
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