[Koha-cvs] CVS: koha/acqui acquire.pl,1.2,1.3 receive.pl,1.2,1.3

[Steve Tonnesen]

Update of /cvsroot/koha/koha/acqui
In directory usw-pr-cvs1:/tmp/cvs-serv17527/acqui

Modified Files:
	acquire.pl receive.pl 
Log Message:
Third in the series of branch merges.  Starting to run out of easy stuff.  :)


Index: acquire.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/acquire.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** acquire.pl	12 Mar 2001 23:32:47 -0000	1.2
--- acquire.pl	20 Jun 2002 17:45:26 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;
  use C4::Database;
***************
*** 191,195 ****
  EOP
  ;
! my ($count2, at bookfund)=bookfunds;                                                    
  for (my $i=0;$i<$count2;$i++){                                                       
    print "<option value=$bookfund[$i]->{'bookfundid'}";
--- 192,197 ----
  EOP
  ;
! my @bookfund;
! ($count2, at bookfund)=bookfunds();                                                    
  for (my $i=0;$i<$count2;$i++){                                                       
    print "<option value=$bookfund[$i]->{'bookfundid'}";

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/receive.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** receive.pl	14 May 2002 09:13:52 -0000	1.2
--- receive.pl	20 Jun 2002 17:45:27 -0000	1.3
***************
*** 5,8 ****
--- 5,9 ----
  
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;
  use CGI;
***************
*** 55,63 ****
  EOP
  ;
! my ($count, at results);
  if ($invoice eq ''){
! 	($count, at results)=getallorders($id);
! } else {
! 	($count, at results)=invoice($invoice);
  }
  print $count;
--- 56,63 ----
  EOP
  ;
! my @results;
! ($count, at results)=invoice($invoice);
  if ($invoice eq ''){
!   ($count, at results)=getallorders($id);
  }
  print $count;