X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Faqbudgets.pl;h=39fffdb7c1ff396c874f4aad56d525ed26549fda;hb=dc1ccb1d74fede81a0603193bc27b43fbaf51298;hp=db99759639d7b5fff0dd72bf92a8ef6e2d9c21f9;hpb=f21577986f8ff5da5fde88deaae2302a8b40dbe7;p=koha_fer diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index db99759639..39fffdb7c1 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -74,9 +74,10 @@ my $budget_hash = $input->Vars; my $budget_id = $$budget_hash{budget_id}; my $budget_permission = $input->param('budget_permission'); my $filter_budgetbranch = $input->param('filter_budgetbranch'); +my $filter_budgetname = $input->param('filter_budgetname'); #filtering non budget keys delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; -my $filter_budgetname = $input->param('filter_budgetname'); + $template->param( notree => ($filter_budgetbranch or $show_mine) ); @@ -271,9 +272,10 @@ if ($op eq 'add_form') { } # ...SUPER_LIB END # if a budget search doesnt match, next - if ($filter_budgetname ) { - next unless $budget->{budget_code} =~ m/$filter_budgetname/ || - $budget->{name} =~ m/$filter_budgetname/ ; + if ($filter_budgetname) { + next + unless $budget->{budget_code} =~ m/$filter_budgetname/i + || $budget->{budget_name} =~ m/$filter_budgetname/i; } if ($filter_budgetbranch ) { next unless $budget->{budget_branchcode} =~ m/$filter_budgetbranch/; @@ -325,12 +327,21 @@ if ($op eq 'add_form') { $budget_period_total = $num->format_price( $period->{budget_period_total} ); } + + if ($period_alloc_total) { + $period_alloc_total = $num->format_price($period_alloc_total); + } + + if ($base_spent_total) { + $base_spent_total = $num->format_price($base_spent_total); + } + $template->param( else => 1, budget => \@loop, budget_period_total => $budget_period_total, - period_alloc_total => $num->format_price($period_alloc_total), - base_spent_total => $num->format_price($base_spent_total), + period_alloc_total => $period_alloc_total, + base_spent_total => $base_spent_total, branchloop => \@branchloop2, );