From cf5582f7ec502744f90c58820b32cf0b829dd912 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 25 Sep 2014 16:39:11 +0200 Subject: [PATCH] [PASSED QA] 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 Signed-off-by: Katrin Fischer --- 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 117e7b2..c00c46f 100644 --- 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 @@

[% END %] - [% order.rrpgste %] - [% order.ecostgste %] - [% order.rrpgsti %] - [% order.ecostgsti %] + [% order.rrpgste | $Price %] + [% order.ecostgste | $Price %] + [% order.rrpgsti | $Price %] + [% order.ecostgsti | $Price %] [% order.quantity %] - [% order.totalgste %] - [% order.totalgsti %] - [% order.gstrate * 100 %] - [% order.gstvalue %] + [% order.totalgste | $Price %] + [% order.totalgsti | $Price %] + [% order.gstrate * 100 | $Price %] + [% order.gstvalue | $Price %] [% order.budget_name %] [% END %] -- 1.9.1