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

(-)a/acqui/acqui-home.pl (+2 lines)
Lines 95-100 foreach my $budget ( @{$budget_arr} ) { Link Here
95
    }
95
    }
96
    $budget->{'budget_avail'} =
96
    $budget->{'budget_avail'} =
97
      $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} );
97
      $budget->{'budget_amount'} - ( $budget->{'budget_spent'} + $budget->{'budget_ordered'} );
98
    $budget->{'total_avail'} =
99
      $budget->{'budget_amount'} - ( $budget->{'total_spent'} + $budget->{'total_ordered'} );
98
100
99
    $total      += $budget->{'budget_amount'};
101
    $total      += $budget->{'budget_amount'};
100
    $totspent   += $budget->{'budget_spent'};
102
    $totspent   += $budget->{'budget_spent'};
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-7 / +26 lines)
Lines 159-174 Link Here
159
                </td>
159
                </td>
160
                <td class="data">
160
                <td class="data">
161
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
161
                    <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
162
                        <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span>
162
                    [% IF !loop_budge.budget_parent_id %]
163
                    </a>
163
                        <a title="Ordered from this fund" href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
164
                            (<span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span>)
165
                        </a>
166
                        <span title="Ordered from this fund and children" class="inclusive_amount">[% loop_budge.total_ordered | $Price %]</span>
167
                    [% ELSE %]
168
                        <a href="ordered.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
169
                            <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span>
170
                        </a>
171
                    [% END %]
164
                </td>
172
                </td>
165
                <td class="data">
173
                <td class="data">
166
                    <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
174
                    [% IF !loop_budge.budget_parent_id %]
167
                        <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span>
175
                        <a title="Spent from this fund" href="spent.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
168
                    </a>
176
                            (<span class="total_amount">[% loop_budge.budget_spent | $Price %]</span>)
177
                        </a>
178
                        <span title="Spent from this fund and children" class="inclusive_amount">[% loop_budge.total_spent | $Price %]</span>
179
                    [% ELSE %]
180
                        <a href="spent.pl?fund=[% loop_budge.budget_id | uri %]&amp;fund_code=[% loop_budge.budget_code | uri %]">
181
                            <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span>
182
                        </a>
183
                    [% END %]
169
                </td>
184
                </td>
170
                <td class="data">
185
                <td class="data">
171
                    <span class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span>
186
                    [% IF !loop_budge.budget_parent_id %]
187
                        (<span title="Remaining in this fund" class="parent_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span>)
188
                        <span title="Remaining with child funds included" class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.total_avail | $Price %]</span>
189
                    [% ELSE %]
190
                        <span class="total_amount" data-parent_id="[% loop_budge.budget_parent_id | html %]" data-self_id="[% loop_budge.budget_id | html %]">[% loop_budge.budget_avail | $Price %]</span>
191
                    [% END %]
172
                </td>
192
                </td>
173
            </tr>
193
            </tr>
174
        [% END %]
194
        [% END %]
175
- 

Return to bug 29287