[Koha-cvs] CVS: koha/C4/Circulation Renewals2.pm,1.2,1.3

[Steve Tonnesen]

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

Modified Files:
        Renewals2.pm 
Log Message:
More merges in from rel-1-2
All of the changes so far have been minor.  I did uncomment delbiblio($biblio)
in delbiblio.pl in the main branch to match delbiblio.pl in rel-1-2


Index: Renewals2.pm
===================================================================
RCS file: /cvsroot/koha/koha/C4/Circulation/Renewals2.pm,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** Renewals2.pm        9 May 2001 00:05:57 -0000       1.2
--- Renewals2.pm        20 Jun 2002 17:33:10 -0000      1.3
***************
*** 15,18 ****
--- 15,19 ----
  use C4::Accounts2;
  use C4::Circulation::Circ2;
+ use warnings;
  
  use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
***************
*** 129,133 ****
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   my $sth=$dbh->prepare($updquery);
    $sth->execute;
    $sth->finish;
--- 130,134 ----
      where borrowernumber='$bornum' and
      itemnumber='$itemno' and returndate is null";
!   $sth=$dbh->prepare($updquery);
    $sth->execute;
    $sth->finish;
***************
*** 179,183 ****
        $charge = ($charge *(100 - $discount)) / 100;                 
      }                         
!     $sth2->{'finish'};                              
    }                                   
    $sth1->finish;  
--- 180,184 ----
        $charge = ($charge *(100 - $discount)) / 100;                 
      }                         
!     $sth2->finish;                              
    }                                   
    $sth1->finish;