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 337-351 Link Here
337
       [% SET estimated_total = 0 %]
337
       [% SET estimated_total = 0 %]
338
338
339
       [% FOREACH loop_receive IN loop_received %]
339
       [% FOREACH loop_receive IN loop_received %]
340
           [% IF (funds.${ loop_receive.budget.budget_name }.estimated == '') %]
340
           [% SET index = loop.count %]
341
              [% SET funds.${ loop_receive.budget.budget_name }.estimated = 0 %]
341
           [% SET funds.${ index }.budget_name = loop_receive.budget.budget_name %]
342
           [% IF (funds.${ index }.estimated == '') %]
343
              [% SET funds.${ index }.estimated = 0 %]
342
           [% END %]
344
           [% END %]
343
           [% IF (funds.${ loop_receive.budget.budget_name }.actual == '') %]
345
           [% IF (funds.${ index }.actual == '') %]
344
              [% SET funds.${ loop_receive.budget.budget_name }.actual = 0 %]
346
              [% SET funds.${ index }.actual = 0 %]
345
           [% END %]
347
           [% END %]
346
           [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
348
           [% SET estimated_total = estimated_total + ( loop_receive.ecost * loop_receive.quantityreceived ) %]
347
           [% SET funds.${ loop_receive.budget.budget_name }.estimated = funds.${ loop_receive.budget.budget_name }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
349
           [% SET funds.${ index }.estimated = funds.${ index }.estimated + ( loop_receive.ecost * loop_receive.quantityreceived )%]
348
           [% SET funds.${ loop_receive.budget.budget_name }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
350
351
           [% SET funds.${ index }.actual = funds.${ loop_receive.budget.budget_name }.actual + loop_receive.total %]
349
       [% END %]
352
       [% END %]
350
353
351
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
354
   <form action="/cgi-bin/koha/acqui/parcel.pl" method="get" name="orderform">
Lines 370-376 Link Here
370
        [% FOREACH key IN funds.keys.sort %]
373
        [% FOREACH key IN funds.keys.sort %]
371
            <tr>
374
            <tr>
372
                <td colspan="6" class="total">(Tax exc.)</td>
375
                <td colspan="6" class="total">(Tax exc.)</td>
373
                <td><i>Subtotal for</i> [% key %]</td>
376
                <td colspan="2"><i>Subtotal for</i> [% funds.$key.budget_name %]</td>
374
                <td>[% currency( funds.$key.estimated ) %]</td>
377
                <td>[% currency( funds.$key.estimated ) %]</td>
375
                <td>[% currency( funds.$key.actual ) %]</td>
378
                <td>[% currency( funds.$key.actual ) %]</td>
376
                <td>&nbsp;</td>
379
                <td>&nbsp;</td>
377
- 

Return to bug 11944