X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=reports%2Facquisitions_stats.pl;h=7207e646709894e5505d72cd62a5c9f43aa63a31;hb=37328c709ecb1e8868c4dd8ce344e844647d8715;hp=ef827ca0b8e08e55d8415d3a58a70123cd17104b;hpb=b8d8a0ec5a10ab7dcb2529e8ca4a815822d43cbb;p=koha_fer

diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index ef827ca0b8..7207e64670 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -14,13 +14,14 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # test comment
 
 use strict;
+#use warnings; FIXME - Bug 2505
 use C4::Auth;
 use CGI;
 use C4::Context;
@@ -46,25 +47,23 @@ my $fullreportname = "reports/acquisitions_stats.tmpl";
 my $line           = $input->param("Line");
 my $column         = $input->param("Column");
 my @filters        = $input->param("Filter");
-$filters[0]= (($line =~ /closedate/ || $column =~ /closedate/) ? format_date_in_iso($filters[0]) : undef);
-$filters[1]= (($line =~ /closedate/ || $column =~ /closedate/) ? format_date_in_iso($filters[1]) : undef);
-$filters[2]= (($line =~ /delivery/ || $column =~ /delivery/) ? format_date_in_iso($filters[2]) : undef);
-$filters[3]= (($line =~ /delivery/ || $column =~ /delivery/) ? format_date_in_iso($filters[3]) : undef);
+$filters[0] = format_date_in_iso( $filters[0] );
+$filters[1] = format_date_in_iso( $filters[1] );
+$filters[2] = format_date_in_iso( $filters[2] );
+$filters[3] = format_date_in_iso( $filters[3] );
 my $podsp          = $input->param("PlacedOnDisplay");
 my $rodsp          = $input->param("ReceivedOnDisplay");
 my $aodsp          = $input->param("AcquiredOnDisplay");    ##added by mason.
 my $calc           = $input->param("Cellvalue");
 my $output         = $input->param("output");
 my $basename       = $input->param("basename");
-my $mime           = $input->param("MIME");
 
-#warn "calcul : ".$calc;
 my ($template, $borrowernumber, $cookie)
 	= get_template_and_user({template_name => $fullreportname,
 				query => $input,
 				type => "intranet",
 				authnotrequired => 0,
-				flagsrequired => {reports => 1},
+				flagsrequired => {reports => '*'},
 				debug => 1,
 				});
 our $sep     = $input->param("sep");
