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

(-)a/acqui/invoice.pl (-3 / +3 lines)
Lines 251-256 elsif ( $op && $op eq 'mod_adj' ) { Link Here
251
    }
251
    }
252
}
252
}
253
253
254
my $active_currency = Koha::Acquisition::Currencies->get_active,
254
my $details = GetInvoiceDetails($invoiceid);
255
my $details = GetInvoiceDetails($invoiceid);
255
my $bookseller = Koha::Acquisition::Booksellers->find( $details->{booksellerid} );
256
my $bookseller = Koha::Acquisition::Booksellers->find( $details->{booksellerid} );
256
my @orders_loop = ();
257
my @orders_loop = ();
Lines 283-289 foreach my $order (@$orders) { Link Here
283
    $total_tax_included += get_rounded_price($$line{total_tax_included});
284
    $total_tax_included += get_rounded_price($$line{total_tax_included});
284
285
285
    $line->{orderline} = $line->{parent_ordernumber};
286
    $line->{orderline} = $line->{parent_ordernumber};
286
    $has_invoice_unitprice = 1 if defined $line->{invoice_unitprice};
287
    $has_invoice_unitprice = 1 if $line->{invoice_currency} ne $active_currency->currency;
287
    push @orders_loop, $line;
288
    push @orders_loop, $line;
288
}
289
}
289
290
Lines 343-349 $template->param( Link Here
343
    total_tax_excluded_shipment => $total_tax_excluded + $shipmentcost,
344
    total_tax_excluded_shipment => $total_tax_excluded + $shipmentcost,
344
    total_tax_included_shipment => $total_tax_included + $shipmentcost,
345
    total_tax_included_shipment => $total_tax_included + $shipmentcost,
345
    invoiceincgst               => $bookseller->invoiceincgst,
346
    invoiceincgst               => $bookseller->invoiceincgst,
346
    currency                    => Koha::Acquisition::Currencies->get_active,
347
    currency                    => $active_currency,
347
    budgets                     => $budget_loop,
348
    budgets                     => $budget_loop,
348
    budget                      => GetBudget( $shipmentcost_budgetid ),
349
    budget                      => GetBudget( $shipmentcost_budgetid ),
349
    has_invoice_unitprice       => $has_invoice_unitprice,
350
    has_invoice_unitprice       => $has_invoice_unitprice,
350
- 

Return to bug 32705