[Koha-cvs] CVS: koha/C4/Circulation Circ2.pm,1.28,1.29

[Steve Tonnesen]

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

Modified Files:
        Circ2.pm 
Log Message:
Merged changes from rel-1-2 branch version 1.21.2.1, all fixes to warnings


Index: Circ2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Circ2.pm,v
retrieving revision 1.28
retrieving revision 1.29
diff -C2 -r1.28 -r1.29
*** Circ2.pm    13 Jun 2002 03:16:55 -0000      1.28
--- Circ2.pm    20 Jun 2002 20:10:08 -0000      1.29
***************
*** 614,618 ****
                          values
                          
('$data->{'borrowernumber'}','$accdata->{'accountno'}','$nextaccntno','$newamtos')";
!               my $usth = $dbh->prepare($updquery);
                $usth->execute;
                $usth->finish;
--- 614,618 ----
                          values
                          
('$data->{'borrowernumber'}','$accdata->{'accountno'}','$nextaccntno','$newamtos')";
!               $usth = $dbh->prepare($updquery);
                $usth->execute;
                $usth->finish;
***************
*** 912,916 ****
    my $cnt=0;
    if (my $data=$sth->fetchrow_hashref) {
!     @itemswaiting[$cnt] =$data;
      $cnt ++
    }
--- 912,916 ----
    my $cnt=0;
    if (my $data=$sth->fetchrow_hashref) {
!     $itemswaiting[$cnt] =$data;
      $cnt ++
    }
***************
*** 1003,1007 ****
    }
    my @date = split("-",$datedue);
!   my $odatedue = (@date[2]+0)."-".(@date[1]+0)."-"address@hidden;
    my $issquery = "select * from issues where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
--- 1003,1007 ----
    }
    my @date = split("-",$datedue);
!   my $odatedue = ($date[2]+0)."-".($date[1]+0)."-".$date[0];
    my $issquery = "select * from issues where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
***************
*** 1015,1019 ****
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   my $sth=$dbh->prepare($updquery);
    
    $sth->execute;
--- 1015,1019 ----
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   $sth=$dbh->prepare($updquery);
    
    $sth->execute;
***************
*** 1044,1048 ****
            $charge = ($charge *(100 - $discount)) / 100;
        }
!       $sth2->{'finish'};
      }      
      $sth1->finish;
--- 1044,1048 ----
            $charge = ($charge *(100 - $discount)) / 100;
        }
!       $sth2->finish;
      }      
      $sth1->finish;