From 12e0708b61b602b70e604ffb1f1f80800d8dd17c Mon Sep 17 00:00:00 2001 From: Mark Tompsett Date: Thu, 15 Mar 2018 16:08:45 +0000 Subject: [PATCH] Bug 20395: Followup to change format to use price filter See comment #1. Signed-off-by: Roch D'Amour --- koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt | 1 - koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt | 3 ++- koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt index 2790d5a..82254c7 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -1,7 +1,6 @@ [% USE Koha %] [% USE KohaDates %] [% USE Price %] -[% USE currency = format('%.2f') -%] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] Koha › Acquisitions › [% IF ( date ) %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt index e1a5839..8cab821 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt @@ -1,4 +1,5 @@ [% USE Branches %] +[% USE Price %] [% SET footerjs = 1 %] [% INCLUDE 'doc-head-open.inc' %] <title>Koha › Administration › Circulation and fine rules @@ -149,7 +150,7 @@ [% rule.chargeperiod %] [% IF rule.chargeperiod_charge_at %]Start of interval[% ELSE %]End of interval[% END %] [% rule.firstremind %] - [% rule.overduefinescap FILTER format("%.2f") %] + [% rule.overduefinescap | $Price %] [% IF rule.cap_fine_to_replacement_price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt index 4a1d6a3..a1352e5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tt @@ -3,6 +3,7 @@ [% USE Branches %] [% USE Categories %] [% USE ItemTypes %] +[% USE Price %] [% INCLUDE 'doc-head-open.inc' %] [% UNLESS ( multi_hold ) %] Koha › Circulation › Holds › Place a hold on [% title |html %] @@ -340,7 +341,7 @@ function checkMultiHold() { [% END %] [% IF amount_outstanding && Koha.Preference('maxoutstanding') && amount_outstanding > Koha.Preference('maxoutstanding') %] -
  • [% patron.firstname %] [% patron.surname %]: Patron has outstanding fines: [% amount_outstanding | format('%.2f') %]
  • +
  • [% patron.firstname %] [% patron.surname %]: Patron has outstanding fines: [% amount_outstanding | $Price %]
  • [% END %] [% IF ( diffbranch ) %] -- 2.7.4