Attachment 72881 Details for Bug 20318 – Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

[patch] Bug 20318: Merge invoices can lead to an merged invoice without Invoice number

Bug-20318-Merge-invoices-can-lead-to-an-merged-inv.patch (text/plain), 2.14 KB, created by Séverine Queune on 2018-03-14 15:21:03 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Séverine Queune

Created: 2018-03-14 15:21:03 UTC

Size: 2.14 KB

patch

obsolete

>From 5e1a581342c8e4e8a2915e0fbd6a322c5d76695b 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] Bug 20318: Merge invoices can lead to an merged invoice
> without Invoice number
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>Signed-off-by: SÃ©verine QUEUNE <severine.queune@bulac.fr>
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt | 6 ++++--
> 1 file changed, 4 insertions(+), 2 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..58acbe2 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,7 +354,6 @@
>                         $(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) {
>                                 $('#merge_' + prop).val(invoice[prop]);
>                             });
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 20318: 72306 | 72873 | 72881 | 72958 | 72969 | 72975 | 73415 | 73532