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

Return to bug 11944