174 Commits

Author	SHA1	Message	Date
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
jekkos	6dfb24e6f1	Fix query performance for Item->exists (receivings) (#924)	2016-11-05 21:03:32 +01:00
FrancescoUK	872aa7b829	Improve sales register scan item performance (#924) + Fix statistics	2016-11-05 15:07:25 +00:00
FrancescoUK	dd66496ccc	Remove deleted stock locations from low inventory report (#916)	2016-10-21 16:28:09 +01:00
FrancescoUK	e21f25c15b	Fix typo causing an error in Sales register (#904)	2016-10-17 08:39:35 +01:00
FrancescoUK	2d8bd2d307	Show deleted items in Receiving receipt (#904)	2016-10-17 08:32:03 +01:00
FrancescoUK	20a6c6ec0a	Show deleted items in receipts and invoices (#904)	2016-10-16 23:14:01 +01:00
FrancescoUK	0cb68d47cb	Apply Customer discount to item kit items too (#910)	2016-10-16 09:24:42 +01:00
FrancescoUK	04a77dff7d	Apply customer default discount even if customer added later (#910)	2016-10-14 21:19:52 +01:00
FrancescoUK	cd0ef34f75	Log error if email sending fails (#772)	2016-09-12 19:18:05 +01:00
FrancescoUK	e3c9cddacb	Merge branch 'master' into composer	2016-09-07 19:31:52 +01:00
jekkos	91b18d032f	Replace DOMPDF, GaTracking with composer managed dependencies (#624) ... Fix trim on search bug (#838)	2016-09-07 09:11:11 +02:00
FrancescoUK	d319c5a73d	Alternative fix to #833	2016-09-04 17:27:53 +01:00
FrancescoUK	f3270a545e	Fixed no internet connection causing blank page (#833)	2016-09-03 10:23:58 +01:00
FrancescoUK	3ce939ad20	Minor fixes	2016-08-30 18:01:05 +01:00
jekkos	6e7b32cb1b	Remove duplicate suggestions ... Remove duplicate result suggestions in nominatim (#805)	2016-08-29 17:50:43 +02:00
jekkos	59bbe55215	Install CI langauges in system/language as before (#624) ... Map CI language folder with ospos language code	2016-08-18 08:27:54 +02:00
FrancescoUK	01aeca579a	Code refactoring and bug fixes	2016-08-13 14:07:27 +01:00
FrancescoUK	b77d368885	Refactoring and statistics support	2016-08-12 21:23:26 +01:00
jekkos	956f18e55c	Round amount due before comparing with zero (#759) ... Bump version chartist tooltip	2016-07-30 10:23:30 +02:00
jekkos	28129ef075	Set calculation precision to currency + tax decimals (#759)	2016-07-25 21:28:56 +02:00
jekkos	d8e4bf48d8	Check if payments cover sale with exact precision (#733) ... Set bc-operation style scale globally Add location filtering in graphical and summary reports (#742)	2016-07-20 20:43:31 +02:00
FrancescoUK	38d234fa5f	Fixed receipt, change due and total cash issues with no payment cases (#707)	2016-07-09 10:04:04 +01:00
jekkos	0f88d6462d	Add fixes for register + receiving validation (#458)	2016-07-07 21:11:33 +02:00
FrancescoUK	c136832db1	Fixed issue with negative tendered amount in sales (#707), improved sales_items_temp table and usage in various parts	2016-07-03 14:07:46 +01:00
FrancescoUK	b7cb5c5873	make consistent use of elseif in place of else if	2016-07-01 17:08:01 +01:00
FrancescoUK	d62af2a007	Limit string length of barcode strings (#692)	2016-06-26 18:21:05 +01:00
FrancescoUK	362b32357f	Complete translation support with dropdowns and Store Config pages (#439)	2016-06-25 19:43:53 +01:00
FrancescoUK	331d97b48f	Added email config to Store Config, added Email_lib, refactored email code (#441, #519)	2016-06-23 19:26:51 +01:00
FrancescoUK	cf860be1fc	Small refactoring of library classes	2016-06-23 18:12:18 +01:00
FrancescoUK	2ca3911d56	No autoload and refactoring of SMS lib and Message Controller to be consistent with the rest of libraries (#693)	2016-06-23 09:05:30 +01:00
FrancescoUK	9a1def21cc	Code tidy up (#635)	2016-06-21 18:34:24 +01:00
FrancescoUK	bb85a172a2	Change invoice_number in Receiving to be Reference, tidy up code (#635)	2016-06-21 08:50:11 +01:00