From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
Date: Tue, 2 Oct 2018 16:42:58 +0000 (-0300)
Subject: Bug 21467: Display the quantity and adjust the amounts
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=3a4b6c9142a3a355d6764c2da1fdb9037f9d1277;p=koha.git

Bug 21467: Display the quantity and adjust the amounts

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>
---

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
index abe2d16a5f..e79648caf1 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
@@ -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>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
index 2c68488293..6296236505 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tt
@@ -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>