Merged changes from rel-1-2 branch version 1.21.2.1, all fixes to warnings

diff --git a/C4/Circulation/Circ2.pm b/C4/Circulation/Circ2.pm
index d290993..049155f 100755 (executable)
--- a/C4/Circulation/Circ2.pm
+++ b/C4/Circulation/Circ2.pm
@@ -613,7 +613,7 @@ sub fixaccountforlostandreturned {
                          (borrowernumber, accountno, offsetaccount,  offsetamount)
                          values
                          ('$data->{'borrowernumber'}','$accdata->{'accountno'}','$nextaccntno','$newamtos')";
-               my $usth = $dbh->prepare($updquery);
+               $usth = $dbh->prepare($updquery);
                $usth->execute;
                $usth->finish;
            }
@@ -911,7 +911,7 @@ sub checkwaiting {
   $sth->execute();
   my $cnt=0;
   if (my $data=$sth->fetchrow_hashref) {
-    @itemswaiting[$cnt] =$data;
+    $itemswaiting[$cnt] =$data;
     $cnt ++
   }
   $sth->finish;
@@ -1002,7 +1002,7 @@ sub renewbook {
     $datedue = (1900+$datearr[5])."-".($datearr[4]+1)."-".$datearr[3];
   }
   my @date = split("-",$datedue);
-  my $odatedue = (@date[2]+0)."-".(@date[1]+0)."-".@date[0];
+  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";
   my $sth=$dbh->prepare($issquery);
@@ -1014,7 +1014,7 @@ sub renewbook {
     set date_due = '$datedue', renewals = '$renews'
     where borrowernumber='$bornum' and
     itemnumber='$itemno' and returndate is null";
-  my $sth=$dbh->prepare($updquery);
+  $sth=$dbh->prepare($updquery);
   
   $sth->execute;
   $sth->finish;
@@ -1043,7 +1043,7 @@ sub calc_charges {
            my $discount = $data2->{'rentaldiscount'};
            $charge = ($charge *(100 - $discount)) / 100;
        }
-       $sth2->{'finish'};
+       $sth2->finish;
     }      
     $sth1->finish;
     return ($charge);