Bug 20777: DBRev 18.06.00.030

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

diff --git a/Koha.pm b/Koha.pm
index b2f74a5..4a2fd0c 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.06.00.029";
+$VERSION = "18.06.00.030";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl b/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl
deleted file mode 100644 (file)
index 4317603..0000000
--- a/installer/data/mysql/atomicupdate/bug_20777_accountlines_dispute.perl
+++ /dev/null
@@ -1,13 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    if ( column_exists( 'accountlines', 'dispute' ) ) {
-        $dbh->do(q{
-            ALTER TABLE `accountlines`
-                DROP COLUMN `dispute`
-        });
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 20777 - Remove unused field accountlines.dispute)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 13592c9..a26dee6 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -16407,6 +16407,18 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 21288: Slowness in acquisition caused by GetInvoices\n";
 }
 
+$DBversion = '18.06.00.030';
+if( CheckVersion( $DBversion ) ) {
+    if ( column_exists( 'accountlines', 'dispute' ) ) {
+        $dbh->do(q{
+            ALTER TABLE `accountlines`
+                DROP COLUMN `dispute`
+        });
+    }
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 20777 - Remove unused field accountlines.dispute)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.