Bug 3744 - OPACAllowHoldDateInFuture description confusing

The missing syspref AllowHoldDateInFuture was added, and
OPACAllowHoldDateInFuture was moved next to it, on the Circulation
tab. Normally, it would go on the OPAC tab, but since both have to be
on for future holds on the OPAC, it's less confusing for them to be
together.

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 8e20b2b..7d83f19 100644 (file)
--- 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,6 +195,18 @@ Circulation:
                   yes: Allow
                   no: "Don't allow"
             - hold requests to be placed on items that are not checked out.
+        -
+            - pref: AllowHoldDateInFuture
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - hold requests to be placed that do not enter the waiting list until a certain future date.
+        -
+            - pref: OPACAllowHoldDateInFuture
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - "patrons to place holds that don't enter the waiting list until a certain future date. (AllowHoldDateInFuture must also be enabled)."
         -
             - Satisfy holds from the libraries
             - pref: StaticHoldsQueueWeight

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
index 3219d6a..5b379c5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -259,12 +259,6 @@ OPAC:
                   yes: Allow
                   no: "Don't allow"
             - patrons to place holds on specific items in the OPAC. If this is disabled, users can only put a hold on the next available item.
-        -
-            - pref: OPACAllowHoldDateInFuture
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - "patrons to place holds that don't enter the waiting list until a certain future date (if AllowHoldDateInFuture is also on)."
         -
             - pref: OpacRenewalAllowed
               choices: