Merge remote branch 'kc/new/enh/bug_1962' into kcmaster

[koha_fer] / 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 8217443..e0eac4d 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
@@ -14,7 +14,8 @@ Circulation:
                   whitespace: Remove spaces from
                   cuecat: Convert from CueCat form
                   T-prefix: Remove the first number from T-prefix style
-            - scanned patron barcodes.
+                  libsuite8: Convert from Libsuite8 form
+            - scanned item barcodes.
         -
             - Sort previous checkouts on the circulation page from
             - pref: previousIssuesDefaultSortOrder
@@ -31,6 +32,12 @@ Circulation:
                   desc: latest to earliest
             - due date.
         -
+            - pref: UseTablesortForCirc
+              choices:
+                  yes: "Enable"
+                  no: "Don't enable"
+            - "the sorting of current patron checkouts on the circulation screen. <br/>NOTE: Enabling this function may slow down circulation time for patrons with many checkouts."
+        -
             - pref: soundon
               choices: 
                  yes: "Enable"
@@ -54,6 +61,12 @@ Circulation:
               class: integer
             - last returned items on the checkin screen.
         -
+            - pref: FineNotifyAtCheckin
+              choices:
+                  yes: Notify
+                  no: "Don't notify"
+            - librarians of overdue fines on the items they are checking in.
+        -
             - pref: FilterBeforeOverdueReport
               choices:
                   yes: Require
@@ -79,10 +92,17 @@ Circulation:
                   no: "Don't allow"
             - staff to manually override the renewal limit and renew a checkout when it would go over the renewal limit.
         -
-            - When items are created, give them the temporary location of
-            - pref: NewItemsDefaultLocation
-              class: short
-            - (should be a location code, or blank to disable).
+            - pref: AllFinesNeedOverride
+              choices:
+                  yes: Require
+                  no: "Don't require"
+            - staff to manually override all fines, even fines less than noissuescharge.
+        -
+            - pref: AllowFineOverride
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - staff to manually override and check out items to patrons who have more than noissuescharge in fines.
         -
             - pref: InProcessingToShelvingCart
               choices:
@@ -127,7 +147,6 @@ Circulation:
               choices:
                   homebranch: the library the item is from.
                   holdingbranch: the library the item was checked out from.
-            - "<br />NOTE: This is older than <code>CircControl</code>, but used by some parts of Koha. It will be removed soon."
         -
             - Make all checkouts have a due date of
             - pref: globalDueDate
@@ -253,6 +272,12 @@ Circulation:
                   no: "Don't allow (with independent branches)"
             - a user from one library to place a hold on an item from another library
         -
+            - pref: OPACAllowUserToChooseBranch
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - a user to choose the branch to pick up a hold from.
+        -
             - pref: ReservesNeedReturns
               choices:
                   yes: "Don't automatically"