From bbedf182d35b293e5465f64083b17f94450d5922 Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 9 Jun 2021 10:59:31 +0000 Subject: [PATCH] Bug 28508: Use "Invoice number" instead of "Invoice no" on the invoice search filter This patch corrects instances of the abbreviated phrase "Invoice no." from the templates, making it "Invoice number." Also corrected: An instance of "Bookseller" is replaced with "Vendor." To test, apply the patch and confirm that the phrase is correct in these cases: - Acquisitions -> Invoices: Check the "Search filters" form in the left-hand sidebar. -> View an invoice: Check the label in the form. - Acquisitions -> Vendor -> Receive shipments: Check the table of invoices. - Acquisitions -> Orders search (in the search header) -> Advanced search: Check the labels in the form. Signed-off-by: Salman Ali Signed-off-by: Tomas Cohen Arazi Note: I fixed Salman's SO line Signed-off-by: Jonathan Druart --- .../prog/en/includes/acquisitions-search.inc | 2 +- .../intranet-tmpl/prog/en/includes/filter-orders.inc | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 8 ++++---- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc index 22bcc14b43..8d4c79e7cd 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/acquisitions-search.inc @@ -19,7 +19,7 @@ Advanced search diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc index 8e343b0117..a2a7fc090e 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/filter-orders.inc @@ -24,7 +24,7 @@ [% PROCESS options_for_libraries libraries => Branches.all(selected => '') %] -
  • +
  • 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 9678419747..2526e8d46b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt @@ -55,7 +55,7 @@   [% END %]   - Invoice no. + Invoice number Vendor Shipment date Billing date @@ -160,7 +160,7 @@
    1. Merge invoices

    2. - +
      Invoice no.Shipment dateBilling dateShipment cost
      Invoice numberShipment dateBilling dateShipment cost
    3. @@ -198,7 +198,7 @@

      Search was:

        [% IF ( invoicenumber ) %] -
      • Invoice no.: [% invoicenumber | html %]
      • +
      • Invoice number: [% invoicenumber | html %]
      • [% END %] [% IF booksellerid %]
      • Vendor: [% suppliername | html %]
      • @@ -269,7 +269,7 @@

        Search filters

        1. - +
        2. 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 5e1a77a1a1..5b4c53f548 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt @@ -50,7 +50,7 @@

          This invoice number has already been used. Would you like to receive on an existing invoice?

          - + [% FOREACH invoice IN duplicate_invoices %] -- 2.39.5
          Invoice no.Shipment date
          Invoice numberShipment date