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

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

0001-PATCH-Bug-20318-Merge-invoices-can-lead-to-an-merged.patch (text/plain), 2.00 KB, created by Christophe Croullebois on 2018-03-01 11:44:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Christophe Croullebois

Created: 2018-03-01 11:44:25 UTC

Size: 2.00 KB

patch

obsolete

>From a97291aee4beee1ead056421cf07d341724e17ba Mon Sep 17 00:00:00 2001
>From: Christophe Croullebois <christophe.croullebois@biblibre.com>
>Date: Thu, 1 Mar 2018 11:38:02 +0000
>Subject: [PATCH] [PATCH] Bug 20318: Merge invoices can lead to an merged
> invoice without Invoice number
>
>---
> 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 20d5edb..0f35d56 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt
>@@ -66,7 +66,6 @@ $(document).ready(function() {
>                 $(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]);
>                     });
>@@ -183,7 +182,10 @@ $(document).ready(function() {
>                         <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>
> 
>-- 
>2.7.4
>

Actions: View | Diff | Splinter Review

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