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

(-)a/acqui/basket.pl (-2 / +5 lines)
Lines 459-466 sub get_order_infos { Link Here
459
    $line{basketno}       = $basketno;
459
    $line{basketno}       = $basketno;
460
    $line{budget_name}    = $budget->{budget_name};
460
    $line{budget_name}    = $budget->{budget_name};
461
461
462
    $line{total_tax_included} = get_rounded_price($line{ecost_tax_included}) * $line{quantity};
462
    # If we have an actual cost tht should be the total, otherwise use the ecost
463
    $line{total_tax_excluded} = get_rounded_price($line{ecost_tax_excluded}) * $line{quantity};
463
    my $cost_tax_included = $line{unitprice_tax_included} || $line{ecost_tax_included};
464
    my $cost_tax_excluded = $line{unitprice_tax_excluded} || $line{ecost_tax_excluded};
465
    $line{total_tax_included} = get_rounded_price($cost_tax_included) * $line{quantity};
466
    $line{total_tax_excluded} = get_rounded_price($cost_tax_excluded) * $line{quantity};
464
    $line{tax_value} = $line{tax_value_on_ordering};
467
    $line{tax_value} = $line{tax_value_on_ordering};
465
    $line{tax_rate} = $line{tax_rate_on_ordering};
468
    $line{tax_rate} = $line{tax_rate_on_ordering};
466
469
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-1 / +8 lines)
Lines 395-402 Link Here
395
                        <th>No.</th>
395
                        <th>No.</th>
396
                        <th>Order</th>
396
                        <th>Order</th>
397
                        <th>RRP tax exc.</th>
397
                        <th>RRP tax exc.</th>
398
                        <th>Actual cost tax exc.</th>
398
                        <th>ecost tax exc.</th>
399
                        <th>ecost tax exc.</th>
399
                        <th>RRP tax inc.</th>
400
                        <th>RRP tax inc.</th>
401
                        <th>Actual cost tax inc.</th>
400
                        <th>ecost tax inc.</th>
402
                        <th>ecost tax inc.</th>
401
                        <th>Replacement price</th>
403
                        <th>Replacement price</th>
402
                        <th>Qty.</th>
404
                        <th>Qty.</th>
Lines 424-429 Link Here
424
                        <th>&nbsp;</th>
426
                        <th>&nbsp;</th>
425
                        <th>&nbsp;</th>
427
                        <th>&nbsp;</th>
426
                        <th>&nbsp;</th>
428
                        <th>&nbsp;</th>
429
                        <th>&nbsp;</th>
430
                        <th>&nbsp;</th>
427
                        <th>[% foot_loo.quantity | html %]</th>
431
                        <th>[% foot_loo.quantity | html %]</th>
428
                        <th>[% foot_loo.total_tax_excluded | $Price %]</th>
432
                        <th>[% foot_loo.total_tax_excluded | $Price %]</th>
429
                        <th>[% foot_loo.total_tax_included | $Price %]</th>
433
                        <th>[% foot_loo.total_tax_included | $Price %]</th>
Lines 447-452 Link Here
447
                    <th>&nbsp;</th>
451
                    <th>&nbsp;</th>
448
                    <th>&nbsp;</th>
452
                    <th>&nbsp;</th>
449
                    <th>&nbsp;</th>
453
                    <th>&nbsp;</th>
454
                    <th>&nbsp;</th>
455
                    <th>&nbsp;</th>
450
                    <th>[% total_quantity | html %]</th>
456
                    <th>[% total_quantity | html %]</th>
451
                    <th>[% total_tax_excluded | $Price %]</th>
457
                    <th>[% total_tax_excluded | $Price %]</th>
452
                    <th>[% total_tax_included | $Price %]</th>
458
                    <th>[% total_tax_included | $Price %]</th>
Lines 519-526 Link Here
519
                        [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
525
                        [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %]
520
                        [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
526
                        [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %]
521
                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
527
                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
528
                        <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td>
522
                        <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
529
                        <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
523
                        <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
530
                        <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
531
                        <td class="number [% IF books_loo.unitprice_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_included | $Price %]</td>
524
                        <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
532
                        <td class="number [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td>
525
                        <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
533
                        <td class="number [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td>
526
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
534
                        <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td>
527
- 

Return to bug 23522