From 3ebe29bf2a79b51b72d274c55160c7a373d727ef Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Fri, 20 Mar 2020 15:57:45 +0000
Subject: [PATCH] Bug 24299: DBRev 19.12.00.048

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 Koha.pm                                       |  2 +-
 .../data/mysql/atomicupdate/bug_24299.perl    | 24 ------------------
 installer/data/mysql/updatedatabase.pl        | 25 +++++++++++++++++++
 3 files changed, 26 insertions(+), 25 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_24299.perl

diff --git a/Koha.pm b/Koha.pm
index d449cd7fa1..869540476f 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 = "19.12.00.047";
+$VERSION = "19.12.00.048";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_24299.perl b/installer/data/mysql/atomicupdate/bug_24299.perl
deleted file mode 100644
index 96b0bc85d0..0000000000
--- a/installer/data/mysql/atomicupdate/bug_24299.perl
+++ /dev/null
@@ -1,24 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    # Add rotating collection states to reason enum
-    $dbh->do(
-        qq{
-            ALTER TABLE
-                `branchtransfers`
-            MODIFY COLUMN
-                `reason` enum(
-                    'Manual',
-                    'StockrotationAdvance',
-                    'StockrotationRepatriation',
-                    'ReturnToHome',
-                    'ReturnToHolding',
-                    'RotatingCollection'
-                )
-            AFTER `comments`
-          }
-    );
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 24299 - Add 'collection' reasons to branchtransfers enum)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 14d1fd9efb..10f8ec0a1c 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -21203,6 +21203,31 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 22987 - Add biblioimages.timestamp)\n";
 }
 
+$DBversion = '19.12.00.048';
+if( CheckVersion( $DBversion ) ) {
+
+    # Add rotating collection states to reason enum
+    $dbh->do(
+        qq{
+            ALTER TABLE
+                `branchtransfers`
+            MODIFY COLUMN
+                `reason` enum(
+                    'Manual',
+                    'StockrotationAdvance',
+                    'StockrotationRepatriation',
+                    'ReturnToHome',
+                    'ReturnToHolding',
+                    'RotatingCollection'
+                )
+            AFTER `comments`
+          }
+    );
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 24299 - Add 'collection' reasons to branchtransfers enum)\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/';
-- 
2.20.1