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

Bug 21467: Display the quantity and adjust the amounts

Browse source 
On the subscription detail view we should display the amounts depending
on the quantity (can be different than 0 now!)

Sponsored-by: BULAC - http://www.bulac.fr/

Signed-off-by: Séverine QUEUNE <severine.queune@bulac.fr>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-10-02 13:42:58 -03:00 committed by Nick Clemens
parent 9a011c58e7
commit 3a4b6c9142
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
View file

@ -100,7 +100,7 @@
<td>
[% IF order.datereceived %][%# FIXME Should only be true, right? %]
[%# FIXME What if unitprice has not been filled? %]
[% order.unitprice_tax_excluded | $Price | html %] / [% order.unitprice_tax_included | $Price | html %]
[% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
[% END %]
</td>
<td>[% order.order_internalnote | html %]</td>

6
koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
View file

@ -368,6 +368,7 @@
<th>Internal note</th>
<th>Vendor note</th>
<th>Fund</th>
<th>Quantity</th>
<th title="ecost tax exc. / ecost tax inc.">Ordered</th>
<th title="Actual cost tax exc. / Actual cost tax inc.">Spent</th>
</tr>
@ -410,15 +411,16 @@
<td>[% order.order_internalnote | html %]</td>
<td>[% order.order_vendornote | html %]</td>
<td>[% order.fund.budget_name | html %]</td>
<td>[% order.quantity | html %]</td>
<td>
[% UNLESS order.datereceived %]
[% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %]
[% order.ecost_tax_excluded * order.quantity | $Price %] / [% order.ecost_tax_included * order.quantity | $Price %]
[% END %]
</td>
<td>
[% IF order.datereceived %]
[%# FIXME What if unitprice has not been filled? %]
[% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %]
[% order.unitprice_tax_excluded * order.quantity | $Price %] / [% order.unitprice_tax_included * order.quantity | $Price %]
[% END %]
</td>
</tr>