View | Details | Raw Unified | Return to bug 38765
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoices.tt (-3 / +3 lines)
Lines 5-10 Link Here
5
[% USE Branches %]
5
[% USE Branches %]
6
[% SET footerjs = 1 %]
6
[% SET footerjs = 1 %]
7
[% PROCESS 'i18n.inc' %]
7
[% PROCESS 'i18n.inc' %]
8
[% INCLUDE 'js-date-format.inc' %]
8
[% INCLUDE 'doc-head-open.inc' %]
9
[% INCLUDE 'doc-head-open.inc' %]
9
<title>[% FILTER collapse %]
10
<title>[% FILTER collapse %]
10
    [% t("Invoices") | html %] &rsaquo;
11
    [% t("Invoices") | html %] &rsaquo;
Lines 70-76 Link Here
70
                                </thead>
71
                                </thead>
71
                                <tbody>
72
                                <tbody>
72
                                    [% FOREACH invoice IN invoices %]
73
                                    [% FOREACH invoice IN invoices %]
73
                                        <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | $KohaDates %]" data-billingdate="[% invoice.billingdate | $KohaDates %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | $KohaDates %]">
74
                                        <tr data-invoiceid="[% invoice.invoiceid | html %]" data-booksellerid="[% invoice.booksellerid | html %]" data-shipmentdate="[% invoice.shipmentdate | html %]" data-billingdate="[% invoice.billingdate | html %]" data-shipmentcost="[% invoice.shipmentcost | html %]" data-shipment_budgetid="[% invoice.shipmentcost_budgetid | html %]" data-closedate="[% invoice.closedate | html %]">
74
                                            [% IF CAN_user_acquisition_merge_invoices %]
75
                                            [% IF CAN_user_acquisition_merge_invoices %]
75
                                                <td>[% invoice.is_linked_to_subscriptions | html %]</td>
76
                                                <td>[% invoice.is_linked_to_subscriptions | html %]</td>
76
                                            [% END %]
77
                                            [% END %]
Lines 506-512 Link Here
506
                } else {
507
                } else {
507
                    $('#merge_table tbody').empty();
508
                    $('#merge_table tbody').empty();
508
                    $.each(invoices, function (idx, invoice) {
509
                    $.each(invoices, function (idx, invoice) {
509
                        var row = $('<tr data-invoiceid="' + invoice.invoiceid + '"><td>' + invoice.invoicenumber + '</td><td>' + invoice.shipmentdate + '</td><td>' + invoice.billingdate + '</td><td>' + invoice.shipmentcost + '</td></tr>');
510
                        var row = $('<tr data-invoiceid="' + invoice.invoiceid + '"><td>' + invoice.invoicenumber + '</td><td>' + $date(invoice.shipmentdate) + '</td><td>' + $date(invoice.billingdate) + '</td><td>' + invoice.shipmentcost + '</td></tr>');
510
                        $(row).appendTo('#merge_table tbody');
511
                        $(row).appendTo('#merge_table tbody');
511
                        $(row).click(function () {
512
                        $(row).click(function () {
512
                            $('#merge_table tbody tr').removeClass('active');
513
                            $('#merge_table tbody tr').removeClass('active');
513
- 

Return to bug 38765