From 10b3bb8f46098d8e07a3ba03756d581773a5c495 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 28 Oct 2016 16:49:24 +0000 Subject: [PATCH] Bug 17443 - DBRev 16.06.00.045 Signed-off-by: Kyle M Hall --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_17443.sql | 1 - installer/data/mysql/updatedatabase.pl | 10 ++++++++++ .../prog/en/modules/admin/preferences/patrons.pref | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_17443.sql diff --git a/Koha.pm b/Koha.pm index 138b12f0e7..22a78b384b 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.06.00.044"; +$VERSION = "16.06.00.045"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_17443.sql b/installer/data/mysql/atomicupdate/bug_17443.sql deleted file mode 100644 index 768bce21bc..0000000000 --- a/installer/data/mysql/atomicupdate/bug_17443.sql +++ /dev/null @@ -1 +0,0 @@ -UPDATE systempreferences SET options = "now|dateexpiry|combination", explanation = "Set whether the borrower renewal date should be counted from the dateexpiry, from the current date or by combination: if the dateexpiry is in future use dateexpiry, else use current date " WHERE variable = "BorrowerRenewalPeriodBase"; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7b9b2c043e..9fbc16faaa 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -13589,6 +13589,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = '16.06.00.045'; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + UPDATE systempreferences SET options = "now|dateexpiry|combination", explanation = "Set whether the borrower renewal date should be counted from the dateexpiry, from the current date or by combination: if the dateexpiry is in future use dateexpiry, else use current date " WHERE variable = "BorrowerRenewalPeriodBase"; + }); + + print "Upgrade to $DBversion done (Bug 17443 - Make possible to renew patron by later of expiry and current date)\n"; + SetVersion($DBversion); +} + # DEVELOPER PROCESS, search for anything to execute in the db_update directory # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref index 1f5c17d567..62a42c7b36 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/patrons.pref @@ -137,7 +137,7 @@ Patrons: choices: now: current date. dateexpiry: current membership expiry date. - combination: the later one of current and expiry date. + combination: the latter of the current and expiry date. - - pref: TalkingTechItivaPhoneNotification choices: -- 2.20.1