From eef6b0c02249f1b47c6af6bdbc9e0d784b445945 Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 22 Jul 2022 15:57:25 +0000 Subject: [PATCH] Bug 31157: (QA follow-up) Update descriptions and wording of configuration options Signed-off-by: Katrin Fischer Signed-off-by: Tomas Cohen Arazi --- installer/data/mysql/atomicupdate/bug_31157.pl | 2 +- installer/data/mysql/mandatory/sysprefs.sql | 2 +- .../prog/en/modules/admin/preferences/circulation.pref | 6 +++--- misc/cronjobs/overdue_notices.pl | 10 ++++++---- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_31157.pl b/installer/data/mysql/atomicupdate/bug_31157.pl index 0165a438b8..a3be6dda17 100644 --- a/installer/data/mysql/atomicupdate/bug_31157.pl +++ b/installer/data/mysql/atomicupdate/bug_31157.pl @@ -9,7 +9,7 @@ return { $dbh->do(q{ INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type` ) VALUES - ('OverdueNoticeFrom', 'cron', 'cron|item-issuebranch|item-homebranch', 'Use the choice as the from address when generating overdue notices', 'Choice') + ('OverdueNoticeFrom', 'cron', 'cron|item-issuebranch|item-homebranch', 'Organize and send overdue notices by item home library or checkout library', 'Choice') }); }, }; diff --git a/installer/data/mysql/mandatory/sysprefs.sql b/installer/data/mysql/mandatory/sysprefs.sql index a94351c65b..259d7f05f1 100644 --- a/installer/data/mysql/mandatory/sysprefs.sql +++ b/installer/data/mysql/mandatory/sysprefs.sql @@ -521,7 +521,7 @@ INSERT INTO systempreferences ( `variable`, `value`, `options`, `explanation`, ` ('OverDrivePasswordRequired','0',NULL,'Does the library require passwords for OverDrive SIP authentication','YesNo'), ('OverDriveUsername','cardnumber','cardnumber|userid','Which patron information should be passed as OverDrive username','Choice'), ('OverdueNoticeCalendar',0,NULL,'Take the calendar into consideration when generating overdue notices','YesNo'), -('OverdueNoticeFrom', 'cron', 'cron|item-issuebranch|item-homebranch', 'Use the choice as the from address when generating overdue notices', 'Choice'), +('OverdueNoticeFrom', 'cron', 'cron|item-issuebranch|item-homebranch', 'Organize and send overdue notices by item home library or checkout library', 'Choice'), ('OverduesBlockCirc','noblock','noblock|confirmation|block','When checking out an item should overdues block checkout, generate a confirmation dialogue, or allow checkout','Choice'), ('OverduesBlockRenewing','allow','allow|blockitem|block','If any of patron checked out documents is late, should renewal be allowed, blocked only on overdue items or blocked on whatever checked out document','Choice'), ('PassItemMarcToXSLT','0',NULL,'If enabled, item fields in the MARC record will be made avaiable to XSLT sheets. Otherwise they will be removed.','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 cd3fc97fa3..a67236b55a 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 @@ -408,13 +408,13 @@ Circulation: 0: "Ignore calendar" - "when working out the period for overdue notices." - - - "Use the" + - "Organize and send overdue notices using the" - pref: OverdueNoticeFrom choices: - cron: "system default" + cron: "command-line option" item-issuebranch: "checkout library" item-homebranch: "item home library" - - "as the from address when generating overdue notices." + - . - - Include up to - pref: PrintNoticesMaxLines diff --git a/misc/cronjobs/overdue_notices.pl b/misc/cronjobs/overdue_notices.pl index 28b748eceb..86a0cb0266 100755 --- a/misc/cronjobs/overdue_notices.pl +++ b/misc/cronjobs/overdue_notices.pl @@ -69,7 +69,9 @@ overdue_notices.pl --date Emulate overdues run for this date. --email Type of email that will be used. Can be 'email', 'emailpro' or 'B_email'. Repeatable. - --frombranch Set the from address for the notice to one of 'item-homebranch' or 'item-issuebranch'. + --frombranch Organize and send overdue notices by home library (item-homebranch) or checkout library (item-issuebranch). + This option is only used, if the OverdueNoticeFrom system preference is set to 'command-line option'. + Defaults to item-issuebranch. =head1 OPTIONS @@ -180,9 +182,9 @@ Allows to specify which type of email will be used. Can be email, emailpro or B_ =item B<--frombranch> -Use the address information from the item homebranch library instead of the issuing library. - -Defaults to 'item-issuebranch' +Organize overdue notices either by checkout library (item-issuebranch) or item home library (item-homebranch). +This option is only used, if the OverdueNoticeFrom system preference is set to use 'command-line option'. +Defaults to checkout library (item-issuebranch). =back -- 2.39.5