diff --git a/C4/Acquisition.pm b/C4/Acquisition.pm index 60dc59d0ea..c6993c3da6 100644 --- a/C4/Acquisition.pm +++ b/C4/Acquisition.pm @@ -2734,10 +2734,11 @@ sub GetInvoiceDetails { my $invoice = $sth->fetchrow_hashref; $query = q{ - SELECT aqorders.*, biblio.*, aqbasket.basketname + SELECT aqorders.*, biblio.*, biblioitems.*, aqbasket.basketname FROM aqorders LEFT JOIN aqbasket ON aqorders.basketno = aqbasket.basketno LEFT JOIN biblio ON aqorders.biblionumber = biblio.biblionumber + LEFT JOIN biblioitems ON aqorders.biblionumber = biblioitems.biblionumber WHERE invoiceid = ? }; $sth = $dbh->prepare($query); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 35bc2daf3e..6573735f9a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -119,7 +119,6 @@ Summary - Publisher Library Actual cost tax exc. Actual cost tax inc. @@ -134,18 +133,18 @@ [% FOREACH order IN orders_loop %] -

[% order.title %] + + [% order.title %] [% IF ( order.author ) %]
by [% order.author %] [% END %] -

- [% IF ( order.publishercode ) %] -

[% order.publishercode %] - [% IF ( order.publicationyear ) %] +
[% order.publishercode %] + [% IF order.publicationyear > 0 %] - [% order.publicationyear %] + [% ELSIF ( order.copyrightdate > 0) %] + - [% order.copyrightdate %] [% END %] -

[% END %]

[% order.branchcode %]

@@ -163,7 +162,7 @@ [% FOR tf IN foot_loop %] - Total (GST [% tf.gstgsti %] %) + Total (GST [% tf.gstgsti %] %) [% tf.quantity %] [% tf.totalgste %] @@ -174,7 +173,7 @@ [% END %] - Total ([% currency %]) + Total ([% currency %]) [% total_quantity %] [% total_gste %] @@ -184,7 +183,7 @@   - Total + Shipment cost ([% currency %]) + Total + Shipment cost ([% currency %]) [% total_quantity %]