From 67c99f585c560fc25c7dbd896b9cd4af50f4b11d Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 29 Mar 2019 11:44:55 +0000
Subject: [PATCH] Bug 22518: DBRev 18.12.00.036

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha.pm                                         |  2 +-
 .../data/mysql/atomicupdate/bug_22518.perl      | 16 ----------------
 installer/data/mysql/updatedatabase.pl          | 17 +++++++++++++++++
 3 files changed, 18 insertions(+), 17 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_22518.perl

diff --git a/Koha.pm b/Koha.pm
index 65b1e353ab..809b5404df 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 = "18.12.00.035";
+$VERSION = "18.12.00.036";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_22518.perl b/installer/data/mysql/atomicupdate/bug_22518.perl
deleted file mode 100644
index e0b924c988..0000000000
--- a/installer/data/mysql/atomicupdate/bug_22518.perl
+++ /dev/null
@@ -1,16 +0,0 @@
-$DBversion = 'XXX';    # will be replaced by the RM
-if ( CheckVersion($DBversion) ) {
-
-    my $rows = $dbh->do(
-        qq{
-        UPDATE `accountlines`
-        SET
-          `accounttype` = 'FU'
-        WHERE
-          `accounttype` = 'O'
-      }
-    );
-
-    SetVersion($DBversion);
-    printf "Upgrade to $DBversion done (Bug 22518 - Fix accounttype 'O' to 'FU' - %d updated)\n", $rows;
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index dc509d5811..4f76b76b9b 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17836,6 +17836,23 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 19722 - Add a MaxItemsToDisplayForBatchMod preference)\n";
 }
 
+$DBversion = '18.12.00.036';
+if ( CheckVersion($DBversion) ) {
+
+    my $rows = $dbh->do(
+        qq{
+        UPDATE `accountlines`
+        SET
+          `accounttype` = 'FU'
+        WHERE
+          `accounttype` = 'O'
+      }
+    );
+
+    SetVersion($DBversion);
+    printf "Upgrade to $DBversion done (Bug 22518 - Fix accounttype 'O' to 'FU' - %d updated)\n", $rows;
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.20.1