[Koha-cvs] CVS: koha/acqui newbiblio.pl,1.2.2.2,1.2.2.3

[Paul POULAIN]

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

Modified Files:
      Tag: rel-1-2
        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.2.2.2
retrieving revision 1.2.2.3
diff -C2 -r1.2.2.2 -r1.2.2.3
*** newbiblio.pl        14 Jun 2002 21:20:27 -0000      1.2.2.2
--- newbiblio.pl        21 Jun 2002 13:15:06 -0000      1.2.2.3
***************
*** 26,30 ****
    $new='yes';
    $ordnum=newordernum;
!   $data=bibdata($biblio);
    if ($data->{'title'} eq ''){
      $data->{'title'}=$title;
--- 26,32 ----
    $new='yes';
    $ordnum=newordernum;
!   if ($biblio) {
!               $data=bibdata($biblio);
!       }
    if ($data->{'title'} eq ''){
      $data->{'title'}=$title;
***************
*** 35,39 ****
    $data=getsingleorder($ordnum);
    $biblio=$data->{'biblionumber'};
! } 
  
  print startpage;
--- 37,41 ----
    $data=getsingleorder($ordnum);
    $biblio=$data->{'biblionumber'};
! }
  
  print startpage;
***************
*** 61,69 ****
    //  ecost=f.ecost.value  //budgetted cost
    //  GST=f.GST.value
!   //  total=f.total.value  
!   //make useful constants out of the above  
!   exchangerate=f.elements[currency].value      //get exchange rate  
    gst_on=(!listinc && applygst);
!   //do real stuff  
    rrp=listprice*exchangerate;
    ecost=rrp*(100-discount)/100
--- 63,71 ----
    //  ecost=f.ecost.value  //budgetted cost
    //  GST=f.GST.value
!   //  total=f.total.value
!   //make useful constants out of the above
!   exchangerate=f.elements[currency].value      //get exchange rate
    gst_on=(!listinc && applygst);
!   //do real stuff
    rrp=listprice*exchangerate;
    ecost=rrp*(100-discount)/100
***************
*** 73,87 ****
      GST=ecost*0.125
    }
!   
    total=(ecost+GST)*quantity
!   
!   
    f.rrp.value=display(rrp)
    f.ecost.value=display(ecost)
    f.GST.value=display(GST)
    f.total.value=display(total)
!   
  }
!                                                                     
  
  
--- 75,89 ----
      GST=ecost*0.125
    }
! 
    total=(ecost+GST)*quantity
! 
! 
    f.rrp.value=display(rrp)
    f.ecost.value=display(ecost)
    f.GST.value=display(GST)
    f.total.value=display(total)
! 
  }
! 
  
  
***************
*** 128,132 ****
  }
  print <<printend
! <a href=basket.pl?basket=$basket><img src=/images/view-basket.gif width=187 
heigth=42 border=0 align=right alt="View Basket"></a> 
  <FONT SIZE=6><em>$ordnum - Order Details </em></FONT><br>
  Shopping Basket For: $booksellers[0]->{'name'}
--- 130,134 ----
  }
  print <<printend
! <a href=basket.pl?basket=$basket><img src=/images/view-basket.gif width=187 
heigth=42 border=0 align=right alt="View Basket"></a>
  <FONT SIZE=6><em>$ordnum - Order Details </em></FONT><br>
  Shopping Basket For: $booksellers[0]->{'name'}
***************
*** 162,167 ****
  $sth->execute;
  print "<option value=\"\">Please choose:\n";
! while (my $data=$sth->fetchrow_hashref){
!   print "<option value=\"" . $data->{'itemtype'} . "\">" . 
$data->{'description'} . "\n";
  }
  $sth->finish;
--- 164,173 ----
  $sth->execute;
  print "<option value=\"\">Please choose:\n";
! while (my $data2=$sth->fetchrow_hashref){
!       if ($data2->{'itemtype'} eq $data->{'itemtype'}) {
!               print "<option value=\"" . $data2->{'itemtype'} . "\" 
SELECTED>" . $data2->{'description'} . "\n";
!       } else {
!               print "<option value=\"" . $data2->{'itemtype'} . "\">" . 
$data2->{'description'} . "\n";
!       }
  }
  $sth->finish;
***************
*** 239,242 ****
--- 245,249 ----
  printend
  ;
+ 
  my @bookfund;
  ($count2,@bookfund)=bookfunds();