mirror/opensourcepos
1
0
Fork 0
mirror of https://github.com/opensourcepos/opensourcepos.git synced 2026-01-21 07:48:06 -05:00
Code Issues Packages Projects Releases Wiki Activity
4,475 Commits 37 Branches 40 Tags
3.3.1
Commit Graph

530 Commits

Author SHA1 Message Date
FrancescoUK
a56a4070a6 Revert "Fix "only_full_group_by" issue (#2538)" 
This reverts commit 424eb4cf14.
 2019-10-06 20:15:24 +01:00
FrancescoUK
69d57b3744 Merge pull request #2567 from opensourcepos/fix-initial-tax-config 
Clear initial default for Cascade and Seq for Tax Config Tables
 2019-10-06 18:54:31 +01:00
FrancescoUK
424eb4cf14 Fix "only_full_group_by" issue (#2538) 2019-10-06 18:43:58 +01:00
SteveIreland
4a6f4e1f74 Clear initial default for Cascade and Seq for Tax Jurisdiction and Tax Category. 2019-10-03 22:28:30 -04:00
jekkos
55c86afcde Fix warning in development mode (#2476) 2019-09-23 07:55:44 +02:00
PICCORO Lenz McKAY
37189ba1f3 added category column to the inventory summary report due huge product data 
closes https://github.com/opensourcepos/opensourcepos/issues/2526
 2019-09-02 22:34:30 -04:30
jekkos
0a2894c582 Left join on attribute_values to show items with no value (#2485) 2019-08-04 22:29:44 +02:00
SteveIreland
f95d777dc2 Improves the behavior of dinner table selection. 2019-07-21 11:53:01 -04:00
objecttothis
8c173540e6 Update Attribute.php 
changed DATETIME to DATE since constant name was changed but it wasn't changed here.
 2019-07-09 18:05:23 +04:00
jekkos
cfe5a3c84e Enable attribute search for datetime (#2441) 2019-06-30 17:52:32 +02:00
FrancescoUK
1f2aa2708d Fix missing ) and minor change 2019-06-22 16:39:18 +01:00
jekkos
8ca5449b79 Add decimals to items search result + fix reports 2019-06-20 18:39:17 +02:00
Steve Ireland
a34f017dbd Fix a couple of issues with payment processing. 2019-06-19 21:50:20 -04:00
FrancescoUK
01dfd023eb Merge pull request #2319 from opensourcepos/fix-attribute-datetime 
Fix attribute datetime formatting
 2019-06-15 10:32:22 +01:00
FrancescoUK
4644dd2e46 MySQL queries consistency check 2019-06-15 09:39:08 +01:00
FrancescoUK
28b3bc87d4 Comment out unused code still with custom fields 2019-06-09 21:47:36 +01:00
Steve Ireland
595ef0b617 Track initial cash refunds 2019-06-07 21:48:05 -04:00
jekkos
0ae6470b35 Migrate attribute datetime to date (#2441) 2019-06-05 00:47:17 +02:00
jekkos
d3d051ee72 Fix loading attribute values in item search (#2232) 2019-06-05 00:31:45 +02:00
jekkos
f2d2b1d3e2 Fix datetime attribute formatting (#2232) 2019-06-05 00:29:48 +02:00
FrancescoUK
d47099fa23 Merge pull request #2431 from opensourcepos/attributes_csv_import_integration 
Attributes csv import integration
 2019-06-04 21:13:54 +01:00
FrancescoUK
3894af4db2 Optimise database temp tables indexes (#2409) 2019-06-03 22:45:00 +01:00
FrancescoUK
dbf3114267 Attributes csv import integration 2019-06-03 21:13:21 +01:00
Steve Ireland
a89674ccfe Support updates to payments 2019-05-01 21:17:22 -04:00
Steve Ireland
e740d8665f Fix Tax Group 2019-04-21 13:33:25 -04:00
Steve Ireland
4ae1c575fc Adapt Cashups to new Sales Summary Report 2019-03-23 10:36:30 -04:00
jekkos
5d047303a0 Sync language files + add script to .gitignore 2019-03-16 14:38:01 +01:00
objecttothis
185cf88534 Update Attribute.php 
Remove blank line
 2019-03-14 10:05:39 +04:00
objecttothis
2dca4785e1 Update Attribute.php 
Without this else if the change from text to dropdown fails but no actual query is made since the query to update the attribute type gets made by the save_definition function.
 2019-03-14 10:04:46 +04:00
Steve Ireland
d242c65e99 Two more Payment Summary report fixes. 2019-03-09 16:34:49 -05:00
FrancescoUK
0199b29063 Summary report code refactoring 2019-03-09 09:44:56 +00:00
objecttothis
ea75574b82 Merge pull request #2393 from opensourcepos/add_DECIMAL_attribute_type 
Add decimal attribute type
 2019-03-07 15:20:02 +04:00
Steve Ireland
09432c6450 Improve the summary payments report. 2019-03-06 19:27:58 -05:00
objecttothis
f875c8e518 Changes to allow attribute type of DECIMAL 2019-03-01 17:48:20 +04:00
objecttothis
aea080d6bd Update Attribute.php 
Without this else, TEXT->DROPDOWN fails.  It just returns a simple success because no database changes are needed other than changing the definition_type which is not done here.  This would also cause all other conversions not listed to automatically succeed, but we don't need to worry because those are restricted in the view to only ones that are actually supported.
 2019-02-26 14:08:33 +04:00
FrancescoUK
c0b947f72e Merge pull request #2362 from opensourcepos/convert_attribute_type 
Add attribute type conversion, error checking.
 2019-02-24 21:25:46 +00:00
Steve Ireland
2f710e80e7 Fixes a couple of problems with sales tax migration plus a couple of other problems. 2019-02-23 18:58:28 -05:00
objecttothis
3b3b58bda4 Refactor regex to locale_helper to be used in other parts of the code. 2019-02-21 15:04:48 +04:00
objecttothis
fd99df8c2e combined nested if statement into single if 2019-02-21 12:23:44 +04:00
objecttothis
20af6120b1 Corrections to $success 2019-02-20 10:32:40 +04:00
objecttothis
7875ecaa5b Corrected $success references 2019-02-19 10:46:27 +04:00
objecttothis
c631cdbaf4 Added code to error out on incorrectly formatted data. 2019-02-18 17:02:12 +04:00
objecttothis
81033f55e5 Corrected code 2019-02-18 12:37:11 +04:00
objecttothis
e66c7bad24 Add attribute type conversion, error checking. 2019-02-15 17:03:31 +04:00
Steve Ireland
b3f53fa627 Fix tax group rendering issue triggered by "% CE" 2019-02-09 16:33:45 -05:00
objecttothis
2c06edba02 Remove function and combine call to reduce redundant code. 2019-01-30 11:30:28 +04:00
objecttothis
e080873ec3 Check to see if attribute_value already exists 2019-01-28 18:16:17 +04:00
Steve Ireland
20cb007f3c Refactor Tax Configuration 2019-01-10 21:42:15 -05:00
jekkos
6792c829b2 Cleanup duplicated field 2019-01-07 18:44:24 +01:00
jekkos
804942cff5 Add warning if migration is needed (#2247) 2018-12-24 20:43:22 +01:00