Commit Graph

252 Commits

Author SHA1 Message Date
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
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
FrancescoUK
8a3ba5692a Minor fixes (#1443) 2017-08-05 15:10:04 +01:00
FrancescoUK
e89bd73bb5 Add reCaptcha to login page (#1443) 2017-08-05 11:46:48 +01:00
FrancescoUK
f1936dbb4d Fixed rewards foreign key constraint issue (#1436) 2017-08-03 21:39:40 +01:00
FrancescoUK
6485cf050d Add database foreign keys related to rewards 2017-07-29 22:21:20 +01:00
FrancescoUK
cd792eb56a Add receipt font size configuration (#1401 #1416) 2017-07-28 21:48:34 +01:00
FrancescoUK
afca2882f8 Regen dist and database files 2017-07-27 19:47:14 +01:00
Steve Ireland
641e2f414c Add missing language element for rounding code "Unknown" and eliminate duplicate statements in upgrade statement, and fix issue with 0 tax_category_id 2017-07-25 00:56:59 +02:00
FrancescoUK
60db2cc4b0 Fixes 2017-07-11 22:43:08 +01:00
Steve Ireland
b7951ea5b2 Consolidate tax configuration. 2017-07-11 22:36:32 +01:00
Steve Ireland
cb31ebb06e Extend alternate item description to 255 characters. 2017-07-11 22:32:51 +01:00
FrancescoUK
f92b06cff2 Fixes 2017-07-11 22:23:14 +01:00
Steve Ireland
bab4791b5e Consolidate tax configuration. 2017-07-09 18:48:47 -04:00
FrancescoUK
d59e713f1f move receiving database update to common database update script 2017-06-24 13:03:00 +01:00
odiea
e2e0ade259 Update for Items receiving_quantity 2017-06-24 13:03:00 +01:00
FrancescoUK
b2d80acafc Regenerate db files 2017-05-28 09:06:04 +01:00
Steve Ireland
c0a9349b60 Add support for database migration 2017-05-09 20:45:25 -04:00
FrancescoUK
daa1614615 Revert "Merge pull request #1281 from RuleDomain/migrate-sales-tax-history"
This reverts commit 11e1cc51aa, reversing
changes made to b32c23ce10.

# Conflicts:
#	application/models/Sale.php
2017-05-01 11:50:13 +01:00
Steve Ireland
c710ec938f Sales tax history migration 2017-04-30 11:30:39 -04:00
FrancescoUK
c68fa19584 Made print company name in receipts optional (#925) 2017-04-22 17:09:22 +01:00
FrancescoUK
b819442e98 Fix indentation and regen db scripts 2017-04-22 13:33:45 +01:00
Joshua Fernandes
621a74653d requested changes 2017-04-22 13:33:45 +01:00
Joshua Fernandes
7a91388d8d giftcard random number 2017-04-22 13:33:45 +01:00
FrancescoUK
938907fe20 Added financial year start date (#1141), various fixes on date & time 2017-04-17 20:20:53 +01:00
FrancescoUK
73ae7b8fd2 Minor fixes to database scripts 2017-04-17 12:00:56 +01:00