@@ -, +, @@ - Locate or create an order in a basket which has an uncertain price. - When viewing the contents of that basket the order which was marked as having an uncertain price should be labeled "Uncertain." - The same should be true for the invoice page. If you don't have an existing invoice with an "uncertain" order, - Go to "Receive shipments" for the vendor your "uncertain" order is with. - Create a new invoice. - Receive one or more orders which has an uncertain price. - Press the "finish receiving" button. - In the "Invoice details" section of the invoice page you should see the "Uncertain" label on the correct order. --- acqui/basket.pl | 3 --- acqui/invoice.pl | 3 --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 9 +++++++-- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt | 2 +- 4 files changed, 8 insertions(+), 9 deletions(-) --- a/acqui/basket.pl +++ a/acqui/basket.pl @@ -464,9 +464,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'}; --- a/acqui/invoice.pl +++ a/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'}; --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -518,7 +518,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.ecost_tax_excluded | $Price %] [% books_loo.rrp_tax_included | $Price %] [% books_loo.ecost_tax_included | $Price %] @@ -634,7 +634,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 %] --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ a/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 %] --