From 970adb16e4e25e51dab85fe8b7647640b67d94d9 Mon Sep 17 00:00:00 2001
From: Garry Collum <gcollum@gmail.com>
Date: Sat, 15 Aug 2009 09:50:24 -0400
Subject: [PATCH] Bug 3420: Fixes 'Patrons with no checkouts' report.

Fixed typo in SQL statement.  Commented out some unused SQL statements.

Removed limit for itemtype (column not available in results) and added limit for branchcode.

Signed-off-by: Galen Charlton <gmcharlt@gmail.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>
---
 .../prog/en/modules/reports/borrowers_out.tmpl         |  4 ++--
 reports/borrowers_out.pl                               | 10 +++++-----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
index ce7c4a978e..452510310d 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/borrowers_out.tmpl
@@ -88,8 +88,8 @@
                     </select></li>
 			<li><label for="criteria">By: </label><select name="Criteria" id="criteria">
                         <option value ="" selected="selected">None</option>
-                        <option value ="categorycode">Categorycode</option>
-                        <option value ="itemtype">Itemtype</option>
+                        <option value ="categorycode">Patron Category</option>
+                        <option value ="branchcode">Library</option>
                     </select></li>
 		</ol>
 	</fieldset>
diff --git a/reports/borrowers_out.pl b/reports/borrowers_out.pl
index 361102169b..2bd831be22 100755
--- a/reports/borrowers_out.pl
+++ b/reports/borrowers_out.pl
@@ -172,7 +172,7 @@ sub calculate {
     my $colfield;
     my $colorder;
     if ($column){
-        $column = "borrowers.".$column if $column=~/categorycode/;
+        $column = "borrowers.".$column if $column=~/categorycode/ || $column=~/branchcode/;
         my @colfilter ;
         $colfilter[0] = @$filters[0] if ($column =~ /category/ )  ;
     # 	$colfilter[0] = @$filters[11] if ($column =~ /sort2/ ) ;
@@ -183,7 +183,7 @@ sub calculate {
         $colorder .= $column;
         
         my $strsth2;
-        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `old_issues` ON issues.borrowernumber=borrowers.borrowernumber";
+        $strsth2 .= "select distinctrow $colfield FROM borrowers LEFT JOIN `old_issues` ON old_issues.borrowernumber=borrowers.borrowernumber";
         if ($colfilter[0]) {
             $colfilter[0] =~ s/\*/%/g;
             $strsth2 .= " and $column LIKE '$colfilter[0]' " ;
@@ -233,7 +233,7 @@ sub calculate {
     $strcalc .= " AND borrowers.categorycode like '" . @$filters[0] ."'" if ( @$filters[0] );
     if (@$filters[1]){
         my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> @$filters[1] ";
-        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> ".format_date_in_iso(@$filters[1]));
+#        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues where old_issues.timestamp> ".format_date_in_iso(@$filters[1]));
         $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
         
 # 		$queryfilter->execute(@$filters[1]);
@@ -242,8 +242,8 @@ sub calculate {
 # 		}
     } else {
         my $strqueryfilter="SELECT DISTINCT borrowernumber FROM old_issues ";
-        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues ");
-        $queryfilter->execute;
+#        my $queryfilter = $dbh->prepare("SELECT DISTINCT borrowernumber FROM old_issues ");
+#        $queryfilter->execute;
         $strcalc .= " AND borrowers.borrowernumber not in ($strqueryfilter)";
 # 		while (my ($borrowernumber)=$queryfilter->fetchrow){
 # 			$strcalc .= " AND borrowers.borrowernumber <> $borrowernumber ";
-- 
2.39.5