From 037e71c5a65d4c20b72b2462ac51fe6833fa368f Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Thu, 25 Sep 2014 16:39:11 +0200
Subject: [PATCH] Bug 12970: Cancelled orders

Previous patch does modify the code for cancelled orders.

Test plan:
Cancel 1+ orders and verify the prices are correct (i.e. the same as
the non-cancelled orders) and that the prices are formated.
---
 acqui/basket.pl                                         |  1 +
 koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt | 16 ++++++++--------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 18c8d8b..6349c50 100755
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -369,6 +369,7 @@ if ( $op eq 'delete_confirm' ) {
     my @cancelledorders = GetCancelledOrders($basketno);
     my @cancelledorders_loop;
     for my $order (@cancelledorders) {
+        $order = C4::Acquisition::populate_order_with_prices({ order => $order, booksellerid => $booksellerid, ordering => 1 });
         my $line = get_order_infos( $order, $bookseller);
         push @cancelledorders_loop, $line;
     }
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 6349173..59350e8 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -624,15 +624,15 @@
                         </p>
                       [% END %]
                     </td>
-                    <td class="number gste">[% order.rrpgste %]</td>
-                    <td class="number gste">[% order.ecostgste %]</td>
-                    <td class="number gsti">[% order.rrpgsti %]</td>
-                    <td class="number gsti">[% order.ecostgsti %]</td>
+                    <td class="number gste">[% order.rrpgste | $Price %]</td>
+                    <td class="number gste">[% order.ecostgste | $Price %]</td>
+                    <td class="number gsti">[% order.rrpgsti | $Price %]</td>
+                    <td class="number gsti">[% order.ecostgsti | $Price %]</td>
                     <td class="number">[% order.quantity %]</td>
-                    <td class="number gste">[% order.totalgste %]</td>
-                    <td class="number gsti">[% order.totalgsti %]</td>
-                    <td class="number">[% order.gstrate * 100 %]</td>
-                    <td class="number">[% order.gstvalue %]</td>
+                    <td class="number gste">[% order.totalgste | $Price %]</td>
+                    <td class="number gsti">[% order.totalgsti | $Price %]</td>
+                    <td class="number">[% order.gstrate * 100 | $Price %]</td>
+                    <td class="number">[% order.gstvalue | $Price %]</td>
                     <td>[% order.budget_name %]
                   </tr>
                 [% END %]
-- 
2.1.0