Lines 74-82
my $budget_hash = $input->Vars;
Link Here
|
74 |
my $budget_id = $$budget_hash{budget_id}; |
74 |
my $budget_id = $$budget_hash{budget_id}; |
75 |
my $budget_permission = $input->param('budget_permission'); |
75 |
my $budget_permission = $input->param('budget_permission'); |
76 |
my $filter_budgetbranch = $input->param('filter_budgetbranch'); |
76 |
my $filter_budgetbranch = $input->param('filter_budgetbranch'); |
|
|
77 |
my $filter_budgetname = $input->param('filter_budgetname'); |
77 |
#filtering non budget keys |
78 |
#filtering non budget keys |
78 |
delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; |
79 |
delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; |
79 |
my $filter_budgetname = $input->param('filter_budgetname'); |
80 |
|
80 |
$template->param( |
81 |
$template->param( |
81 |
notree => ($filter_budgetbranch or $show_mine) |
82 |
notree => ($filter_budgetbranch or $show_mine) |
82 |
); |
83 |
); |
Lines 271-279
if ($op eq 'add_form') {
Link Here
|
271 |
} # ...SUPER_LIB END |
272 |
} # ...SUPER_LIB END |
272 |
|
273 |
|
273 |
# if a budget search doesnt match, next |
274 |
# if a budget search doesnt match, next |
274 |
if ($filter_budgetname ) { |
275 |
if ($filter_budgetname) { |
275 |
next unless $budget->{budget_code} =~ m/$filter_budgetname/ || |
276 |
next |
276 |
$budget->{name} =~ m/$filter_budgetname/ ; |
277 |
unless $budget->{budget_code} =~ m/$filter_budgetname/i |
|
|
278 |
|| $budget->{name} =~ m/$filter_budgetname/i; |
277 |
} |
279 |
} |
278 |
if ($filter_budgetbranch ) { |
280 |
if ($filter_budgetbranch ) { |
279 |
next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/; |
281 |
next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/; |
Lines 325-336
if ($op eq 'add_form') {
Link Here
|
325 |
$budget_period_total = |
327 |
$budget_period_total = |
326 |
$num->format_price( $period->{budget_period_total} ); |
328 |
$num->format_price( $period->{budget_period_total} ); |
327 |
} |
329 |
} |
|
|
330 |
|
331 |
if ($period_alloc_total) { |
332 |
$period_alloc_total = $num->format_price($period_alloc_total); |
333 |
} |
334 |
|
335 |
if ($base_spent_total) { |
336 |
$base_spent_total = $num->format_price($base_spent_total); |
337 |
} |
338 |
|
328 |
$template->param( |
339 |
$template->param( |
329 |
else => 1, |
340 |
else => 1, |
330 |
budget => \@loop, |
341 |
budget => \@loop, |
331 |
budget_period_total => $budget_period_total, |
342 |
budget_period_total => $budget_period_total, |
332 |
period_alloc_total => $num->format_price($period_alloc_total), |
343 |
period_alloc_total => $period_alloc_total, |
333 |
base_spent_total => $num->format_price($base_spent_total), |
344 |
base_spent_total => $base_spent_total, |
334 |
branchloop => \@branchloop2, |
345 |
branchloop => \@branchloop2, |
335 |
); |
346 |
); |
336 |
|
347 |
|
337 |
- |
|
|