Bug 14576: (QA follow-up) Tidy up feature documentation

[koha-equinox.git] / koha-tmpl / intranet-tmpl / prog / en / modules / admin / preferences / circulation.pref

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 05fa080..ffe4062 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
@@ -168,6 +168,12 @@ Circulation:
 
     Checkout Policy:
         -
+            - pref: AutoReturnCheckedOutItems
+              choices:
+                  yes: Don't
+                  no: Do
+            - require librarians to manually confirm a checkout where the item is already checked out to another patron.
+        -
             - pref: AllowTooManyOverride
               choices:
                   yes: Allow
@@ -196,7 +202,7 @@ Circulation:
               choices:
                   yes: Allow
                   no: "Don't allow"
-            - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items.
+            - checkouts of items reserved to someone else. If allowed do not generate RESERVE_WAITING and RESERVED warning. This allows self checkouts for those items. If using the holds queue items with pending holds will be marked as "unavailable" if this set to "Don't Allow".
         -
             - pref: AllowItemsOnHoldCheckoutSCO
               choices:
@@ -216,20 +222,6 @@ Circulation:
                   no: "Don't allow"
             - staff to manually override and check out items to patrons who have more than noissuescharge in fines.
         -
-            - pref: InProcessingToShelvingCart
-              choices:
-                  yes: Move
-                  no: "Don't move"
-            - items that have the location PROC to the location CART when they are checked in.
-            - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/cart_to_shelf.pl</code> cronjob. Ask your system administrator to schedule it."
-        -
-            - pref: ReturnToShelvingCart
-              choices:
-                  yes: Move
-                  no: "Don't move"
-            - all items to the location CART when they are checked in.
-            - "<br><strong>NOTE:</strong> This system preference requires the <code>misc/cronjobs/cart_to_shelf.pl</code> cronjob. Ask your system administrator to schedule it."
-        -
             - pref: AutomaticItemReturn
               choices:
                   yes: Do
@@ -532,6 +524,22 @@ Circulation:
             - calculate and update overdue charges when an item is returned.
             - "<br /><strong>NOTE: If you are doing hourly loans then you should have this on.</strong>"
         -
+            - pref: UpdateItemLocationOnCheckin
+              type: textarea
+              class: code
+            - "This a list of value pairs. the first value is followed immediately by colon space then the second value.<br/><br/>"
+            - "Examples:<br/>"
+            - "PROC: FIC - causes an item in the Processing Center location to be updated into the Fiction location on check in.<br/>"
+            - "FIC: GEN - causes an item in the Fiction location to be updated into the General stacks location on check in.<br/>"
+            - "_BLANK_: FIC - causes an item that has no location to be updated into the Fiction location on check in.<br/>"
+            - "FIC: _BLANK_ - causes an item in location FIC to be updated to a blank location on check in.<br/>"
+            - "_ALL_: FIC - causes all items to be updated into the Fiction location on check in.<br/>"
+            - "PROC: _PERM_ - causes an item that is in the Processing Center to be updated to it's permanent location.<br/><br/>"
+            - "General rule: if the location value on the left of the colon (:) matches the item's current location, it will be updated to match the location value on the right of the colon (:).<br/>"
+            - "Note: PROC and CART are special values, for these locations only can location and permanent_location differ, in all other cases an update will affect both. Items in the CART location will be returned to their permanent location on checkout.<br/>"
+            - "The special term _BLANK_ may be used on either side of a value pair to update or remove the location from items with no locaiton assigned.<br/>"
+            - "The special term _ALL_ is used on the left side of the colon (:) to affect all items, <strong>and overrides all other rules.</strong>"
+        -
             - pref: UpdateNotForLoanStatusOnCheckin
               type: textarea
               class: code