From 1863e0284140aaf08ea5e78e23f5b542e2c4c9af Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 23 Apr 2021 09:40:10 +0000 Subject: [PATCH] Bug 27281: DBRev 20.12.00.038 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_27281.perl | 28 ------------------- installer/data/mysql/updatedatabase.pl | 28 +++++++++++++++++++ 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_27281.perl diff --git a/Koha.pm b/Koha.pm index db89d56c75..7d40261c01 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 = "20.12.00.037"; +$VERSION = "20.12.00.038"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_27281.perl b/installer/data/mysql/atomicupdate/bug_27281.perl deleted file mode 100644 index 0d18397a99..0000000000 --- a/installer/data/mysql/atomicupdate/bug_27281.perl +++ /dev/null @@ -1,28 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - # Add 'LostItem' to reserves cancellation_reason enum - $dbh->do( - qq{ - ALTER TABLE - `branchtransfers` - MODIFY COLUMN - `cancellation_reason` enum( - 'Manual', - 'StockrotationAdvance', - 'StockrotationRepatriation', - 'ReturnToHome', - 'ReturnToHolding', - 'RotatingCollection', - 'Reserve', - 'LostReserve', - 'CancelReserve', - 'ItemLost' - ) - AFTER `comments` - } - ); - - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 27281, "Add 'ItemLost' to cancellation_reason enum"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d5dbdb56ae..c9dc560439 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23900,6 +23900,34 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 23971, "Add new system preference AcquisitionLog"); } +$DBversion = '20.12.00.038'; +if( CheckVersion( $DBversion ) ) { + + # Add 'ItemLost' to reserves cancellation_reason enum + $dbh->do( + q{ + ALTER TABLE + `branchtransfers` + MODIFY COLUMN + `cancellation_reason` enum( + 'Manual', + 'StockrotationAdvance', + 'StockrotationRepatriation', + 'ReturnToHome', + 'ReturnToHolding', + 'RotatingCollection', + 'Reserve', + 'LostReserve', + 'CancelReserve', + 'ItemLost' + ) + AFTER `comments` + } + ); + + NewVersion( $DBversion, 27281, "Add 'ItemLost' to branchtransfers.cancellation_reason enum"); +} + # 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.39.5