Bug 21756: DBRev 18.12.00.028

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 113728f..e26332f 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 = "18.12.00.027";
+$VERSION = "18.12.00.028";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_21756.perl b/installer/data/mysql/atomicupdate/bug_21756.perl
deleted file mode 100644 (file)
index 4bfda53..0000000
--- a/installer/data/mysql/atomicupdate/bug_21756.perl
+++ /dev/null
@@ -1,13 +0,0 @@
-$DBversion = 'XXX';  # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do(q{
-        INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Account Fee' );
-    });
-
-    $dbh->do(q{
-        INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Hold Expired' );
-    });
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 21756 - Add 'Account Fee' and 'Hold Expired' to the account_offset_types table if missing)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index cdfe8fe..107d7af 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17737,6 +17737,20 @@ INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) V
     print "Upgrade to $DBversion done (Bug 18837: Add ILLModuleUnmediated Syspref)\n";
 }
 
+$DBversion = '18.12.00.028';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do(q{
+        INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Account Fee' );
+    });
+
+    $dbh->do(q{
+        INSERT IGNORE INTO account_offset_types ( type ) VALUES ( 'Hold Expired' );
+    });
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 21756 - Add 'Account Fee' and 'Hold Expired' to the account_offset_types table if missing)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.