Commit Graph

1169 Commits

Author SHA1 Message Date
objecttothis
4584b7eace Final indentation and formatting fixes 2020-03-24 14:17:36 +04:00
objecttothis
3281fc9bb0 Correct indentation problems 2020-03-24 14:04:04 +04:00
objecttothis
fb9fec1a10 Merge branch 'master' into pos_bool 2020-03-18 16:19:45 +04:00
FrancescoUK
3382610871 Merge pull request #2760 from opensourcepos/attribute-colon-patch
Removing the restriction for colons in the name
2020-03-14 07:18:44 +00:00
jekkos
531035fef2 Update invalid chars 2020-03-13 22:41:42 +01:00
objecttothis
ecb21d2d5e Same correction for removing attribute value 2020-03-13 16:38:18 +04:00
objecttothis
a2a5db8901 Correct a bug causing & to break in POST
See #2758 for details
2020-03-13 16:32:39 +04:00
objecttothis
04ade7ab0b Removing the restriction for colons in the name
Please see #2665
2020-03-13 13:22:23 +04:00
objecttothis
ea7cb48f1c CHECKBOX Attribute type
Conversion from DROPDOWN or TEXT logic
2020-03-02 14:17:48 +04:00
FrancescoUK
cdaf88ef28 Fix Employee autocomplete bug (#2736) 2020-03-01 17:34:39 +00:00
objecttothis
d7a59221fc Fix problem with unchecked attributes
Previously, if the attribute was unchecked, the form wouldn't submit the
attribute and the model/controller would delete the attribute_link from
the item.  A hidden input type with value 0 occuring before the checkbox
fixes this problem.
2020-02-27 12:24:04 +04:00
objecttothis
ff79b73e34 Implement CHECKBOX attribute type
Attribute Configuration view
Attributes section of item management view
Attributes section of CSV item import
2020-02-25 15:44:49 +04:00
FrancescoUK
efd53cbccf Add Employee name to suspended form (#2678) 2020-02-16 13:46:25 +00:00
FrancescoUK
e0620e1a3e Add more onClick select the text content 2020-02-15 22:44:03 +00:00
FrancescoUK
99d861535e Add allow sales change price permission (#2653) 2020-01-25 17:22:26 +00:00
FrancescoUK
7739994eda Minor indentation adjustment 2020-01-19 20:51:41 +00:00
FrancescoUK
5007410c1a Change Employee input type in Sales edit form 2020-01-19 20:32:57 +00:00
FrancescoUK
b4eabd2265 Fix missing cash refund in sale edit form 2020-01-19 18:24:11 +00:00
FrancescoUK
d08381850d Merge pull request #2668 from opensourcepos/fix-attr-default-date
Use today as default date in DATETIME attribute (#2666)
2020-01-12 22:13:59 +00:00
FrancescoUK
472e15ab0a Add detailed supplier report 2020-01-12 20:28:55 +00:00
jekkos
de6a547272 Use today as default date in DATETIME attribute (#2666) 2020-01-09 20:24:32 +01:00
FrancescoUK
351bc544ee Fixed indentation 2020-01-04 10:38:31 +00:00
SteveIreland
5dfe0c237f Add payments to emailed invoice and fix issue with unsupported fonts 2020-01-03 21:01:07 -05:00
FrancescoUK
3b628bed45 Prepare Release 3.3.2 2020-01-03 22:38:57 +00:00
FrancescoUK
91d72c0265 Merge pull request #2641 from opensourcepos/csrf-cookie-prefix
Add cookie_prefix to csrf cookie name (#2638)
2019-12-30 11:47:37 +00:00
jekkos
fd3b48ba43 Add cookie_prefix to csrf cookie name (#2638) 2019-12-30 11:29:17 +01:00
FrancescoUK
e03ee00e61 Merge pull request #2639 from opensourcepos/refresh-after-import
Refresh tables after import + close after invoice email (#478)
2019-12-29 20:31:23 +00:00
andriux1990
2641a34a1e onclick 2019-12-29 17:55:35 +01:00
andriux1990
59bf8d0a45 item selection 2019-12-29 17:55:35 +01:00
jekkos
b8f255cc50 Refresh tables after import + close after invoice email (#478) 2019-12-29 17:50:17 +01:00
objecttothis
619742de4e Refactoring files and variable names in Customer/People 2019-11-25 17:27:59 +04:00
objecttothis
6294079ce3 File rename and variable refactor to correct error in import. 2019-11-25 15:51:31 +04:00
Brian Cassidy
80a512b9be type="username" is not valid html and breaks firefox autofill; changed to "text" 2019-11-12 15:30:20 -04:00
SteveIreland
fffb70933d Fix item type maintenance issue regardless. 2019-11-10 19:40:57 -05:00
SteveIreland
4c4725795c Fix numeric locale configuration. 2019-10-19 17:10:51 -04:00
FrancescoUK
907e42e46b Merge pull request #2581 from opensourcepos/fix_numeric_locale_config
Fix numeric locale configuration.
2019-10-17 06:43:24 +01:00
SteveIreland
d4c2693511 Fix numeric locale configuration. 2019-10-16 21:37:46 -04:00
FrancescoUK
eef7d65b5c Update Bootswatch themes to latest version 2019-10-13 21:29:40 +01:00
SteveIreland
61e28302ce Add a code to indicate a taxable item on a sales receipt 2019-10-11 00:10:13 -04:00
tuthanika
51ca6e92c7 Fix Colspan in receipt_short.php (#2557)
On Discounts: Columns deviation after adding a discounted amount to sales.
2019-10-01 13:22:02 +03:00
FrancescoUK
8d699cc9ad Upgrade CodeIgniter to 3.1.11, LICENSE file and npm 2019-09-28 19:06:52 +01:00
jekkos
0ca766e9c9 Trigger validation when creating items in bulk (#2521) 2019-09-25 00:17:55 +02:00
FrancescoUK
4274321a3f Fix empty report issue (#2522) 2019-09-11 21:46:06 +01:00
FrancescoUK
64eb7abf2f Fix empty reports issue (#2522) 2019-09-09 22:11:38 +01:00
objecttothis
f235cede08 Update date_input.php
Corrected this from 1 to 2.  'All' is counted in the array which means that if there is only one stock location, this dropdown will still appear.  Setting this to 2 means that the dropdown only shows when there is more than 1 stock location.
2019-07-12 15:16:21 +04:00
jekkos
abcf12c3d7 Change newlines into html breaks (invoice template) 2019-07-03 19:44:55 +02:00
FrancescoUK
4f78b1efab Fix datetime issues (#2319) and refactor code 2019-06-15 21:37:27 +01:00
FrancescoUK
01dfd023eb Merge pull request #2319 from opensourcepos/fix-attribute-datetime
Fix attribute datetime formatting
2019-06-15 10:32:22 +01:00
objecttothis
32a88098b0 Update system_info.php
Remove check for write permissions on import_items.csv file since the file no longer exists and is generated on-the-fly.
2019-06-13 23:52:03 +04:00
jekkos
0ae6470b35 Migrate attribute datetime to date (#2441) 2019-06-05 00:47:17 +02:00