From 1abd0b56c2d9d9663586d1e76c2abc557964039c Mon Sep 17 00:00:00 2001
From: Jesse Weaver <pianohacker@gmail.com>
Date: Tue, 3 Nov 2009 21:09:16 -0700
Subject: [PATCH] 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.
---
 .../prog/en/modules/admin/preferences/circulation.pref       | 12 ++++++++++++
 .../prog/en/modules/admin/preferences/opac.pref              |  6 ------
 2 files changed, 12 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 8e20b2b811..7d83f196fe 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
@@ -196,6 +196,18 @@ Circulation:
                   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
               class: multi
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 3219d6a178..5b379c5844 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/opac.pref
@@ -260,12 +260,6 @@ OPAC:
                   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:
                   yes: Allow
-- 
2.11.4.GIT