X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=koha-tmpl%2Fintranet-tmpl%2Fprog%2Fen%2Fmodules%2Fadmin%2Fpreferences%2Fcirculation.pref;h=3f12bff286a5f243298491c61de7082f672dcbbe;hb=4b6c9178c42698d4734dbbef387000fad5a55b72;hp=81b671c5fcc5e3051983477bcd93b41618d385a9;hpb=1edb8cbeee2f89c7fb4cd1f643b23cb20d91d35d;p=koha-ffzg.git

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 81b671c5fc..3f12bff286 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
@@ -123,9 +123,11 @@ Circulation:
                   no: "Do not"
             - update a bibliographic record's total issues count whenever an item is issued (WARNING! This increases server load significantly; if performance is a concern, use the update_totalissues.pl cron job to update the total issues count).
         -
-            - Use the
-            - pref: ExportWithCsvProfile
-            - CSV profile when exporting patron checkout history (enter CSV Profile name)
+            - pref: ExportCircHistory
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the export patron checkout history options.
         -
             - The following fields should be excluded from the patron checkout history CSV or iso2709 export
             - pref: ExportRemoveFields
@@ -142,6 +144,12 @@ Circulation:
                   yes: Show
                   no: "Do not show"
             - all items in the "Checked-in items" list, even items that were not checked out.
+        -
+            - pref: AllowCheckoutNotes
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to submit notes about checked out items.
 
     Checkout Policy:
         -
@@ -346,7 +354,7 @@ Circulation:
             - "patrons to return books before their accounts expire (by restricting due dates to before the patron's expiration date)."
         -
             - Send all notices as a BCC to this email address
-            - pref: OverdueNoticeBcc
+            - pref: NoticeBcc
         -
             - pref: OverdueNoticeCalendar
               choices:
@@ -444,6 +452,13 @@ Circulation:
                   yes: Block
                   no: Allow
             - renewing of items.
+        -
+            - If a patron owes more than the value of OPACFineNoRenewals,
+            - pref: OPACFineNoRenewalsBlockAutoRenew
+              choices:
+                  yes: Block
+                  no: Allow
+            - his/her auto renewals.
     Checkin Policy:
         -
             - pref: BlockReturnOfWithdrawnItems
@@ -465,6 +480,12 @@ 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. E.g. '-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:
+                  yes: Cumulate
+                  no: "Don't cumulate"
+            - the restriction periods.
     Holds Policy:
         -
             - pref: AllowHoldItemTypeSelection
@@ -610,6 +631,12 @@ Circulation:
                   no: "Don't allow"
             - expired holds to be canceled on days the library is closed.
         -
+            - pref: ExcludeHolidaysFromMaxPickUpDelay
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - Closed days to be taken into account in reserves max pickup delay.
+        -
             - pref: decreaseLoanHighHolds
               choices:
                   yes: Enable
@@ -710,8 +737,20 @@ Circulation:
             - Charge a hold fee
             - pref: HoldFeeMode
               choices:
-                  always: "any time a hold is placed."
+                  any_time_is_placed: "any time a hold is placed."
                   not_always: "only if all items are checked out and the record has at least one hold already."
+                  any_time_is_collected: "any time a hold is collected."
+            - pref: useDefaultReplacementCost
+              choices:
+                  yes: use
+                  no: "Don't use"
+            - the default replacement cost defined in item type.
+        -
+            - "Set the text to be recorded in the column 'note', table 'accountlines' when the processing fee (defined in item type) is applied."
+            - pref: ProcessingFeeNote
+              type: textarea
+              class: code
+
     Self Checkout:
         -
             - "Include the following JavaScript on all pages in the web-based self checkout:"
@@ -740,7 +779,7 @@ Circulation:
             - pref: SelfCheckoutByLogin
               choices:
                   yes: Username and Password
-                  no: Barcode
+                  no: Cardnumber
         -
             - "Time out the current patron's web-based self checkout system login after"
             - pref: SelfCheckTimeout