From a2318e8b7eef4e210ff402d7386f382b9051064b Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Fri, 13 May 2016 10:07:02 -0300 Subject: [PATCH] Bug 16288: (QA followup) Remove the syspref INSERT line Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/atomicupdate/removeoldsyspref.sql | 1 - installer/data/mysql/updatedatabase.pl | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/removeoldsyspref.sql diff --git a/installer/data/mysql/atomicupdate/removeoldsyspref.sql b/installer/data/mysql/atomicupdate/removeoldsyspref.sql deleted file mode 100644 index 38f4fff..0000000 --- a/installer/data/mysql/atomicupdate/removeoldsyspref.sql +++ /dev/null @@ -1 +0,0 @@ -DELETE FROM systempreferences where variable = 'EDIInvoicesShippingBudget'; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1cde4d6..7e87e78 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12094,7 +12094,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { } $DBversion = "3.23.00.045"; -if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { +if ( CheckVersion($DBversion) ) { ## Holds details for vendors supplying goods by EDI $dbh->do(q{ CREATE TABLE IF NOT EXISTS vendor_edi_accounts ( @@ -12186,10 +12186,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { CONSTRAINT efk_branchcode FOREIGN KEY ( branchcode ) REFERENCES branches ( branchcode ) ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci; }); -## Syspref budget to hold shipping costs - $dbh->do(q{ - INSERT INTO systempreferences (variable, explanation, type) VALUES('EDIInvoicesShippingBudget','The budget code used to allocate shipping charges to when processing EDI Invoice messages', 'free'); - }); ## Add a permission for managing EDI $dbh->do(q{ -- 2.8.2