From 767ede853bbc2d899c0b7c39ad884111d4e93902 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 31 Mar 2017 12:12:21 +0000 Subject: [PATCH] Bug 17560 - DBRev 16.12.00.020 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_XXXXX.sql | 2 -- installer/data/mysql/updatedatabase.pl | 14 ++++++++++++++ 3 files changed, 15 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_XXXXX.sql diff --git a/Koha.pm b/Koha.pm index 06500c2244..e4ac48d064 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.12.00.019"; +$VERSION = "16.12.00.020"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_XXXXX.sql b/installer/data/mysql/atomicupdate/bug_XXXXX.sql deleted file mode 100644 index 96c142f592..0000000000 --- a/installer/data/mysql/atomicupdate/bug_XXXXX.sql +++ /dev/null @@ -1,2 +0,0 @@ -UPDATE systempreferences SET options="any_time_is_placed|not_always|any_time_is_collected" WHERE variable="HoldFeeMode"; -UPDATE systempreferences SET value="any_time_is_placed" WHERE variable="HoldFeeMode" AND value="always"; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d24dbd771e..73cea8c635 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14048,6 +14048,20 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\n"; } +$DBversion = "16.12.00.020"; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE systempreferences SET options="any_time_is_placed|not_always|any_time_is_collected" WHERE variable="HoldFeeMode"; + }); + + $dbh->do(q{ + UPDATE systempreferences SET value="any_time_is_placed" WHERE variable="HoldFeeMode" AND value="always"; + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 17560 - Hold fee placement at point of checkout)\n"; +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1