Attachment 17540 Details for Bug 10046 – Bug 10046: Standardize terms used in invoices

[patch] Bug 10046: Standardize terms used in invoices

Bug-10046-Standardize-terms-used-in-invoices.patch (text/plain), 5.66 KB, created by Jonathan Druart on 2013-04-19 12:26:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2013-04-19 12:26:25 UTC

Size: 5.66 KB

patch

obsolete

>From 5bf6742572ce7940e4d627fdebdad5c0153bdb92 Mon Sep 17 00:00:00 2001
>From: Katrin Fischer <Katrin.Fischer.83@web.de>
>Date: Sun, 14 Apr 2013 17:29:20 +0200
>Subject: [PATCH] Bug 10046: Standardize terms used in invoices
>
>Changes are:
>budget > where actually fund is meant
>branch > library
>bookseller, supplier > vendor
>
>To test:
>
>1) Receive a shipment, check the little form where you
>   enter your invoice number for correct use of terms.
>2) Receive some orders and save finish receiving.
>3) Search for your created invoice. Check filters and
>   results table for correct use of terms.
>4) Look at the details of your invoice, repeat check there.
>
>Signed-off-by: Owen Leonard <oleonard@myacpl.org>
>Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt |   14 +++++++-------
> .../intranet-tmpl/prog/en/modules/acqui/invoices.tt      |    4 ++--
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt |    4 ++--
> 3 files changed, 11 insertions(+), 11 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>index d357e18..97d9146 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
>@@ -40,7 +40,7 @@
>       [% END %]
>       <h1>Invoice: [% invoicenumber %]</h1>
> 
>-      <p>Supplier: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
>+      <p>Vendor: <a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% booksellerid %]">[% suppliername %]</a></p>
>       <form action="" method="post">
>         <fieldset>
>           <label for="shipmentdate">Shipment date:</label>
>@@ -51,9 +51,9 @@
>           <p></p>
>           <label for="shipmentcost">Shipment cost:</label>
>           <input type="text" size="10" id="shipmentcost" name="shipmentcost" value="[% shipmentcost %]" />
>-          <label for="shipment_budget_id">Budget:</label>
>+          <label for="shipment_budget_id">Fund:</label>
>           <select id="shipment_budget_id" name="shipment_budget_id">
>-              <option value="">No budget</option>
>+              <option value="">No fund</option>
>             [% FOREACH budget IN budgets_loop %]
>               [% IF ( budget.selected ) %]
>                 <option selected="selected" value="[% budget.budget_id %]">
>@@ -94,7 +94,7 @@
>               <tr>
>                 <th>Summary</th>
>                 <th>Publisher</th>
>-                <th>Branch</th>
>+                <th>Library</th>
>                 <th>RRP</th>
>                 <th>Est.</th>
>                 <th>Qty.</th>
>@@ -130,7 +130,7 @@
>             </tbody>
>             <tfoot>
>                 <tr>
>-                    <th colspan="3">Total Tax Exc.</th>
>+                    <th colspan="3">Total tax exc.</th>
>                     <th>[% total_rrp_gste %]</th>
>                     <th>&nbsp;</th>
>                     <th>[% total_quantity %]</th>
>@@ -146,7 +146,7 @@
>                     <th>&nbsp;</th>
>                 </tr>
>                 <tr>
>-                    <th colspan='3'>Total Tax Inc. ([% currency %])</th>
>+                    <th colspan='3'>Total tax inc. ([% currency %])</th>
>                     <th>[% total_rrp_gsti %]</th>
>                     <th>&nbsp;</th>
>                     <th>[% total_quantity %]</th>
>@@ -154,7 +154,7 @@
>                     <th>&nbsp;</th>
>                 </tr>
>                 <tr>
>-                    <th colspan="3">Total + Shipment cost ([% currency %])</th>
>+                    <th colspan="3">Total + shipment cost ([% currency %])</th>
>                     <th>&nbsp;</th>
>                     <th>&nbsp;</th>
>                     <th>[% total_quantity %]</th>
>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 54e12ff..90d7fe1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -127,7 +127,7 @@ $(document).ready(function() {
>                 <li>Publication year: [% publicationyear %]</li>
>               [% END %]
>               [% IF ( branch ) %]
>-                <li>Branch: [% branchname %]</li>
>+                <li>Library: [% branchname %]</li>
>               [% END %]
>             </ul>
>           </p>
>@@ -147,7 +147,7 @@ $(document).ready(function() {
>             <input type="text" id="invoicenumber" name="invoicenumber" value="[% invoicenumber %]" />
>           </li>
>           <li>
>-            <label for="supplier">Supplier:</label>
>+            <label for="supplier">Vendor:</label>
>             <select id="supplier" name="supplierid">
>               <option value="">All</option>
>               [% FOREACH supplier IN suppliers_loop %]
>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 b3220da..39c53e2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcels.tt
>@@ -139,9 +139,9 @@
>             <input type="text" id="shipmentcost" name="shipmentcost" size="10" />
>         </li>
>         <li>
>-            <label for="shipmentcost_budgetid">Budget: </label>
>+            <label for="shipmentcost_budgetid">Fund: </label>
>             <select id="shipmentcost_budgetid" name="shipmentcost_budgetid">
>-                <option value="">No budget</option>
>+                <option value="">No fund</option>
>                 [% FOREACH budget IN budgets %]
>                     <option value="[% budget.budget_id %]">[% budget.budget_name %]</option>
>                 [% END %]
>-- 
>1.7.10.4

Actions: View | Diff | Splinter Review

Attachments on bug 10046: 17415 | 17419 | 17458 | 17540