From b9a7f3360151a90e60aed25333a84aec5a47470a Mon Sep 17 00:00:00 2001 From: tipaul Date: Mon, 4 Oct 2004 20:03:23 +0000 Subject: [PATCH] * removing the hard coded $ * adding bookfund to the order list --- C4/Acquisition.pm | 1 + acqui/basket.pl | 1 + .../default/en/acqui/basket.tmpl | 34 ++++++++++--------- 3 files changed, 20 insertions(+), 16 deletions(-) diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 3093f89861..a38151a50d 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -105,6 +105,7 @@ sub getbasketcontent { my ($basketno,$supplier)=@_; my $dbh = C4::Context->dbh; my $query="Select *,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 =aqorders.biblioitemnumber diff --git a/acqui/basket.pl b/acqui/basket.pl index 37d1a16222..c2173c047c 100755 --- a/acqui/basket.pl +++ b/acqui/basket.pl @@ -94,6 +94,7 @@ 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"); diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl index 2f690116dd..3c2c526673 100644 --- a/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl +++ b/koha-tmpl/intranet-tmpl/default/en/acqui/basket.tmpl @@ -22,15 +22,16 @@ - - - - - - - - - + + + + + + + + + + "> @@ -43,24 +44,25 @@ + > "> - - - + + - - + + - - + +
OrderPublisherIsbnTitleAuthor$ rrp$estQtyTotalOrderPublisherIsbnTitleAuthorrrpestQtyTotalBook fund
+   SubTotalSubTotal
GSTGST
TOTALTOTAL
-- 2.39.5