From f6a3f83ca2cb3564dc592f1008cd5f6a098d04cc Mon Sep 17 00:00:00 2001
From: Chris Nighswonger <chris.nighswonger@liblime.com>
Date: Fri, 25 Jul 2008 10:37:51 -0500
Subject: [PATCH] kohabug 2224 Third installment: Further corrections for NULL
 fields

This patch adds code to clean out any NULL fields in rows returned
since NULL fields do not truly meet the filter criteria

It also corrects a bad db field reference.

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Joshua Ferraro <jmf@liblime.com>
---
 .../prog/en/modules/reports/acquisitions_stats.tmpl          | 4 ++--
 reports/acquisitions_stats.pl                                | 5 +++--
 2 files changed, 5 insertions(+), 4 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 263188283c..50eb946b60 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
@@ -156,8 +156,8 @@
 			</tr>
 			<tr>
 				<td>Received On</td>
-				<td><input type="radio" name="Line" value="aqorderbreakdown.datereceived" /></td>
-				<td><input type="radio" name="Column" value="aqorderbreakdown.datereceived" /></td>
+				<td><input type="radio" name="Line" value="aqorders.datereceived" /></td>
+				<td><input type="radio" name="Column" value="aqorders.datereceived" /></td>
 				<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">
diff --git a/reports/acquisitions_stats.pl b/reports/acquisitions_stats.pl
index ce0f37d857..c5c4036c99 100755
--- a/reports/acquisitions_stats.pl
+++ b/reports/acquisitions_stats.pl
@@ -620,10 +620,10 @@ sub calculate {
     $strcalc .= " AND aqbasket.closedate <= '" . @$filters[1] . "'"
       if ( @$filters[1] );
     @$filters[2] =~ s/\*/%/g if ( @$filters[2] );
-    $strcalc .= " AND aqorderbreakdown.datereceived >= '" . @$filters[2] . "'"
+    $strcalc .= " AND aqorders.datereceived >= '" . @$filters[2] . "'"
       if ( @$filters[2] );
     @$filters[3] =~ s/\*/%/g if ( @$filters[3] );
-    $strcalc .= " AND aqorderbreakdown.datereceived <= '" . @$filters[3] . "'"
+    $strcalc .= " AND aqorders.datereceived <= '" . @$filters[3] . "'"
       if ( @$filters[3] );
 #    @$filters[4] =~ s/\*/%/g if ( @$filters[4] );
 #    $strcalc .= " AND aqbasket.closedate >= '" . @$filters[4] . "'"
@@ -655,6 +655,7 @@ sub calculate {
     #       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 ( $col eq undef );
         $col      = "zzEMPTY" if ( $col eq undef );
-- 
2.39.5