From 4595a28b2979134fec010ca70f3d2a73eeb5aa34 Mon Sep 17 00:00:00 2001
From: Martin Renvoize <martin.renvoize@ptfs-europe.com>
Date: Tue, 3 May 2022 15:30:04 +0100
Subject: [PATCH] Bug 23681: (QA follow-up) Move preference again

This patch removes the new PatronRestrictionTypes preference from the
accounting area in preference to creating a new group for 'Patron
restriction' related preferences in the circulation preferences tab.

Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>
---
 .../modules/admin/preferences/accounting.pref |  6 ---
 .../admin/preferences/circulation.pref        | 45 +++++++++++--------
 2 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref
index 7450736af1..cb79d1d379 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/accounting.pref
@@ -57,9 +57,3 @@ Accounting:
                 branchyyyymmincr: 'Automatically generate credit numbers in the form <branchcode>yyyymm0001'
                 incremental: 'Automatically generate credit numbers in the form 1, 2, 3'
             - Automatic generation also has to be enabled for each credit type (<a href="/cgi-bin/koha/admin/credit_types.pl">Configure credit types</a>)
-        -
-         - pref: PatronRestrictionTypes
-           choices:
-               1: Allow
-               0: Don't allow
-         - "the type of patron restriction to be specified when applying manually."
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 488ee65ba1..f99af038e8 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
@@ -195,12 +195,6 @@ Circulation:
                   1: Allow
                   0: "Don't allow"
             - staff to override and check out items when the patron has reached the maximum number of allowed checkouts.
-        -
-            - pref: AutoRemoveOverduesRestrictions
-              choices:
-                  1: "Do"
-                  0: "Don't"
-            - allow OVERDUES restrictions triggered by sent notices to be cleared automatically when all overdue items are returned by a patron.
         -
             - pref: AllowNotForLoanOverride
               choices:
@@ -526,13 +520,6 @@ Circulation:
                   allow: allow renewing.
                   blockitem: block renewing only for this item.
                   block: block renewing for all the patron's items.
-        -
-            - If a patron is restricted,
-            - pref: RestrictionBlockRenewing
-              choices:
-                  1: block
-                  0: allow
-            - renewing of items from the staff interface and via the <code>misc/cronjobs/automatic_renewals.pl</code> cronjob.
         -
             - If a patron owes more than the value of <a href="/cgi-bin/koha/admin/preferences.pl?op=search&searchfield=OPACFineNoRenewals">OPACFineNoRenewals</a>,
             - pref: OPACFineNoRenewalsBlockAutoRenew
@@ -648,12 +635,6 @@ Circulation:
             - This is a list of value pairs. When an item is checked in, if the not for loan value on the left matches the items not for loan value
             - "it will be updated to the right-hand value. For example, '-1: 0' will cause an item that was set to 'Ordered' to now be available for loan."
             - Each pair of values should be on a separate line.
-        -
-            - pref: CumulativeRestrictionPeriods
-              choices:
-                  1: Cumulate
-                  0: "Don't cumulate"
-            - the restriction periods.
         -
             - pref: HidePersonalPatronDetailOnCirculation
               choices:
@@ -977,6 +958,32 @@ Circulation:
                   homebranch: "item's home library"
                   holdingbranch: "item's holding library"
             - "."
+    Patron restrictions:
+        -
+            - pref: PatronRestrictionTypes
+              choices:
+                  1: Allow
+                  0: Don't allow
+            - "the type of patron restriction to be specified when applying manually."
+        -
+            - pref: CumulativeRestrictionPeriods
+              choices:
+                  1: Cumulate
+                  0: "Don't cumulate"
+            - the restriction periods.
+        -
+            - pref: AutoRemoveOverduesRestrictions
+              choices:
+                  1: "Do"
+                  0: "Don't"
+            - allow OVERDUES restrictions triggered by sent notices to be cleared automatically when all overdue items are returned by a patron.
+        -
+            - If a patron is restricted,
+            - pref: RestrictionBlockRenewing
+              choices:
+                  1: block
+                  0: allow
+            - renewing of items from the staff interface and via the <code>misc/cronjobs/automatic_renewals.pl</code> cronjob.
     Interlibrary loans:
         -
             - pref: ILLModule
-- 
2.39.5