Getting Iteminfo in Search to only display correct reserves (mainly used on

detail.pl) and another typo fix in moremember.pl

C4/Reserves2.pm

@@ -91,14 +91,21 @@ sub FindReserves {
 }
 
 sub Findgroupreserve {
-  my ($bibitem)=@_;
+  my ($bibitem,$biblio)=@_;
   my $dbh=C4Connect;
   $bibitem=$dbh->quote($bibitem);
-  my $query="Select * from reserves,reserveconstraints where
-  reserves.biblionumber=reservesconstraints.biblionumber and
-  and reserveconstraints.biblioitemnumber=$bibitem
+  my $query="Select * from reserves 
+  left join reserveconstraints on
+  reserves.biblionumber=reserveconstraints.biblionumber
+  where
+  reserves.biblionumber=$biblio and
+  ((reserveconstraints.biblioitemnumber=$bibitem 
+  and reserves.borrowernumber=reserveconstraints.borrowernumber
+  and reserves.reservedate=reserveconstraints.reservedate)
+  or reserves.constrainttype='a')
   and reserves.cancellationdate is NULL
   and (reserves.found <> 'F' or reserves.found is NULL)";
+#  print $query;
   my $sth=$dbh->prepare($query);
   $sth->execute;
   my $i=0;

C4/Search.pm

@@ -907,7 +907,8 @@ sub ItemInfo {
       $datedue="Cancelled";
     }
     if ($datedue eq ''){
-       my ($rescount,$reserves)=FindReserves($biblionumber,'');   
+       my ($rescount,$reserves)=Findgroupreserve($data->{'biblioitemnumber'},$biblionumber);
+
        if ($rescount >0){                                
           $datedue='Request';
        }

moremember.pl

@@ -226,7 +226,7 @@ for (my $i=0;$i<$count;$i++){
 #    print "<td> &nbsp; </td>";
 #  }
   #check item is not reserved
-  my ($rescount,$reserves)=Findgroupreserve($issue->[$i]{'biblioitemnumber'},'');
+  my ($rescount,$reserves)=Findgroupreserve($issue->[$i]{'biblioitemnumber'},$issue->[$i]{'biblionumber'});
   if ($rescount >0){
     print "<TD><a href=/cgi-bin/koha/request.pl?bib=$issue->[$i]{'biblionumber'}>On Request - no renewals</a></td></tr>";
 #  } elsif ($issue->[$i]->{'renewals'} > 0) {