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

(-)a/acqui/basket.pl (-3 lines)
Lines 467-475 sub get_order_infos { Link Here
467
    $line{tax_value} = $line{tax_value_on_ordering};
467
    $line{tax_value} = $line{tax_value_on_ordering};
468
    $line{tax_rate} = $line{tax_rate_on_ordering};
468
    $line{tax_rate} = $line{tax_rate_on_ordering};
469
469
470
    if ( $line{uncertainprice} ) {
471
        $line{rrp_tax_excluded} .= ' (Uncertain)';
472
    }
473
    if ( $line{'title'} ) {
470
    if ( $line{'title'} ) {
474
        my $volume      = $order->{'volume'};
471
        my $volume      = $order->{'volume'};
475
        my $seriestitle = $order->{'seriestitle'};
472
        my $seriestitle = $order->{'seriestitle'};
(-)a/acqui/invoice.pl (-3 lines)
Lines 256-264 sub get_infos { Link Here
256
    $line{order_received} = ( $qty == $order->{'quantityreceived'} );
256
    $line{order_received} = ( $qty == $order->{'quantityreceived'} );
257
    $line{budget_name}    = $budget->{budget_name};
257
    $line{budget_name}    = $budget->{budget_name};
258
258
259
    if ( $line{uncertainprice} ) {
260
        $line{rrp} .= ' (Uncertain)';
261
    }
262
    if ( $line{'title'} ) {
259
    if ( $line{'title'} ) {
263
        my $volume      = $order->{'volume'};
260
        my $volume      = $order->{'volume'};
264
        my $seriestitle = $order->{'seriestitle'};
261
        my $seriestitle = $order->{'seriestitle'};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt (-2 / +7 lines)
Lines 524-530 Link Here
524
                        </td>
524
                        </td>
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 ... %]
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 ... %]
526
                        [%# 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 %]
527
                        <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 %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] </td>
528
                        <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_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>
529
                        <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>
530
                        <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>
Lines 642-648 Link Here
642
                        </p>
642
                        </p>
643
                      [% END %]
643
                      [% END %]
644
                    </td>
644
                    </td>
645
                    <td class="number">[% order.rrp_tax_excluded | $Price %]</td>
645
                    <td class="number">
646
                        [% order.rrp_tax_excluded | $Price %]
647
                        [% IF ( order.uncertain ) %]
648
                            (Uncertain)
649
                        [% END %]
650
                    </td>
646
                    <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
651
                    <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
647
                    <td class="number">[% order.rrp_tax_included | $Price %]</td>
652
                    <td class="number">[% order.rrp_tax_included | $Price %]</td>
648
                    <td class="number">[% order.ecost_tax_included | $Price %]</td>
653
                    <td class="number">[% order.ecost_tax_included | $Price %]</td>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt (-2 / +1 lines)
Lines 280-286 Link Here
280
                  <td><p>[% order.branchcode | html %]</p></td>
280
                  <td><p>[% order.branchcode | html %]</p></td>
281
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
281
                  <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
282
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
282
                  <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
283
                  <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
283
                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td>
284
                  <td class="number">[% order.quantity | html %]</td>
284
                  <td class="number">[% order.quantity | html %]</td>
285
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
285
                  <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
286
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
286
                  <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
287
- 

Return to bug 11514