Attachment 29994 Details for Bug 11944 – Bug 11944: Fix fund names encoding on the parcel page

[patch] Bug 11944: Fix fund names encoding on the parcel page

Bug-11944-Fix-fund-names-encoding-on-the-parcel-pa.patch (text/plain), 3.18 KB, created by Dobrica Pavlinusic on 2014-07-23 16:17:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dobrica Pavlinusic

Created: 2014-07-23 16:17:01 UTC

Size: 3.18 KB

patch

obsolete

>From 14d74bd92f780d5a2b4fb53f23b114efdc7292dd 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).
>
>Signed-off-by: Paola Rossi <paola.rossi@cineca.it>
>Signed-off-by: Bernardo Gonzalez Kriegel <bgkriegel@gmail.com>
>Signed-off-by: Dobrica Pavlinusic <dpavlin@rot13.org>
>---
> .../intranet-tmpl/prog/en/modules/acqui/parcel.tt  |   17 ++++++++++-------
> 1 files 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 f4f6e3e..e6f001e 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt
>@@ -343,15 +343,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">
>@@ -376,7 +379,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.2.5

Actions: View | Diff | Splinter Review

Attachments on bug 11944: 26364 | 26365 | 26366 | 26367 | 26368 | 26369 | 26370 | 26371 | 26372 | 26407 | 26408 | 26409 | 26737 | 26738 | 26739 | 26740 | 26741 | 26742 | 26743 | 26744 | 26745 | 26746 | 26747 | 26748 | 26794 | 26857 | 26858 | 26859 | 26860 | 26861 | 26862 | 26863 | 26864 | 26865 | 26866 | 26867 | 26868 | 26869 | 26870 | 26871 | 26895 | 26921 | 27021 | 27080 | 27094 | 27158 | 27159 | 27161 | 27193 | 27194 | 27195 | 27196 | 27198 | 27199 | 27200 | 27201 | 27202 | 27203 | 27204 | 27205 | 27206 | 27207 | 27208 | 27209 | 27210 | 27211 | 27212 | 27213 | 27214 | 27215 | 27216 | 27585 | 27586 | 27587 | 27588 | 27589 | 27590 | 27591 | 27592 | 27593 | 27594 | 27595 | 27596 | 27597 | 27598 | 27599 | 27600 | 27601 | 27602 | 27603 | 27880 | 27881 | 27882 | 27883 | 27884 | 27885 | 27886 | 27887 | 27888 | 27889 | 27890 | 27891 | 27892 | 27893 | 27894 | 27895 | 27896 | 27897 | 27898 | 28046 | 28047 | 28048 | 28049 | 28050 | 28051 | 28052 | 28053 | 28054 | 28055 | 28056 | 28057 | 28058 | 28059 | 28060 | 28061 | 28062 | 28063 | 28064 | 28065 | 28066 | 28097 | 28245 | 28246 | 28247 | 28248 | 28249 | 28250 | 28251 | 28252 | 28253 | 28732 | 29981 | 29982 | 29983 | 29984 | 29985 | 29986 | 29987 | 29988 | 29989 | 29990 | 29991 | 29992 | 29993 | 29994 | 29995 | 29996 | 29997 | 29998 | 29999 | 30000 | 30001 | 30002 | 30003 | 30004 | 30005 | 30006 | 30012 | 30016 | 30945 | 31299 | 35223 | 35224 | 35225 | 35226 | 35227 | 35228 | 35229 | 35230 | 35231 | 35232 | 35233 | 35234 | 35235 | 35236 | 35237 | 35238 | 35239 | 35240 | 35241 | 35242 | 35243 | 35244 | 35245 | 35246 | 35247 | 35248 | 35249 | 35250 | 35251 | 35252 | 35253