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

(-)a/acqui/invoice.pl (+3 lines)
Lines 262-267 my $total_quantity = 0; Link Here
262
my $total_tax_excluded = 0;
262
my $total_tax_excluded = 0;
263
my $total_tax_included = 0;
263
my $total_tax_included = 0;
264
my $total_tax_value = 0;
264
my $total_tax_value = 0;
265
my $has_invoice_unitprice;
265
foreach my $order (@$orders) {
266
foreach my $order (@$orders) {
266
    my $line = get_infos( $order, $bookseller);
267
    my $line = get_infos( $order, $bookseller);
267
268
Lines 282-287 foreach my $order (@$orders) { Link Here
282
    $total_tax_included += get_rounded_price($$line{total_tax_included});
283
    $total_tax_included += get_rounded_price($$line{total_tax_included});
283
284
284
    $line->{orderline} = $line->{parent_ordernumber};
285
    $line->{orderline} = $line->{parent_ordernumber};
286
    $has_invoice_unitprice = 1 if defined $line->{invoice_unitprice};
285
    push @orders_loop, $line;
287
    push @orders_loop, $line;
286
}
288
}
287
289
Lines 344-349 $template->param( Link Here
344
    currency                    => Koha::Acquisition::Currencies->get_active,
346
    currency                    => Koha::Acquisition::Currencies->get_active,
345
    budgets                     => $budget_loop,
347
    budgets                     => $budget_loop,
346
    budget                      => GetBudget( $shipmentcost_budgetid ),
348
    budget                      => GetBudget( $shipmentcost_budgetid ),
349
    has_invoice_unitprice       => $has_invoice_unitprice,
347
);
350
);
348
351
349
defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );
352
defined( $invoice_files ) && $template->param( files => $invoice_files->GetFilesInfo() );
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-1 / +19 lines)
Lines 312-317 Link Here
312
              <tr>
312
              <tr>
313
                <th class="anti-the">Summary</th>
313
                <th class="anti-the">Summary</th>
314
                <th>Library</th>
314
                <th>Library</th>
315
                [% IF has_invoice_unitprice %]
316
                    <th>Invoice price</th>
317
                [% END %]
315
                <th class="tax_excluded">Actual cost tax exc.</th>
318
                <th class="tax_excluded">Actual cost tax exc.</th>
316
                <th class="tax_included">Actual cost tax inc.</th>
319
                <th class="tax_included">Actual cost tax inc.</th>
317
                <th class="replacementprice">Replacement price</th>
320
                <th class="replacementprice">Replacement price</th>
Lines 343-348 Link Here
343
                    [% END %]
346
                    [% END %]
344
                  </td>
347
                  </td>
345
                  <td><p>[% order.branchcode | html %]</p></td>
348
                  <td><p>[% order.branchcode | html %]</p></td>
349
                  [% IF has_invoice_unitprice %]
350
                      <td>
351
                          [% IF order.invoice_unitprice %]
352
                              [% order.invoice_unitprice | $Price %] [% order.invoice_currency | html %]
353
                          [% END %]
354
                      </td>
355
                  [% END %]
346
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
356
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
347
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
357
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
348
                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] <span>(Uncertain)</span> [% END %]</td>
358
                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] <span>(Uncertain)</span> [% END %]</td>
Lines 362-367 Link Here
362
              [% FOR tf IN foot_loop %]
372
              [% FOR tf IN foot_loop %]
363
                <tr>
373
                <tr>
364
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 | html %] %)</th>
374
                    <th colspan="2">Total (GST [% tf.tax_rate * 100 | html %] %)</th>
375
                    [% IF has_invoice_unitprice %]
376
                        <th></th>
377
                    [% END %]
365
                    <th class="tax_excluded"></th>
378
                    <th class="tax_excluded"></th>
366
                    <th class="tax_included"></th>
379
                    <th class="tax_included"></th>
367
                    <th class="replacementprice"/>
380
                    <th class="replacementprice"/>
Lines 375-380 Link Here
375
              [% END %]
388
              [% END %]
376
              <tr>
389
              <tr>
377
                <th colspan="2">Total ([% currency.symbol | html %])</th>
390
                <th colspan="2">Total ([% currency.symbol | html %])</th>
391
                [% IF has_invoice_unitprice %]
392
                    <th></th>
393
                [% END %]
378
                <th class="tax_excluded"></th>
394
                <th class="tax_excluded"></th>
379
                <th class="tax_included"></th>
395
                <th class="tax_included"></th>
380
                <th class="replacementprice"/>
396
                <th class="replacementprice"/>
Lines 387-392 Link Here
387
              </tr>
403
              </tr>
388
              <tr>
404
              <tr>
389
                <th colspan="2">Total + adjustments + shipment cost ([% currency.symbol | html %])</th>
405
                <th colspan="2">Total + adjustments + shipment cost ([% currency.symbol | html %])</th>
406
                [% IF has_invoice_unitprice %]
407
                    <th></th>
408
                [% END %]
390
                <th class="tax_excluded"></th>
409
                <th class="tax_excluded"></th>
391
                <th class="tax_included"></th>
410
                <th class="tax_included"></th>
392
                <th class="replacementprice"/>
411
                <th class="replacementprice"/>
393
- 

Return to bug 32705