diff --git a/acqui/basket.pl b/acqui/basket.pl index 6fb2b961c4..0c8b5eac6c 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -467,9 +467,6 @@ sub get_order_infos { $line{tax_value} = $line{tax_value_on_ordering}; $line{tax_rate} = $line{tax_rate_on_ordering}; - if ( $line{uncertainprice} ) { - $line{rrp_tax_excluded} .= ' (Uncertain)'; - } if ( $line{'title'} ) { my $volume = $order->{'volume'}; my $seriestitle = $order->{'seriestitle'}; diff --git a/acqui/invoice.pl b/acqui/invoice.pl index 0e3d8214c5..26717e99fe 100755 --- a/acqui/invoice.pl +++ b/acqui/invoice.pl @@ -256,9 +256,6 @@ sub get_infos { $line{order_received} = ( $qty == $order->{'quantityreceived'} ); $line{budget_name} = $budget->{budget_name}; - if ( $line{uncertainprice} ) { - $line{rrp} .= ' (Uncertain)'; - } if ( $line{'title'} ) { my $volume = $order->{'volume'}; my $seriestitle = $order->{'seriestitle'}; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index 8764658ead..379b974eb7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -524,7 +524,7 @@ [% 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 ... %] [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] - [% books_loo.rrp_tax_excluded | $Price %] + [% books_loo.rrp_tax_excluded | $Price %] [% IF ( books_loo.uncertainprice ) %] (Uncertain) [% END %] [% books_loo.unitprice_tax_excluded | $Price %] [% books_loo.ecost_tax_excluded | $Price %] [% books_loo.rrp_tax_included | $Price %] @@ -642,7 +642,12 @@

[% END %] - [% order.rrp_tax_excluded | $Price %] + + [% order.rrp_tax_excluded | $Price %] + [% IF ( order.uncertain ) %] + (Uncertain) + [% END %] + [% order.ecost_tax_excluded | $Price %] [% order.rrp_tax_included | $Price %] [% order.ecost_tax_included | $Price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 6498f42257..befc245dd9 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -280,7 +280,7 @@

[% order.branchcode | html %]

[% order.unitprice_tax_excluded | $Price %] [% order.unitprice_tax_included | $Price %] - [% order.replacementprice | $Price %] + [% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %] [% order.quantity | html %] [% order.total_tax_excluded | $Price %] [% order.total_tax_included | $Price %]