1024 Commits

Author	SHA1	Message	Date
FrancescoUK	bc34293cac	Add due payment to cashup (#440 #2131)	2018-09-30 15:17:31 +01:00
FrancescoUK	b3bfc51ee8	Add cashup feature	2018-09-09 11:09:43 +01:00
FrancescoUK	c7b32a5a0e	Minor fixes	2018-09-08 15:48:21 +01:00
jekkos	2605dff9b7	Fix colspan in receivings	2018-09-07 00:38:11 +02:00
Erastus	858f7614f9	merge branch	2018-09-03 01:10:28 -05:00
Erastus	c57d8ef536	discount in item_kits	2018-09-03 00:51:34 -05:00
Erastus	3b659526f3	cleaning spaces	2018-09-02 17:58:41 -05:00
FrancescoUK	7e85586313	Fix Receivings colspan when cart is empty	2018-09-01 16:24:28 +01:00
jekkos	da114ae988	Add item_number to receivings view	2018-09-01 09:42:46 +02:00
Erastus	53efbdb3b7	reports discount fixed	2018-08-31 23:05:32 -05:00
Erastus	a6b11e6f48	new discount on sales	2018-08-31 15:27:44 -05:00
FrancescoUK	26e33dddec	Check FORCE_HTTPS env to be true, upgrade MariaDB vs in docker-compose	2018-08-25 16:03:07 +01:00
Erastus	8b29fc7fea	reports graphical discount	2018-08-20 23:42:47 -05:00
Erastus	85bbbe835c	Discount on Sales	2018-08-20 13:41:56 -05:00
FrancescoUK	8e6b33b228	Add support for multi-pack items (#1919)	2018-07-14 09:33:08 +01:00
FrancescoUK	baebd237e5	Fix review feedback	2018-07-14 09:29:10 +01:00
FrancescoUK	463a56b1c4	Fix item_kits form issue	2018-07-08 18:02:19 +01:00
jekkos	a4e135eb92	Add support for multi-pack items.	2018-07-05 19:05:54 -04:00
FrancescoUK	1026ebb0eb	Fix indentation issue	2018-07-05 18:09:42 +02:00
jekkos	d8f086a840	Fix double submit issue (#2020)	2018-07-05 18:09:42 +02:00
FrancescoUK	732e1a028b	Fix indentation issue	2018-07-05 18:09:42 +02:00
jekkos	8f172e172b	Fix double submit issue	2018-07-05 18:09:42 +02:00
FrancescoUK	683ef75162	Code refactoring	2018-07-05 18:09:42 +02:00
FrancescoUK	086c2de441	Remove csrf_form_base() from register	2018-07-05 18:09:42 +02:00
jekkos	bc0077012d	Use backend for amount validation (#2020, #2018)	2018-07-05 18:09:42 +02:00
FrancescoUK	a34f152153	Revert "Fix Item form issue (#2021)"	2018-06-13 22:30:37 +01:00
Steve Ireland	5ef8a88000	Add support for temporary items.	2018-06-13 22:11:00 +01:00
FrancescoUK	c6b5ff1934	Restore CSRF change with & issue fix (#1990, #2009)	2018-06-13 22:11:00 +01:00
FrancescoUK	f1cf3d3c87	Release 3.2.3	2018-06-13 21:37:15 +01:00
FrancescoUK	8138db1a80	Fix Item form issue (#2021)	2018-06-13 21:19:55 +01:00
FrancescoUK	2e7e9cecd8	Revert CSRF change (#2009)	2018-06-06 21:28:52 +01:00
FrancescoUK	fe2ae55e94	Minor tidy up	2018-05-30 11:49:26 +02:00
FrancescoUK	fea0462407	Remove additional csrf_form_base calls, general tidy up	2018-05-30 11:49:26 +02:00
jekkos	c9a50cdeaf	Check first if type parameter exists (#1990)	2018-05-30 11:49:26 +02:00
jekkos	04cbd95c13	Add as query string in case we use url encoded form (#1990)	2018-05-30 11:49:26 +02:00
jekkos	07d4b852e0	Hook $.ajax instead of $.post	2018-05-30 11:49:26 +02:00
FrancescoUK	c423bc4222	Fix Mailchimp config issue due to missing json payload format	2018-05-27 19:20:12 +01:00
FrancescoUK	37390ae9dd	Fix issue with barcode scanner and customer field (#871)	2018-05-12 18:56:25 +01:00
FrancescoUK	5f0d8b2312	Add extra payment combinations (#1982)	2018-05-12 17:21:18 +01:00
FrancescoUK	9d149ad4f3	Autoreturn to Sale page after receipt printing (#1966)	2018-05-01 20:46:18 +01:00
FrancescoUK	fdbdf55e71	Better Customer data privacy protection (#1949)	2018-04-29 14:13:00 +01:00
Steve Ireland	b4f8667047	Fix rendering of discounted unit price on invoice and quotes.	2018-04-27 08:55:22 -04:00
FrancescoUK	0e14d5390f	Minor fixes	2018-04-22 09:12:01 +01:00
Steve Ireland	cdd966878d	Various fixes for the item kit feature.	2018-04-21 17:46:39 -04:00
jekkos	50c4b30df2	Hide discount / item if no discount for that item (#1924)	2018-04-05 08:57:36 +02:00
FrancescoUK	4079e44572	Allow password change with no restrictions + code reorg (#1894)	2018-03-25 19:18:03 +01:00
FrancescoUK	4595ab5c35	Allow editing of Customer from sales register (#1884)	2018-03-25 18:02:08 +01:00
FrancescoUK	35150f14ed	Fix Submit button translation (#1894)	2018-03-25 15:53:57 +01:00
FrancescoUK	ae472d0176	Print reports date in different formats, remove sorting (#1896)	2018-03-25 13:57:20 +01:00
FrancescoUK	4f2b6badd9	Allow password change with no restriction (#1894)	2018-03-24 21:47:10 +00:00