From 900e1d30b2978eebcce53800ac4df5e1adf5f67e Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Mon, 26 Nov 2012 14:34:38 -0500 Subject: [PATCH] Bug 7731 [Follow-up] Library should be used instead of branch and site This patch corrects new and old instances of the use of the term "branch" and replaces them with "library." Signed-off-by: Melia Meggs Signed-off-by: Katrin Fischer All tests pass, changes look good. Also inlcudes some bookseller > vendor changes. Signed-off-by: Jared Camins-Esakov --- .../intranet-tmpl/prog/en/modules/acqui/invoices.tt | 2 +- .../prog/en/modules/acqui/neworderempty.tt | 4 ++-- .../prog/en/modules/acqui/orderreceive.tt | 4 ++-- .../prog/en/modules/admin/smart-rules.tt | 4 ++-- .../intranet-tmpl/prog/en/modules/circ/returns.tt | 2 +- .../prog/en/modules/help/admin/smart-rules.tt | 12 ++++++------ .../prog/en/modules/help/circ/branchoverdues.tt | 2 +- .../prog/en/modules/help/circ/pendingreserves.tt | 2 +- .../prog/en/modules/help/circ/returns.tt | 10 +++++----- .../prog/en/modules/help/circ/view_holdsqueue.tt | 2 +- .../prog/en/modules/help/members/member.tt | 2 +- .../prog/en/modules/help/members/members-home.tt | 2 +- .../prog/en/modules/help/reports/guided_reports.tt | 6 +++--- .../prog/en/modules/help/tools/holidays.tt | 4 ++-- .../prog/en/modules/help/tools/letter.tt | 8 ++++---- .../prog/en/modules/serials/serials-search.tt | 8 ++++---- 16 files changed, 37 insertions(+), 37 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt index a04204e09b..8e9b1a3799 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -207,7 +207,7 @@ $(document).ready(function() {
  • - + [% END %] - Item returns to issuing branch + Item returns to issuing library [% IF ( default_returnbranch == 'noreturn' ) %] - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt index 672105a191..a27b45f7a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ -415,7 +415,7 @@ $(document).ready(function () { [% IF ( riloop ) %]

    Checked-in items

    - + [% FOREACH riloo IN riloop %] 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 4791ab2ed9..e9552c5a1d 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 @@ -17,13 +17,13 @@
  • all libraries, all patron types, all item types
    • -

    Tip: 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)

    +

    Tip: If you are a single library system choose your library 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.

    Default Circulation Rules

    -

    Using the issuing rules matrix you can define rules that depend on patron/item typecombos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all branches)

    +

    Using the issuing rules matrix you can define rules that depend on patron/item typecombos. To set your rules, choose a library from the pull down (or 'all libraries' if you want to apply these rules to all libraries)

    From the matrix you can choose any combination of patron categories and item types to apply the rules to

    @@ -84,7 +84,7 @@
  • Control where the item returns to once it is checked in
    • Item returns home
      • -
    • Item returns to issuing branch
      • +
    • Item returns to issuing library
    • Item floats
      • When an item floats it stays where it was checked in and does not ever return 'home'
        • @@ -115,7 +115,7 @@

        Important: Note that if the system preference AllowHoldPolicyOverrideset to 'allow', these policies can be overridden by your circulation staff.

        -

        Important: These policies are based on the patron's home branch, not the branch that the reserving staff member is from.

        +

        Important: These policies are based on the patron's home library, not the library that the reserving staff member is from.

        The various Return Policies have the following effects:

        @@ -125,12 +125,12 @@
      • Important: If the AutomaticItemReturnpreference is set to automatically transfer the items home, then a prompt will not appear
      • -
    • Item returns to issuing branch: The item will prompt the librarian to transfer the item back to the library where it was checked out +
    • Item returns to issuing library: The item will prompt the librarian to transfer the item back to the library where it was checked out
      • Important: If the AutomaticItemReturnpreference is set to automatically transfer the items home, then a prompt will not appear
      • -
    • Item floats: The item will not be transferred from the branch it was checked in at, instead it will remain there until transferred manually or checked in at another branch
      • +
    • Item floats: The item will not be transferred from the library it was checked in at, instead it will remain there until transferred manually or checked in at another library

    See the full documentation for Circulation and Fine Rules in the manual (online).

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt index 153b012e93..699643a271 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/branchoverdues.tt @@ -4,7 +4,7 @@

    This report will show you any overdues at your library that have accrued fines on them.

    -

    If you would like to limit the report you can use the pull down menu at the top to limit to a specific shelving location at your branch. To see overdues with fines at other branches you will have to change your branch or log in at that branch.

    +

    If you would like to limit the report you can use the pull down menu at the top to limit to a specific shelving location at your library. To see overdues with fines at other libraries you will have to change your library or log in at that library.

    Important: If you do not charge fines and/or don't have the fines cron job running you will see no data on this report.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt index 397e599169..b6a5e29e78 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/pendingreserves.tt @@ -2,7 +2,7 @@

    Holds to Pull

    -

    This report will show you all of the items that have holds on them that are available at the library for pulling. If the items are available at multiple branches then all branches with that item available will see the hold to pull until one library triggers the hold.

    +

    This report will show you all of the items that have holds on them that are available at the library for pulling. If the items are available at multiple libraries then all libraries with that item available will see the hold to pull until one library triggers the hold.

    You can limit the results you see by using the Refine box on the left side of the page

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt index 852648d5a7..1e0a0c407e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/returns.tt @@ -28,12 +28,12 @@

    There are several messages that can appear when checking items in:

      -
    • If you are checking an item in at a library other than the home branch, a message will appear asking you to transfer the book to the home library +
    • If you are checking an item in at a library other than the home library, a message will appear asking you to transfer the book to the home library
      • After this item is checked in the status of the item will be changed in the catalog to 'in transit'
        • -
      • To mark an item as back at the home branch, check the item in at the home branch +
      • To mark an item as back at the home library, check the item in at the home library
          -
        • A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home branch.
          • +
        • A message will appear tell you that the item is not checked out, but the status will now say available in the catalog. This step is necessary to mark items as received by the home library.
      @@ -46,7 +46,7 @@
    • Ignoring the hold will leave the item on hold, but leave its status as Available (it will not cancel the hold)
    • -
  • If you're checking in an item that has a hold on it at another branch you will be prompted to confirm and transfer the item +
  • If you're checking in an item that has a hold on it at another library you will be prompted to confirm and transfer the item
    • Clicking the Confirm hold and Transfer button will mark the item as in transit to the library where the hold was placed
    • Clicking the Print Slip, Transfer and Confirm button will mark the item as in transit to the library where the hold was placed and present the library with a receipt to print and place on the book with the patron's information
      • @@ -61,7 +61,7 @@

      When you check in an item that has a hold on it the system will ask you to either confirm and transfer the item or just confirm the hold

      -

      Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper branch. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.

      +

      Clicking the Confirm button will mark the item as on hold for the patron. If the item needs to be transferred the item will also be marked as in transit to the proper library. Clicking 'Ignore' will retain the hold, but allow you to check the item out to another patron. Choosing to confirm and print will present you with a printable page that you can slip inside the book with the necessary hold and/or transfer information.

      Once confirmed the hold will show on the patron record and on the checkout screen under the 'Hold' tab.

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt index c45d16da46..29be8714e6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/circ/view_holdsqueue.tt @@ -10,7 +10,7 @@

      If you do not want all of your libraries to participate in the on-shelf holds fulfillment process, you should list the the libraries that *do* participate in the process here by inputting all the participating library's branchcodes, separated by commas ( e.g. "MPL,CPL,SPL,BML" etc. ).

      -

      By default, the holds queue will be generated such that the system will first attempt to hold fulfillment using items already at the pickup library if possible. If there are no items available at the pickup library to fill a hold, build_holds_queue.pl will then use the list of libraries defined in StaticHoldsQueueWeight. If RandomizeHoldsQueueWeight is disabled ( which it is by default ), the script will assign fulfillment requests in the order the branches are placed in the StaticHoldsQueueWeight system preference.

      +

      By default, the holds queue will be generated such that the system will first attempt to hold fulfillment using items already at the pickup library if possible. If there are no items available at the pickup library to fill a hold, build_holds_queue.pl will then use the list of libraries defined in StaticHoldsQueueWeight. If RandomizeHoldsQueueWeight is disabled ( which it is by default ), the script will assign fulfillment requests in the order the libraries are placed in the StaticHoldsQueueWeight system preference.

      For example, if your system has three libraries, of varying sizes ( small, medium and large ) and you want the burden of holds fulfillment to be on larger libraries before smaller libraries, you would want StaticHoldsQueueWeight to look something like "LRG,MED,SML".

      diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt index 258e167475..37dc0dba7c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/member.tt @@ -32,7 +32,7 @@
    -

    If you want to filter your results to a specific branch or category, you can click the plus sign [+] to the right of the search box.

    +

    If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.

    You can also browse through the patron records by clicking on the linked letters across the top.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt index 428fe7f08b..2023cbb1e7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/members/members-home.tt @@ -34,7 +34,7 @@
    • -

    If you want to filter your results to a specific branch or category, you can click the plus sign [+] to the right of the search box.

    +

    If you want to filter your results to a specific library or category, you can click the plus sign [+] to the right of the search box.

    You can also browse through the patron records by clicking on the linked letters across the top.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt index 7be3885d83..33f46c6ddc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/reports/guided_reports.tt @@ -72,7 +72,7 @@
    • The << and >> are just delimiters. You must put << at the beginning and >> at the end of your parameter
    • The 'Question to ask' will be displayed on the left of the string to enter.
      • -
    • The authorized_value can be omitted if not applicable. If it contains an authorized value category, or branches or itemtype or categorycode, a list with the Koha authorized values will be displayed instead of a free field Note that you can have more than one parameter in a given SQL Note that entering nothing at run time won't probably work as you expect. It will be considered as "value empty" not as "ignore this parameter". For example entering nothing for : "title=<<Enter title>>" will display results with title='' (no title). If you want to have to have something not mandatory, use "title like <<Enter title>>" and enter a % at run time instead of nothing
      • +
    • The authorized_value can be omitted if not applicable. If it contains an authorized value category, or libraries or itemtype or categorycode, a list with the Koha authorized values will be displayed instead of a free field Note that you can have more than one parameter in a given SQL Note that entering nothing at run time won't probably work as you expect. It will be considered as "value empty" not as "ignore this parameter". For example entering nothing for : "title=<<Enter title>>" will display results with title='' (no title). If you want to have to have something not mandatory, use "title like <<Enter title>>" and enter a % at run time instead of nothing

    Examples:

      @@ -81,12 +81,12 @@ FROM borrowers
      WHERE branchcode=<<Enter patrons library|branches>> AND surname like <<Enter filter for patron surname (% if none)>>
    • SELECT *
      FROM items
      -WHERE homebranch = <<Pick your branch|branches>> AND barcode like <<Partial barcode value here>>
      • +WHERE homebranch = <<Pick your library|branches>> AND barcode like <<Partial barcode value here>>
  • Tip: To generate a date picker calendar to the right of the field when running a report you can use the 'date' keyword like this: <<Enter Date|date>>
  • Tip: You have to put "%" in a text box to 'leave it blank'. Otherwise, it literally looks for "" (empty string) as the value for the field.
    • -
  • Important: In addition to using any authorized value code to generate a dropdown, you can use the following values as well: Branches (branches), Item Types (itemtypes) and Patron Categories (categorycode). For example a branch pull down would be generated like this <<Branch|branches>>
    • +
  • Important: In addition to using any authorized value code to generate a dropdown, you can use the following values as well: Libraries (branches), Item Types (itemtypes) and Patron Categories (categorycode). For example a library pull down would be generated like this <<Library|branches>>

    • Note: There is a limit of 10,000 records put on SQL statements entered in Koha. To get around this you want to add 'LIMIT 100000' to the end of your SQL statement (or any other number above 10,000.

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt index 1784350d4d..923e1d5904 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/holidays.tt @@ -19,7 +19,7 @@

    Adding Events

    -

    Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one branch or all branches. To add events, simply

    +

    Before adding events, choose the library you would like to apply the closings to. When adding events you will be asked if you would like to apply the event to one library or all libraries. To add events, simply

    • Click on the date on the calendar that you would like to apply the closing to
      • @@ -39,7 +39,7 @@
    • Finally decide if this event should be applied to all libraries or just the one you have originally selected
        -
      • If you'd rather enter all the holidays and then copy them all to another branch all at once you can use the copy menu below the calendar
        • +
      • If you'd rather enter all the holidays and then copy them all to another library all at once you can use the copy menu below the calendar
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt index cf81c5eb23..bae182f414 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/tools/letter.tt @@ -91,19 +91,19 @@ -
  • When this notice references the branches table it is referring to the pickup branch information.
    • +
  • When this notice references the branches table it is referring to the pickup library information.
  • HOLDPLACED (a notice to the library staff that a hold has been placed)
    • This notice requires the emailLibrarianWhenHoldIsPlaced system preference to be set to 'Enable'
      • -
    • When this notice references the branches table it is referring to the pickup branch information.
      • +
    • When this notice references the branches table it is referring to the pickup library information.
  • HOLD_PRINT (Printed notice when hold available for pickup)
    • This notice is used for hold confirmation notices that are sent out in print format. This will not effect what the email notice looks like.
      • -
    • When this notice references the branches table it is referring to the pickup branch information.
      • +
    • When this notice references the branches table it is referring to the pickup library information.
  • ODUE (Overdue Notice) @@ -152,7 +152,7 @@
  • TRANSFERSLIP
    • Used to print a transfer slip
      • -
    • The transfer sliip is printed when you confirm a transfer from one branch to another in your system
      • +
    • The transfer sliip is printed when you confirm a transfer from one library to another in your system
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt index 98ef4d556b..f0235862b3 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-search.tt @@ -59,11 +59,11 @@
  • - +
  • - +
  • - +
  • - +
    • Due dateTitle Author BarcodeHome branchHolding branchShelving locationCall numberType PatronNote
    Due dateTitle Author BarcodeHome libraryHolding libraryShelving locationCall numberType PatronNote