Third in the series of branch merges. Starting to run out of easy stuff. :)

diff --git a/acqui.simple/bulkmarcimport.pl b/acqui.simple/bulkmarcimport.pl
index c537d6d..e54d224 100755 (executable)
--- a/acqui.simple/bulkmarcimport.pl
+++ b/acqui.simple/bulkmarcimport.pl
@@ -32,6 +32,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/acqui/acquire.pl b/acqui/acquire.pl
index 28a1cae..309f768 100755 (executable)
--- a/acqui/acquire.pl
+++ b/acqui/acquire.pl
@@ -4,6 +4,7 @@
 #written by chris@katipo.co.nz 24/2/2000
 
 use C4::Acquisitions;
+use C4::Biblio;
 use C4::Output;
 use C4::Database;
 use C4::Search;
@@ -190,7 +191,8 @@ print <<EOP
 <td><select name=bookfund size=1>
 EOP
 ;
-my ($count2,@bookfund)=bookfunds;                                                    
+my @bookfund;
+($count2,@bookfund)=bookfunds();                                                    
 for (my $i=0;$i<$count2;$i++){                                                       
   print "<option value=$bookfund[$i]->{'bookfundid'}";
   if ($bookfund[$i]->{'bookfundid'}==$results[0]->{'bookfundid'}){

diff --git a/acqui/receive.pl b/acqui/receive.pl
index a49190f..bf276ab 100755 (executable)
--- a/acqui/receive.pl
+++ b/acqui/receive.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;
@@ -54,11 +55,10 @@ $date
 
 EOP
 ;
-my ($count,@results);
+my @results;
+($count,@results)=invoice($invoice);
 if ($invoice eq ''){
-       ($count,@results)=getallorders($id);
-} else {
-       ($count,@results)=invoice($invoice);
+  ($count,@results)=getallorders($id);
 }
 print $count;
 my $totalprice=0;

diff --git a/delbiblio.pl b/delbiblio.pl
index c987e62..e0403b5 100755 (executable)
--- a/delbiblio.pl
+++ b/delbiblio.pl
@@ -10,6 +10,7 @@ use C4::Search;
 use CGI;
 use C4::Output;
 use C4::Acquisitions;
+use C4::Biblio;
 
 my $input = new CGI;
 #print $input->header;
@@ -27,6 +28,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/");
 }