diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index 9acc451904..f0e2942788 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/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 %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt index 80f88f9925..3fdd631968 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt +++ b/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. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 7b93de6818..0cf7ff691f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/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]

    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index f19b29969b..572d353eea 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/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' %] - +
    -

    Basket Grouping for [% booksellername |html %]

    +

    Basket grouping for [% booksellername |html %]

    [% 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. +
        3. -
      3. +
        5. -
      5. +

      7. or

        8. -
      8. +
      10. @@ -253,7 +253,7 @@ function yuiToolbar() { - + @@ -285,7 +285,7 @@ function yuiToolbar() {
        Basket GroupActionBasket groupAction
        - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt index 798c2e7a94..4077b5db9c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/booksellers.tt @@ -38,7 +38,7 @@ $(document).ready(function() { [% INCLUDE 'header.inc' %] [% INCLUDE 'acquisitions-search.inc' %] - +
        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt index 1d6c242983..80eb827b3f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/histsearch.tt +++ b/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 @@
        14. -
        15. +
      16. Show Calendar @@ -60,13 +60,13 @@
        [% END %] - [% IF ( suggestions_loop ) %]

        Search Results

        + [% IF ( suggestions_loop ) %]

        Search results

        17. Basket GroupActionBasket groupAction
        - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt index 9305ae52f7..cf54b03b19 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt +++ b/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
        - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt index 5e1ee9a46f..6342d338ec 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderbiblio.tt +++ b/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 ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 379d0429d1..5a2af78ccc 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -25,9 +25,9 @@
        - + - + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt index bb706ec610..97a7223363 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/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. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 4ddfc7d4aa..a5d3e1a11f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/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 @@
      17. - +
        18. diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt index 712c47284c..740d0bbe52 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/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 @@

        - - - - + + + + diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt index b671f486b1..25b52eab70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt +++ b/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 %] %

        diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt index 176922dfd5..2e2a46dc9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/z3950_search.tt +++ b/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 :
          3. -
          4. -
          5. +
          6. +
          2. -
          3. +
          @@ -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 %]
        Preview MARC Preview Card Order X
        		[% breeding_loo.server %]
        Preview MARC Preview card Order X
        		[% breeding_loo.title |html %] [% breeding_loo.author %] [% breeding_loo.isbn %]