From c4ed5a4ec27d2d9499987f20e360581d186e1305 Mon Sep 17 00:00:00 2001
From: Christophe Croullebois <christophe.croullebois@biblibre.com>
Date: Wed, 14 Mar 2018 14:28:28 +0000
Subject: [PATCH 1/1] Bug 20318: Merge invoices can lead to an merged invoice
 without Invoice number

---
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

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 79cbc6a..5ca6a8b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
@@ -105,7 +105,10 @@
                         <tbody>
                         </tbody>
                     </table></li>
-                    <li><label for="merge_invoicenumber">Invoice number:</label><span id="merge_invoicenumber"></span></li>
+                    <li><label for="merge_invoicenumber">Invoice number:</label>
+                            <input type="text" size="10" id="merge_invoicenumber" name="invoicenumber" value="" class="required" required="required" />
+                            <span class="required">Required</span>
+                            </li>
                     <li><label for="merge_shipmentdate">Shipment date:</label>
                             <input type="text" size="10" id="merge_shipmentdate" name="shipmentdate" value="" class="datepicker" /></li>
 
@@ -351,8 +354,7 @@
                         $(row).click(function () {
                             $('#merge_table tbody tr').removeClass('active');
                             $(this).addClass('active');
-                            $('#merge_invoicenumber').text(invoice.invoicenumber);
-                            $.each(['invoiceid', 'shipmentdate', 'billingdate', 'shipmentcost', 'shipment_budgetid'], function (idx, prop) {
+                            $.each(['invoiceid', 'shipmentdate', 'billingdate', 'shipmentcost', 'shipment_budgetid', 'invoicenumber'], function (idx, prop) {
                                 $('#merge_' + prop).val(invoice[prop]);
                             });
                             if (invoice.closedate) {
-- 
2.7.4