@@ -, +, @@
- create an invoice for records that
- have a publication year
- have no publication year
- have a publisher...
- 'finish receiving' and check the invoice summary page
...acqui/invoice.pl?invoiceid=?
- Make sure all the information displays now but didn't witout the patch.
---
C4/Acquisition.pm | 3 ++-
.../intranet-tmpl/prog/en/modules/acqui/invoice.tt | 19 +++++++++----------
2 files changed, 11 insertions(+), 11 deletions(-)
--- a/C4/Acquisition.pm
+++ a/C4/Acquisition.pm
@@ -2657,10 +2657,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);
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
+++ a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
@@ -131,7 +131,6 @@
Summary
- Publisher
Library
Actual cost tax exc.
Actual cost tax inc.
@@ -146,18 +145,18 @@
[% order.publishercode %]
- [% IF ( order.publicationyear ) %]
+
[% order.publishercode %]
+ [% IF order.publicationyear > 0 %]
- [% order.publicationyear %]
+ [% ELSIF ( order.copyrightdate > 0) %]
+ - [% order.copyrightdate %]
[% END %]
-
[% order.branchcode %]