Bug 21633: DBRev 19.12.00.024

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha.pm b/Koha.pm
index 00871c0..6669162 100644 (file)
--- 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 = "19.12.00.023";
+$VERSION = "19.12.00.024";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl b/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl
deleted file mode 100644 (file)
index 58b0282..0000000
--- a/installer/data/mysql/atomicupdate/bug_21633_remove_finesMode_test.perl
+++ /dev/null
@@ -1,14 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do(q{
-        UPDATE systempreferences SET value = 'off'
-        WHERE variable = 'finesMode' AND (value <> 'production' OR value IS NULL)
-    });
-    $dbh->do(q{
-        UPDATE systempreferences SET options = 'off|production',
-        explanation = "Choose the fines mode, 'off' (do not accrue fines) or 'production' (accrue overdue fines).  Requires accruefines cronjob or CalculateFinesOnReturn system preference."
-        WHERE variable = 'finesMode'
-    });
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 21633  - Remove finesMode 'test')\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 1b94f2b..08010e5 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -20825,6 +20825,21 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 24640 - Allow quotes.timestamp to be NULL)\n";
 }
 
+$DBversion = '19.12.00.024';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do(q{
+        UPDATE systempreferences SET value = 'off'
+        WHERE variable = 'finesMode' AND (value <> 'production' OR value IS NULL)
+    });
+    $dbh->do(q{
+        UPDATE systempreferences SET options = 'off|production',
+        explanation = "Choose the fines mode, 'off' (do not accrue fines) or 'production' (accrue overdue fines).  Requires accruefines cronjob or CalculateFinesOnReturn system preference."
+        WHERE variable = 'finesMode'
+    });
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 21633  - Remove finesMode 'test')\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';