synch'ing 2.2 and head

[srvgit] / acqui / basket.pl

diff --git a/acqui/basket.pl b/acqui/basket.pl
index 9d41fa8..515abfd 100755 (executable)
--- a/acqui/basket.pl
+++ b/acqui/basket.pl
@@ -26,7 +26,6 @@
 use strict;
 use C4::Auth;
 use C4::Koha;
-# use C4::Biblio;
 use C4::Output;
 use CGI;
 use C4::Interface::CGI::Output;
@@ -37,7 +36,8 @@ use C4::Date;
 
 my $query =new CGI;
 my $basketno = $query ->param('basket');
-my $supplierid = $query->param('id');
+my $booksellerid = $query->param('supplierid');
+my $order = $query->param('order');
 my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "acqui/basket.tmpl",
                             query => $query,
@@ -48,19 +48,22 @@ my ($template, $loggedinuser, $cookie)
                             });
 my ($count,@results);
 
-my ($count2,@booksellers)=bookseller($supplierid);
-
 my $basket = getbasket($basketno);
+# FIXME : the query->param('supplierid') below is probably useless. The bookseller is always known from the basket
+# if no booksellerid in parameter, get it from basket
+# warn "=>".$basket->{booksellerid};
+$booksellerid = $basket->{booksellerid} unless $booksellerid;
+my ($count2,@booksellers)=bookseller($booksellerid);
+
 # if new basket, pre-fill infos
 $basket->{creationdate} = "" unless ($basket->{creationdate});
 $basket->{authorisedby} = $loggedinuser unless ($basket->{authorisedby});
-($count,@results)=getbasketcontent($basketno);
+($count,@results)=getbasketcontent($basketno,'',$order);
 
 my $line_total; # total of each line
 my $sub_total; # total of line totals
 my $gist;      # GST
 my $grand_total; # $subttotal + $gist
-my $toggle=0;
 
 my @books_loop;
 for (my $i=0;$i<$count;$i++){
@@ -70,12 +73,10 @@ for (my $i=0;$i<$count;$i++){
        $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'};
        $sub_total+=$line_total;
        my %line;
-       if ($toggle==0){
-               $line{color}='#EEEEEE';
-               $toggle=1;
+       if ($i % 2){
+               $line{highlight}=1;
        } else {
-               $line{color}='white';
-               $toggle=0;
+               $line{highlight}=0;
        }
        $line{ordernumber} = $results[$i]->{'ordernumber'};
        $line{publishercode} = $results[$i]->{'publishercode'};
@@ -91,16 +92,18 @@ for (my $i=0;$i<$count;$i++){
        $line{quantityrecieved} = $results[$i]->{'quantityreceived'};
        $line{line_total} = $line_total;
        $line{biblionumber} = $results[$i]->{'biblionumber'};
+       $line{bookfundid} = $results[$i]->{'bookfundid'};
        push @books_loop, \%line;
 }
 my $prefgist =C4::Context->preference("gist");
 $gist=sprintf("%.2f",$sub_total*$prefgist);
 $grand_total=$sub_total+$gist;
-
 $template->param(basketno => $basketno,
                                creationdate => $basket->{creationdate},
                                authorisedby => $basket->{authorisedby},
                                authorisedbyname => $basket->{authorisedbyname},
+                               closedate => format_date($basket->{closedate}),
+                               active => $booksellers[0]->{'active'},
                                booksellerid=> $booksellers[0]->{'id'},
                                name => $booksellers[0]->{'name'},
                                entrydate => format_date($results[0]->{'entrydate'}),