Commit Graph

276 Commits

Author SHA1 Message Date
Steve Ireland
e85e2e5e55 Final touch on Work Orders 2017-09-09 17:39:23 -04:00
FrancescoUK
700e695b4b Consistency in database upgrade script 2017-09-09 15:59:38 +01:00
FrancescoUK
717bda9f31 Merge branch 'feature/backoffice' (#1543 #1539) 2017-09-09 10:30:12 +01:00
Steve Ireland
771c1b9d1e Enance reporting to accomodate work orders and canceled transactions. 2017-09-08 08:54:25 -04:00
FrancescoUK
cfa051cee8 Add en_GB translations to backoffice feature (#1543 #1539) 2017-09-07 21:40:18 +01:00
Steve Ireland
981aceda53 Add support for Work Orders 2017-09-07 21:37:50 +01:00
Steve Ireland
23b4dacb9a Fix database and table script. 2017-09-07 21:35:42 +01:00
Steve Ireland
893aad3502 Add Office Menu 2017-09-07 21:35:42 +01:00
FrancescoUK
2bc702acc8 Fix old database upgrade scripts (#1546) 2017-09-04 19:37:38 +01:00
FrancescoUK
e1743f4d9f Fix database upgrade script issue and rename it to 3.0.2 to 3.1.1 (#1546) 2017-09-04 18:32:58 +01:00
FrancescoUK
52ab4ce035 Fix db upgrade script and prepare 3.1.0 release (#1242) 2017-09-02 12:43:21 +01:00
FrancescoUK
8dbd5e55dd Switch from en to en_US & en_GB (#1485) 2017-09-01 22:19:32 +01:00
FrancescoUK
8169a08ff1 Minor fix 2017-08-27 18:21:29 +01:00
FrancescoUK
e26290469f Regen database script files 2017-08-27 18:12:59 +01:00
objecttothis
3612ecf577 Addition and changes
This app_config key/value exists in the 3.0.2_to_3.1.0 upgrade script but not in tables.sql
Custom values changed to varchar 255 and allowing null to match change in update scripts.
2017-08-27 13:15:25 +02:00
FrancescoUK
31367d8943 Regen db script files 2017-08-26 20:54:16 +01:00
FrancescoUK
4c763ea9c0 Drop location column after migration 2017-08-26 20:47:31 +01:00
objecttothis
7b8a7033a1 Update receivings and sales tables
changing comment to default to null which allows comment fields to not be filled
2017-08-25 22:06:20 +04:00
FrancescoUK
8478a7797c Merge pull request #1523 from objecttothis/patch-4
Removed duplicate lines that exist elsewhere
2017-08-25 15:13:57 +01:00
FrancescoUK
44a571ad4f Remove duplicates from database.sql script 2017-08-25 15:12:37 +01:00
objecttothis
e4e106d6bc This line needs to go into 2.3_migrate_locations.sql
-- ALTER TABLE ospos_items DROP COLUMN location;
2017-08-25 16:59:21 +04:00
objecttothis
00bc200643 Removed duplicate lines that exist elsewhere
('currency_decimals', '2'), exists in 2.4_to_3.0.sql
('cash_decimals', '2'), already exists above
('cash_rounding_code', '0'), already exists above
2017-08-25 16:40:05 +04:00
FrancescoUK
a40ccfd232 Merge pull request #1508 from objecttothis/patch-2
Increase acceptable length of custom fields and allow null values
2017-08-25 13:15:25 +01:00
FrancescoUK
63f859d392 Merge pull request #1520 from objecttothis/patch-10
add missing keys delete dropped key
2017-08-25 08:56:53 +01:00
objecttothis
93d00f06b3 removed the addition of client_id to app_config
this field is added automatically and not needed to be added by the update script.
2017-08-25 11:52:27 +04:00
objecttothis
b5f6cd56d6 add distinct designation to prevent sql error
without distinct it migrates multiple copies of the same stock location name which later cause issues in 2.3_to_2.3.1.sql when trying to insert into ospos_permissions.
2017-08-25 00:12:48 +04:00
objecttothis
8e8713d1b0 add missing keys delete dropped key
added several missing keys to app_config
deleted one key that was removed from the app at some point
2017-08-24 23:33:25 +04:00
objecttothis
90523b79e2 Corrections to dB modifications
removed comment lines as those appear in 2.3.2_to_2.3.3.sql
2017-08-24 23:25:08 +04:00
FrancescoUK
c715bca5cd Merge pull request #1516 from objecttothis/patch-4
Ignore inserted to prevent SQL errors on duplicate values and comment to default null
2017-08-24 19:23:13 +01:00
FrancescoUK
c88bbe3852 Merge pull request #1515 from objecttothis/patch-8
Ignore pre-existing rows
2017-08-24 19:22:29 +01:00
FrancescoUK
5a19031271 Merge pull request #1512 from objecttothis/patch-7
This insert actually needed to be done in 2.3_to_2.3.1
2017-08-24 19:21:06 +01:00
FrancescoUK
8817005401 Merge pull request #1511 from objecttothis/patch-6
#1509 add missing key,value pairs to permissions
2017-08-24 19:20:30 +01:00
objecttothis
3af4bf0187 Ignore pre-existing rows
sales_stock and receivings_stock already exist at the point this insert gets run causing the sql to fail.  Adding the IGNORE directive causes duplicate entries to be skipped in the insert.
2017-08-24 17:55:35 +04:00
objecttothis
1d4692a44a This insert actually needed to be done in 2.3_to_2.3.1
I've already submitted the change in 2.3_to_2.3.1.sql
2017-08-24 17:44:19 +04:00
objecttothis
258debc94a #1509 add missing key,value pairs to permissions
sales_stock and receivings_stock are missing from permissions and it's causing a constraint failure.
2017-08-24 16:51:28 +04:00
objecttothis
34c01ed179 migrations table wont exist for everyone
and the people it does exist for should already have the correct collation
2017-08-24 14:37:30 +04:00
objecttothis
477dcb78db comment should be default null 2017-08-24 14:28:23 +04:00
objecttothis
d4ddb4c8ee IGNORE statement prevents mysql error if already exists 2017-08-24 14:08:23 +04:00
objecttothis
9864b126a8 SQL Fails if key already exists
Using the IGNORE keyword bypasses the insert of that key if it already exists and moves onto the next one.
2017-08-24 14:02:20 +04:00
objecttothis
e940c1e99d Increase acceptable length of custom fields and allow null values
Currently the maximum length of these custom fields is 25 characters.  It's not too difficult to imagine a case in which this is far too little.  Also, currently none of the fields are allowed to remain null, which for most uses doesn't make sense as every item wont necessarily have all the fields populated.
2017-08-24 12:31:21 +04:00
FrancescoUK
bdc63c5c02 Missing additions to database update scripts (#1488) 2017-08-23 22:28:11 +01:00
FrancescoUK
5dd7a5fde1 Fix sql upgrade scripts and UPGRADE.txt description (#1488) 2017-08-20 17:11:26 +01:00
FrancescoUK
ddaa1e88e9 Fix comment cannot be null issue (#1483) 2017-08-18 19:49:01 +01:00
jekkos
767b0d293b Fix error in upgrade script (#1477) 2017-08-16 22:55:09 +02:00
FrancescoUK
0f8c7f52cd Fix 3.0.2_to_3.1.0.sql script mistake 2017-08-07 16:37:42 +01:00
FrancescoUK
bbe766165a Fix sql script error due to foreign key constraints 2017-08-06 19:55:22 +01:00
FrancescoUK
9d08e9e5be Restore barcode formats 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