From 3642c2f44af55ac9ec1161fc3a226b1e82a8e70f Mon Sep 17 00:00:00 2001 From: Owen Leonard Date: Wed, 17 Apr 2019 18:44:27 +0000 Subject: [PATCH] Bug 11514: Untranslatable "Uncertain" text in acq This patch modifies two pages so that the "Uncertain price" information is shown by the template rather than the Perl script, making the text translatable. To test, apply the patch and go to Acquisitions. - 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(-) diff --git a/acqui/basket.pl b/acqui/basket.pl index e9bf7cd440..d6fdcc88b4 100755 --- a/acqui/basket.pl +++ b/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'}; 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 96858b9268..17f5636d79 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/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 %] 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 %] -- 2.11.0