From 0a5dee49baa04851f71e1a7f7fb0b0a6d7d85c5d Mon Sep 17 00:00:00 2001 From: Caroline Cyr La Rose Date: Fri, 26 Jan 2024 09:48:34 -0500 Subject: [PATCH] Bug 35457: Move SerialsDefaultEMailAddress and SerialsDefaultReplyTo to serials preferences This patch moved the SerialsDefaultEMailAddress system preference and the SerialsDefaultReplyTo system preference to the Serials preferences. To test: 1. Apply patch 2. Go to Administration > System preferences > Acquisitions --> SerialsDefaultEMailAddress and SerialsDefaultReplyTo should not be there 3. Go to Administration > System preferences > Serials --> There should be a new section called "Notifications" with the two system preferences Signed-off-by: David Nind Signed-off-by: Emily Lamancusa --- .../en/modules/admin/preferences/acquisitions.pref | 12 ------------ .../prog/en/modules/admin/preferences/serials.pref | 14 ++++++++++++++ 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref index 990b7b91ae..d8ac0011e1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/acquisitions.pref @@ -132,24 +132,12 @@ Acquisitions: class: email - 'when sending acquisitions order and claim notices.' - '
If left empty, it will fall back to the first defined address in the following list: library email, KohaAdminEmailAddress.' - - - - Use the from email address - - pref: SerialsDefaultEMailAddress - class: email - - 'when sending serial claim notices.' - - '
If left empty, it will fall back to the first defined address in the following list: library email, KohaAdminEmailAddress.' - - Use the reply-to email address - pref: AcquisitionsDefaultReplyTo class: email - 'when sending acquisitions order and claim notices.' - '
If left empty, it will fall back to the first defined address in the following list: library reply-to, library email, ReplytoDefault, KohaAdminEmailAddress.' - - - - Use the reply-to email address - - pref: SerialsDefaultReplyTo - class: email - - 'when sending serial claim notices.' - - '
If left empty, it will fall back to the first defined address in the following list: Library ReplyTo, Library Email, ReplytoDefault, KohaAdminEmailAddress.' Printing: - - Use the diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref index e24ea209a6..17dc2620b8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/serials.pref @@ -68,3 +68,17 @@ Serials: - pref: SerialsSearchResultsLimit class: integer - first serials when performing an advanced serials search. + + Notifications: + - + - Use the from email address + - pref: SerialsDefaultEMailAddress + class: email + - 'when sending serial claim notices.' + - '
If left empty, it will fall back to the first defined address in the following list: library email, KohaAdminEmailAddress.' + - + - Use the reply-to email address + - pref: SerialsDefaultReplyTo + class: email + - 'when sending serial claim notices.' + - '
If left empty, it will fall back to the first defined address in the following list: Library ReplyTo, Library Email, ReplytoDefault, KohaAdminEmailAddress.' -- 2.34.1