diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 2d034880f4..7a4098d6b7 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -104,7 +104,7 @@ number of elements in C<@orders>. sub getbasketcontent { my ($basketno,$supplier,$orderby)=@_; my $dbh = C4::Context->dbh; - my $query="Select *,biblio.title from aqorders,biblio,biblioitems + my $query="Select biblio.*,biblioitems.*,aqorders.*,aqorderbreakdown.*,biblio.title from aqorders,biblio,biblioitems left join aqorderbreakdown on aqorderbreakdown.ordernumber=aqorders.ordernumber where basketno='$basketno' and biblio.biblionumber=aqorders.biblionumber and biblioitems.biblioitemnumber diff --git a/acqui/basket.pl b/acqui/basket.pl index 020263ed60..fbec06e443 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -72,6 +72,8 @@ my $sub_total_est; # total of line totals my $gist_est; # GST my $grand_total_est; # $subttotal + $gist +my $qty_total; + my @books_loop; for (my $i=0;$i<$count;$i++){ my $rrp=$results[$i]->{'listprice'}; @@ -80,18 +82,15 @@ for (my $i=0;$i<$count;$i++){ $sub_total_est+=$results[$i]->{'quantity'}*$results[$i]->{'rrp'}; $line_total=$results[$i]->{'quantity'}*$results[$i]->{'ecost'}; $sub_total+=$line_total; + $qty_total += $results[$i]->{'quantity'}; my %line; - if ($i % 2){ - $line{highlight}=1; - } else { - $line{highlight}=0; - } $line{ordernumber} = $results[$i]->{'ordernumber'}; $line{publishercode} = $results[$i]->{'publishercode'}; $line{isbn} = $results[$i]->{'isbn'}; $line{booksellerid} = $results[$i]->{'booksellerid'}; $line{basketno}=$basketno; $line{title} = $results[$i]->{'title'}; + $line{notes} = $results[$i]->{'notes'}; $line{author} = $results[$i]->{'author'}; $line{i} = $i; $line{rrp} = $results[$i]->{'rrp'}; @@ -101,6 +100,7 @@ for (my $i=0;$i<$count;$i++){ $line{line_total} = $line_total; $line{biblionumber} = $results[$i]->{'biblionumber'}; $line{bookfundid} = $results[$i]->{'bookfundid'}; + $line{odd} = $i %2; push @books_loop, \%line; } my $prefgist =C4::Context->preference("gist"); @@ -130,5 +130,6 @@ $template->param(basketno => $basketno, gist_est => $gist_est, grand_total_est =>$grand_total_est, currency => $booksellers[0]->{'listprice'}, + qty_total => $qty_total, ); output_html_with_http_headers $query, $cookie, $template->output; diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl index 199d05cee0..57aa7649ab 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl @@ -44,7 +44,11 @@ - "> + + + + + @@ -52,7 +56,7 @@
- - +

@@ -61,14 +65,14 @@ &booksellerid=&basketno=">
- - +

- - - - + + + + @@ -103,7 +107,7 @@

-

 

+