From b7adcf69476a969cda6b8670e8a7e91f4c4af5b2 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 31 Mar 2017 10:18:35 +0000 Subject: [PATCH] Bug 14146 - DBRev 16.12.00.017 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_14146.sql | 2 -- installer/data/mysql/updatedatabase.pl | 13 ++++++++++++- 3 files changed, 13 insertions(+), 4 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_14146.sql diff --git a/Koha.pm b/Koha.pm index 1cbabf6333..cf268ab0d1 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 = "16.12.00.016"; +$VERSION = "16.12.00.017"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_14146.sql b/installer/data/mysql/atomicupdate/bug_14146.sql deleted file mode 100644 index 24cc49fde7..0000000000 --- a/installer/data/mysql/atomicupdate/bug_14146.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) -VALUES ('CumulativeRestrictionPeriods', 0, NULL, 'Cumulate the restriction periods instead of keeping the highest', 'YesNo'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index ffc1c07a3a..63974ca996 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14001,7 +14001,18 @@ if ( CheckVersion($DBversion) ) { }); } - print "Upgrade to $DBversion done (Bug 13757: Make patron attributes editable in the opac if set to 'editable in OPAC'\n"; + print "Upgrade to $DBversion done (Bug 13757: Make patron attributes editable in the opac if set to 'editable in OPAC)'\n"; + SetVersion($DBversion); +} + +$DBversion = "16.12.00.017"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) + VALUES ('CumulativeRestrictionPeriods', 0, NULL, 'Cumulate the restriction periods instead of keeping the highest', 'YesNo') + }); + + print "Upgrade to $DBversion done (Bug 14146 - Additional days are not added to restriction period when checking-in several overdues for same patron)'\n"; SetVersion($DBversion); } -- 2.20.1