From 880c1335f68678310a2abbcb886adf6a1fdb74f0 Mon Sep 17 00:00:00 2001
From: Chris Nighswonger <chris.nighswonger@liblime.com>
Date: Thu, 24 Jul 2008 10:29:45 -0500
Subject: [PATCH] kohabug 2224 Corrects display descrepancies when applying
 filters

This patch corrects display descrepancies when filters are applied to the
acquisitions report. It also corrects a number of other issues with this
report.

Some documentation changes may be in order based on report filters that
were only partially implimented, but are now available.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../modules/reports/acquisitions_stats.tmpl   |  24 +-
 reports/acquisitions_stats.pl                 | 295 +++++++++---------
 2 files changed, 156 insertions(+), 163 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
index e77201e53e..3cbcb26008 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/acquisitions_stats.tmpl
@@ -19,9 +19,9 @@
 	<!-- TMPL_LOOP NAME="mainloop" -->
 		<h1>Acquisitions statistics </h1>
      		<!-- TMPL_IF NAME="loopfilter" -->
-			<p>Filtered on</p>
+			<p><b>Filtered on:</b></p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
-					<p><!-- TMPL_VAR NAME="crit"--> =<!--  TMPL_VAR NAME="filter" --></p>
+					<p><!-- TMPL_VAR NAME="crit"-->: <!--  TMPL_VAR NAME="filter" --></p>
 			<!-- /TMPL_LOOP -->
 		<!-- /TMPL_IF-->
 		
@@ -77,8 +77,8 @@
 			<tr class="hilighted">
 				<td>Placed On</td>
 				<td><input type="radio" name="Line" value="aqbasket.closedate" /></td>
-				<td><input type="radio" name="Column" value="aqbasket.closedate" /> </td>
-				<td> From <input type="text" readonly="readonly" size="10" id="from" name="Filter" />
+				<td><input type="radio" checked="checked" name="Column" value="aqbasket.closedate" /> </td>
+				<td> From <input type="text" size="10" id="from" name="Filter" value="" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFrom" style="cursor: pointer;" />
 									<script type="text/javascript">
 									//<![CDATA[
@@ -109,7 +109,7 @@
 									);
 									//]]>
 								</script>
-					To <input readonly="readonly" size="10" id="to" name="Filter" value="" type="text" />
+					To <input size="10" id="to" name="Filter" type="text" value="" />
 						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarTo" style="cursor: pointer;" border="0" />
 							<script type="text/javascript">
 							//<![CDATA[
@@ -158,7 +158,7 @@
 				<td>Received On</td>
 				<td><input type="radio" name="Line" value="aqorderdelivery.deliverydate" /></td>
 				<td><input type="radio" name="Column" value="aqorderdelivery.deliverydate" /></td>
-				<td> From <input type="text" readonly="readonly" size="10" id="fromRO" name="Filter" />
+				<td> From <input type="text" size="10" id="fromRO" name="Filter" value="" />
 							<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" border="0" id="openCalendarFromRO" style="cursor: pointer;" />
 									<script type="text/javascript">
 									//<![CDATA[
@@ -189,7 +189,7 @@
 									);
 									//]]>
 									</script>
-					To <input type="text" readonly="readonly" size="10" id="toRO" name="Filter" value="" />
+					To <input type="text" size="10" id="toRO" name="Filter" value="" />
 						<img src="<!-- TMPL_VAR Name="themelang" -->/lib/calendar/cal.gif" alt="Show Calendar" id="openCalendarToRO" style="cursor: pointer;" border="0" />
 								<script type="text/javascript">
 								//<![CDATA[
@@ -236,10 +236,16 @@
 			</tr>
 			<tr class="hilighted">
 				<td>Supplier</td>
-				<td><input type="radio" name="Line" value="aqbooksellers.name" /></td>
+				<td><input type="radio" checked="checked" name="Line" value="aqbooksellers.name" /></td>
 				<td><input type="radio" name="Column" value="aqbooksellers.name" /></td>
 				<td><!-- TMPL_VAR NAME="CGIBookSeller" --></td>
 			</tr>
