From 4e9a8b6413a0ce64e5757842a61ed122d8fe8d15 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 17 Apr 2020 07:51:16 +0100 Subject: [PATCH] Bug 25147: AllowSelfCheckReturns is in the wrong system preference section This reverts commit 8aa9f2cc078932a0a4db434f8bd793de29a8ff7b. I agree with the following comment and as such have reverted the patch. Quoting Phil Ringnalda : Everything currently in the chunk labelled "Self Checkout" is preferences used to control sco-main.pl, a feature that does checkout and renewal, and optionally with the preference AllSelfCheckReturns, also checkin. Everything currently in the chunk labelled "Self check-in module" is preferences used to control sci-main.pl, a separate feature that does only checkin, and does checkin whether or not AllowSelfCheckReturns is set. I'd think a better solution would be to either rename the preference, which is actually AllowReturnsInSelfCheckout, or rename the chunks to make it more clear that they are preferences for two different features. Signed-off-by: Martin Renvoize --- .../en/modules/admin/preferences/circulation.pref | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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 ff87a1db38..645609785a 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 @@ -943,12 +943,6 @@ Circulation: type: textarea class: code Self check-in module: - - - - pref: AllowSelfCheckReturns - choices: - yes: Allow - no: "Don't allow" - - patrons to return items through web-based self checkout system. - - "Include the following HTML on the self check-in screen:" - pref: SelfCheckInMainUserBlock @@ -1020,6 +1014,12 @@ Circulation: - pref: SelfCheckTimeout class: integer - seconds. + - + - pref: AllowSelfCheckReturns + choices: + yes: Allow + no: "Don't allow" + - patrons to return items through web-based self checkout system. - - "Include the following HTML in the Help page of the web-based self checkout system:" - pref: SelfCheckHelpMessage -- 2.39.5