Attachment 34966 Details for Bug 12970 – [PASSED QA] Bug 12970: Cancelled orders

[patch] [PASSED QA] Bug 12970: Cancelled orders

PASSED-QA-Bug-12970-Cancelled-orders.patch (text/plain), 2.97 KB, created by Katrin Fischer on 2015-01-05 22:48:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2015-01-05 22:48:58 UTC

Size: 2.97 KB

patch

obsolete

>From cf5582f7ec502744f90c58820b32cf0b829dd912 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] [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 <paola.rossi@cineca.it>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> 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 @@
>                         </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 %]
>-- 
>1.9.1

Actions: View | Diff | Splinter Review

Attachments on bug 12970: 31747 | 31881 | 31882 | 31954 | 31955 | 31956 | 33572 | 34964 | 34965 | 34966 | 34967