+			<tr>
+				<td>Item Type</td>
+				<td><input type="radio" name="Line" value="biblioitems.itemtype" /></td>
+				<td><input type="radio" name="Column" value="biblioitems.itemtype" /></td>
+				<td><!-- TMPL_VAR NAME="CGIItemType" --></td>
+			</tr>
 			<tr>
 				<td>Budget</td>
 				<td><input type="radio" name="Line" value="aqorderbreakdown.bookfundid" /></td>
@@ -291,4 +297,4 @@
 <!-- TMPL_INCLUDE NAME="reports-menu.inc" -->
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index ae09354913..0ccbfad417 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -46,10 +46,10 @@ my $fullreportname = "reports/acquisitions_stats.tmpl";
 my $line           = $input->param("Line");
 my $column         = $input->param("Column");
 my @filters        = $input->param("Filter");
-$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]);
+$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);
 my $podsp          = $input->param("PlacedOnDisplay");
 my $rodsp          = $input->param("ReceivedOnDisplay");
 my $aodsp          = $input->param("AcquiredOnDisplay");    ##added by mason.
@@ -115,40 +115,33 @@ if ($do_it) {
 }
 else {
     my $dbh = C4::Context->dbh;
-    my @values;
-    my %labels;
+    my @select;
     my %select;
     my $req;
     $req = $dbh->prepare("SELECT distinctrow id,name FROM aqbooksellers ORDER BY name");
     $req->execute;
     my @select;
     push @select, "";
-
-    #       $select{""}="";
+	$select{''} = "All Suppliers";
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $desc;
-
-        #               $select{$value}=$desc;
+        $select{$value}=$desc;
     }
     my $CGIBookSellers = CGI::scrolling_list(
         -name   => 'Filter',
         -id     => 'supplier',
         -values => \@select,
-
-        #                               -labels   => \%select,
+        -labels   => \%select,
         -size     => 1,
         -multiple => 0
     );
 
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description"
-      );
+    $req = $dbh->prepare("SELECT DISTINCTROW itemtype,description FROM itemtypes ORDER BY description");
     $req->execute;
     undef @select;
     undef %select;
     push @select, "";
-    $select{""} = "";
+    $select{''} = "All Item Types";
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $value;
         $select{$value} = $desc;
@@ -162,15 +155,12 @@ else {
         -multiple => 0
     );
 
-    $req =
-      $dbh->prepare(
-"SELECT DISTINCTROW bookfundid,bookfundname FROM aqbookfund ORDER BY bookfundname"
-      );
+    $req = $dbh->prepare("SELECT DISTINCTROW bookfundid,bookfundname FROM aqbookfund ORDER BY bookfundname");
     $req->execute;
     undef @select;
     undef %select;
     push @select, "";
-    $select{""} = "";
+    $select{''} = "All Funds";
 
     while ( my ( $value, $desc ) = $req->fetchrow ) {
         push @select, $value;
@@ -191,16 +181,22 @@ else {
       );
     $req->execute;
     undef @select;
+    undef %select;
     push @select, "";
+    $select{''} = "All";
     my $hassort1;
     while ( my ($value) = $req->fetchrow ) {
-        $hassort1 = 1 if ($value);
-        push @select, $value;
+		if ($value) {
+			$hassort1 = 1;
+			push @select, $value;
+			$select{$value} = $value;
+		}
     }
     my $CGISort1 = CGI::scrolling_list(
         -name     => 'Filter',
         -id       => 'sort1',
         -values   => \@select,
+        -labels   => \%select,
         -size     => 1,
         -multiple => 0
     );
@@ -211,19 +207,25 @@ else {
       );
     $req->execute;
     undef @select;
+    undef %select;
     push @select, "";
+    $select{''} = "All";
     my $hassort2;
     my $hglghtsort2;
 
     while ( my ($value) = $req->fetchrow ) {
-        $hassort2 = 1 if ($value);
-        $hglghtsort2 = !($hassort1);
-        push @select, $value;
+		if ($value) {
+			$hassort2 = 1;
+			$hglghtsort2 = !($hassort1);
+			push @select, $value;
+			$select{$value} = $value;
+		}
     }
     my $CGISort2 = CGI::scrolling_list(
         -name     => 'Filter',
         -id       => 'sort2',
         -values   => \@select,
+        -labels   => \%select,
         -size     => 1,
         -multiple => 0
     );
@@ -260,7 +262,8 @@ else {
         CGISort1      => $CGISort1,
         CGISort2      => $CGISort2,
         CGIextChoice  => $CGIextChoice,
-        CGIsepChoice  => $CGIsepChoice
+        CGIsepChoice  => $CGIsepChoice,
+		date_today => C4::Dates->new()->output()
     );
 
 }
