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.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>

diff --git a/acqui/basket.pl b/acqui/basket.pl
index bcd4177..4b3853c 100755 (executable)
--- 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 117e7b2..c00c46f 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt
@@ -614,15 +614,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 %]