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

diff --git a/C4/Circulation/Renewals2.pm b/C4/Circulation/Renewals2.pm
index e644734..b634625 100755 (executable)
--- a/C4/Circulation/Renewals2.pm
+++ b/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;

diff --git a/acqui.simple/addbookslccn.pl b/acqui.simple/addbookslccn.pl
index 8c67ffc..04acec2 100755 (executable)
--- a/acqui.simple/addbookslccn.pl
+++ b/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;
 

diff --git a/acqui.simple/processz3950queue b/acqui.simple/processz3950queue
index 23fc80d..2a6223f 100755 (executable)
--- a/acqui.simple/processz3950queue
+++ b/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;

diff --git a/acqui.simple/viewmarc.pl b/acqui.simple/viewmarc.pl
index 827868c..b12aa23 100755 (executable)
--- a/acqui.simple/viewmarc.pl
+++ b/acqui.simple/viewmarc.pl
@@ -12,6 +12,7 @@ use C4::Database;
 use CGI;
 use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 
 

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 6c59bd5..ea6db1b 100755 (executable)
--- a/acqui/basket.pl
+++ b/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;

diff --git a/acqui/modorders.pl b/acqui/modorders.pl
index 36a6dd6..6bd657c 100755 (executable)
--- a/acqui/modorders.pl
+++ b/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;

diff --git a/acqui/newbasket.pl b/acqui/newbasket.pl
index 8d4bc4b..726e79b 100755 (executable)
--- a/acqui/newbasket.pl
+++ b/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;

diff --git a/acqui/order.pl b/acqui/order.pl
index 0aa7096..4c3f511 100755 (executable)
--- a/acqui/order.pl
+++ b/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;

diff --git a/acqui/recieveorder.pl b/acqui/recieveorder.pl
index 4fb40f3..d468326 100755 (executable)
--- a/acqui/recieveorder.pl
+++ b/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;

diff --git a/acqui/supplier.pl b/acqui/supplier.pl
index d2e0f47..1bb485f 100755 (executable)
--- a/acqui/supplier.pl
+++ b/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;

diff --git a/acqui/updatesupplier.pl b/acqui/updatesupplier.pl
index b51bb14..250ccc0 100755 (executable)
--- a/acqui/updatesupplier.pl
+++ b/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;

diff --git a/delbiblio.pl b/delbiblio.pl
index 2724e74..c987e62 100755 (executable)
--- a/delbiblio.pl
+++ b/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/");
 }

diff --git a/marc/koha2marc b/marc/koha2marc
index ab3620e..2ce26a6 100644 (file)
--- a/marc/koha2marc
+++ b/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'};

diff --git a/marc/test b/marc/test
index 3d26f77..af7474c 100644 (file)
--- a/marc/test
+++ b/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'};
 

diff --git a/marc/viewmarc.pl b/marc/viewmarc.pl
index 827868c..b12aa23 100755 (executable)
--- a/marc/viewmarc.pl
+++ b/marc/viewmarc.pl
@@ -12,6 +12,7 @@ use C4::Database;
 use CGI;
 use strict;
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;