@@ -, +, @@ --- .../prog/en/modules/acqui/acqui-home.tt | 8 +++--- .../prog/en/modules/acqui/addorderiso2709.tt | 6 ++-- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 6 ++-- .../prog/en/modules/acqui/basketgroup.tt | 22 ++++++++++---------- .../prog/en/modules/acqui/booksellers.tt | 2 +- .../prog/en/modules/acqui/histsearch.tt | 10 ++++---- .../prog/en/modules/acqui/lateorders.tt | 2 +- .../prog/en/modules/acqui/neworderbiblio.tt | 6 ++-- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 4 +- .../prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/acqui/parcel.tt | 20 +++++++++--------- .../intranet-tmpl/prog/en/modules/acqui/parcels.tt | 12 +++++----- .../intranet-tmpl/prog/en/modules/acqui/spent.tt | 8 +++--- .../prog/en/modules/acqui/supplier.tt | 12 +++++----- .../prog/en/modules/acqui/z3950_search.tt | 10 ++++---- 15 files changed, 65 insertions(+), 65 deletions(-) --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -122,8 +122,8 @@ $(document).ready(function() { [% loop_budge.budget_owner %] [% loop_budge.budget_branchname %] [% loop_budge.budget_amount %] - [% loop_budge.budget_ordered %] - [% loop_budge.budget_spent %] + [% loop_budge.budget_ordered %] + [% loop_budge.budget_spent %] [% loop_budge.budget_avail %] [% ELSE %] @@ -136,8 +136,8 @@ $(document).ready(function() { [% loop_budge.budget_owner %] [% loop_budge.budget_branchname %] [% loop_budge.budget_amount %] - [% loop_budge.budget_ordered %] - [% loop_budge.budget_spent %] + [% loop_budge.budget_ordered %] + [% loop_budge.budget_spent %] [% loop_budge.budget_avail %] [% END %] [% END %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt @@ -1,10 +1,10 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Order Staged MARC Records +<title>Koha › Acquisitions › Order staged MARC records [% IF ( batch_details ) %] › Batch [% import_batch_id %] [% ELSE %] - › Batch List + › Batch list [% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -146,7 +146,7 @@ [% END %]
- Accounting Details + Accounting details
  1. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -237,7 +237,7 @@ [% IF ( GST ) %] - Total Tax Exc. + Total tax exc. [% total_rrp_gste %]   [% qty_total %] @@ -258,7 +258,7 @@ [% gist_est %] - Total Tax Inc. ([% currency %]) + Total tax inc. ([% currency %]) [% total_rrp_gsti %]   [% qty_total %] @@ -289,7 +289,7 @@ [% IF ( books_loo.suggestionid ) %]
    Suggested by: [% books_loo.surnamesuggestedby %][% IF ( books_loo.firstnamesuggestedby ) %], [% books_loo.firstnamesuggestedby %] [% END %] - (suggestion #[% books_loo.suggestionid %]) + (suggestion #[% books_loo.suggestionid %]) [% END %] [% IF ( books_loo.notes ) %]

    Note: [% books_loo.notes|html %] [Change note]

    --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Basket Grouping for [% booksellername |html %] +Koha › Basket grouping for [% booksellername |html %] [% INCLUDE 'doc-head-close.inc' %] [% IF ( grouping ) %] @@ -137,15 +137,15 @@ function yuiToolbar() { [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
    [% IF ( grouping ) %]
    @@ -156,7 +156,7 @@ function yuiToolbar() {
    -

    Ungrouped Baskets

    +

    Ungrouped baskets

      [% IF ( baskets ) %] [% FOREACH basket IN baskets %] @@ -185,16 +185,16 @@ function yuiToolbar() {
        -
      1. +
      2. -
      3. +
      4. -
      5. +
      6. or

      7. -
      8. +
      9. @@ -253,7 +253,7 @@ function yuiToolbar() { - + @@ -285,7 +285,7 @@ function yuiToolbar() {
        Basket GroupActionBasket groupAction
        - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -38,7 +38,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
        --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt @@ -1,6 +1,6 @@ [% USE KohaDates %] [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search Results[% ELSE %]Order search[% END %] +Koha › Acquisitions › [% IF ( suggestions_loop ) %]Orders search › Search results[% ELSE %]Order search[% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -8,7 +8,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
        @@ -25,7 +25,7 @@
      10. -
      11. +
      12. Show Calendar @@ -60,13 +60,13 @@
        [% END %] - [% IF ( suggestions_loop ) %]

        Search Results

        + [% IF ( suggestions_loop ) %]

        Search results

      13. Basket GroupActionBasket groupAction
        - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt @@ -61,7 +61,7 @@ $(document).ready(function() { [% END %]
        Basket Basket groupInvoice NumberInvoice number Summary Vendor Placed on
        - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt @@ -1,5 +1,5 @@ [% INCLUDE 'doc-head-open.inc' %] -Koha › Acquisitions › Search Existing Records +Koha › Acquisitions › Search existing records [% INCLUDE 'greybox.inc' %] [% INCLUDE 'doc-head-close.inc' %] @@ -7,7 +7,7 @@ [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
        @@ -15,7 +15,7 @@
        -

        Search Existing Records

        +

        Search existing records

        [% IF ( total ) %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -25,9 +25,9 @@
        - + - + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -61,7 +61,7 @@
        - Catalog Details + Catalog details
        1. Title: [% title |html %]
        2. Author: [% author %]
        3. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -1,6 +1,6 @@ [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( date ) %] - Receipt Summary for [% name %] [% IF ( invoice ) %]Invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive Orders from [% name %][% END %] + Receipt summary for [% name %] [% IF ( invoice ) %]invoice [% invoice %][% END %] on [% formatteddatereceived %][% ELSE %]Receive orders from [% name %][% END %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'greybox.inc' %] @@ -158,7 +158,7 @@ [% INCLUDE 'acquisitions-search.inc' %] @@ -180,7 +180,7 @@ [% END %]

          [% IF ( datereceived ) %] - Receipt Summary for [% name %] [% IF ( invoice ) %] [ [% invoice %] ] [% END %] on [% formatteddatereceived %] + Receipt summary for [% name %] [% IF ( invoice ) %] [ [% invoice %] ] [% END %] on [% formatteddatereceived %] [% ELSE %] Receive orders from [% name %] [% END %] @@ -202,15 +202,15 @@

        Order DateOrder date Estimated delivery date Vendor Information Order Vendor Itemtype Left on Order Left on order Estimated cost per unit Date Ordered Date ordered Subtotal
        - + - + @@ -307,7 +307,7 @@
        -

        Already Received

        +

        Already received

        [% IF ( loop_received ) %]
        @@ -315,9 +315,9 @@
        - + - + @@ -420,7 +420,7 @@
      14. - +
      15. --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -25,9 +25,9 @@
        BasketOrder LineOrder line SummaryView RecordView record Quantity Unit cost Order cost
        BasketOrder LineOrder line SummaryView RecordView record Quantity Est cost Actual cost
        - - - + + + @@ -85,7 +85,7 @@
        Receive a new shipment
        1. - + @@ -131,8 +131,8 @@

        - - - - + + + + --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt @@ -155,9 +155,9 @@ if (f.company.value == "") {

        Vendor details

        -

        Company Name: [% name %]

        -

        Postal Address: [% postal %]

        -

        Physical Address: [% address1 %][% address2 %][% address3 %][% address4 %]

        +

        Company name: [% name %]

        +

        Postal address: [% postal %]

        +

        Physical address: [% address1 %][% address2 %][% address3 %][% address4 %]

        Phone: [% phone %]

        Fax: [% fax %]

        [% IF ( url ) %] @@ -192,11 +192,11 @@ if (f.company.value == "") { [% END %]

        List prices are: [% listprice %]

        Invoice prices are: [% invoiceprice %]

        - [% IF ( GST ) %]

        Tax Number Registered: + [% IF ( GST ) %]

        Tax number registered: [% IF ( gstreg ) %]Yes[% ELSE %]No[% END %]

        -

        List Item Price Includes Tax: +

        List item price includes tax: [% IF ( listincgst ) %]Yes[% ELSE %]No[% END %]

        -

        Invoice Item Price Includes Tax: +

        Invoice item price includes tax: [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]

        [% END %]

        Discount: [% discount %] %

        --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt @@ -76,14 +76,14 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
        1. -
        2. -
        3. +
        4. +
        1. -
        2. +
          @@ -108,7 +108,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color :
        -

        Search targets Select AllClear All

        +

        Search targets Select allClear all

        [% FOREACH serverloo IN serverloop %]

        @@ -143,7 +143,7 @@ tr.selected { background-color : #FFFFCC; } tr.selected td { background-color : [% IF ( breeding_loo.breedingid ) %] [% IF ( breeding_loo.toggle ) %]

        [% ELSE %][% END %] - + --
        LineDate ReceivedInvoice NumberItem CountDate receivedInvoice numberItem count Biblio count Items expected
        Invoice Itemtype Received Unit Price Freight per Item Date Ordered Date Received Unit price Freight per item Date ordered Date received Subtotal
        [% breeding_loo.server %] [% breeding_loo.server %] [% breeding_loo.title |html %] [% breeding_loo.author %] [% breeding_loo.isbn %]