From 48a5c0b20249c17210df4ec1e9f146094aebc5e8 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 1 May 2019 14:29:16 +0100 Subject: [PATCH] Bug 5770: (QA follow-up) Move system preference to appropriate section The new sysprefs wher in the general admin section. I believe they are better placed within the acquisitions area. Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens --- .../en/modules/admin/preferences/acquisitions.pref | 13 ++++++++++++- .../prog/en/modules/admin/preferences/admin.pref | 12 ------------ 2 files changed, 12 insertions(+), 13 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 44602270fd..1bd894d716 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 @@ -1,4 +1,3 @@ -# Broken, omitted: acquisitions, emailPurchaseSuggestions Acquisitions: Policy: - @@ -100,6 +99,18 @@ Acquisitions: yes: "Use" no: "Don't use" - " the framework 'ACQ' for bibliographic records fields" + - + - "Choose email address that new purchase suggestions will be sent to: " + - pref: EmailPurchaseSuggestions + default: 0 + choices: + 0: None + EmailAddressForSuggestions: EmailAddressForSuggestions + BranchEmailAddress: email address of branch + KohaAdminEmailAddress: KohaAdminEmailAddress + - "If you choose EmailAddressForSuggestions you have to enter a valid email address: " + - pref: EmailAddressForSuggestions + class: email Printing: - - Use the diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref index adf86d77fb..5bf920ba25 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/admin.pref @@ -6,18 +6,6 @@ Administration: - pref: KohaAdminEmailAddress class: email - "(This is the default From: address for emails unless there is one for the particular library, and is referred to when an internal error occurs.)" - - - - "Choose email address that new purchase suggestions will be sent to: " - - pref: EmailPurchaseSuggestions - default: 0 - choices: - 0: None - EmailAddressForSuggestions: EmailAddressForSuggestions - BranchEmailAddress: email address of branch - KohaAdminEmailAddress: KohaAdminEmailAddress - - "If you choose EmailAddressForSuggestions you have to enter a valid email address: " - - pref: EmailAddressForSuggestions - class: email - - "Email address to be set as the replyto in emails: " - pref: ReplytoDefault -- 2.39.2