[Koha-cvs] CVS: koha/acqui addorder.pl,1.14,1.15 basket.pl,1.14,1.15 newbiblio.pl,1.13,1.14 order.pl,1.8,1.9 receive.pl,1.10,1.11 recieveorder.pl,1.6,1.7

[Pierre Cauchois]

Update of /cvsroot/koha//koha/acqui
In directory sc8-pr-cvs1:/tmp/cvs-serv5911

Modified Files:
        addorder.pl basket.pl newbiblio.pl order.pl receive.pl 
        recieveorder.pl 
Log Message:
invoice number problems fixed, "fast receive" now works


Index: addorder.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/addorder.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** addorder.pl 2 May 2003 13:04:00 -0000       1.14
--- addorder.pl 8 Jul 2003 16:20:15 -0000       1.15
***************
*** 72,75 ****
--- 72,79 ----
  my $gst=$input->param('GST');
  my $orderexists=$input->param('orderexists');
+ my $budget=$input->param('budget');
+ my $cost=$input->param('cost');
+ my$sub=$input->param('sub');
+ my $invoice=$input->param('invoice');
  
  if ($quantity ne '0'){
***************
*** 106,112 ****
        }
        if ($orderexists ne '') {
!               
modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
        }else {
!               
neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst);
        }
  } else {
--- 110,116 ----
        }
        if ($orderexists ne '') {
!               
modorder($title,$ordnum,$quantity,$listprice,$bibnum,$basketno,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice);
        }else {
!               
neworder($bibnum,$title,$ordnum,$basketno,$quantity,$listprice,$supplier,$who,$notes,$bookfund,$bibitemnum,$rrp,$ecost,$gst,$budget,$cost,$sub,$invoice);
        }
  } else {

Index: basket.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/basket.pl,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -r1.14 -r1.15
*** basket.pl   7 Jul 2003 14:11:16 -0000       1.14
--- basket.pl   8 Jul 2003 16:20:15 -0000       1.15
***************
*** 71,75 ****
        my %line;
        if ($toggle==0){
!               $line{color}='#ffffcc';
                $toggle=1;
        } else {
--- 71,75 ----
        my %line;
        if ($toggle==0){
!               $line{color}='#EEEEEE';
                $toggle=1;
        } else {
***************
*** 91,95 ****
        push @books_loop, \%line;
  }
! $gist=sprintf("%.2f",$sub_total*C4::Context->preference("gist"));
  $grand_total=$sub_total+$gist;
  
--- 91,96 ----
        push @books_loop, \%line;
  }
! my $prefgist =C4::Context->preference("gist");
! $gist=sprintf("%.2f",$sub_total*$prefgist);
  $grand_total=$sub_total+$gist;
  

Index: newbiblio.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/newbiblio.pl,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -r1.13 -r1.14
*** newbiblio.pl        7 Jul 2003 14:11:16 -0000       1.13
--- newbiblio.pl        8 Jul 2003 16:20:15 -0000       1.14
***************
*** 26,31 ****
  use C4::Context;
  use C4::Catalogue;
- use C4::Biblio;
- use C4::Output;
  use C4::Search;
  use C4::Auth;
--- 26,29 ----
***************
*** 152,156 ****
                                                itemtype => $data->{'itemtype'},
                                                discount => 
$booksellers[0]->{'discount'},
!                                               listincgst => 
$booksellers[0]->{'listincgst'},
                                                listprice => 
$booksellers[0]->{'listprice'},
                                                gstreg => 
$booksellers[0]->{'gstreg'},
--- 150,154 ----
                                                itemtype => $data->{'itemtype'},
                                                discount => 
$booksellers[0]->{'discount'},
!                                                       listincgst => 
$booksellers[0]->{'listincgst'},
                                                listprice => 
$booksellers[0]->{'listprice'},
                                                gstreg => 
$booksellers[0]->{'gstreg'},

Index: order.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/order.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** order.pl    22 Apr 2003 10:22:20 -0000      1.8
--- order.pl    8 Jul 2003 16:20:15 -0000       1.9
***************
*** 49,53 ****
  my ($count,@suppliers)=bookseller($supplier);
  
! my $colour='#ffffcc';
  my $toggle=0;
  my @loop_suppliers;
--- 49,53 ----
  my ($count,@suppliers)=bookseller($supplier);
  
! my $colour='#EEEEEE';
  my $toggle=0;
  my @loop_suppliers;
***************
*** 56,60 ****
        my %line;
        if ($toggle==0){
!               $line{color}='#ffffcc';
                $toggle=1;
        } else {
--- 56,60 ----
        my %line;
        if ($toggle==0){
!               $line{color}='#EEEEEE';
                $toggle=1;
        } else {

Index: receive.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/receive.pl,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** receive.pl  19 Mar 2003 21:02:24 -0000      1.10
--- receive.pl  8 Jul 2003 16:20:15 -0000       1.11
***************
*** 32,36 ****
  use C4::Database;
  use HTML::Template;
- use C4::Catalogue;
  use strict;
  
--- 32,35 ----
***************
*** 65,73 ****
  my @loop_orders = ();
  for (my$i=0;$i<$count;$i++){
!       $total=($results[$i]->{'unitprice'} + $results[$i]->{'freight'}) * 
$results[$i]->{'quantityreceived'};
        $results[$i]->{'unitprice'}+=0;
        my %line;
        if ($toggle==0){
!               $line{color}='#ffffcc';
                $toggle=1;
        } else {
--- 64,72 ----
  my @loop_orders = ();
  for (my$i=0;$i<$count;$i++){
!       $total=($results[$i]->{'unitprice'} + $results[$i]->{'freight'}) * 
$results[$i]->{'quantityreceived'};   #weird, are the freight fees counted by 
book? (pierre)
        $results[$i]->{'unitprice'}+=0;
        my %line;
        if ($toggle==0){
!               $line{color}='#EEEEEE';
                $toggle=1;
        } else {

Index: recieveorder.pl
===================================================================
RCS file: /cvsroot/koha//koha/acqui/recieveorder.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** recieveorder.pl     13 Feb 2003 17:27:52 -0000      1.6
--- recieveorder.pl     8 Jul 2003 16:20:15 -0000       1.7
***************
*** 44,48 ****
                             debug => 1,
                             });
! $template->param(name => $booksellers[0]->{'name'},id => $id,);
  
  output_html_with_http_headers $input, $cookie, $template->output;
--- 44,52 ----
                             debug => 1,
                             });
! 
! $template->param(
!               name => $booksellers[0]->{'name'},
!               id => $id,
!               );
  
  output_html_with_http_headers $input, $cookie, $template->output;