From 8bd02f991942e307a8603304ffd29d8eb42343c4 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 6 Nov 2020 12:03:17 +0000 Subject: [PATCH] Bug 23091: DBRev 20.06.00.062 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_23091.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 8 ++++++++ 3 files changed, 9 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23091.perl diff --git a/Koha.pm b/Koha.pm index cdb9feaab1..f7f35c3fa0 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.06.00.061"; +$VERSION = "20.06.00.062"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23091.perl b/installer/data/mysql/atomicupdate/bug_23091.perl deleted file mode 100644 index a0b02d3556..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23091.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "UPDATE circulation_rules SET rule_name = 'lostreturn' WHERE rule_name = 'refund'" ); - $dbh->do( "UPDATE circulation_rules SET rule_value = 'refund' WHERE rule_name = 'lostreturn' AND rule_value = 1" ); - - NewVersion( $DBversion, 23091, "Update refund rules"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 76489d19b8..5177228d83 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -23252,6 +23252,14 @@ if( CheckVersion( $DBversion ) ) { NewVersion( $DBversion, 24412, "Attach waiting reserve to desk" ); } +$DBversion = '20.06.00.062'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "UPDATE circulation_rules SET rule_name = 'lostreturn' WHERE rule_name = 'refund'" ); + $dbh->do( "UPDATE circulation_rules SET rule_value = 'refund' WHERE rule_name = 'lostreturn' AND rule_value = 1" ); + + NewVersion( $DBversion, 23091, "Update refund rules"); +} + # 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.11.4.GIT