View | Details | Raw Unified | Return to bug 11944
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt (-8 / +10 lines)
Lines 329-343 Link Here
329
       [% SET estimated_total = 0 %]
329
       [% SET estimated_total = 0 %]
330
330
331
       [% FOREACH loop_receive IN loop_received %]
331
       [% FOREACH loop_receive IN loop_received %]
332
           [% IF (funds.${ loop_receive.budget.budget_name }.estimated == '') %]
332
           [% SET index = loop.count %]
333
              [% SET funds.${ loop_receive.budget.budget_name }.estimated = 0 %]
333
           [% SET funds.${ index }.budget_name = loop_receive.budget.budget_name %]
334
           [% IF (funds.${ index }.estimated == '') %]
335
              [% SET funds.${ index }.estimated = 0 %]
334
           [% END %]
336
           [% END %]
335
           [% IF (funds.${ loop_receive.budget.budget_name }.actual == '') %]
337
           [% IF (funds.${ index }.actual == '') %]
336
              [% SET funds.${ loop_receive.budget.budget_name }.actual = 0 %]
338
              [% SET funds.${ index }.actual = 0 %]
337
           [% END %]
339
           [% END %]
338
           [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
340
           [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
339
           [% SET funds.${ loop_receive.budget.budget_name }.estimated = funds.${ loop_receive.budget.budget_name }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
341
           [% SET funds.${ index }.estimated = funds.${ index }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
340
           [% SET funds.${ loop_receive.budget.budget_name }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
342
343
           [% SET funds.${ index }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
341
       [% END %]
344
       [% END %]
342
345
343
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
346
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
Lines 362-368 Link Here
362
        [% FOREACH key IN funds.keys.sort %]
365
        [% FOREACH key IN funds.keys.sort %]
363
            <tr>
366
            <tr>
364
                <td colspan="6" class="total">(Tax exc.)</td>
367
                <td colspan="6" class="total">(Tax exc.)</td>
365
                <td><i>Subtotal for</i> [% key %]</td>
368
                <td colspan="2"><i>Subtotal for</i> [% funds.$key.budget_name %]</td>
366
                <td>[% currency( funds.$key.estimated ) %]</td>
369
                <td>[% currency( funds.$key.estimated ) %]</td>
367
                <td>[% currency( funds.$key.actual ) %]</td>
370
                <td>[% currency( funds.$key.actual ) %]</td>
368
                <td>&nbsp;</td>
371
                <td>&nbsp;</td>
369
- 

Return to bug 11944