From ca9297348e73e8cb5d78e0761432d082a2f43636 Mon Sep 17 00:00:00 2001
From: David Nind <david@davidnind.com>
Date: Mon, 8 Jul 2024 02:36:24 +0000
Subject: [PATCH] Bug 34325: Rename "Barcode" to "Item barcode" on manual
 invoice and credit forms

The forms for adding a manual invoice and credit for patrons (in
the accounting section) have a field for entering a barcode. This
can cause confusion, as it is not clear if it is for an item
barcode or the patron card number.

This patch changes the form labels and error message for the
manual invoice and credit forms to clarify that this is for an
item barcode. Related table column headings are left as "Barcode".

Test plan:
1. Go to a patron's record: Patrons > search for a patron >
   select a patron.
2. Go to Accounting > Create manual invoice.
3. Note that there is a label "Barcode:"
4. Enter details for a manual invoice and 'Save':
   - Type: Manual fee
   - Barcode: an item barcode, for example 39999000011418
   - Amount: 15
   ==> Result: Manual invoice saved
5. Repeat step 4, but enter a patron card number for the barcode.
   For example: 23529000651225.
   ==> Result: You get an error message
               "Error: Invalid barcode entered, please try again".
6. Enter details for a manual credit and 'Save':
   - Credit type: Credit
   - Barcode: an item barcode, for example 39999000011418
   - Amount: 5
   ==> Result: Manual credit saved.
7. Check the tables listing transactions - note that the column
   heading is "Barcode". (Tables are Transactions, Make a payment,
   and Transactions > Details (under the Actions column).
8. Apply the patch.
9. Repeat steps 4 to 7. Note that:
   - The label is now "Item barcode:" for the manual invoice and
     manual credit forms.
   - The error message in step 5 is now "Error: Invalid item
     barcode entered, please try again".
   - For the tables in step 8, the column headings remain as
     "Barcode" - there is generally enough context that it doesn't
     need to be changed.
10. Sign off D:

Signed-off-by: David Nind <david@davidnind.com>
Signed-off-by: Brendan Lawlor <blawlor@clamsnet.org>
Signed-off-by: Katrin Fischer <katrin.fischer@bsz-bw.de>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt  | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
index cf2af4c58c..b1ac445bef 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/mancredit.tt
@@ -81,7 +81,7 @@
                                             [% END %]
                                         </select>
                                     </li>
-                                    <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" /></li>
+                                    <li><label for="barcode">Item barcode: </label><input type="text" name="barcode" id="barcode" /></li>
                                     <li><label for="desc">Description: </label><input type="text" name="desc" size="50" id="desc" /></li>
                                     <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" /></li>
                                     <li><label for="amount" class="required">Amount: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="amount" id="amount" required="required" min="0" value=""/> Example: 5.00</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
index 3d8ca560a3..968b9d3514 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt
@@ -67,7 +67,7 @@
                     <div role="tabpanel" class="tab-pane active">
                 [% IF error == 'itemnumber' %]
                     <div id="error_message" class="alert alert-warning">
-                        Error: Invalid barcode entered, please try again
+                        Error: Invalid item barcode entered, please try again
                     </div>
                 [% ELSIF error %]
                     <div id="error_message" class="alert alert-warning">
@@ -93,7 +93,7 @@
                                     [% END %]
                                 </select>
                             </li>
-                            <li><label for="barcode">Barcode: </label><input type="text" name="barcode" id="barcode" value="[% barcode | html %]" /></li>
+                            <li><label for="barcode">Item barcode: </label><input type="text" name="barcode" id="barcode" value="[% barcode | html %]" /></li>
                             <li><label for="desc">Description: </label><input type="text" name="desc" id="desc" size="50" value="[% desc | html %]" /></li>
                             <li><label for="note">Note: </label><input type="text" name="note" size="50" id="note" value="[% note | html %]" /></li>
                             <li class="additional_field"><label for="cost">Cost: </label><input type="text" inputmode="decimal" pattern="^\d+(\.\d{2})?$" name="cost" id="cost" min="0" value="[% amount | $Price on_editing => 1 %]" /></li>
-- 
2.39.5