From f8093f18d4c04fc75af43add253c973c7bb700f8 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 9 Oct 2020 11:04:20 +0000 Subject: [PATCH] Bug 26529: DBRev 20.06.00.048 Signed-off-by: Jonathan Druart --- Koha.pm | 2 +- .../bug_26529_remove_blank_default_branch_rules.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_26529_remove_blank_default_branch_rules.perl diff --git a/Koha.pm b/Koha.pm index 41d70e69a3..15c568a50f 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.047"; +$VERSION = "20.06.00.048"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_26529_remove_blank_default_branch_rules.perl b/installer/data/mysql/atomicupdate/bug_26529_remove_blank_default_branch_rules.perl deleted file mode 100644 index 63d491b9be..0000000000 --- a/installer/data/mysql/atomicupdate/bug_26529_remove_blank_default_branch_rules.perl +++ /dev/null @@ -1,9 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - $dbh->do(q{ - DELETE FROM circulation_rules WHERE - rule_name IN ('holdallowed','hold_fulfillment_policy','returnbranch') AND - rule_value = '' - }); - NewVersion( $DBversion, 26529, "Description"); -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 1eaa420ff9..03e9ed8cca 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -22999,6 +22999,16 @@ if ( CheckVersion($DBversion) ) { NewVersion( $DBversion, 23420, "Allow configuration of hidden fields on the suggestion form in OPAC" ); } +$DBversion = '20.06.00.048'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + DELETE FROM circulation_rules WHERE + rule_name IN ('holdallowed','hold_fulfillment_policy','returnbranch') AND + rule_value = '' + }); + NewVersion( $DBversion, 26529, "Remove blank default branch 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.39.5