From: Nahuel ANGELINETTI <nahuel.angelinetti@biblibre.com>
Date: Tue, 29 Dec 2009 15:06:35 +0000 (+0100)
Subject: [followup](bug #3667) cleaning borrowers fix
X-Git-Tag: v3.00.06~112
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=595c05628d55b34867c1e7eddd88e74c6aff426c;p=koha.git

[followup](bug #3667) cleaning borrowers fix

This fix GetBorrowersWhoHaveNotBorrowedSince to select only borrowers that have no issues and have no old_issues more recent than a specified date.
---

diff --git a/C4/Members.pm b/C4/Members.pm
index f5a360e803..43305c5cbd 100644
--- a/C4/Members.pm
+++ b/C4/Members.pm
@@ -1756,7 +1756,7 @@ Looks up the different title . Returns array  with all borrowers title
 =cut
 
 sub GetTitles {
-    my @borrowerTitle = split /,|\|/,C4::Context->preference('BorrowersTitles');
+    my @borrowerTitle = split (/,|\|/,C4::Context->preference('BorrowersTitles'));
     unshift( @borrowerTitle, "" );
     my $count=@borrowerTitle;
     if ($count == 1){
@@ -1870,10 +1870,13 @@ sub GetBorrowersWhoHaveNotBorrowedSince {
                          : "");  
     my $dbh   = C4::Context->dbh;
     my $query = "
-        SELECT borrowers.borrowernumber,max(issues.timestamp) as latestissue
+        SELECT borrowers.borrowernumber,
+               max(old_issues.timestamp) as latestissue,
+               max(issues.timestamp) as currentissue
         FROM   borrowers
         JOIN   categories USING (categorycode)
-        LEFT JOIN issues ON borrowers.borrowernumber = issues.borrowernumber
+        LEFT JOIN old_issues USING (borrowernumber)
+        LEFT JOIN issues USING (borrowernumber) 
         WHERE  category_type <> 'S'
    ";
     my @query_params;
@@ -1886,7 +1889,8 @@ sub GetBorrowersWhoHaveNotBorrowedSince {
     }
     $query.=" GROUP BY borrowers.borrowernumber";
     if ($filterdate){ 
-        $query.=" HAVING latestissue <? OR latestissue IS NULL";
+        $query.=" HAVING (latestissue < ? OR latestissue IS NULL) 
+                  AND currentissue IS NULL";
         push @query_params,$filterdate;
     }
     warn $query if $debug;