From cb7441a537e227aba7c30cf59a97da989d55a241 Mon Sep 17 00:00:00 2001 From: tonnesen Date: Thu, 20 Jun 2002 17:33:07 +0000 Subject: [PATCH] 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 | 5 +++-- acqui.simple/addbookslccn.pl | 1 + acqui.simple/processz3950queue | 1 + acqui.simple/viewmarc.pl | 1 + acqui/basket.pl | 1 + acqui/modorders.pl | 1 + acqui/newbasket.pl | 1 + acqui/order.pl | 1 + acqui/recieveorder.pl | 1 + acqui/supplier.pl | 1 + acqui/updatesupplier.pl | 1 + delbiblio.pl | 4 ++-- marc/koha2marc | 1 + marc/test | 1 + marc/viewmarc.pl | 1 + 15 files changed, 18 insertions(+), 4 deletions(-) diff --git a/C4/Circulation/Renewals2.pm b/C4/Circulation/Renewals2.pm index e64473410b..b6346255e7 100755 --- 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 8c67ffc375..04acec2e99 100755 --- 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 23fc80df26..2a6223f107 100755 --- 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 827868c000..b12aa230ba 100755 --- 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 6c59bd5b15..ea6db1b580 100755 --- 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 36a6dd6577..6bd657c28e 100755 --- 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 8d4bc4b2a0..726e79b540 100755 --- 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 0aa7096cf7..4c3f5113f6 100755 --- 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 4fb40f3ca0..d468326d51 100755 --- 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 d2e0f47531..1bb485f537 100755 --- 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 b51bb1445e..250ccc0ee4 100755 --- 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 2724e746d1..c987e629a0 100755 --- 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

"; } else { -#delbiblio($biblio); -print $input->redirect("/catalogue/"); + delbiblio($biblio); + print $input->redirect("/catalogue/"); } diff --git a/marc/koha2marc b/marc/koha2marc index ab3620e214..2ce26a69a9 100644 --- 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 3d26f77d97..af7474cd2d 100644 --- 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 827868c000..b12aa230ba 100755 --- 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; -- 2.39.5