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

(-)a/admin/aqbudgets.pl (-12 / +5 lines)
Lines 100-107 $template->param( Link Here
100
    op  => $op,
100
    op  => $op,
101
);
101
);
102
102
103
# retrieve branches
103
my $budget;
104
my ( $budget, );
105
104
106
my $branches = GetBranches($show_mine);
105
my $branches = GetBranches($show_mine);
107
my @branchloop2;
106
my @branchloop2;
Lines 132-138 if ($op eq 'add_form') { Link Here
132
        }
131
        }
133
        $dropbox_disabled = BudgetHasChildren($budget_id);
132
        $dropbox_disabled = BudgetHasChildren($budget_id);
134
        my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
133
        my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
135
        $budget->{budget_owner_name} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
134
        $budget->{budget_owner_name} = ( $borrower ? $borrower->{'firstname'} . ' ' . $borrower->{'surname'} : '' );
136
        $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget;
135
        $$budget{$_}= sprintf("%.2f", $budget->{$_}) for grep{ /amount|encumb|expend/ } keys %$budget;
137
    }
136
    }
138
137
Lines 164-170 if ($op eq 'add_form') { Link Here
164
            value      => $thisbranch,
163
            value      => $thisbranch,
165
            branchname => $branches->{$thisbranch}->{'branchname'},
164
            branchname => $branches->{$thisbranch}->{'branchname'},
166
        );
165
        );
167
        $row{selected} = 1 if $thisbranch eq $budget->{'budget_branchcode'};
166
        $row{selected} = 1 if $budget and $thisbranch eq $budget->{'budget_branchcode'};
168
        push @branchloop_select, \%row;
167
        push @branchloop_select, \%row;
169
    }
168
    }
170
    
169
    
Lines 173-186 if ($op eq 'add_form') { Link Here
173
    my @auth_cats_loop1 = ();
172
    my @auth_cats_loop1 = ();
174
    foreach my $category (@$categories) {
173
    foreach my $category (@$categories) {
175
        my $entry = { category => $category,
174
        my $entry = { category => $category,
176
                        selected => $budget->{sort1_authcat} eq $category ?1:0,
175
                        selected => ( $budget and $budget->{sort1_authcat} eq $category ? 1 : 0 ),
177
                    };
176
                    };
178
        push @auth_cats_loop1, $entry;
177
        push @auth_cats_loop1, $entry;
179
    }
178
    }
180
    my @auth_cats_loop2 = ();
179
    my @auth_cats_loop2 = ();
181
    foreach my $category (@$categories) {
180
    foreach my $category (@$categories) {
182
        my $entry = { category => $category,
181
        my $entry = { category => $category,
183
                        selected => $budget->{sort2_authcat} eq $category ?1:0,
182
                        selected => ( $budget and $budget->{sort2_authcat} eq $category ? 1 : 0 ),
184
                    };
183
                    };
185
        push @auth_cats_loop2, $entry;
184
        push @auth_cats_loop2, $entry;
186
    }
185
    }
Lines 330-339 if ( $op eq 'list' ) { Link Here
330
        $budget->{"budget_spent"} = $num->format_price(0) unless defined($budget->{"budget_spent"});
329
        $budget->{"budget_spent"} = $num->format_price(0) unless defined($budget->{"budget_spent"});
331
        $budget->{budget_ordered} = $num->format_price(0) unless defined($budget->{"budget_ordered"});
330
        $budget->{budget_ordered} = $num->format_price(0) unless defined($budget->{"budget_ordered"});
332
331
333
        my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} );
334
        $budget->{"budget_owner_name"}     = $borrower->{'firstname'} . ' ' . $borrower->{'surname'};
335
        $budget->{"budget_borrowernumber"} = $borrower->{'borrowernumber'};
336
337
        #Make a list of parents of the bugdet
332
        #Make a list of parents of the bugdet
338
        my @budget_hierarchy;
333
        my @budget_hierarchy;
339
        push  @budget_hierarchy, { element_name => $budget->{"budget_name"}, element_id => $budget->{"budget_id"} };
334
        push  @budget_hierarchy, { element_name => $budget->{"budget_name"}, element_id => $budget->{"budget_id"} };
Lines 346-352 if ( $op eq 'list' ) { Link Here
346
        push  @budget_hierarchy, { element_name => $period->{"budget_period_description"} };
341
        push  @budget_hierarchy, { element_name => $period->{"budget_period_description"} };
347
        @budget_hierarchy = reverse(@budget_hierarchy);
342
        @budget_hierarchy = reverse(@budget_hierarchy);
348
343
349
        $budget->{branchname} = $branches->{ $budget->{branchcode} }->{branchname};
350
        $budget->{budget_hierarchy} = \@budget_hierarchy;
344
        $budget->{budget_hierarchy} = \@budget_hierarchy;
351
    }
345
    }
352
346
353
- 

Return to bug 12957