From fad70512c0d6ebe72f34848406e00d9eb927930b Mon Sep 17 00:00:00 2001
From: Owen Leonard <oleonard@myacpl.org>
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.

Signed-off-by: Christophe Croullebois <christophe.croullebois@biblibre.com>
Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
For the invoice view: close, receive, reopen, mark prices uncertain, go
to the invoice page (not sure it's expected however)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
---
 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 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 @@
                         </td>
                         [% 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 %]
-                        <td class="number [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td>
+                        <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>
                         <td class="number [% IF books_loo.unitprice_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.unitprice_tax_excluded | $Price %]</td>
                         <td class="number [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td>
                         <td class="number [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td>
@@ -642,7 +642,12 @@
                         </p>
                       [% END %]
                     </td>
-                    <td class="number">[% order.rrp_tax_excluded | $Price %]</td>
+                    <td class="number">
+                        [% order.rrp_tax_excluded | $Price %]
+                        [% IF ( order.uncertain ) %]
+                            (Uncertain)
+                        [% END %]
+                    </td>
                     <td class="number">[% order.ecost_tax_excluded | $Price %]</td>
                     <td class="number">[% order.rrp_tax_included | $Price %]</td>
                     <td class="number">[% order.ecost_tax_included | $Price %]</td>
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 @@
                   <td><p>[% order.branchcode | html %]</p></td>
                   <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td>
                   <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td>
-                  <td class="number replacementprice">[% order.replacementprice | $Price %]</td>
+                  <td class="number replacementprice">[% order.replacementprice | $Price %] [% IF ( order.uncertainprice ) %] (Uncertain) [% END %]</td>
                   <td class="number">[% order.quantity | html %]</td>
                   <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td>
                   <td class="number tax_included">[% order.total_tax_included | $Price %]</td>
-- 
2.39.5