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

(-)a/acqui/invoice.pl (+4 lines)
Lines 257-262 my $total_tax_excluded = 0; Link Here
257
my $total_tax_included = 0;
257
my $total_tax_included = 0;
258
my $total_tax_value    = 0;
258
my $total_tax_value    = 0;
259
my $has_invoice_unitprice;
259
my $has_invoice_unitprice;
260
my $invoice_currency_totals;
260
261
261
foreach my $order (@$orders) {
262
foreach my $order (@$orders) {
262
    my $line = get_infos( $order, $bookseller );
263
    my $line = get_infos( $order, $bookseller );
Lines 279-284 foreach my $order (@$orders) { Link Here
279
280
280
    $line->{orderline} = $line->{parent_ordernumber};
281
    $line->{orderline} = $line->{parent_ordernumber};
281
    $has_invoice_unitprice = 1 if $line->{invoice_currency} ne $active_currency->currency;
282
    $has_invoice_unitprice = 1 if $line->{invoice_currency} ne $active_currency->currency;
283
    $invoice_currency_totals->{ $line->{invoice_currency} } += $line->{invoice_unitprice};
284
282
    push @orders_loop, $line;
285
    push @orders_loop, $line;
283
}
286
}
284
287
Lines 340-345 $template->param( Link Here
340
    budgets                     => $budget_loop,
343
    budgets                     => $budget_loop,
341
    budget                      => GetBudget($shipmentcost_budgetid),
344
    budget                      => GetBudget($shipmentcost_budgetid),
342
    has_invoice_unitprice       => $has_invoice_unitprice,
345
    has_invoice_unitprice       => $has_invoice_unitprice,
346
    invoice_currency_totals     => $invoice_currency_totals,
343
);
347
);
344
348
345
defined($invoice_files) && $template->param( files => $invoice_files->GetFilesInfo() );
349
defined($invoice_files) && $template->param( files => $invoice_files->GetFilesInfo() );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +5 lines)
Lines 416-422 Link Here
416
                    <tr>
416
                    <tr>
417
                        <th colspan="2">Total ([% currency.symbol | html %])</th>
417
                        <th colspan="2">Total ([% currency.symbol | html %])</th>
418
                        [% IF has_invoice_unitprice %]
418
                        [% IF has_invoice_unitprice %]
419
                            <th></th>
419
                            <th class="total_invoice_currencies">
420
                                [% FOREACH total IN invoice_currency_totals %]
421
                                    <span id="total_[% total.key | html %]">[% total.value | $Price %] [% total.key | html %]</span>
422
                                [% END %]
423
                            </th>
420
                        [% END %]
424
                        [% END %]
421
                        <th class="tax_excluded"></th>
425
                        <th class="tax_excluded"></th>
422
                        <th class="tax_included"></th>
426
                        <th class="tax_included"></th>
423
- 

Return to bug 40537