2 translation fixes

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

diff --git a/acqui/acqui-home.pl b/acqui/acqui-home.pl
index 4ebf874..291383e 100755 (executable)
--- a/acqui/acqui-home.pl
+++ b/acqui/acqui-home.pl
@@ -69,12 +69,11 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
 my $borrower= GetMember('borrowernumber' => $loggedinuser);
 my ( $flags, $homebranch )= ($borrower->{'flags'},$borrower->{'branchcode'});
 
-my @results = GetBookFunds($homebranch);
+my @results = GetBudgets($homebranch);
 my $count = scalar @results;
 my $branchname = GetBranchName($homebranch);
 
 #my $count = scalar @results;
-my $count;
 my $classlist   = '';
 my $total       = 0;
 my $totspent    = 0;
@@ -89,26 +88,9 @@ my @rates = GetCurrencies();
 $count = scalar @rates;
 
 my $active_currency = GetCurrency;
-my $num = new Number::Format(-int_curr_symbol => '',
-                             -decimal_digits => "2" );
-my @loop_currency = ();
-for ( my $i = 0 ; $i < $count ; $i++ ) {
-    my %line;
-    $line{currency}        = $rates[$i]->{'currency'} ;
-    $line{currency_symbol} = $rates[$i]->{'symbol'};
-    $line{rate}            = sprintf ( '%.2f',  $rates[$i]->{'rate'} );
-    push @loop_currency, \%line;
-}
-
-# suggestions
-my $status           = $query->param('status') || "ASKED";
-my $suggestion       = CountSuggestion($status);
-my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
-# ---------------------------------------------------
-# number format
-my $cur_format = C4::Context->preference("CurrencyFormat");
 my $num;
 
+my $cur_format = C4::Context->preference("CurrencyFormat");
 if ( $cur_format eq 'FR' ) {
     $num = new Number::Format(
         'decimal_fill'      => '2',
@@ -126,15 +108,29 @@ if ( $cur_format eq 'FR' ) {
     );
 }
 
+my @loop_currency = ();
+for ( my $i = 0 ; $i < $count ; $i++ ) {
+    my %line;
+    $line{currency}        = $rates[$i]->{'currency'} ;
+    $line{currency_symbol} = $rates[$i]->{'symbol'};
+    $line{rate}            = sprintf ( '%.2f',  $rates[$i]->{'rate'} );
+    push @loop_currency, \%line;
+}
+
+# suggestions
+my $status           = $query->param('status') || "ASKED";
+my $suggestion       = CountSuggestion($status);
+my $suggestions_loop = &SearchSuggestion( {STATUS=> $status} );
+# ---------------------------------------------------
+# number format
 my $period            = GetBudgetPeriod;
 my $budget_period_id  = $period->{budget_period_id};
 my $budget_branchcode = $period->{budget_branchcode};
 my $moo               = GetBudgetHierarchy('',$homebranch, $template->{param_map}->{'USER_INFO'}[0]->{'borrowernumber'} );
-my @results           = @$moo;
+@results           = @$moo;
 my $period_total      = 0;
 my $toggle            = 0;
 my @loop;
-my ( $total, $totspent, $totcomtd, $totavail );
 
 foreach my $result (@results) {
     # only get top-level budgets for display
@@ -173,76 +169,6 @@ foreach my $result (@results) {
     push( @loop_budget, { %{$result}, toggle => $toggle++ % 2, } );
 }
 
-
-# ---------------------------------------------------
-
-=c FIXME
-
-
-### $cur
-
-## suggestions
-
-my $dbh = C4::Context->dbh;
-
-
-## liste des domaines
-
-my $sth=$dbh->prepare("
-SELECT bookfundgroupnumber,bookfundgroupname
-FROM `aq2bookfundgroups`
-ORDER BY Bookfundgroupname
-");
-$sth->execute;
-
-my @bookfundgroup_loop;  ## liste des domaines
-
-while (my $row=$sth->fetchrow_hashref) {
-        push @bookfundgroup_loop,$row;
-}
-$sth->finish;
-
-
-## liste des BFG ayant des suggestions à traiter
-
-
-## nowsuggestions = Number Of Waiting Suggestions
-
-my $dbh = C4::Context->dbh;
-
-my $sth=$dbh->prepare("
-SELECT bookfundgroupnumber, count(*) AS nowsuggestions
-FROM `aq2orders`
-WHERE step=2
-AND STATUS='ASKED'
-GROUP BY bookfundgroupnumber
-");
-$sth->execute;
-
-my @nowsuggestionsneq0_loop;  ## liste des BFG ayant des suggestions à traiter
-
-while (my $row=$sth->fetchrow_hashref) {
-        push @nowsuggestionsneq0_loop,$row;
-}
-$sth->finish;
-
-
-## liste des BFG avec l'effectif des suggestions à traiter (effectif éventuellement nul)
-
-my @nowsuggestions_loop;
-
-foreach my $data1 (@bookfundgroup_loop) {
-    $data1->{'nowsuggestions'}=0;
-    foreach my $data2 (@nowsuggestionsneq0_loop) {
-        if ($data1->{'bookfundgroupnumber'}==$data2->{'bookfundgroupnumber'}) {
-            $data1->{'nowsuggestions'}=$data2->{'nowsuggestions'};
-        }
-    }
-}
-
-=cut
-
-
 $template->param(
     classlist     => $classlist,
     type          => 'intranet',
@@ -255,13 +181,7 @@ $template->param(
     totspent      => $num->format_price($totspent ),
     totcomtd      => $num->format_price( $totcomtd ),
     totavail      => $num->format_price( $totavail ),
-
-    #      nowsuggestions_loop           => \@nowsuggestions_loop,
-    #      bookfundgroup_loop            => \@bookfundgroup_loop,
-    #      numberofwaitingsuggestionsgpd => $numberofwaitingsuggestionsgpd,
-    #      numberofwaitingsuggestionspd  => $numberofwaitingsuggestionspd,
-    #      suggestions_loop              => $suggestions_loop,
-
+    suggestion    => $suggestion,
 );
 
 output_html_with_http_headers $query, $cookie, $template->output;