Bugzilla – Attachment 121921 Details for
Bug 28508
Use "Invoice number" instead of "Invoice no" on the invoice search filter
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28508: Use "Invoice number" instead of "Invoice no" on the invoice search filter
Bug-28508-Use-Invoice-number-instead-of-Invoice-no.patch (text/plain), 5.84 KB, created by
Tomás Cohen Arazi (tcohen)
on 2021-06-14 18:25:27 UTC
(
hide
)
Description:
Bug 28508: Use "Invoice number" instead of "Invoice no" on the invoice search filter
Filename:
MIME Type:
Creator:
Tomás Cohen Arazi (tcohen)
Created:
2021-06-14 18:25:27 UTC
Size:
5.84 KB
patch
obsolete
>From 3c1f9a5f7595b758cfdf71804a435cc5994e852e Mon Sep 17 00:00:00 2001 >From: Owen Leonard <oleonard@myacpl.org> >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 <salman.ali@inLibro.com> >Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io> > >Note: I fixed Salman's SO line >--- > .../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 @@ > <input value="Submit" class="submit" type="submit" /> <a href="/cgi-bin/koha/acqui/histsearch.pl">Advanced search</a> > <p id="filters" style="display:none"> > <label for="basket">Basket: </label><input type="text" name="basket" id="basket" /> >- <label for="booksellerinvoicenumber">Invoice no.: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> >+ <label for="booksellerinvoicenumber">Invoice number: </label><input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" /> > </p> > </form> > </div> >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 => '') %] > </select> > </li> >- <li><label for="booksellerinvoicenumber ">Bookseller invoice no: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% filters.booksellerinvoicenumber | html %]" /></li> >+ <li><label for="booksellerinvoicenumber ">Vendor invoice number: </label> <input type="text" name="booksellerinvoicenumber" id="booksellerinvoicenumber" value="[% filters.booksellerinvoicenumber | html %]" /></li> > <li> > <label for="basketgroupname">Basket group:</label> > <input type="text" name="basketgroupname" id="basketgroupname" value="[% filters.basketgroupname | html %]" /> >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 @@ > <th> </th> > [% END %] > <th> </th> >- <th>Invoice no.</th> >+ <th>Invoice number</th> > <th>Vendor</th> > <th>Shipment date</th> > <th>Billing date</th> >@@ -160,7 +160,7 @@ > <ol> > <li><h2>Merge invoices</h2></li> > <li><table id="merge_table"> >- <thead><tr><th>Invoice no.</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead> >+ <thead><tr><th>Invoice number</th><th>Shipment date</th><th>Billing date</th><th>Shipment cost</th></tr></thead> > <tbody> > </tbody> > </table></li> >@@ -198,7 +198,7 @@ > <p>Search was: > <ul> > [% IF ( invoicenumber ) %] >- <li>Invoice no.: [% invoicenumber | html %]</li> >+ <li>Invoice number: [% invoicenumber | html %]</li> > [% END %] > [% IF booksellerid %] > <li>Vendor: [% suppliername | html %]</li> >@@ -269,7 +269,7 @@ > <h3>Search filters</h3> > <ol> > <li> >- <label for="invoicenumber">Invoice no:</label> >+ <label for="invoicenumber">Invoice number</label> > <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber | html %]" class="focus" /> > </li> > <li> >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 @@ > <div id="parcels_duplicate_invoice" class="dialog alert"> > <p>This invoice number has already been used. Would you like to receive on an existing invoice?</p> > <table> >- <thead><tr><th>Invoice no.</th><th>Shipment date</th><th></th></tr></thead> >+ <thead><tr><th>Invoice number</th><th>Shipment date</th><th></th></tr></thead> > <tbody> > [% FOREACH invoice IN duplicate_invoices %] > <tr> >-- >2.32.0
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=121921">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 28508
:
121736
|
121796
| 121921