From 0745bd10957aabac1c27b0aeddac9ce0e80ea527 Mon Sep 17 00:00:00 2001
From: Jonathan Druart <jonathan.druart@biblibre.com>
Date: Wed, 9 Apr 2014 15:21:50 +0200
Subject: [PATCH] Bug 11944: Fix fund names encoding on the parcel page

On the parcel page, the subtotal values are stored in an hashref. The
key was the fund name. The fund name being encoded in utf8, the hashref
was broken.
This patch replaces this logic creating a key based on an integer.
The budget name is now stored in a new "budget_name" key.

Note: It also fixes a small ergonomic issue (a td was missing in the
tfoot).
---
 .../intranet-tmpl/prog/en/modules/acqui/parcel.tt     |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
index b537148..e617e9c 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
@@ -337,15 +337,18 @@
        [% SET estimated_total = 0 %]
 
        [% FOREACH loop_receive IN loop_received %]
-           [% IF (funds.${ loop_receive.budget.budget_name }.estimated == '') %]
-              [% SET funds.${ loop_receive.budget.budget_name }.estimated = 0 %]
+           [% SET index = loop.count %]
+           [% SET funds.${ index }.budget_name = loop_receive.budget.budget_name %]
+           [% IF (funds.${ index }.estimated == '') %]
+              [% SET funds.${ index }.estimated = 0 %]
            [% END %]
-           [% IF (funds.${ loop_receive.budget.budget_name }.actual == '') %]
-              [% SET funds.${ loop_receive.budget.budget_name }.actual = 0 %]
+           [% IF (funds.${ index }.actual == '') %]
+              [% SET funds.${ index }.actual = 0 %]
            [% END %]
            [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
-           [% SET funds.${ loop_receive.budget.budget_name }.estimated = funds.${ loop_receive.budget.budget_name }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
-           [% SET funds.${ loop_receive.budget.budget_name }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
+           [% SET funds.${ index }.estimated = funds.${ index }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
+
+           [% SET funds.${ index }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
        [% END %]
 
    <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
@@ -370,7 +373,7 @@
         [% FOREACH key IN funds.keys.sort %]
             <tr>
                 <td colspan="6" class="total">(Tax exc.)</td>
-                <td><i>Subtotal for</i> [% key %]</td>
+                <td colspan="2"><i>Subtotal for</i> [% funds.$key.budget_name %]</td>
                 <td>[% currency( funds.$key.estimated ) %]</td>
                 <td>[% currency( funds.$key.actual ) %]</td>
                 <td>&nbsp;</td>
-- 
1.7.10.4