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

C4/Circulation/Renewals2.pm

@@ -14,6 +14,7 @@ use C4::Database;
 use C4::Stats;
 use C4::Accounts2;
 use C4::Circulation::Circ2;
+use warnings;
 
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
   
@@ -128,7 +129,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;
   UpdateStats($env,$env->{'branchcode'},'renew','','',$itemno);
@@ -178,7 +179,7 @@ sub calc_charges {
       my $discount = $data2->{'rentaldiscount'};         
       $charge = ($charge *(100 - $discount)) / 100;                 
     }                         
-    $sth2->{'finish'};                              
+    $sth2->finish;                              
   }                                   
   $sth1->finish;  
   $dbh->disconnect;

acqui.simple/addbookslccn.pl

@@ -17,6 +17,7 @@ use C4::Database;
 use CGI;
 use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use C4::Circulation::Circ2;
 

acqui.simple/processz3950queue

@@ -3,6 +3,7 @@ use C4::Database;
 use DBI;
 #use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use Net::Z3950;
 my $dbh=C4Connect;

acqui.simple/viewmarc.pl

@@ -12,6 +12,7 @@ use C4::Database;
 use CGI;
 use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 
 

acqui/basket.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 24/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

acqui/modorders.pl

@@ -7,6 +7,7 @@ use strict;
 use CGI;
 use C4::Output;
 use C4::Acquisitions;
+use C4::Biblio;
 #use Date::Manip;
 
 my $input = new CGI;

acqui/newbasket.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 24/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

acqui/order.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 23/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

acqui/recieveorder.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 24/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

acqui/supplier.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 24/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

acqui/updatesupplier.pl

@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 23/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use CGI;
 use strict;

delbiblio.pl

@@ -27,6 +27,6 @@ if ($count > 0){
   print "This biblio has $count items attached, please delete them before deleting this biblio<p>
   ";
 } else {
-#delbiblio($biblio);
-print $input->redirect("/catalogue/");
+    delbiblio($biblio);
+    print $input->redirect("/catalogue/");
 }

marc/koha2marc

@@ -13,6 +13,7 @@ use CGI;
 use DBI;
 #use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 my $dbh=C4Connect;
 my $userid=$ENV{'REMOTE_USER'};

marc/test

@@ -8,6 +8,7 @@ use CGI;
 use DBI;
 #use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 my $userid=$ENV{'REMOTE_USER'};
 

marc/viewmarc.pl

@@ -12,6 +12,7 @@ use C4::Database;
 use CGI;
 use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;