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

Return to bug 11944