fixes

C4/Reserves2.pm

@@ -57,9 +57,15 @@ sub FindReserves {
   my $query="Select *,reserves.branchcode
   from reserves,borrowers,biblio ";
   if ($bib ne ''){
-    $query=$query." where reserves.biblionumber=$bib and
+    if ($bor ne ''){
-    reserves.borrowernumber=borrowers.borrowernumber and
+       $query=$query." where reserves.biblionumber=$bib and
-biblio.biblionumber=$bib and cancellationdate is NULL";
+       reserves.borrowernumber=borrowers.borrowernumber and
+       biblio.biblionumber=$bib and cancellationdate is NULL";
+    } else {
+       $query=$query." where reserves.borrowernumber=borrowers.borrowernumber
+       and biblio.biblionumber=$bib and reserves.biblionumber=$bib
+       and cancellationdate is NULL";
+    }
   } else {
     $query=$query." where borrowers.borrowernumber=$bor and
     reserves.borrowernumber=borrowers.borrowernumber and reserves.biblionumber

modbib.pl

@@ -12,8 +12,8 @@ use C4::Output;
 
 my $input = new CGI;
 print $input->header;
-my $title=$input->param('title');
+my $bibitemnum=$input->param('bibitem');
-my $data=bibdata($title);
+my $data=bibitemdata($bibitemnum);
 
 
 print startpage();
@@ -22,18 +22,25 @@ my %inputs;
 
 #hash is set up with input name being the key then
 #the value is a tab separated list, the first item being the input type
-
-$inputs{'title'}="text\t$data->{'title'}";
-$inputs{'unititle'}="text\t$data->{'unititle'}";
-$inputs{'notes'}="textarea\t$data->{'notes'}";
-#$inputs{'dateaccessioned'}="text\t$data->{'dateaccessioned'}";
-#$inputs{'dewey'}="text\t$data->{'dewey'}";
-#$inputs{'classification'}="text\t$data->{'classification'}";
-#$inputs{'subclass'}="text\t$data->{'subclass'}";
-#$inputs{'itemtype'}="text\t$data->{'itemtype'}";
-
 $inputs{'Author'}="text\t$data->{'author'}";
+$inputs{'Title'}="text\t$data->{'title'}";
+$inputs{'Unititle'}="text\t$data->{'unititle'}";
+$inputs{'Notes'}="textarea\t$data->{'notes'}";
+$inputs{'Serial'}="text\t$data->{'serial'}";
 $inputs{'Series Title'}="text\t$data->{'seriestitle'}";
+$inputs{'Copyright'}="text\t$data->{'copyrightdate'}";
+#$inputs{'Volume'}="text\t$data->{'volume'}";
+#$inputs{'Number'}="text\t$data->{'number'}";
+$inputs{'Classification'}="text\t$data->{'classification'}";
+$inputs{'Item Type'}="text\t$data->{'itemtype'}";
+$inputs{'ISBN'}="text\t$data->{'isbn'}";
+$inputs{'Dewey'}="text\t$data->{'dewey'}";
+$inputs{'Sub Class'}="text\t$data->{'subclass'}";
+$inputs{'Publication Year'}="text\t$data->{'publicationyear'}";
+$inputs{'Volume'}="text\t$data->{'volumedesc'}";
+$inputs{'Illustrations'}="text\t$data->{'illustration'}";
+$inputs{'Pages'}="text\t$data->{'pages'}";
+
 print mkform('wah',%inputs);
 #print mktablehdr();
 #print mktableft();

moredetail.pl

@@ -44,7 +44,8 @@ print <<printend
 <a href=/cgi-bin/koha/request.pl?bib=$bib><img src=/images/requests.gif width=120 height=42 border=0 align=right border=0></a>
 <FONT SIZE=6><em>$data->{'title'} ($data->{'author'})</em></FONT><P>
 <p>
-<form >
+<form action=/cgi-bin/koha/modbib.pl>
+<input type=hidden name=bibitem value=$bi>
 <!-------------------BIBLIO ITEM------------>
 <TABLE  CELLSPACING=0  CELLPADDING=5 border=1 align=left>
 <TR VALIGN=TOP>

moremember.pl

@@ -57,7 +57,7 @@ Alternative Contact:$data->{'contactname'}<BR>
 Phone: $data->{'altphone'}<BR>
 Relationship: $data->{'altrelationship'}<BR>
 Notes: $data->{'altnotes'}<P>
-Guarantees: <A HREF="sam.html">Guarantor goes here</a><P>
+Guarantees: <A HREF=""></a><P>
 
 General Notes: <A HREF="popbox.html" onclick="messenger(200,250,'Form that lets you add to and delete notes.'); return false">
 $data->{'borrowernotes'}</a>
@@ -157,10 +157,15 @@ for (my $i=0;$i<$count;$i++){
   } else {
     print "<td> &nbsp; </td>";
   }
-  print "<TD><input type=radio name=\"renew_item_$issue->[$i]{'itemnumber'}\" value=y>Y
+  #check item is not reserved
-  <input type=radio name=\"renew_item_$issue->[$i]{'itemnumber'}\" value=n>N</td>
+  my ($rescount,$reserves)=FindReserves($issue->[$i]{'biblionumber'},'');
-  </tr>
+  if ($rescount >0){
-";
+  } else{
+    print "<TD><input type=radio name=\"renew_item_$issue->[$i]{'itemnumber'}\" value=y>Y
+    <input type=radio name=\"renew_item_$issue->[$i]{'itemnumber'}\" value=n>N</td>
+    </tr>
+    ";
+  }
 }
 print <<printend