Merge remote-tracking branch 'origin/new/bug_7621'

diff --combined koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
index 91eb1ac,034c4be..b99e28f
--- 1/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
--- 2/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/circulation.pref
@@@ -52,11 -52,6 +52,11 @@@ Circulation
                    no: "Don't allow"
              - staff to specify a due date for a checkout.
          -
 +            - Set the default start date for the Holds to pull list to
 +            - pref: HoldsToPullStartDate
 +              class: integer
 +            - ago.
 +        -
              - pref: AllowAllMessageDeletion
                choices:
                    yes: Allow
@@@ -115,12 -110,6 +115,12 @@@
                    yes: Do
                    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).
 +        -
 +            - pref: ExportRemoveFields
 +            - choices:
 +                yes: Export
 +                no: "Don't export"
 +            - fields for csv or iso2709 export
      Checkout Policy:
          -
              - pref: AllowNotForLoanOverride
@@@ -139,7 -128,7 +139,7 @@@
                choices:
                    yes: Allow
                    no: "Don't allow"
 -            - checkouts of items 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.
          -
              - pref: AllFinesNeedOverride
                choices:
@@@ -182,12 -171,6 +182,12 @@@
                    itemtype: item type
              - .
          -
 +            - pref: UseTransportCostMatrix
 +              choices:
 +                  yes: Use
 +                  no: "Don't use"
 +            - Transport Cost Matrix for calculating optimal holds filling between branches.
 +        -
              - Use the checkout and fines rules of
              - pref: CircControl
                type: choice
@@@ -203,15 -186,6 +203,15 @@@
                    homebranch: the library the item is from.
                    holdingbranch: the library the item was checked out from.
          -
 +            - Allow materials to be returned to
 +            - pref: AllowReturnToBranch
 +              type: choice
 +              choices:
 +                  anywhere: to any library.
 +                  homebranch: only the library the item is from.
 +                  holdingbranch: only the library the item was checked out from.
 +                  homeorholdingbranch: either the library the item is from or the library it was checked out from.
 +        -
              - Calculate the due date using 
              - pref: useDaysMode
                choices:
@@@ -241,8 -215,9 +241,9 @@@
                    no: "Prevent"
              - patrons from checking out an item whose rental charge would take them over the limit.
          -
+             - "Restrict patrons with the following target audience values from checking out inappropriate materials:"
              - pref: AgeRestrictionMarker
-             - "E.g. FSK|PEGI|Age| (No white space near |). Entry in MARC field (e.g. 521a) as defined for agerestriction in Koha to MARC mapping. Entry in MARC field like FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. (Empty: Do not apply age restriction.)"
+             - "E.g. enter target audience keyword(s) split by | (bar) FSK|PEGI|Age| (No white space near |). Be sure to map agerestriction in Koha to MARC mapping (e.g. 521$a). A MARC field value of FSK 12 or PEGI 12 would mean: Borrower must be 12 years old. Leave empty to not apply an age restriction."
          -
              - pref: AgeRestrictionOverride
                choices:
@@@ -290,13 -265,6 +291,13 @@@
                    alert: "display a message"
                    nothing : "do nothing"
              - .
 +    Checkin Policy:
 +        -
 +            - pref: BlockReturnOfWithdrawnItems
 +              choices:
 +                  yes: Block
 +                  no: "Don't block"
 +            - returning of items that have been withdrawn.
      Holds Policy:
          -
              - pref: AllowHoldPolicyOverride
@@@ -419,22 -387,6 +420,22 @@@
                    yes: Allow
                    no: "Don't allow"
              - holds to be suspended from the OPAC.
 +        -
 +            - pref: decreaseLoanHighHolds
 +              choices:
 +                  yes: Enable
 +                  no:  "Don't enable"
 +            - the reduction of loan period for items with number of holds above the threshold specified in decreaseLoanHighHoldsValue
 +        -
 +            - A loan should be reduced by
 +            - pref: decreaseLoanHighHoldsDuration
 +              class: integer
 +            - days, when decreaseLoanHighHoldsValue threshold is reached (if decreaseLoanHighHolds is enabled)
 +        -
 +            - A loan should be reduced by decreaseLoanHighHoldsDuration when
 +            - pref: decreaseLoanHighHoldsValue
 +              class: integer
 +            - holds have been places (if decreaseLoanHighHolds is enables)
      Fines Policy:
          -
              - Calculate fines based on days overdue