[Koha-devel] CVS: koha/C4 Accounts2.pm,1.7,1.8

[Chris Cormack]

Update of /cvsroot/koha/koha/C4
In directory usw-pr-cvs1:/tmp/cvs-serv21906/C4

Modified Files:
	Accounts2.pm 
Log Message:
More little bug fixes in the manual credits section


Index: Accounts2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Accounts2.pm,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -r1.7 -r1.8
*** Accounts2.pm	2001/05/09 23:22:10	1.7
--- Accounts2.pm	2001/05/15 23:05:43	1.8
***************
*** 201,205 ****
    my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
    my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}";
!   my $upitem="Update items set itemnotes='Paid for by $bor $date' where itemnumber='$itemnum'";
    $sth=$dbh->prepare($upitem);
    $sth->execute;
--- 201,205 ----
    my $date = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
    my $bor="$borrower->{'firstname'} $borrower->{'surname'} $borrower->{'cardnumber'}";
!   my $upitem="Update items set paidfor='Paid for by $bor $date' where itemnumber='$itemnum'";
    $sth=$dbh->prepare($upitem);
    $sth->execute;
***************
*** 216,220 ****
    my $amountleft=$amount;
    
!   if ($type eq 'C' || $type eq 'BAY'){
      my $amount2=$amount*-1;
      $amountleft=fixcredit('',$bornum,$amount2);
--- 216,220 ----
    my $amountleft=$amount;
    
!   if ($type eq 'C' || $type eq 'BAY' || $type eq 'WORK'){
      my $amount2=$amount*-1;
      $amountleft=fixcredit('',$bornum,$amount2);
***************
*** 262,266 ****
    # get lines with outstanding amounts to offset
    my $query = "select * from accountlines 
!   where (borrowernumber = '$bornumber') and (amountoutstanding<>0)
    order by date";
    my $sth = $dbh->prepare($query);
--- 262,266 ----
    # get lines with outstanding amounts to offset
    my $query = "select * from accountlines 
!   where (borrowernumber = '$bornumber') and (amountoutstanding >0)
    order by date";
    my $sth = $dbh->prepare($query);
***************
*** 273,277 ****
  	$amountleft = $amountleft - $accdata->{'amountoutstanding'};
       }  else {
!         $newamtos = $accdata->{'amountoutstanding'} + $amountleft;
  	$amountleft = 0;
       }
--- 273,277 ----
  	$amountleft = $amountleft - $accdata->{'amountoutstanding'};
       }  else {
!         $newamtos = $accdata->{'amountoutstanding'} - $amountleft;
  	$amountleft = 0;
       }