gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 12059: Publisher column on invoice page always empty 

This patch moves the publisher information out of its own
always empty column into the Summary column below the title,
as it is on other acq pages.

The information was never displaying, as publishercode is in
biblioitems and that table was not selected by GetInvoiceDetails.

Also modified the code to take into account that UNIMARC uses
biblioitems.publicationyear and MARC21/NORMARC use bibio.copyrightdate
for the copyright year.

To test:
- 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.

Signed-off-by: Paola Rossi <paola.rossi@cineca.it>

Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@gmail.com>
(cherry picked from commit d9c99b6f5e)
Signed-off-by: Chris Cormack <chris@bigballofwax.co.nz>
This commit is contained in:
Katrin Fischer 2014-11-10 09:55:52 +01:00 committed by Chris Cormack
parent 2edde60ffb
commit b970d1ef11
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
C4/Acquisition.pm
View File

@ -2644,10 +2644,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);

19
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt
View File

@ -131,7 +131,6 @@
<thead>
<tr>
<th>Summary</th>
<th>Publisher</th>
<th>Library</th>
<th class="gste">Actual cost tax exc.</th>
<th class="gsti">Actual cost tax inc.</th>
@ -146,18 +145,18 @@
<tbody>
[% FOREACH order IN orders_loop %]
<tr>
<td><p><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
<td>
<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% order.biblionumber %]">[% order.title %]</a>
[% IF ( order.author ) %]
<br /><em>by</em> [% order.author %]
[% END %]
</p></td>
<td>
[% IF ( order.publishercode ) %]
<p>[% order.publishercode %]
[% IF ( order.publicationyear ) %]
<br/>[% order.publishercode %]
[% IF order.publicationyear > 0 %]
- [% order.publicationyear %]
[% ELSIF ( order.copyrightdate > 0) %]
- [% order.copyrightdate %]
[% END %]
</p>
[% END %]
</td>
<td><p>[% order.branchcode %]</p></td>
@ -175,7 +174,7 @@
<tfoot>
[% FOR tf IN foot_loop %]
<tr>
<th colspan='3'>Total (GST [% tf.gstgsti %] %)</th>
<th colspan='2'>Total (GST [% tf.gstgsti %] %)</th>
<th class="gste"/><th class="gsti"/>
<th>[% tf.quantity %]</th>
<th class="gste">[% tf.totalgste %]</th>
@ -186,7 +185,7 @@
</tr>
[% END %]
<tr>
<th colspan='3'>Total ([% currency %])</th>
<th colspan='2'>Total ([% currency %])</th>
<th class="gste"/><th class="gsti"/>
<th>[% total_quantity %]</th>
<th class="gste">[% total_gste %]</th>
@ -196,7 +195,7 @@
<th>&nbsp;</th>
</tr>
<tr>
<th colspan="3">Total + Shipment cost ([% currency %])</th>
<th colspan="2">Total + Shipment cost ([% currency %])</th>
<th class="gste"></th>
<th class="gsti"></th>
<th>[% total_quantity %]</th>