[Koha-cvs] CVS: koha/circ branchtransfers.pl,1.8,1.9 circulation.pl,1.26,1.27 returns.pl,1.4,1.5

[Finlay Thompson]

Update of /cvsroot/koha/koha/circ
In directory usw-pr-cvs1:/tmp/cvs-serv15406/circ

Modified Files:
        branchtransfers.pl circulation.pl returns.pl 
Log Message:

fixed minor bugs


Index: branchtransfers.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/branchtransfers.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** branchtransfers.pl  29 May 2002 04:33:42 -0000      1.8
--- branchtransfers.pl  6 Jun 2002 02:51:38 -0000       1.9
***************
*** 285,306 ****
  
  print <<"EOF";
! <p>
! <table border=0 cellpadding=5><tr>
! <td align="left"><FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
  <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
  <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
  <a href=selectbranchprinter.pl>Change Settings</a>
- </td>
- <td align="left"><img src="/images/holder.gif" width=40 height=35>
- </td>
- <td align="right" valign="top">
- <FONT SIZE=2  face="arial, helvetica">
- <a href=circulation.pl>Next Borrower</a> || 
- <a href=returns.pl>Returns</a> || 
- <a href=branchtransfers.pl>Transfers</a></font><p>
- </td></tr></table>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
! </p>
  EOF
  
--- 285,301 ----
  
  print <<"EOF";
! <table align=right><tr><td>
! <img src="/images/button-issues.gif" width="99" height="42" border="0" 
alt="Next Borrower"></a> &nbsp
! <a href=returns.pl>
! <img src="/images/button-returns.gif" width="110" height="42" border="0" 
alt="Returns"></a>
! </td></tr></table>
! 
! <FONT SIZE=6><em>Circulation: Transfers</em></FONT><br>
  <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp
  <b>Printer:</b> $printers->{$printer}->{'printername'}<br>
  <a href=selectbranchprinter.pl>Change Settings</a>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
! <p>           
  EOF
  

Index: circulation.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/circulation.pl,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** circulation.pl      18 May 2002 05:37:26 -0000      1.26
--- circulation.pl      6 Jun 2002 02:51:38 -0000       1.27
***************
*** 45,49 ****
  my @datearr = localtime(time());
  my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", 
($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
! 
  
  
--- 45,49 ----
  my @datearr = localtime(time());
  my $todaysdate = (1900+$datearr[5]).sprintf ("%0.2d", 
($datearr[4]+1)).sprintf ("%0.2d", $datearr[3]);
! warn $todaysdate;
  
  
***************
*** 119,124 ****
        $rejectedtext = << "EOF";
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
! <tr><th><font color=black size=6>Error Issuing Book</font></th></tr>
! <tr><td><font color=red size=6>$rejected</font></td></tr>
  </table>
  <br>
--- 119,124 ----
        $rejectedtext = << "EOF";
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
! <tr><th><font color=black size=5>Error Issuing Book</font></th></tr>
! <tr><td><font color=red size=5>$rejected</font></td></tr>
  </table>
  <br>
***************
*** 130,134 ****
  if ($borrowerslist) {
      $selectborrower = <<"EOF";
! <form method=get action=/cgi-bin/koha/circ/issues.pl>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
--- 130,134 ----
  if ($borrowerslist) {
      $selectborrower = <<"EOF";
! <form method=post action=/cgi-bin/koha/circ/circulation.pl>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
***************
*** 153,171 ****
  # title....
  my $title = <<"EOF";
! <p>
! <table border=0 cellpadding=5 width=90%><tr>
! <td align="left"><FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
  <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
- <td align="right" valign="top">
- <FONT SIZE=2  face="arial, helvetica">
- <a href=circulation.pl>Next Borrower</a> || 
- <a href=returns.pl>Returns</a> || 
- <a href=branchtransfers.pl>Transfers</a></font><p>
- </td></tr></table>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
! </p>
  EOF
  
--- 153,172 ----
  # title....
  my $title = <<"EOF";
! <table align="right"><tr><td>
! <a href=circulation.pl>
! <img src="/images/button-next-borrower.gif" width="171" height="42" 
border="0" alt="Next Borrower"></a> &nbsp
! <a href=returns.pl>
! <img src="/images/button-returns.gif" width="110" height="42" border="0" 
alt="Returns"></a>
! &nbsp<a href=branchtransfers.pl>
! <img src="/images/button-transfers.gif" width="127" height="42" border="0" 
alt="Transfers">
! </a>
! </td></tr></table>
! <FONT SIZE=6><em>Circulation: Issues</em></FONT><br>
  <b>Branch:</b> $branches->{$branch}->{'branchname'} &nbsp 
  <b>Printer:</b> $printers->{$printer}->{'printername'} <br>
  <a href=selectbranchprinter.pl>Change Settings</a></td>
  <input type=hidden name=branch value=$branch>
  <input type=hidden name=printer value=$printer>
! <p>
  EOF
  
***************
*** 173,177 ****
  
  my $cardnumberinput = << "EOF";
! <form method=get action=/cgi-bin/koha/circ/issues.pl>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
--- 174,178 ----
  
  my $cardnumberinput = << "EOF";
! <form method=post action=/cgi-bin/koha/circ/circulation.pl>
  <table border=1 cellpadding=5 cellspacing=0 bgcolor="#dddddd">
  <tr><th bgcolor=$headerbackgroundcolor background=$backgroundimage>
***************
*** 179,184 ****
  <tr><td><input name=findborrower></td></tr>
  </table>
- <input type=hidden name=branch value=$branch>
- <input type=hidden name=printer value=$printer>
  </form>
  EOF
--- 180,183 ----
***************
*** 277,281 ****
  
  my $barcodeentrytext = <<"EOF";
! <form method=post action=/cgi-bin/koha/circ/issues.pl>
  <table border=1 cellpadding=5>
  <tr>
--- 276,280 ----
  
  my $barcodeentrytext = <<"EOF";
! <form method=post action=/cgi-bin/koha/circ/circulation.pl>
  <table border=1 cellpadding=5>
  <tr>
***************
*** 433,437 ****
      print $flaginfotable;
      print $barcodeentrytext;
!     print "<p clear=all>";
      print $issuedbookstable;
  }
--- 432,436 ----
      print $flaginfotable;
      print $barcodeentrytext;
!     print "<p clear=all><br><br>";
      print $issuedbookstable;
  }

Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** returns.pl  30 May 2002 01:32:29 -0000      1.4
--- returns.pl  6 Jun 2002 02:51:38 -0000       1.5
***************
*** 86,89 ****
--- 86,90 ----
      my $biblio = $query->param('biblionumber');
      my $borrnum = $query->param('borrowernumber');
+     warn "In Kill Reserved";
      CancelReserve($biblio, 0, $borrnum);
      $messagetext .= "Reserve Cancelled<br>";