From 8b570a880803241a2a87a4f99b5098da681e5c7e Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 21 Oct 2016 17:28:42 +0000 Subject: [PATCH] Bug 15131 - DBRev 16.06.00.035 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- .../bug_15131_AllowItemsOnHoldCheckoutSCO.sql | 19 ------------------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 20 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15131_AllowItemsOnHoldCheckoutSCO.sql diff --git a/Koha.pm b/Koha.pm index 0e7c99a5f9..5a1135fc72 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "16.06.00.034"; +$VERSION = "16.06.00.035"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_15131_AllowItemsOnHoldCheckoutSCO.sql b/installer/data/mysql/atomicupdate/bug_15131_AllowItemsOnHoldCheckoutSCO.sql deleted file mode 100644 index 63849f27d3..0000000000 --- a/installer/data/mysql/atomicupdate/bug_15131_AllowItemsOnHoldCheckoutSCO.sql +++ /dev/null @@ -1,19 +0,0 @@ -INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) - SELECT 'AllowItemsOnHoldCheckoutSCO', - COALESCE(value,0), - '', - 'Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.', - 'YesNo' - FROM systempreferences WHERE variable='AllowItemsOnHoldCheckout'; - --- $DBversion = '16.06.00.XXX'; --- if ( CheckVersion($DBversion) ) { --- $dbh->do(q{ --- INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) --- SELECT 'AllowItemsOnHoldCheckoutSCO',COALESCE(value,0),'','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo' --- FROM systempreferences WHERE variable='AllowItemsOnHoldCheckout'; --- }); - --- print "Upgrade to $DBversion done (Bug 15131: Give SCO separate control for AllowItemsOnHoldCheckout)\n"; --- SetVersion($DBversion); --- } diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 179e9303c5..a3fb7dbf53 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -13194,6 +13194,17 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = '16.06.00.035'; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( variable, value, options, explanation, type ) + SELECT 'AllowItemsOnHoldCheckoutSCO',COALESCE(value,0),'','Do not generate RESERVE_WAITING and RESERVED warning in the SCO module when checking out items reserved to someone else. This allows self checkouts for those items.','YesNo' + FROM systempreferences WHERE variable='AllowItemsOnHoldCheckout'; + }); + + print "Upgrade to $DBversion done (Bug 15131: Give SCO separate control for AllowItemsOnHoldCheckout)\n"; + SetVersion($DBversion); +} # DEVELOPER PROCESS, search for anything to execute in the db_update directory -- 2.39.5