Commit Graph

206 Commits

Author SHA1 Message Date
Steve Ireland
d63446cdb8 Suspending Work Order lost work order number 2017-09-17 09:24:52 -04:00
FrancescoUK
7789675a55 Merge branch 'RuleDomain-fix-item-kit-cost' (#1580 #1595)
# 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-09-16 20:46:12 +01:00
Steve Ireland
729283af37 Add support for item kit costing 2017-09-16 11:39:03 -04:00
Steve Ireland
771c1b9d1e Enance reporting to accomodate work orders and canceled transactions. 2017-09-08 08:54:25 -04:00
Steve Ireland
981aceda53 Add support for Work Orders 2017-09-07 21:37:50 +01:00
FrancescoUK
4d7397647f Fix db backup failure (#1557) 2017-09-06 18:26:42 +01:00
Steve Ireland
2177e71f47 Fix cash rounding issue 2017-08-12 21:17:52 -04:00
FrancescoUK
c364d296cd Fix PRICE_KIT_ITEMS mistake (#1450) 2017-08-07 20:21:30 +01:00
jekkos
6c714b2dc4 Add constants for magic numbers 2017-08-06 14:33:26 +01:00
jekkos
4a05f00307 Some indentation 2017-08-06 14:33:26 +01:00
jekkos
86d3c6bf04 Cleanup Sales controller 2017-08-06 14:33:26 +01:00
FrancescoUK
3b0df85f69 Various fixes 2017-08-05 16:17:06 +01:00
jekkos
bc04884190 Add function to parse barcode fields 2017-08-05 15:18:49 +01: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
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
863988d2ab Regen ApiGen documentation 2017-07-06 22:13:18 +01:00
FrancescoUK
181d904360 Visualise the taxes according to the selected number of decimals (#1133) 2017-07-06 20:31:35 +01:00
FrancescoUK
ab29527619 Fix (yet again) registry "complete" issue with rounding 2017-07-02 21:07:55 +01:00
FrancescoUK
5ea0324bc0 Fix rounding issues in reports (#1336) 2017-07-02 15:32:06 +01:00
FrancescoUK
c8499599ab General code tidy up, added documentation 2017-07-02 11:15:57 +01:00
Steve Ireland
c71ce1e8ae Fix discount issue on checkout in VAT tax scenario 2017-06-30 19:05:03 +01:00
odiea
e2e0ade259 Update for Items receiving_quantity 2017-06-24 13:03:00 +01:00
Jorge Colmenarez
55bf5eddda Fixed Dinner Tables feature 2017-06-07 11:15:46 -04:00
Steve Ireland
c0a9349b60 Add support for database migration 2017-05-09 20:45:25 -04:00
FrancescoUK
daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history"
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
2017-05-01 11:50:13 +01:00
Steve Ireland
c710ec938f Sales tax history migration 2017-04-30 11:30:39 -04:00
FrancescoUK
5bdf6d396b Add Mailchimp connector (#113) avoid email duplicates (#112) 2017-04-22 16:07:33 +01:00
FrancescoUK
9d01398a4b Minor code style adjustments 2017-04-17 21:47:22 +01:00
Steve Ireland
7f8ac815ef Fix the line total extension error when receiving the same item multiple times. 2017-04-16 10:06:24 -04: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
3f489d6f53 Fix payment issue (#1182) regen sql script files 2017-03-12 22:12:42 +00:00
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
Jorge Colmenarez
6826115b2d Support for Configurable Dinner Tables Feature 2017-02-26 15:35:21 -04: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
Steve Ireland
a99f326bb8 Generate low inventory message if at least one of the item kit items added to a sale are below the reorder level. 2017-01-31 09:03:36 -05:00
Steve Ireland
2719c43e3d Fix for issue where the warning messages for out of stock or below reorder level were not being sent to the user. 2017-01-30 20:38:24 -05:00
Steve Ireland
85983cd17a Fix merge issues related to line_sequence for receipts and invoices 2017-01-30 19:03:57 -05:00
Steve Ireland
68cf3bf68b Merge remote-tracking branch 'jekkos/item-kit' into item-kit 2017-01-29 23:10:37 -05:00
Steve Ireland
f9c1dde054 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-29 22:23:46 -05:00
Steve Ireland
dd6bd1cf11 Changes to support Item Kits, support for MySQL 5.7, and a tweak for PHP 7 2017-01-21 23:26:01 -05:00
FrancescoUK
5a4c27cf87 Set correct Employee in Sales receipt and invoice (#967) 2016-11-13 11:21:09 +00:00
FrancescoUK
d380524f9d Sales and Receivings code refactoring 2016-11-09 10:06:09 +00:00
FrancescoUK
868868163c Replace Appconfig->get with config->item to reduce database calls 2016-11-08 20:09:40 +00:00
FrancescoUK
1f2e87ec09 Encrypt email and sms passwords before saving to MySQL (#963)
It also automatically generates an encryption key if not existing storing it in config/config.php in order to enable encryption.
2016-11-07 19:20:44 +00:00