@@ -300,14 +303,14 @@ sub calculate {
             $cell{crit}   .= "Received On From" if ( $i == 2 );
             $cell{crit}   .= "Received On To" if ( $i == 3 );
 
-            $cell{crit} .= "Acquired On From" if ( $i == 4 );
-            $cell{crit} .= "Acquired On To"   if ( $i == 5 );
+#            $cell{crit} .= "Acquired On From" if ( $i == 4 );
+#            $cell{crit} .= "Acquired On To"   if ( $i == 5 );
 
-            $cell{crit} .= "BookSeller" if ( $i == 6 );
-            $cell{crit} .= "Doc Type"   if ( $i == 7 );
-            $cell{crit} .= "Budget"     if ( $i == 8 );
-            $cell{crit} .= "Sort1"      if ( $i == 9 );
-            $cell{crit} .= "Sort2"      if ( $i == 10 );
+            $cell{crit} .= "BookSeller" if ( $i == 4 );
+            $cell{crit} .= "Doc Type"   if ( $i == 5 );
+            $cell{crit} .= "Budget"     if ( $i == 6 );
+            $cell{crit} .= "Sort1"      if ( $i == 7 );
+            $cell{crit} .= "Sort2"      if ( $i == 8 );
             push @loopfilter, \%cell;
         }
     }
@@ -324,14 +327,14 @@ sub calculate {
     $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 =~ /acquired/ );
+#    $linefilter[1] = @$filters[5] if ( $line =~ /acquired/ );
 
-    $linefilter[0] = @$filters[6]  if ( $line =~ /bookseller/ );
-    $linefilter[0] = @$filters[7]  if ( $line =~ /itemtype/ );
-    $linefilter[0] = @$filters[8]  if ( $line =~ /bookfund/ );
-    $linefilter[0] = @$filters[9]  if ( $line =~ /sort1/ );
-    $linefilter[0] = @$filters[10] if ( $line =~ /sort2/ );
+    $linefilter[0] = @$filters[4]  if ( $line =~ /bookseller/ );
+    $linefilter[0] = @$filters[5]  if ( $line =~ /itemtype/ );
+    $linefilter[0] = @$filters[6]  if ( $line =~ /bookfund/ );
+    $linefilter[0] = @$filters[7]  if ( $line =~ /sort1/ );
+    $linefilter[0] = @$filters[8] if ( $line =~ /sort2/ );
 
     #warn "filtre lignes".$linefilter[0]." ".$linefilter[1];
     #
@@ -341,18 +344,17 @@ sub calculate {
     $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[6]  if ( $column =~ /bookseller/ );
-    $colfilter[0] = @$filters[7]  if ( $column =~ /itemtype/ );
-    $colfilter[0] = @$filters[8]  if ( $column =~ /bookfund/ );
-    $colfilter[0] = @$filters[9]  if ( $column =~ /sort1/ );
-    $colfilter[0] = @$filters[10] if ( $column =~ /sort2/ );
+#    $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[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";
+#    warn "line=$line, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
 
     # 1st, loop rows.
     my $linefield;
@@ -388,22 +390,22 @@ 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)";
-
-    }
+#    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;
     }
