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
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
