[Koha-cvs] CVS: koha/circ returns.pl,1.22,1.23

[Andrew Arensburger]

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

Modified Files:
	returns.pl 
Log Message:
Removed trailing whitespace.


Index: returns.pl
===================================================================
RCS file: /cvsroot/koha/koha/circ/returns.pl,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -r1.22 -r1.23
*** returns.pl	5 Sep 2002 00:16:40 -0000	1.22
--- returns.pl	13 Oct 2002 10:44:08 -0000	1.23
***************
*** 153,158 ****
  my $title = <<"EOF";
  <FONT SIZE=6><em>Circulation: Returns</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>
--- 153,157 ----
  my $title = <<"EOF";
  <FONT SIZE=6><em>Circulation: Returns</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>
***************
*** 221,226 ****
  </form></center>
  EOF
!     } 
!     if ($res->{'ResFound'} eq "Reserved") {
  	my @da = localtime(time());
  	my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
--- 220,224 ----
  </form></center>
  EOF
!     }    if ($res->{'ResFound'} eq "Reserved") {
  	my @da = localtime(time());
  	my $todaysdate = sprintf ("%0.2d", ($da[3]+1))."/".sprintf ("%0.2d", ($da[4]+1))."/".($da[5]+1900);
***************
*** 229,237 ****
  Date: $todaysdate;
  
! ITEM RESERVED: 
! $iteminfo->{'title'} ($iteminfo->{'author'})
  barcode: $iteminfo->{'barcode'}
! itemtype: $iteminfo->{'itemtype'} 
! 
  COLLECT AT: $branchname
  
--- 227,233 ----
  Date: $todaysdate;
  
! ITEM RESERVED:$iteminfo->{'title'} ($iteminfo->{'author'})
  barcode: $iteminfo->{'barcode'}
! itemtype: $iteminfo->{'itemtype'}
  COLLECT AT: $branchname
  
***************
*** 253,258 ****
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
! <tr><td valign="top">Change status to waiting and print 
! <a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
  <td valign="top">
  <form method=post action='returns.pl'>
--- 249,253 ----
  for $name ($number) to be collected at <b>$branchname</b>.
  <table cellpadding=5 cellspacing=0>
! <tr><td valign="top">Change status to waiting and print<a href="" onClick='alert(document.forms[0].resslip.value); return false'>slip</a>?: </td>
  <td valign="top">
  <form method=post action='returns.pl'>
***************
*** 322,327 ****
  <font color=black><b>Borrower Information</b></font></td></tr>
  <tr><td colspan=2>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'} 
! onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
  $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
  </td></tr>
--- 317,321 ----
  <font color=black><b>Borrower Information</b></font></td></tr>
  <tr><td colspan=2>
! <a href=/cgi-bin/koha/moremember.pl?bornum=$borrower->{'borrowernumber'}onClick="openWindow(this,'Member', 480, 640)">$borrower->{'cardnumber'}</a>
  $borrower->{'surname'}, $borrower->{'title'} $borrower->{'firstname'}<br>
  </td></tr>
***************
*** 337,347 ****
  	} else {
  	    $displayflag = $flag;
! 	}  
! 	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
  <tr><td valign=top>$displayflag</td>
! <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b> 
! <a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'} 
! onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
  EOF
  	} elsif ($flag eq 'WAITING') {
--- 331,338 ----
  	} else {
  	    $displayflag = $flag;
! 	}	if ($flag eq 'CHARGES') {
  	    $flaginfotext.= <<"EOF";
  <tr><td valign=top>$displayflag</td>
! <td bgcolor=$color><b>$flags->{$flag}->{'message'}</b><a href=/cgi-bin/koha/pay.pl?bornum=$borrower->{'borrowernumber'}onClick="openWindow(this, 'Payment', 480,640)">Payment</a></td></tr>
  EOF
  	} elsif ($flag eq 'WAITING') {
***************
*** 351,358 ****
  		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
  		$itemswaiting .= <<"EOF";
! <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
! onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
! $iteminformation->{'title'} 
! ($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
  EOF
              }
--- 342,346 ----
  		my ($iteminformation) = getiteminformation(\%env, $item->{'itemnumber'}, 0);
  		$itemswaiting .= <<"EOF";
! <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intraonClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a>$iteminformation->{'title'}($branches->{$iteminformation->{'holdingbranch'}}->{'branchname'})<br>
  EOF
              }
***************
*** 365,371 ****
                  $itemsoverdue .=  <<"EOF";
  <font color=red>$item->{'date_due'}</font>
! <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intra 
! onClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a> 
! $iteminformation->{'title'}
  <br>
  EOF
--- 353,357 ----
                  $itemsoverdue .=  <<"EOF";
  <font color=red>$item->{'date_due'}</font>
! <a href=/cgi-bin/koha/detail.pl?bib=$iteminformation->{'biblionumber'}&type=intraonClick="openWindow(this, 'Item', 480, 640)">$iteminformation->{'barcode'}</a>$iteminformation->{'title'}
  <br>
  EOF
***************
*** 383,388 ****
  <tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
  <b>Flags</b></td></tr>
! $flaginfotext 
! EOF
      }
      $borrowertable .= "</table>";
--- 369,373 ----
  <tr><td bgcolor=$headerbackgroundcolor background=$backgroundimage colspan=2>
  <b>Flags</b></td></tr>
! $flaginfotextEOF
      }
      $borrowertable .= "</table>";
***************
*** 504,508 ****
      } else {
  	return $barcode;
!     } 
! } 
! 
--- 489,491 ----
      } else {
  	return $barcode;
!     }}