Koha-community/Koha
15
7
Fork 0
Code Issues Releases Wiki Activity

Bug 23397: (follow-up) Split and display itemtypes

Browse source 
Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
This commit is contained in:
Nick Clemens 2019-08-23 13:14:57 +00:00 committed by Martin Renvoize
parent 1f40de2931
commit 36a16efec3
Signed by: martin.renvoize
GPG key ID: 422B469130441A0F
4 changed files with 14 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
acqui/ordered.pl
View file

@ -58,7 +58,7 @@ SELECT
ecost_tax_included, budgetdate, entrydate,
aqbasket.booksellerid,
aqbooksellers.name as vendorname,
GROUP_CONCAT(DISTINCT itype),
GROUP_CONCAT(DISTINCT itype SEPARATOR '|') AS itypes,
title
FROM (aqorders, aqbasket)
LEFT JOIN biblio ON
@ -93,6 +93,7 @@ my @ordered;
my $total = 0;
while ( my $data = $sth->fetchrow_hashref ) {
$data->{'itemtypes'} = [split('\|', $data->{itypes})];
my $left = $data->{'tleft'};
if ( !$left || $left eq '' ) {
$left = $data->{'quantity'};

3
acqui/spent.pl
View file

@ -59,7 +59,7 @@ SELECT
quantity-quantityreceived AS tleft,
budgetdate, entrydate,
aqbasket.booksellerid,
GROUP_CONCAT(DISTINCT itype),
GROUP_CONCAT(DISTINCT itype SEPARATOR '|') as itypes,
title,
aqorders.invoiceid,
aqinvoices.invoicenumber,
@ -106,6 +106,7 @@ my $subtotal = 0;
my @spent;
while ( my $data = $sth->fetchrow_hashref ) {
my $recv = $data->{'quantityreceived'};
$data->{'itemtypes'} = [split('\|', $data->{itypes})];
if ( $recv > 0 ) {
my $rowtotal = $recv * get_rounded_price($data->{'unitprice_tax_included'});
$data->{'rowtotal'} = sprintf( "%.2f", $rowtotal );

7
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt
View file

@ -29,7 +29,7 @@
<th class="anti-the"> Title </th>
<th> Order </th>
<th> Vendor </th>
<th> Item type </th>
<th> Item types </th>
<th> Left on order </th>
<th> Estimated cost per unit </th>
<th class="title-string"> Date ordered </th>
@ -55,7 +55,10 @@
<a href="/cgi-bin/koha/acqui/supplier.pl?booksellerid=[% order.booksellerid | uri %]">[% order.vendorname | html %]</a>
</td>
<td class="cell">
[% ItemTypes.GetDescription( order.itype ) | html %]
[% FOREACH itemtype IN order.itemtypes %]
[% IF !(loop.count() mod 2) %] | [% END %]
[% ItemTypes.GetDescription( itemtype ) | html %]
[% END %]
</td>
<td class="cell">
[% order.left | html %]

7
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt
View file

@ -30,7 +30,7 @@
<th>Order</th>
<th>Vendor</th>
<th>Invoice</th>
<th>Item type</th>
<th>Item types</th>
<th>Received</th>
<th>Unit price</th>
<th class="title-string">Date ordered</th>
@ -56,7 +56,10 @@
<a href="/cgi-bin/koha/acqui/invoice.pl?invoiceid=[% order.invoiceid | uri %]">[% order.invoicenumber | html %]</a>
</td>
<td class="cell">
[% ItemTypes.GetDescription( order.itype ) | html %]
[% FOREACH itemtype IN order.itemtypes %]
[% IF !(loop.count() mod 2) %] | [% END %]
[% ItemTypes.GetDescription( itemtype ) | html %]
[% END %]
</td>
<td class="cell">
[% order.quantityreceived | html %]