Bug 9044: DBRev 3.13.00.036

[koha.git] / reports / acquisitions_stats.pl

diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index 9a74365..8d5cb1d 100755 (executable)
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -72,10 +72,11 @@ my ( $template, $borrowernumber, $cookie ) = get_template_and_user(
 
 our $sep     = $input->param("sep") // '';
 $sep = "\t" if ($sep eq 'tabulation');
+
 $template->param(
     do_it                    => $do_it,
-    DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 );
+
 if ($do_it) {
     my $results =
       calculate( $line, $column, $podsp, $rodsp, $calc, \@filters );
@@ -117,32 +118,17 @@ if ($do_it) {
 }
 else {
     my $dbh = C4::Context->dbh;
-    my @select;
-    my %select;
     my $req;
     $req = $dbh->prepare("SELECT distinctrow id,name FROM aqbooksellers ORDER BY name");
     $req->execute;
-    push @select, "";
-    $select{''} = "All Suppliers";
-    while ( my ( $value, $desc ) = $req->fetchrow ) {
-        push @select, $desc;
-        $select{$value}=$desc;
-    }
-    my $CGIBookSellers = CGI::scrolling_list(
-        -name   => 'Filter',
-        -id     => 'supplier',
-        -values => \@select,
-        -labels   => \%select,
-        -size     => 1,
-        -multiple => 0
-    );
+    my $booksellers = $req->fetchall_arrayref({});
 
     $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description");
     $req->execute;
-    undef @select;
-    undef %select;
+    my @select;
+    my %select;
     push @select, "";
-    $select{''} = "All Item Types";
+    $select{''} = "All item types";
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $value;
         $select{$value} = $desc;
@@ -161,7 +147,7 @@ else {
     undef @select;
     undef %select;
     push @select, "";
-    $select{''} = "All budgets";
+    $select{''} = "All funds";
 
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $value;
@@ -256,7 +242,7 @@ else {
     }
 
     $template->param(
-        CGIBookSeller => $CGIBookSellers,
+        booksellers   => $booksellers,
         CGIItemType   => $CGIItemTypes,
         CGIBudget     => $CGIBudget,
         hassort1      => $hassort1,
@@ -305,20 +291,7 @@ sub calculate {
             } else {
                 $cell{filter} = format_date(@$filters[$i]);
             }
-            given ($i) {
-                when (0)  { $cell{crit} = "Placed On From" }
-                when (1)  { $cell{crit} = "Placed On To" }
-                when (2)  { $cell{crit} = "Received On From" }
-                when (3)  { $cell{crit} = "Received On To" }
-                when (4)  { $cell{crit} = "Bookseller" }
-                when (5)  { $cell{crit} = "Home branch" }
-                when (6)  { $cell{crit} = "Collection" }
-                when (7)  { $cell{crit} = "Doc Type" }
-                when (8)  { $cell{crit} = "Budget" }
-                when (9)  { $cell{crit} = "Sort1" }
-                when (10) { $cell{crit} = "Sort2" }
-                default   { $cell{crit} = "" }
-            }
+            $cell{crit} = $i;
             push @loopfilter, \%cell;
         }
     }