From 71227300a3f367ef8b17572a419d24eeecea9ded Mon Sep 17 00:00:00 2001 From: Katrin Fischer Date: Fri, 11 Jan 2019 22:55:35 +0100 Subject: [PATCH] Bug 21427: Format prices on ordered/spent lists consistently Some price information on the spent and ordered list already used the $Price filter. With this patch all amounts should be formatted according to the CurrencyFormat system preference. Signed-off-by: Jack Kelliher Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit 209570f89d050f22fa90eed6a8a70ad9eb56e8a2) Signed-off-by: Martin Renvoize --- .../intranet-tmpl/prog/en/modules/acqui/ordered.tt | 6 +++--- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt index 5cc5ae7f6f..fc25300c11 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/ordered.tt @@ -68,7 +68,7 @@ [% order.entrydate | $KohaDates %] - [% order.subtotal | html %] + [% order.subtotal | $Price %] [% END %] @@ -79,7 +79,7 @@ Adjustment cost for invoice [% adjustment.invoiceid | html %] - [% adjustment.adjustment | html %] + [% adjustment.adjustment | $Price %] [% END %] @@ -93,7 +93,7 @@ - [% total | html %] + [% total | $Price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt index 5aeedabc3e..b57f2f5f5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/spent.tt @@ -72,7 +72,7 @@ [% order.datereceived | $KohaDates %] - [% order.rowtotal | html %] + [% order.rowtotal | $Price %] [% END %] @@ -81,7 +81,7 @@ [% IF shipmentcosts.size || ( adjustments && adjustments.count > 0 ) %] Sub total - [% subtotal | html %] + [% subtotal | $Price %] [% END %] [% IF shipmentcosts.size %] @@ -89,7 +89,7 @@ Shipping cost for invoice [% shipmentcost.invoicenumber | html %] - [% shipmentcost.shipmentcost | html %] + [% shipmentcost.shipmentcost | $Price %] [% END %] [% END %] @@ -98,13 +98,13 @@ Adjustment cost for invoice [% adjustment.invoiceid | html %] - [% adjustment.adjustment | html %] + [% adjustment.adjustment | $Price %] [% END %] [% END %] TOTAL - [% total | html %] + [% total | $Price %] -- 2.39.5