@@ -411,8 +413,8 @@ sub calculate {
     my $strsth;
     $strsth .=
       "SELECT DISTINCTROW $linefield FROM (aqorders, aqbasket,aqorderbreakdown)
-                LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
+                LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
+                LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
                 LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
                 LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
                 AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) AND $line IS NOT NULL ";
@@ -423,17 +425,17 @@ sub calculate {
                 $strsth .= " AND $line BETWEEN ? AND ? ";
             }
             else {
-                $strsth .= " AND $line < ? ";
+                $strsth .= " AND $line <= ? ";
             }
         }
         elsif (
             ( $linefilter[0] )
             and (  ( $line =~ /closedate/ )
-                or ( $line =~ /received/ )
-                or ( $line =~ /acquired/ ) )
+                or ( $line =~ /received/ ))
+#                or ( $line =~ /acquired/ ) )
           )
         {
-            $strsth .= " AND $line > ? ";
+            $strsth .= " AND $line >= ? ";
         }
         elsif ( $linefilter[0] ) {
             $linefilter[0] =~ s/\*/%/g;
@@ -447,7 +449,7 @@ sub calculate {
 
     my $sth = $dbh->prepare($strsth);
     if ( (@linefilter) and ( $linefilter[1] ) ) {
-        $sth->execute( "'" . $linefilter[0] . "'", "'" . $linefilter[1] . "'" );
+        $sth->execute( $linefilter[0], $linefilter[1] );
     }
     elsif ( $linefilter[0] ) {
         $sth->execute( $linefilter[0] );
@@ -455,20 +457,15 @@ sub calculate {
     else {
         $sth->execute;
     }
-
-    while ( my ($celvalue) = $sth->fetchrow ) {
-        my %cell;
-        if ($celvalue) {
-            $cell{rowtitle} = $celvalue;
-
-            #               } else {
-            #                       $cell{rowtitle} = "";
-        }
-        $cell{totalrow} = 0;
-        push @loopline, \%cell;
-    }
-
-    #warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
+	while ( my ($celvalue) = $sth->fetchrow ) {
+		my %cell;
+		if ($celvalue) {
+			$cell{rowtitle} = $celvalue;
+			push @loopline, \%cell;
+		}
+		$cell{totalrow} = 0;
+	}
+#    warn "column=$column, podsp=$podsp, rodsp=$rodsp, aodsp=$aodsp\n";
 
     # 2nd, loop cols.
     my $colfield;
@@ -504,22 +501,22 @@ sub calculate {
         $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)";
-
-    }
+#    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;
     }
@@ -527,8 +524,8 @@ sub calculate {
     my $strsth2;
     $strsth2 .=
       "SELECT distinctrow $colfield FROM (aqorders, aqbasket,aqorderbreakdown)
-                 LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                 LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
+                 LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
+                 LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
                  LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
                  LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id)
                  WHERE (aqorders.basketno=aqbasket.basketno) AND (aqorderbreakdown.ordernumber=aqorders.ordernumber)
@@ -540,17 +537,17 @@ sub calculate {
                 $strsth2 .= " AND $column BETWEEN  ? AND ? ";
             }
             else {
-                $strsth2 .= " AND $column < ? ";
+                $strsth2 .= " AND $column <= ? ";
             }
         }
         elsif (
             ( $colfilter[0] )
             and (  ( $column =~ /closedate/ )
-                or ( $line =~ /received/ )
-                or ( $line =~ /acquired/ ) )
+                or ( $line =~ /received/ ))
+#                or ( $line =~ /acquired/ ) )
           )
         {
-            $strsth2 .= " AND $column > ? ";
+            $strsth2 .= " AND $column >= ? ";
         }
         elsif ( $colfilter[0] ) {
             $colfilter[0] =~ s/\*/%/g;
@@ -560,13 +557,11 @@ sub calculate {
     $strsth2 .= " GROUP BY $colfield";
     $strsth2 .= " ORDER BY $colfield";
 
-    #        warn "MASON:. $strsth2";
+#	warn "MASON:. $strsth2";
 
     my $sth2 = $dbh->prepare($strsth2);
-    if ( (@colfilter) and ( $colfilter[1] ) ) {
-
-        #                warn "from : ".$colfilter[0]." To  :".$colfilter[1];
-        $sth2->execute( "'" . $colfilter[0] . "'", "'" . $colfilter[1] . "'" );
+    if ( (@colfilter) and ($colfilter[1]) ) {
+        $sth2->execute( $colfilter[0], $colfilter[1] );
     }
     elsif ( $colfilter[0] ) {
         $sth2->execute( $colfilter[0] );
@@ -574,16 +569,15 @@ sub calculate {
     else {
         $sth2->execute;
     }
+	while ( my $celvalue = $sth2->fetchrow ) {
+		my %cell;
+		if ($celvalue) {
+			$cell{coltitle} = $celvalue;
+			#warn "\$cell{coltitle} = $celvalue\n";
+			push @loopcol, \%cell;
+		}
+	}
 
-    while ( my ($celvalue) = $sth2->fetchrow ) {
-        my %cell;
-        if ($celvalue) {
-
-            #               warn "coltitle :".$celvalue;
-            $cell{coltitle} = $celvalue;
-        }
-        push @loopcol, \%cell;
-    }
 
     #       warn "fin des titres colonnes";
 
@@ -594,11 +588,10 @@ sub calculate {
     #Initialization of cell values.....
     my %table;
 
-    #       warn "init table";
+#	warn "init table...\n";
     foreach my $row (@loopline) {
         foreach my $col (@loopcol) {
-
-#                       warn " init table : $row->{rowtitle} / $col->{coltitle} ";
+			#warn " init table : $row->{rowtitle} / $col->{coltitle} \n";
             $table{ $row->{rowtitle} }->{ $col->{coltitle} } = 0;
         }
         $table{ $row->{rowtitle} }->{totalrow} = 0;
@@ -611,56 +604,55 @@ sub calculate {
     $strcalc .= "SUM( aqorders.quantity * aqorders.listprice ) "
       if ( $process == 2 );
     $strcalc .= "FROM (aqorders, aqbasket,aqorderbreakdown)
-                 LEFT JOIN items ON (aqorders.biblioitemnumber= items.biblioitemnumber)
-                 LEFT JOIN biblioitems ON (aqorders.biblioitemnumber= biblioitems.biblioitemnumber)
+                 LEFT JOIN items ON (aqorders.biblionumber= items.biblionumber)
+                 LEFT JOIN biblioitems ON (aqorders.biblionumber= biblioitems.biblionumber)
                  LEFT JOIN aqorderdelivery ON (aqorders.ordernumber =aqorderdelivery.ordernumber )
                  LEFT JOIN aqbooksellers ON (aqbasket.booksellerid=aqbooksellers.id) WHERE (aqorders.basketno=aqbasket.basketno)
                       AND (aqorderbreakdown.ordernumber=aqorders.ordernumber) ";
 
     @$filters[0] =~ s/\*/%/g if ( @$filters[0] );
-    $strcalc .= " AND aqbasket.closedate > '" . @$filters[0] . "'"
+    $strcalc .= " AND aqbasket.closedate >= '" . @$filters[0] . "'"
       if ( @$filters[0] );
     @$filters[1] =~ s/\*/%/g if ( @$filters[1] );
-    $strcalc .= " AND aqbasket.closedate < '" . @$filters[1] . "'"
+    $strcalc .= " AND aqbasket.closedate <= '" . @$filters[1] . "'"
       if ( @$filters[1] );
     @$filters[2] =~ s/\*/%/g if ( @$filters[2] );
-    $strcalc .= " AND aqorderdelivery.deliverydate > '" . @$filters[2] . "'"
+    $strcalc .= " AND aqorderdelivery.deliverydate >= '" . @$filters[2] . "'"
       if ( @$filters[2] );
     @$filters[3] =~ s/\*/%/g if ( @$filters[3] );
-    $strcalc .= " AND aqorderdelivery.deliverydate < '" . @$filters[3] . "'"
+    $strcalc .= " AND aqorderdelivery.deliverydate <= '" . @$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 aqbasket.closedate > '" . @$filters[4] . "'"
+    $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[4] . "'"
       if ( @$filters[4] );
     @$filters[5] =~ s/\*/%/g if ( @$filters[5] );
-    $strcalc .= " AND aqbasket.closedate < '" . @$filters[5] . "'"
+    $strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[5] . "'"
       if ( @$filters[5] );
     @$filters[6] =~ s/\*/%/g if ( @$filters[6] );
-    $strcalc .= " AND aqbooksellers.name LIKE '" . @$filters[6] . "'"
+    $strcalc .= " AND aqorderbreakdown.bookfundid LIKE '" . @$filters[6] . "'"
       if ( @$filters[6] );
     @$filters[7] =~ s/\*/%/g if ( @$filters[7] );
-    $strcalc .= " AND biblioitems.itemtype LIKE '" . @$filters[7] . "'"
+    $strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[7] . "'"
       if ( @$filters[7] );
     @$filters[8] =~ s/\*/%/g if ( @$filters[8] );
-    $strcalc .= " AND aqbookfund.bookfundid LIKE '" . @$filters[8] . "'"
+    $strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[8] . "'"
       if ( @$filters[8] );
-    @$filters[9] =~ s/\*/%/g if ( @$filters[9] );
-    $strcalc .= " AND aqorders.sort1 LIKE '" . @$filters[9] . "'"
-      if ( @$filters[9] );
-    @$filters[10] =~ s/\*/%/g if ( @$filters[10] );
-    $strcalc .= " AND aqorders.sort2 LIKE '" . @$filters[10] . "'"
-      if ( @$filters[10] );
     $strcalc .= " GROUP BY $linefield, $colfield ORDER BY $linefield,$colfield";
 
-    #        warn "/n/n". $strcalc;
+#	warn $strcalc . "\n";
     my $dbcalc = $dbh->prepare($strcalc);
     $dbcalc->execute;
 
     #       warn "filling table";
     my $emptycol;
     while ( my ( $row, $col, $value ) = $dbcalc->fetchrow ) {
-
-        #              warn "filling table $row / $col / $value ";
+		#warn "filling table $row / $col / $value ";
         $emptycol = 1         if ( $col eq undef );
         $col      = "zzEMPTY" if ( $col eq undef );
         $row      = "zzEMPTY" if ( $row eq undef );
@@ -674,15 +666,10 @@ sub calculate {
 
     foreach my $row ( sort keys %table ) {
         my @loopcell;
-
         #@loopcol ensures the order for columns is common with column titles
         # and the number matches the number of columns
         foreach my $col (@loopcol) {
-            my $value = $table{$row}->{
-                ( $col->{coltitle} eq "NULL" )
-                ? "zzEMPTY"
-                : $col->{coltitle}
-              };
+            my $value = $table{$row}->{ ( $col->{coltitle} eq "NULL" ) ? "zzEMPTY" : $col->{coltitle} };
             push @loopcell, { value => $value };
         }
         push @looprow,
@@ -715,7 +702,7 @@ sub calculate {
     }
 
     # the header of the table
-    #        $globalline{loopfilter}=\@loopfilter;
+	$globalline{loopfilter}=\@loopfilter;
     # the core of the table
     $globalline{looprow} = \@looprow;
     $globalline{loopcol} = \@loopcol;
-- 
2.39.5