From c76c509d830b48e009f55d7da23faf3baba600a5 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 31 Oct 2019 11:56:46 +0000 Subject: [PATCH] Bug 15260: DBRev 19.06.00.046 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- ..._15260-add_Dayweek_option_to_useDaysMode_syspref.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl diff --git a/Koha.pm b/Koha.pm index 6ec4fca8df..1e1dd7851d 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.06.00.045"; +$VERSION = "19.06.00.046"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl b/installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl deleted file mode 100644 index 7d2583b536..0000000000 --- a/installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( 'UPDATE systempreferences SET options = "Calendar|Days|Datedue|Dayweek", explanation = "Choose the method for calculating due date: select Calendar, Datedue or Dayweek to use the holidays module, and Days to ignore the holidays module" WHERE variable = "useDaysMode"' ); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 15260 - Option for extended loan with useDaysMode)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0a1ec1de00..a63dc24f47 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20111,6 +20111,22 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 23866 - Set HEA syspref to prompt for review)\n"; } +$DBversion = '19.06.00.046'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(qq{ + UPDATE systempreferences + SET + options = "Calendar|Days|Datedue|Dayweek", + explanation = "Choose the method for calculating due date: select Calendar, Datedue or Dayweek to use the holidays module, and Days to ignore the holidays module" + WHERE + variable = "useDaysMode" + }); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 15260 - Option for extended loan with useDaysMode)\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.11.4.GIT