Bug 9662: Followup for acquisition

[koha.git] / acqui / acqui-home.pl

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index ed96a9e..8b6c584 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -41,7 +41,7 @@ use C4::Debug;
 use C4::Suggestions;
 
 my $query = CGI->new;
-my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+my ( $template, $loggedinuser, $cookie, $userflags ) = get_template_and_user(
     {   template_name   => 'acqui/acqui-home.tmpl',
         query           => $query,
         type            => 'intranet',
@@ -78,9 +78,7 @@ if ( $cur_format eq 'FR' ) {
 my $status           = $query->param('status') || "ASKED";
 my $suggestions_count       = CountSuggestion($status);
 
-my $budget_arr =
-  GetBudgetHierarchy( '', $user->{branchcode},
-    $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} );
+my $budget_arr = GetBudgetHierarchy;
 
 my $total      = 0;
 my $totspent   = 0;
@@ -88,7 +86,14 @@ my $totordered = 0;
 my $totcomtd   = 0;
 my $totavail   = 0;
 
+my $total_active        = 0;
+my $totspent_active     = 0;
+my $totordered_active   = 0;
+my $totavail_active     = 0;
+
+my @budget_loop;
 foreach my $budget ( @{$budget_arr} ) {
+    next unless (CanUserUseBudget($loggedinuser, $budget, $userflags));
 
     $budget->{budget_code_indent} =~ s/\ /\&nbsp\;/g;
 
@@ -121,21 +126,34 @@ foreach my $budget ( @{$budget_arr} ) {
     $totordered += $budget->{'budget_ordered'};
     $totavail   += $budget->{'budget_avail'};
 
+    if ($budget->{budget_period_active}){
+       $total_active      += $budget->{'budget_amount'};
+       $totspent_active   += $budget->{'budget_spent'};
+       $totordered_active += $budget->{'budget_ordered'};
+       $totavail_active   += $budget->{'budget_avail'};    
+    }
+
     for my $field (qw( budget_amount budget_spent budget_ordered budget_avail ) ) {
         $budget->{$field} = $num_formatter->format_price( $budget->{$field} );
     }
+
+    push @budget_loop, $budget;
 }
 
 $template->param(
     type          => 'intranet',
-    loop_budget   => $budget_arr,
+    loop_budget   => \@budget_loop,
     branchname    => $branchname,
     total         => $num_formatter->format_price($total),
     totspent      => $num_formatter->format_price($totspent),
     totordered    => $num_formatter->format_price($totordered),
     totcomtd      => $num_formatter->format_price($totcomtd),
     totavail      => $num_formatter->format_price($totavail),
-    suggestions_count    => $suggestions_count,
+    total_active  => $num_formatter->format_price($total_active),
+    totspent_active     => $num_formatter->format_price($totspent_active),
+    totordered_active   => $num_formatter->format_price($totordered_active),
+    totavail_active     => $num_formatter->format_price($totavail_active),
+    suggestions_count   => $suggestions_count,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;