From 7f6e7be8e5c5bdd66623abebecb9055a33fdaab6 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 2 Oct 2018 13:42:58 -0300 Subject: [PATCH] Bug 21467: Display the quantity and adjust the amounts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Katrin Fischer --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt | 2 +- .../intranet-tmpl/prog/en/modules/serials/subscription-detail.tt | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) 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 @@ [% 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 %] [% order.order_internalnote | html %] 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 1dcac0f3f9..5cbbb9bc39 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 @@ Internal note Vendor note Fund + Quantity Ordered Spent @@ -410,15 +411,16 @@ [% order.order_internalnote | html %] [% order.order_vendornote | html %] [% order.fund.budget_name | html %] + [% order.quantity | html %] [% 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 %] [% 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 %] -- 2.11.0