From d24293bab480ec2b7128427b5bf3cef1860b1292 Mon Sep 17 00:00:00 2001 From: Grace McKenzie Date: Tue, 17 Jan 2017 22:45:28 +0000 Subject: [PATCH] Bug 17290 - Standardize on "Patron Categories" MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit We need to standardize on terminology, this changes all instances of patron types to be patron categories. To text, just view the patch Signed-off-by: Cédric Vita Signed-off-by: Jonathan Druart Signed-off-by: Kyle M Hall (cherry picked from commit 9a4fd7b27074d7ce923f7b47061d1e6636ecbc56) Signed-off-by: Katrin Fischer --- .../prog/en/modules/admin/smart-rules.tt | 18 +++++++-------- .../prog/en/modules/help/admin/categorie.tt | 6 ++--- .../help/admin/item_circulation_alerts.tt | 6 ++--- .../prog/en/modules/help/admin/smart-rules.tt | 22 +++++++++---------- .../en/modules/help/members/boraccount.tt | 4 ++-- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index fea8912c66..64ddde4ba1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -130,16 +130,16 @@ $(document).ready(function() {

The rules are applied from most specific to less specific, using the first found in this order:

    -
  • same library, same patron type, same item type
    • -
  • same library, same patron type, all item types
    • -
  • same library, all patron types, same item type
    • -
  • same library, all patron types, all item types
    • -
  • default (all libraries), same patron type, same item type
    • -
  • default (all libraries), same patron type, all item types
    • -
  • default (all libraries), all patron types, same item type
    • -
  • default (all libraries), all patron types, all item types
    • +
  • same library, same patron category, same item type
    • +
  • same library, same patron category, all item types
    • +
  • same library, all patron categories, same item type
    • +
  • same library, all patron categories, all item types
    • +
  • default (all libraries), same patron category, same item type
    • +
  • default (all libraries), same patron category, all item types
    • +
  • default (all libraries), all patron categories, same item type
    • +
  • default (all libraries), all patron categories, all item types
-

To modify a rule, create a new one with the same patron type and item type.

+

To modify a rule, create a new one with the same patron category and item type.

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt index 2cb29b0248..7105e42571 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/categorie.tt @@ -2,14 +2,14 @@

Patron Categories

-

Patron categories allow you to organize your patrons into different roles, age groups, and patron types.

+

Patron categories allow you to organize your patrons into different roles, age groups, and patron categories.

Patrons are assigned to one of six main categories:

  • Adult
      -
    • Most common patron type, usually used for a general 'Patron' category.
      • +
    • Most common patron category, usually used for a general 'Patron' category.
  • Child @@ -34,7 +34,7 @@
  • Statistical
      -
    • This patron type is used strictly for statistical purposes, such as in house use of items.
      • +
    • This patron category is used strictly for statistical purposes, such as in house use of items.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt index ac33024460..40e43ebd08 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/item_circulation_alerts.tt @@ -4,7 +4,7 @@

Libraries can decide if they want to have patrons automatically notified of circulation events (check ins and check outs).

-

These preferences are set based on patron types and item types.

+

These preferences are set based on patron categories and item types.

Important: These preference can be overwritten by changes in the individual patron's messaging preferences.

@@ -16,9 +16,9 @@
  • To set preferences for all libraries, keep the menu set to 'Default'
    • -
  • By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item/patron type combination that you would like to stop notices for.
    • +
  • By default all item types and all patrons are notified of check ins and check outs. To change this, click on the item type/patron category combination that you would like to stop notices for.

    • See the full documentation for Item Circulation Alerts in the manual (online).

    -[% INCLUDE 'help-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'help-bottom.inc' %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt index 8852c27084..f1428d0fc1 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/smart-rules.tt @@ -7,14 +7,14 @@

    The rules are applied from most specific to less specific, using the first found in this order:

      -
    • same library, same patron type, same item type
      • -
    • same library, same patron type, all item type
      • -
    • same library, all patron types, same item type
      • -
    • same library, all patron types, all item types
      • -
    • all libraries, same patron type, same item type
      • -
    • all libraries, same patron type, all item types
      • -
    • all libraries, all patron types, same item type
      • -
    • all libraries, all patron types, all item types
      • +
    • same library, same patron category, same item type
      • +
    • same library, same patron category, all item type
      • +
    • same library, all patron categories, same item type
      • +
    • same library, all patron categories, all item types
      • +
    • all libraries, same patron category, same item type
      • +
    • all libraries, same patron category, all item types
      • +
    • all libraries, all patron categories, same item type
      • +
    • all libraries, all patron categories, all item types

    The CircControl and HomeOrHoldingBranch also come in to play when figuring out which circulation rule to follow.

    @@ -28,7 +28,7 @@

    If you are a single library system choose your branch name before creating rules (sometimes having only rules for the 'all libraries' option can cause issues with holds)

    -

    Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron types then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron types to avoid this holds issue. Koha needs to know what rule to fall back on.

    +

    Important: At the very least you will need to set a default circulation rule. This rule should be set for all item types, all libraries and all patron categories. That will catch all instances that do not match a specific rule. When checking out if you do not have a rule for all libraries, all item types and all patron categories then you may see patrons getting blocked from placing holds. You will also want a rule for your specific library set for all item types and all patron categories to avoid this holds issue. Koha needs to know what rule to fall back on.

    Default Circulation Rules

    @@ -83,10 +83,10 @@
  • Don't allow: Will only allow patrons to choose next available
  • Force: Will only allow patrons to choose an specific item
    • -
  • Finally, if you charge a rental fee for the item type and want to give a specific patron type a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field
    • +
  • Finally, if you charge a rental fee for the item type and want to give a specific patron category a discount on that fee, enter the percentage discount (without the % symbol) in the 'Rental Discount' field
    • -

    When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron type and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.

    +

    When finished, click 'Add' to save your changes. To modify a rule, create a new one with the same patron category and item type. If you would like to delete your rule, simply click the 'Delete' link to the right of the rule.

    To save time you can clone rules from one library to another by choosing the clone option above the rules matrix.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt index c94187a468..2b7df6c7bc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/boraccount.tt @@ -10,7 +10,7 @@
    • Fines will be charged based on your Circulation & Fines Rules
      • -
    • Hold fees will be charged based on the rules you set in the Patron Types & Categories administration area
      • +
    • Hold fees will be charged based on the rules you set for the patron category in administration
    • Rental fees will be charged based on the settings in your Item Types administration area
    • Marking an item 'Lost' via the cataloging module will automatically charge the patron the replacement cost for that item
    @@ -21,4 +21,4 @@

    See the full documentation for Patron Fines in the manual (online).

    -[% INCLUDE 'help-bottom.inc' %] \ No newline at end of file +[% INCLUDE 'help-bottom.inc' %] -- 2.39.5