X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=admin%2Faqbudgets.pl;h=39fffdb7c1ff396c874f4aad56d525ed26549fda;hb=67942f7432e8706c460e7f8e36178c0cd60333f7;hp=35c8bc6970c97f2d0f638fd03289d6a662a1edd5;hpb=bce3e2e619e3efffdd01caf560ce53a8ba903df2;p=srvgit diff --git a/admin/aqbudgets.pl b/admin/aqbudgets.pl index 35c8bc6970..39fffdb7c1 100755 --- a/admin/aqbudgets.pl +++ b/admin/aqbudgets.pl @@ -52,7 +52,9 @@ my ($template, $borrowernumber, $cookie, $staffflags ) = get_template_and_user( ); my $cur = GetCurrency(); -$template->param( cur => $cur->{symbol} ); +$template->param( symbol => $cur->{symbol}, + currency => $cur->{currency} + ); my $op = $input->param('op'); @@ -62,21 +64,20 @@ my $show = $input->param('show'); # SET TO 1, BY A FORM SUMBIT $show_mine = $input->param('show_mine') if $show == 1; # IF USER DOESNT HAVE PERM FOR AN 'ADD', THEN REDIRECT TO THE DEFAULT VIEW... -if ( not defined $template->{param_map}->{'CAN_user_acquisition_budget_add_del'} && $op == 'add_form' ) { +if ( not defined $template->{VARS}->{'CAN_user_acquisition_budget_add_del'} && $op == 'add_form' ) { $op = ''; } - my $num=FormatNumber; my $script_name = "/cgi-bin/koha/admin/aqbudgets.pl"; -my $budget_hash=$input->Vars; +my $budget_hash = $input->Vars; my $budget_id = $$budget_hash{budget_id}; my $budget_permission = $input->param('budget_permission'); -my $budget_period_dropbox = $input->param('budget_period_dropbox'); -#filtering non budget keys -delete $$budget_hash{$_} foreach grep {/filter|^op$|show/} keys %$budget_hash; 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; + $template->param( notree => ($filter_budgetbranch or $show_mine) ); @@ -90,7 +91,7 @@ $template->param( # ------- get periods stuff ------------------ # USED FOR PERMISSION COMPARISON LATER -my $borrower_id = $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'}; +my $borrower_id = $template->{VARS}->{'USER_INFO'}[0]->{'borrowernumber'}; my $user = GetMemberDetails($borrower_id); my $user_branchcode = $user->{'branchcode'}; @@ -121,7 +122,6 @@ $template->param(auth_cats_loop => GetBudgetAuthCats($$period{budget_period_id}) # Used to create form to add or modify a record if ($op eq 'add_form') { #### ------------------- ADD_FORM ------------------------- - # if no buget_id is passed then its an add # pass the period_id to build the dropbox - because we only want to show budgets from this period my $dropbox_disabled; @@ -184,16 +184,17 @@ if ($op eq 'add_form') { $template->param(authorised_value_categories1 => \@auth_cats_loop1); $template->param(authorised_value_categories2 => \@auth_cats_loop2); - my $budget_perm_dropbox = - GetBudgetPermDropbox($budget->{'budget_permission'}); - + if($budget->{'budget_permission'}){ + my $budget_permission = "budget_perm_".$budget->{'budget_permission'}; + $template->param($budget_permission => 1); + } + # if no buget_id is passed then its an add $template->param( add_validate => 1, dateformat => C4::Dates->new()->visual(), budget_parent_id => $budget_parent->{'budget_id'}, budget_parent_name => $budget_parent->{'budget_name'}, - budget_perm_dropbox => $budget_perm_dropbox, branchloop_select => \@branchloop_select, %$period, %$budget, @@ -224,9 +225,7 @@ if ($op eq 'add_form') { } } my $branches = GetBranches(); - my $budget_period_dropbox = GetBudgetPeriodsDropbox($$period{budget_period_id} ); $template->param( - budget_period_dropbox => $budget_period_dropbox, budget_id => $budget_id, %$period, ); @@ -239,15 +238,16 @@ if ($op eq 'add_form') { my $period_total = 0; my ( $period_alloc_total, $base_spent_total ); - use YAML; - $debug && warn Dump(@budgets); #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 ? foreach my $budget (@budgets) { + #Level and sublevels total spent + $budget->{'total_levels_spent'} = GetChildBudgetsSpent($budget->{"budget_id"}); + # PERMISSIONS unless($staffflags->{'superlibrarian'} % 2 == 1 ) { #IF NO PERMS, THEN DISABLE EDIT/DELETE - unless ( $template->{param_map}->{'CAN_user_acquisition_budget_modify'} ) { + unless ( $template->{VARS}->{'CAN_user_acquisition_budget_modify'} ) { $budget->{'budget_lock'} = 1; } # check budget permission @@ -272,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/; @@ -284,34 +285,63 @@ 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'}; - $budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'budget_spent'}; + $budget->{'budget_remaining'} = $budget->{'budget_amount'} - $budget->{'total_levels_spent'}; # if amount == 0 dont display... delete $budget->{'budget_unalloc_sublevel'} if $budget->{'budget_unalloc_sublevel'} == 0 ; $budget->{'remaining_pos'} = 1 if $budget->{'budget_remaining'} > 0; $budget->{'remaining_neg'} = 1 if $budget->{'budget_remaining'} < 0; - for (grep {/budget_spent|budget_amount|budget_remaining|budget_unalloc/} keys %$budget){ - $$budget{$_} = $num->format_price( $$budget{$_} ) if defined($$budget{$_}) + for (grep {/total_levels_spent|budget_spent|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"}); + my $borrower = &GetMember( borrowernumber=>$budget->{budget_owner_id} ); $budget->{"budget_owner_name"} = $borrower->{'firstname'} . ' ' . $borrower->{'surname'}; $budget->{"budget_borrowernumber"} = $borrower->{'borrowernumber'}; + #Make a list of parents of the bugdet + my @budget_hierarchy; + push @budget_hierarchy, { element_name => $budget->{"budget_name"}, element_id => $budget->{"budget_id"} }; + my $parent_id = $budget->{"budget_parent_id"}; + while ($parent_id) { + my $parent = GetBudget($parent_id); + push @budget_hierarchy, { element_name => $parent->{"budget_name"}, element_id => $parent->{"budget_id"} }; + $parent_id = $parent->{"budget_parent_id"}; + } + push @budget_hierarchy, { element_name => $period->{"budget_period_description"} }; + @budget_hierarchy = reverse(@budget_hierarchy); + push( @loop, { %{$budget}, branchname => $branches->{ $budget->{branchcode} }->{branchname}, + budget_hierarchy => \@budget_hierarchy, } ); } - my $budget_period_total = $num->format_price($$period{budget_period_total}) if $$period{budget_period_total}; + my $budget_period_total; + if ( $period->{budget_period_total} ) { + $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, );