From 940c0e319a1df9fb2d218d816079b5f5034972f0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Mon, 1 Feb 2021 16:18:57 +0000 Subject: [PATCH] Bug 25552: DBRev 20.12.00.008 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_25552.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_25552.perl diff --git a/Koha.pm b/Koha.pm index ae621f3d72..50a5824551 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.007"; +$VERSION = "20.12.00.008"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_25552.perl b/installer/data/mysql/atomicupdate/bug_25552.perl deleted file mode 100644 index ad76e6ba08..0000000000 --- a/installer/data/mysql/atomicupdate/bug_25552.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - UPDATE systempreferences SET options = "claim_returned|batchmod|moredetail|cronjob|additem|pendingreserves|onpayment" WHERE variable = "MarkLostItemsAsReturned"; - }); - # Always end with this (adjust the bug info) - NewVersion( $DBversion, 25552, "Add missing Claims Returned option to MarkLostItemsAsReturned"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index fbdfef1d7f..f18f375a23 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23467,6 +23467,16 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 27486, "Renaming system preference 'delimiter' to 'CSVDelimiter'"); } +$DBversion = '20.12.00.008'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + UPDATE systempreferences + SET options = "claim_returned|batchmod|moredetail|cronjob|additem|pendingreserves|onpayment" + WHERE variable = "MarkLostItemsAsReturned"; + }); + NewVersion( $DBversion, 25552, "Add missing Claims Returned option to MarkLostItemsAsReturned"); +} + # 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