[followup](bug #3348) fixing acq module

[koha.git] / serials / acqui-search.pl

diff --git a/serials/acqui-search.pl b/serials/acqui-search.pl
index 2f06abc..a629315 100755 (executable)
--- a/serials/acqui-search.pl
+++ b/serials/acqui-search.pl
@@ -17,72 +17,79 @@
 # Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
 # Suite 330, Boston, MA  02111-1307 USA
 
-# $Id$
 
 use strict;
+use warnings;
 use CGI;
 use C4::Auth;
 use C4::Output;
-use C4::Interface::CGI::Output;
-use C4::Database;
-use HTML::Template;
-use C4::Acquisition;
+use C4::Bookfund;
+
 my $query = new CGI;
-my ($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "serials/acqui-search.tmpl",
-                            query => $query,
-                            type => "intranet",
-                            authnotrequired => 0,
-                            flagsrequired => {acquisition => 1},
-                            debug => 1,
-                            });
 
-# FIXME : Is this page still used ????
-# looks like no.
+my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+    {
+        template_name   => "serials/acqui-search.tmpl",
+        query           => $query,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { serials => '*' },
+        debug           => 1,
+    }
+);
 
 # budget
-my $dbh = C4::Context->dbh;
-my $sthtemp = $dbh->prepare("Select flags, branchcode from borrowers where borrowernumber = ?");
+my $dbh     = C4::Context->dbh;
+my $sthtemp =
+  $dbh->prepare(
+    "Select flags, branchcode from borrowers where borrowernumber = ?");
 $sthtemp->execute($loggedinuser);
-my ($flags, $homebranch)=$sthtemp->fetchrow;
-my ($count,@results)=bookfunds($homebranch);
-my $classlist='';
-my $total=0;
-my $totspent=0;
-my $totcomtd=0;
-my $totavail=0;
+my ( $flags, $homebranch ) = $sthtemp->fetchrow;
+my @results = GetBookFunds($homebranch);
+my $count   = scalar(@results);
+
+my $classlist   = '';
+my $total       = 0;
+my $totspent    = 0;
+my $totcomtd    = 0;
+my $totavail    = 0;
 my @loop_budget = ();
-for (my $i=0;$i<$count;$i++){
-       my ($spent,$comtd)=bookfundbreakdown($results[$i]->{'bookfundid'});
-       my $avail=$results[$i]->{'budgetamount'}-($spent+$comtd);
-       my %line;
-       $line{bookfundname} = $results[$i]->{'bookfundname'};
-       $line{budgetamount} = $results[$i]->{'budgetamount'};
-       $line{spent} = sprintf  ("%.2f", $spent);
-       $line{comtd} = sprintf  ("%.2f",$comtd);
-       $line{avail}  = sprintf  ("%.2f",$avail);
-       push @loop_budget, \%line;
-       $total+=$results[$i]->{'budgetamount'};
-       $totspent+=$spent;
-       $totcomtd+=$comtd;
-       $totavail+=$avail;
+for my $r (@results) {
+    my ( $spent, $comtd ) =
+      GetBookFundBreakdown( $r->{'bookfundid'} );
+    my $avail = $r->{'budgetamount'} - ( $spent + $comtd );
+    my %line;
+    $line{bookfundname} = $r->{'bookfundname'};
+    $line{budgetamount} = $r->{'budgetamount'};
+    $line{spent}        = sprintf( "%.2f", $spent );
+    $line{comtd}        = sprintf( "%.2f", $comtd );
+    $line{avail}        = sprintf( "%.2f", $avail );
+    push @loop_budget, \%line;
+    $total    += $r->{'budgetamount'};
+    $totspent += $spent;
+    $totcomtd += $comtd;
+    $totavail += $avail;
 }
+
 #currencies
-my ($count,$rates)=getcurrencies();
-my @loop_currency = ();
-for (my $i=0;$i<$count;$i++){
-       my %line;
-       $line{currency} = $rates->[$i]->{'currency'};
-       $line{rate} = $rates->[$i]->{'rate'};
-       push @loop_currency, \%line;
+my @rates = GetCurrencies();
+
+my $loop_currency = [];
+for my $r (@rates) {
+    push @{$loop_currency}, {
+        currency => $r->{'currency'},
+        rate     => $r->{'rate'},
+    };
 }
-$template->param(classlist => $classlist,
-                                               type => 'intranet',
-                                               loop_budget => \@loop_budget,
-                                               loop_currency => \@loop_currency,
-                                               total => sprintf("%.2f",$total),
-                                               totspent => sprintf("%.2f",$totspent),
-                                               totcomtd => sprintf("%.2f",$totcomtd),
-                                               totavail => sprintf("%.2f",$totavail));
+$template->param(
+    classlist     => $classlist,
+    type          => 'intranet',
+    loop_budget   => \@loop_budget,
+    loop_currency => $loop_currency,
+    total         => sprintf( "%.2f", $total ),
+    totspent      => sprintf( "%.2f", $totspent ),
+    totcomtd      => sprintf( "%.2f", $totcomtd ),
+    totavail      => sprintf( "%.2f", $totavail )
+);
 
 output_html_with_http_headers $query, $cookie, $template->output;