@@ -, +, @@ --- .../prog/en/modules/acqui/addorderiso2709.tmpl | 6 +++--- .../prog/en/modules/acqui/basket.tmpl | 4 ++-- .../prog/en/modules/acqui/basketgroup.tmpl | 8 ++++---- .../prog/en/modules/acqui/basketheader.tmpl | 2 +- .../prog/en/modules/acqui/neworderempty.tmpl | 2 +- .../prog/en/modules/admin/aqcontract.tmpl | 14 +++++++------- .../prog/en/modules/help/serials/claims.tmpl | 6 +++--- .../en/modules/reports/acquisitions_stats.tmpl | 2 +- .../prog/en/modules/reports/serials_stats.tmpl | 4 ++-- .../prog/en/modules/serials/claims.tmpl | 8 ++++---- 10 files changed, 28 insertions(+), 28 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tmpl @@ -40,7 +40,7 @@ - &basketno=&booksellerid=&breedingid=&import_batch_id=">Add order + &basketno=&booksellerid=&breedingid=&import_batch_id=">Add order @@ -60,7 +60,7 @@ - ?import_batch_id=&offset="> + ?import_batch_id=&offset="> @@ -82,7 +82,7 @@ - ?import_batch_id=&basketno=&booksellerid=">Add orders + ?import_batch_id=&basketno=&booksellerid=">Add orders --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tmpl @@ -113,7 +113,7 @@ -

Supplier Not Found

+

Vendor not found

Basket deleted

@@ -138,7 +138,7 @@

Basket details

Internal note:

-

Bookseller note:

+

Vendor note:

Contract number:

Contract name: ">

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tmpl @@ -140,8 +140,8 @@ fieldset.various li { function yuiToolbar() { var booksellermenu = [ - { text: _("Bookseller"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=" }, - { text: _("Edit bookseller"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid="}, + { text: _("Vendor"), url: "/cgi-bin/koha/acqui/supplier.pl?supplierid=" }, + { text: _("Edit vendor"), url: "/cgi-bin/koha/acqui/booksellers.pl?booksellerid="}, ] var ordersbutton = [ { text: _("Manage orders"), url: "/cgi-bin/koha/acqui/booksellers.pl?supplierid=" }, @@ -150,7 +150,7 @@ fieldset.various li { new YAHOO.widget.Button("newbasketgroup"); new YAHOO.widget.Button({ type: "menu", - label: _("Bookseller"), + label: _("Vendor"), name: "booksellerbutton", menu: booksellermenu, container: "toolbar" @@ -168,7 +168,7 @@ fieldset.various li { " name="newbasketgroup" id="newbasketgroup">New Basket Group
-

Basket grouping for Vendor ">

+

Basket grouping for vendor ">

--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketheader.tmpl @@ -129,7 +129,7 @@ li.list2 {
  • -   +  
  • --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tmpl @@ -80,7 +80,7 @@ ff.submit(); Basket details
    1. Internal note:
    2. -
    3. Bookseller note:
    4. +
    5. Vendor note:
    6. Contract number:
    7. Contract name: ">
    8. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqcontract.tmpl @@ -117,7 +117,7 @@ function Check(ff) {
    9.   " />
    10. -
    11. +
    12. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/help/serials/claims.tmpl @@ -6,11 +6,11 @@

      Claims are notices that you send when an issue that was expected has not been received by the library.

      How to lodge a Claim?

      -

      Make a selection from the drop down list. The "All Suppliers" count gives you a count of the total number of current item claims across all suppliers.

      -

      There are two ways to lodge a claim with the supplier:

      +

      Make a selection from the drop down list. The "All Vendors" count gives you a count of the total number of current item claims across all vendors.

      +

      There are two ways to lodge a claim with the vendor:

      1. Using a Letter defined in Notices. Note that you will need to set up the notice.
      2. -
      3. Exporting the claims information. This downloads a CSV file to your local machine with all the claim data ready for additional formatting before sending to the supplier.
      4. +
      5. Exporting the claims information. This downloads a CSV file to your local machine with all the claim data ready for additional formatting before sending to the vendor.

      How to resolve a Claim?

      --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl @@ -235,7 +235,7 @@   - Supplier + Vendor --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/serials_stats.tmpl @@ -31,11 +31,11 @@ - + - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/claims.tmpl @@ -158,7 +158,7 @@

      Claims

      -
      No missing issues found.
      Please choose a supplier.
      +
      No missing issues found.
      Please choose a vendor.
      Your notification has been sent.
      @@ -248,7 +248,7 @@ - + @@ -294,7 +294,7 @@

      " /> - &op=preview" onclick="popup(,''); return false" class="button">Supplier Group Claim Notice

      --> + &op=preview" onclick="popup(,''); return false" class="button">Vendor Group Claim Notice

      --> @@ -346,7 +346,7 @@

      Missing Issues

      BooksellerVendor Title Subscription id BranchCallnumberCall Number Subscription Begin Subscription End
      Claim SupplierVendor Title Issue number Status
      - + --
      SupplierVendor Title Issue number Missing since