@@ -73,7 +72,6 @@ $template->param(do_it => $do_it,
         DHTMLcalendar_dateformat => C4::Dates->DHTMLcalendar(),
 		);
 if ($do_it) {
-    # warn "line=$line, col=$column, pod=$podsp, rod=$rodsp, aod=$aodsp, calc=$calc, filters=@filters\n";
     my $results =
       calculate( $line, $column, $podsp, $rodsp, $aodsp, $calc, \@filters );
     if ( $output eq "screen" ) {
@@ -110,7 +108,7 @@ if ($do_it) {
         }
         print $sep. @$results[0]->{total};
     }
-    exit(1);
+    exit;
 }
 else {
     my $dbh = C4::Context->dbh;
@@ -154,12 +152,12 @@ else {
         -multiple => 0
     );
 
-    $req = $dbh->prepare("SELECT DISTINCTROW bookfundid,bookfundname FROM aqbookfund ORDER BY bookfundname");
+    $req = $dbh->prepare("SELECT DISTINCTROW budget_code, budget_name FROM aqbudgets ORDER BY budget_name");
     $req->execute;
     undef @select;
     undef %select;
     push @select, "";
-    $select{''} = "All Funds";
+    $select{''} = "All budgets";
 
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $value;
@@ -229,15 +227,10 @@ else {
         -multiple => 0
     );
 
-    my @mime = ( C4::Context->preference("MIME") );
-    foreach my $mime (@mime) {
-        #               warn "".$mime;
-    }
-
     my $CGIextChoice = CGI::scrolling_list(
         -name     => 'MIME',
         -id       => 'MIME',
-        -values   => \@mime,
+        -values   => ['CSV'], # FIXME translation
         -size     => 1,
         -multiple => 0
     );
@@ -309,56 +302,40 @@ sub calculate {
 
     my @linefilter;
 
-    #       warn "filtres ".@filters[0];
-    #       warn "filtres ".@filters[1];
-    #       warn "filtres ".@filters[2];
-    #       warn "filtres ".@filters[3];
-
     $linefilter[0] = @$filters[0] if ( $line =~ /closedate/ );
     $linefilter[1] = @$filters[1] if ( $line =~ /closedate/ );
     $linefilter[0] = @$filters[2] if ( $line =~ /received/ );
     $linefilter[1] = @$filters[3] if ( $line =~ /received/ );
 
-#    $linefilter[0] = @$filters[4] if ( $line =~ /acquired/ );
-#    $linefilter[1] = @$filters[5] if ( $line =~ /acquired/ );
-
     $linefilter[0] = @$filters[4]  if ( $line =~ /bookseller/ );
     $linefilter[0] = @$filters[5]  if ( $line =~ /itemtype/ );
-    $linefilter[0] = @$filters[6]  if ( $line =~ /bookfund/ );
+    $linefilter[0] = @$filters[6]  if ( $line =~ /budget/ );
     $linefilter[0] = @$filters[7]  if ( $line =~ /sort1/ );
     $linefilter[0] = @$filters[8] if ( $line =~ /sort2/ );
 
-    #warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
-    #
     my @colfilter;
     $colfilter[0] = @$filters[0] if ( $column =~ /closedate/ );
     $colfilter[1] = @$filters[1] if ( $column =~ /closedate/ );
     $colfilter[0] = @$filters[2] if ( $column =~ /received/ );
     $colfilter[1] = @$filters[3] if ( $column =~ /received/ );
 
-#    $colfilter[0] = @$filters[4] if ( $column =~ /acquired/ );
-#    $colfilter[1] = @$filters[5] if ( $column =~ /acquired/ );
     $colfilter[0] = @$filters[4]  if ( $column =~ /bookseller/ );
     $colfilter[0] = @$filters[5]  if ( $column =~ /itemtype/ );
-    $colfilter[0] = @$filters[6]  if ( $column =~ /bookfund/ );
+    $colfilter[0] = @$filters[6]  if ( $column =~ /budget/ );
     $colfilter[0] = @$filters[7]  if ( $column =~ /sort1/ );
     $colfilter[0] = @$filters[8]  if ( $column =~ /sort2/ );
 
-    #warn "filtre col ".$colfilter[0]." ".$colfilter[1];
-
-#    warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
-
     # 1st, loop rows.
     my $linefield;
     if ( ( $line =~ /closedate/ ) and ( $podsp == 1 ) ) {
 
         #Display by day
-        $linefield .= "dayname($line)";
+        $linefield .= "concat(hex(weekday($line)+1),'-',dayname($line))";
     }
     elsif ( ( $line =~ /closedate/ ) and ( $podsp == 2 ) ) {
 
         #Display by Month
-        $linefield .= "monthname($line)";
+        $linefield .= "concat(hex(month($line)),'-',monthname($line))";
     }
     elsif ( ( $line =~ /closedate/ ) and ( $podsp == 3 ) ) {
 
@@ -369,12 +346,12 @@ sub calculate {
     elsif ( ( $line =~ /received/ ) and ( $rodsp == 1 ) ) {
 
         #Display by day
-        $linefield .= "dayname($line)";
+        $linefield .= "concat(hex(weekday($line)+1),'-',dayname($line))";
     }
     elsif ( ( $line =~ /received/ ) and ( $rodsp == 2 ) ) {
 
         #Display by Month
-        $linefield .= "monthname($line)";
+        $linefield .= "concat(hex(month($line)),'-',monthname($line))";
     }
     elsif ( ( $line =~ /received/ ) and ( $rodsp == 3 ) ) {
 
@@ -382,35 +359,19 @@ sub calculate {
         $linefield .= "Year($line)";
 
     }
-#    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 1 ) ) {
-#
-#        #Display by day
-#        $linefield .= "dayname($line)";
-#    }
-#    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 2 ) ) {
-#
-#        #Display by Month
-#        $linefield .= "monthname($line)";
-#    }
-#    elsif ( ( $line =~ /acquired/ ) and ( $aodsp == 3 ) ) {
-#
-#        #Display by Year
-#        $linefield .= "Year($line)";
-#
-#    }
     else {
         $linefield .= $line;
     }
 
     my $strsth;
     $strsth .=
-      "SELECT DISTINCTROW $linefield FROM (aqorders, aqbasket,aqorderbreakdown)
+      "SELECT DISTINCTROW $linefield FROM (aqorders, aqbasket )
                 LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
                 LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
-                LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
-                AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) AND $line IS NOT NULL ";
+                LEFT JOIN aqbudgets  ON (aqorders.budget_id = aqbudgets.budget_id )
 
-#				LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
+                LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
+                AND $line IS NOT NULL AND $line <> '' ";
     
 	if (@linefilter) {
         if ( $linefilter[1] ) {
@@ -425,7 +386,6 @@ sub calculate {
             ( $linefilter[0] )
             and (  ( $line =~ /closedate/ )
                 or ( $line =~ /received/ ))
-#                or ( $line =~ /acquired/ ) )
           )
         {
             $strsth .= " AND $line >= ? ";
@@ -436,9 +396,7 @@ sub calculate {
         }
     }
     $strsth .= " GROUP BY $linefield";
-    $strsth .= " ORDER BY $linefield";
-
-    #warn "377:strsth= $strsth";
+    $strsth .= " ORDER BY $line";
 
     my $sth = $dbh->prepare($strsth);
     if ( (@linefilter) and ( $linefilter[1] ) ) {
@@ -458,19 +416,17 @@ sub calculate {
 		}
 		$cell{totalrow} = 0;
 	}
-#    warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
-
     # 2nd, loop cols.
     my $colfield;
     if ( ( $column =~ /closedate/ ) and ( $podsp == 1 ) ) {
 
         #Display by day
-        $colfield .= "dayname($column)";
+        $colfield .= "concat(hex(weekday($column)+1),'-',dayname($column))";
     }
     elsif ( ( $column =~ /closedate/ ) and ( $podsp == 2 ) ) {
 
         #Display by Month
-        $colfield .= "monthname($column)";
+        $colfield .= "concat(hex(month($column)),'-',monthname($column))";
     }
     elsif ( ( $column =~ /closedate/ ) and ( $podsp == 3 ) ) {
 
@@ -478,52 +434,36 @@ sub calculate {
         $colfield .= "Year($column)";
 
     }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 1 ) ) {
+    elsif ( ( $column =~ /received/ ) and ( $rodsp == 1 ) ) {
 
         #Display by day
-        $colfield .= "dayname($column)";
+        $colfield .= "concat(hex(weekday($column)+1),'-',dayname($column))";
     }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 2 ) ) {
+    elsif ( ( $column =~ /received/ ) and ( $rodsp == 2 ) ) {
 
         #Display by Month
-        $colfield .= "monthname($column)";
+        $colfield .= "concat(hex(month($column)),'-',monthname($column))";
     }
-    elsif ( ( $column =~ /deliverydate/ ) and ( $rodsp == 3 ) ) {
+    elsif ( ( $column =~ /received/ ) and ( $rodsp == 3 ) ) {
 
         #Display by Year
         $colfield .= "Year($column)";
 
     }
-#    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 1 ) ) {
-#
-#        #Display by day
-#        $colfield .= "dayname($column)";
-#    }
-#    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 2 ) ) {
-#
-#        #Display by Month
-#        $colfield .= "monthname($column)";
-#    }
-#    elsif ( ( $column =~ /dateaccessioned/ ) and ( $aodsp == 3 ) ) {
-#
-#        #Display by Year
-#        $colfield .= "Year($column)";
-#
-#    }
     else {
         $colfield .= $column;
     }
 
     my $strsth2;
     $strsth2 .=
-      "SELECT distinctrow $colfield FROM (aqorders, aqbasket,aqorderbreakdown)
+      "SELECT distinctrow $colfield FROM (aqorders, aqbasket )
                  LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
                  LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
-                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id)
-                 WHERE (aqorders.basketno=aqbasket.basketno) AND (aqorderbreakdown.ordernumber=aqorders.ordernumber)
-                 AND $column IS NOT NULL";
+                 LEFT JOIN aqbudgets  ON (aqorders.budget_id = aqbudgets.budget_id )
 
-#				LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
+                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id)
+                 WHERE (aqorders.basketno=aqbasket.basketno) AND 
+                 $column IS NOT NULL AND $column <> '' ";
 
     if (@colfilter) {
         if ( $colfilter[1] ) {
@@ -538,7 +478,6 @@ sub calculate {
             ( $colfilter[0] )
             and (  ( $column =~ /closedate/ )
                 or ( $line =~ /received/ ))
-#                or ( $line =~ /acquired/ ) )
           )
         {
             $strsth2 .= " AND $column >= ? ";
@@ -548,12 +487,13 @@ sub calculate {
             $strsth2 .= " AND $column LIKE ? ";
         }
     }
+
+
     $strsth2 .= " GROUP BY $colfield";
     $strsth2 .= " ORDER BY $colfield";
 
-#	warn "MASON:. $strsth2";
-
     my $sth2 = $dbh->prepare($strsth2);
+
     if ( (@colfilter) and ($colfilter[1]) ) {
         $sth2->execute( $colfilter[0], $colfilter[1] );
     }
@@ -567,14 +507,10 @@ sub calculate {
 		my %cell;
 		if ($celvalue) {
 			$cell{coltitle} = $celvalue;
-			#warn "\$cell{coltitle} = $celvalue\n";
 			push @loopcol, \%cell;
 		}
 	}
 
-
-    #       warn "fin des titres colonnes";
-
     my $i = 0;
     my @totalcol;
     my $hilighted = -1;
@@ -582,10 +518,8 @@ sub calculate {
     #Initialization of cell values.....
     my %table;
 
-#	warn "init table...\n";
     foreach my $row (@loopline) {
         foreach my $col (@loopcol) {
-			#warn " init table : $row->{rowtitle} / $col->{coltitle} \n";
             $table{ $row->{rowtitle} }->{ $col->{coltitle} } = 0;
         }
         $table{ $row->{rowtitle} }->{totalrow} = 0;
@@ -597,13 +531,13 @@ sub calculate {
     $strcalc .= "SUM( aqorders.quantity ) " if ( $process == 1 );
     $strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) "
       if ( $process == 2 );
-    $strcalc .= "FROM (aqorders, aqbasket,aqorderbreakdown)
+    $strcalc .= "FROM (aqorders, aqbasket )
                  LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
                  LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
-                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
-                      AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
+                 LEFT JOIN aqbudgets  ON (aqorders.budget_id = aqbudgets.budget_id )
 
-#                 LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
+                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) 
+                 WHERE (aqorders.basketno=aqbasket.basketno) ";
     
 	@$filters[0] =~ s/\*/%/g if ( @$filters[0] );
     $strcalc .= " AND aqbasket.closedate >= '" . @$filters[0] . "'"
@@ -617,12 +551,6 @@ sub calculate {
     @$filters[3] =~ s/\*/%/g if ( @$filters[3] );
     $strcalc .= " AND aqorders.datereceived <= '" . @$filters[3] . "'"
       if ( @$filters[3] );
-#    @$filters[4] =~ s/\*/%/g if ( @$filters[4] );
-#    $strcalc .= " AND aqbasket.closedate >= '" . @$filters[4] . "'"
-#      if ( @$filters[4] );
-#    @$filters[5] =~ s/\*/%/g if ( @$filters[5] );
-#    $strcalc .= " AND aqbasket.closedate <= '" . @$filters[5] . "'"
-#      if ( @$filters[5] );
     @$filters[4] =~ s/\*/%/g if ( @$filters[4] );
     $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[4] . "'"
       if ( @$filters[4] );
@@ -630,7 +558,7 @@ sub calculate {
     $strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[5] . "'"
       if ( @$filters[5] );
     @$filters[6] =~ s/\*/%/g if ( @$filters[6] );
-    $strcalc .= " AND aqorderbreakdown.bookfundid LIKE '" . @$filters[6] . "'"
+    $strcalc .= " AND aqbudgets.budget_code LIKE '" . @$filters[6] . "'"
       if ( @$filters[6] );
     @$filters[7] =~ s/\*/%/g if ( @$filters[7] );
     $strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[7] . "'"
@@ -638,17 +566,17 @@ sub calculate {
     @$filters[8] =~ s/\*/%/g if ( @$filters[8] );
     $strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[8] . "'"
       if ( @$filters[8] );
-    $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield";
 
-#	warn $strcalc . "\n";
+    $strcalc .= " AND aqorders.datecancellationprinted is NULL ";
+
+    $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield";
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
 
-    #       warn "filling table";
     my $emptycol;
     while ( my ( $row, $col, $value ) = $dbcalc->fetchrow ) {
 		next if ($row eq undef || $col eq undef);
-		#warn "filling table $row / $col / $value ";
+
         $emptycol = 1         if ( !defined($col) );
         $col      = "zzEMPTY" if ( !defined($col) );
         $row      = "zzEMPTY" if ( !defined($row) );
@@ -678,7 +606,6 @@ sub calculate {
         $hilighted = -$hilighted;
     }
 
-    #       warn "footer processing";
     foreach my $col (@loopcol) {
         my $total = 0;
         foreach my $row (@looprow) {
@@ -689,11 +616,8 @@ sub calculate {
                 ( $col->{coltitle} eq "NULL" ) ? "zzEMPTY"
                 : $col->{coltitle}
               };
-
-#                       warn "value added ".$table{$row->{rowtitle}}->{$col->{coltitle}}. "for line ".$row->{rowtitle};
         }
 
-        #               warn "summ for column ".$col->{coltitle}."  = ".$total;
         push @loopfooter, { 'totalcol' => $total };
     }