Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 7308: Show ordered amount in aqbudgets.pl

Browse source 
Signed-off-by: Cédric Vita <cedric.vita@dracenie.com>
Signed-off-by: Katrin Fischer <Katrin.Fischer.83@web.de>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
This commit is contained in:
Julian Maurice 2012-04-13 10:40:35 +02:00 committed by Galen Charlton
parent 123f07cc8a
commit dc3a90c411
3 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
C4/Budgets.pm
View file

@ -611,6 +611,7 @@ sub GetBudgetHierarchy {
$r->{'budget_name_indent'} = $moo;
$r->{'budget_spent'} = GetBudgetSpent( $r->{'budget_id'} );
$r->{budget_ordered} = GetBudgetOrdered( $r->{budget_id} );
$r->{'budget_amount_total'} = $r->{'budget_amount'};

11
admin/aqbudgets.pl
View file

@ -276,7 +276,7 @@ if ($op eq 'add_form') {
my $toggle = 0;
my @loop;
my $period_total = 0;
my ( $period_alloc_total, $base_spent_total );
my ( $period_alloc_total, $base_spent_total, $base_ordered_total );
#This Looks WEIRD to me : should budgets be filtered in such a way ppl who donot own it would not see the amount spent on the budget by others ?
@ -303,6 +303,7 @@ if ($op eq 'add_form') {
# adds to total - only if budget is a 'top-level' budget
$period_alloc_total += $budget->{'budget_amount_total'} if $budget->{'depth'} == 0;
$base_spent_total += $budget->{'budget_spent'};
$base_ordered_total += $budget->{budget_ordered};
$budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'total_levels_spent'};
# if amount == 0 dont display...
@ -312,12 +313,13 @@ if ($op eq 'add_form') {
$budget->{'remaining_pos'} = 1 if $budget->{'budget_remaining'} > 0;
$budget->{'remaining_neg'} = 1 if $budget->{'budget_remaining'} < 0;
for (grep {/total_levels_spent|budget_spent|budget_amount|budget_remaining|budget_unalloc/} keys %$budget){
for (grep {/total_levels_spent|budget_spent|budget_ordered|budget_amount|budget_remaining|budget_unalloc/} keys %$budget){
$budget->{$_} = $num->format_price( $budget->{$_} ) if defined($budget->{$_})
}
# Value of budget_spent equals 0 instead of undefined value
$budget->{"budget_spent"} = $num->format_price(0) unless defined($budget->{"budget_spent"});
$budget->{budget_ordered} = $num->format_price(0) unless defined($budget->{"budget_ordered"});
my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
$budget->{"budget_owner_name"} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
@ -356,12 +358,17 @@ if ($op eq 'add_form') {
$base_spent_total = $num->format_price($base_spent_total);
}
if ($base_ordered_total) {
$base_ordered_total = $num->format_price($base_ordered_total);
}
$template->param(
else => 1,
budget => \@loop,
budget_period_total => $budget_period_total,
period_alloc_total => $period_alloc_total,
base_spent_total => $base_spent_total,
base_ordered_total => $base_ordered_total,
branchloop => \@branchloop2,
);

3
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt
View file

@ -243,6 +243,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
<th>Fund name</th>
<th>Total<br />allocated</th>
<th>Base-level<br />allocated</th>
<th>Base-level<br />ordered</th>
<th>Base-level<br />spent</th>
<th>Total sublevels<br />spent</th>
<th>Base-level<br />remaining</th>
@ -255,6 +256,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
<th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF ( budget_period_total ) %][% budget_period_total %][% END %] </th>
<th nowrap="nowrap" class="data"> [% period_alloc_total %]</th>
<th nowrap="nowrap" class="data"> [% base_alloc_total %]</th>
<th class="data">[% base_ordered_total %]</th>
<th class="data">[% base_spent_total %]</th>
<th class="data">[% base_spent_total %]</th>
<th class="data">[% base_remaining_total %]</th>
@ -274,6 +276,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget")
<td>[% budge.budget_name %]</td>
<td class="data">[% budge.budget_amount_total %]</td>
<td class="data">[% budge.budget_amount %] </td>
<td class="data">[% budge.budget_ordered %]</td>
<td class="data">[% budge.budget_spent %] </td>
<td class="data">[% budge.total_levels_spent %]</td>
[% IF ( budge.remaining_pos ) %]