From f307ce663c16e7723658592df5a947cd5f8eee48 Mon Sep 17 00:00:00 2001 From: Andrew Isherwood Date: Thu, 31 Jan 2019 15:36:52 +0000 Subject: [PATCH] Bug 15260: Add new useDaysMode option "Dayweek" This patch adds a new "Dayweek" option to the useDaysMode syspref, it has the description: "the calendar to push the due date to the next open day on the same weekday". --- .../bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl | 8 ++++++++ installer/data/mysql/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 1 + 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl 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 new file mode 100644 index 0000000000..fd585025f2 --- /dev/null +++ b/installer/data/mysql/atomicupdate/bug_15260-add_Dayweek_option_to_useDaysMode_syspref.perl @@ -0,0 +1,8 @@ +$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 XXXXX - description)\n"; +} diff --git a/installer/data/mysql/sysprefs.sql b/installer/data/mysql/sysprefs.sql index 0a983e35ef..7231e470c5 100644 --- a/installer/data/mysql/sysprefs.sql +++ b/installer/data/mysql/sysprefs.sql @@ -626,7 +626,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('UseBranchTransferLimits','0','','If ON, Koha will will use the rules defined in branch_transfer_limits to decide if an item transfer should be allowed.','YesNo'), ('UseControlNumber','0','','If ON, record control number (w subfields) and control number (001) are used for linking of bibliographic records.','YesNo'), ('UseCourseReserves','0',NULL,'Enable the course reserves feature.','YesNo'), -('useDaysMode','Calendar','Calendar|Days|Datedue','Choose the method for calculating due date: select Calendar to use the holidays module, and Days to ignore the holidays module','Choice'), +('useDaysMode','Calendar','Calendar|Days|Datedue|Dayweek','Choose the method for calculating due date: select Calendar, Datedue or Dayweek to use the holidays module, and Days to ignore the holidays module','Choice'), ('useDefaultReplacementCost', '0', NULL, 'default replacement cost defined in item type', 'YesNo'), ('useDischarge','','','Allows librarians to discharge borrowers and borrowers to request a discharge','YesNo'), ('UseEmailReceipts','0','','Send email receipts for payments and write-offs','YesNo'), diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref index 9720430bf3..b7c197f885 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref @@ -290,6 +290,7 @@ Circulation: Days: circulation rules only. Calendar: the calendar to skip all days the library is closed. Datedue: the calendar to push the due date to the next open day + Dayweek: the calendar to push the due date to the next open day on the same weekday - - Calculate "No renewal before" based on - pref: NoRenewalBeforePrecision -- 2.11.0