[Koha-cvs] CVS: koha/acqui newbiblio.pl,1.4,1.5

[Paul POULAIN]

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

Modified Files:
        newbiblio.pl 
Log Message:
merging branches 1.2 and main


Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha/koha/acqui/newbiblio.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** newbiblio.pl        15 May 2002 14:32:48 -0000      1.4
--- newbiblio.pl        21 Jun 2002 13:15:36 -0000      1.5
***************
*** 5,8 ****
--- 5,9 ----
  
  use C4::Acquisitions;
+ use C4::Biblio;
  use C4::Output;
  use C4::Search;
***************
*** 22,26 ****
  my $data;
  my $new;
- 
  if ($ordnum eq ''){
    $new='yes';
--- 23,26 ----
***************
*** 195,199 ****
  printend
  ;
! my ($count2,@branches)=branches;
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$branches[$i]->{'branchcode'}";
--- 195,200 ----
  printend
  ;
! my @branches;
! ($count2,@branches)=branches();
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$branches[$i]->{'branchcode'}";
***************
*** 245,249 ****
  ;
  
! my ($count2,@bookfund)=bookfunds;
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$bookfund[$i]->{'bookfundid'}";
--- 246,251 ----
  ;
  
! my @bookfund;
! ($count2,@bookfund)=bookfunds();
  for (my $i=0;$i<$count2;$i++){
    print "<option value=$bookfund[$i]->{'bookfundid'}";