From 2ca57f71067eceeb0c86f872a9fc1e4e315107ba Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sat, 29 Sep 2018 13:12:38 -0300 Subject: [PATCH] Bug 21454: Remove html filter for Price filtered variables Generated with: perl -p -i -e 's/\|\s?\$Price\s?\|\s?html\s%]/| \$Price %]/g' **/*.tt **/*.inc Signed-off-by: Kyle M Hall --- .../prog/en/includes/blocked-fines.inc | 2 +- .../prog/en/modules/acqui/acqui-home.tt | 16 +++---- .../prog/en/modules/acqui/basket.tt | 44 +++++++++---------- .../prog/en/modules/acqui/basketgroup.tt | 4 +- .../prog/en/modules/acqui/csv/basketgroup.tt | 8 ++-- .../prog/en/modules/acqui/invoice.tt | 34 +++++++------- .../prog/en/modules/acqui/orderreceive.tt | 6 +-- .../prog/en/modules/acqui/parcel.tt | 24 +++++----- .../prog/en/modules/admin/aqbudgetperiods.tt | 8 ++-- .../prog/en/modules/admin/aqbudgets.tt | 34 +++++++------- .../prog/en/modules/admin/aqplan.tt | 4 +- .../prog/en/modules/admin/categories.tt | 8 ++-- .../prog/en/modules/admin/itemtypes.tt | 8 ++-- .../prog/en/modules/circ/circulation.tt | 8 ++-- .../circ/circulation_batch_checkouts.tt | 4 +- .../en/modules/members/accountline-details.tt | 10 ++--- .../prog/en/modules/members/boraccount.tt | 8 ++-- .../prog/en/modules/members/deletemem.tt | 2 +- .../en/modules/members/moremember-print.tt | 6 +-- .../prog/en/modules/members/pay.tt | 10 ++--- .../modules/members/tables/members_results.tt | 2 +- .../en/modules/reports/cash_register_stats.tt | 4 +- .../en/modules/reports/orders_by_budget.tt | 12 ++--- .../en/modules/serials/subscription-detail.tt | 4 +- .../prog/en/modules/suggestion/suggestion.tt | 4 +- .../bootstrap/en/modules/opac-account.tt | 6 +-- .../bootstrap/en/modules/opac-reserve.tt | 2 +- .../bootstrap/en/modules/opac-user.tt | 16 +++---- .../bootstrap/en/modules/sco/sco-main.tt | 2 +- 29 files changed, 150 insertions(+), 150 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc index 0da49d03a7..832706f98b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/blocked-fines.inc @@ -3,7 +3,7 @@ [% IF fines and fines > 0 %]
  • Fees & Charges: - Patron has outstanding fees & charges of [% fines | $Price | html %]. + Patron has outstanding fees & charges of [% fines | $Price %]. [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt index b579b1145b..d02bdbd221 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt @@ -128,34 +128,34 @@ [% Branches.GetName( loop_budge.budget_branchcode ) | html %] [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_amount | $Price | html %] + [% loop_budge.budget_amount | $Price %] [% ELSE %] - [% loop_budge.budget_amount | $Price | html %] + [% loop_budge.budget_amount | $Price %] [% END %] [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_ordered | $Price | html %] + [% loop_budge.budget_ordered | $Price %] [% ELSE %] - [% loop_budge.budget_ordered | $Price | html %] + [% loop_budge.budget_ordered | $Price %] [% END %] [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_spent | $Price | html %] + [% loop_budge.budget_spent | $Price %] [% ELSE %] - [% loop_budge.budget_spent | $Price | html %] + [% loop_budge.budget_spent | $Price %] [% END %] [% IF loop_budge.budget_parent_id %] - [% loop_budge.budget_avail | $Price | html %] + [% loop_budge.budget_avail | $Price %] [% ELSE %] - [% loop_budge.budget_avail | $Price | html %] + [% loop_budge.budget_avail | $Price %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt index b870d835e8..ab91cb2c70 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -385,10 +385,10 @@     [% foot_loo.quantity | html %] - [% foot_loo.total_tax_excluded | $Price | html %] - [% foot_loo.total_tax_included | $Price | html %] + [% foot_loo.total_tax_excluded | $Price %] + [% foot_loo.total_tax_included | $Price %]   - [% foot_loo.tax_value | $Price | html %] + [% foot_loo.tax_value | $Price %]     [% IF ( active ) %] @@ -408,10 +408,10 @@     [% total_quantity | html %] - [% total_tax_excluded | $Price | html %] - [% total_tax_included | $Price | html %] + [% total_tax_excluded | $Price %] + [% total_tax_included | $Price %]   - [% total_tax_value | $Price | html %] + [% total_tax_value | $Price %]     [% IF ( active ) %] @@ -478,16 +478,16 @@ [% SET zero_regex = "^0{1,}\.?0{1,}[^1-9]" %] [%# 0 or 0.0 or 0.00 or 00 or 00.0 or 00.00 or 0.000 ... %] [%# FIXME: use of a regexp is not ideal; bugs 9410 and 10929 suggest better way of handling this %] - [% books_loo.rrp_tax_excluded | $Price | html %] - [% books_loo.ecost_tax_excluded | $Price | html %] - [% books_loo.rrp_tax_included | $Price | html %] - [% books_loo.ecost_tax_included | $Price | html %] - [% books_loo.replacementprice | $Price | html %] + [% books_loo.rrp_tax_excluded | $Price %] + [% books_loo.ecost_tax_excluded | $Price %] + [% books_loo.rrp_tax_included | $Price %] + [% books_loo.ecost_tax_included | $Price %] + [% books_loo.replacementprice | $Price %] [% books_loo.quantity | html %] - [% books_loo.total_tax_excluded | $Price | html %] - [% books_loo.total_tax_included | $Price | html %] + [% books_loo.total_tax_excluded | $Price %] + [% books_loo.total_tax_included | $Price %] [% books_loo.tax_rate * 100 | html %] - [% books_loo.tax_value | $Price | html %] + [% books_loo.tax_value | $Price %] [% books_loo.budget_name | html %] [% books_loo.suppliers_report | html %] [% IF ( active ) %] @@ -594,16 +594,16 @@

    [% END %] - [% order.rrp_tax_excluded | $Price | html %] - [% order.ecost_tax_excluded | $Price | html %] - [% order.rrp_tax_included | $Price | html %] - [% order.ecost_tax_included | $Price | html %] - [% order.replacementprice | $Price | html %] + [% order.rrp_tax_excluded | $Price %] + [% order.ecost_tax_excluded | $Price %] + [% order.rrp_tax_included | $Price %] + [% order.ecost_tax_included | $Price %] + [% order.replacementprice | $Price %] [% order.quantity | html %] - [% order.total_tax_excluded | $Price | html %] - [% order.total_tax_included | $Price | html %] + [% order.total_tax_excluded | $Price %] + [% order.total_tax_included | $Price %] [% order.tax_rate * 100 | html %] - [% order.tax_value | $Price | html %] + [% order.tax_value | $Price %] [% order.budget_name | html %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt index 6f4ac6d745..9c81b71e55 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt @@ -178,7 +178,7 @@ function submitForm(form) { No name, basketnumber: [% basket.basketno | html %] [% END %] ,
    - Total: [% basket.total | $Price | html %] + Total: [% basket.total | $Price %]
    • [% END %] @@ -268,7 +268,7 @@ function submitForm(form) { No name, basketnumber: [% selectedbasket.basketno | html %] [% END %] ,
    - Total: [% selectedbasket.total | $Price | html %] + Total: [% selectedbasket.total | $Price %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt index 423d14548c..fe4d77c406 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/csv/basketgroup.tt @@ -16,11 +16,11 @@ "[% r.collectiontitle | html %]"[%- delimiter | html -%] [% r.isbn | html %][%- delimiter | html -%] [% r.quantity | html %][%- delimiter | html -%] -[% r.rrp_tax_included | $Price | html %][%- delimiter | html -%] -[% r.rrp_tax_excluded | $Price | html %][%- delimiter | html -%] +[% r.rrp_tax_included | $Price %][%- delimiter | html -%] +[% r.rrp_tax_excluded | $Price %][%- delimiter | html -%] [% r.discount | html %][%- delimiter | html -%] -[% r.ecost_tax_included | $Price | html %][%- delimiter | html -%] -[% r.ecost_tax_excluded | $Price | html %][%- delimiter | html -%] +[% r.ecost_tax_included | $Price %][%- delimiter | html -%] +[% r.ecost_tax_excluded | $Price %][%- delimiter | html -%] "[% r.notes | html %]"[%- delimiter | html -%] [% r.entrydate | html %][%- delimiter | html -%] "[% r.booksellername | html %]"[%- delimiter | html -%] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt index 0389baddf2..c66c94ba3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/invoice.tt @@ -109,7 +109,7 @@ [% total_adj = total_adj + adjustment.adjustment | html %] [% adjustment.adjustment_id | html %] - + [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %] [% IF reasons.0 %] @@ -273,14 +273,14 @@ [% END %]

    [% order.branchcode | html %]

    - [% order.unitprice_tax_excluded | $Price | html %] - [% order.unitprice_tax_included | $Price | html %] - [% order.replacementprice | $Price | html %] + [% order.unitprice_tax_excluded | $Price %] + [% order.unitprice_tax_included | $Price %] + [% order.replacementprice | $Price %] [% order.quantity | html %] - [% order.total_tax_excluded | $Price | html %] - [% order.total_tax_included | $Price | html %] + [% order.total_tax_excluded | $Price %] + [% order.total_tax_included | $Price %] [% order.tax_rate * 100 | html %] - [% order.tax_value | $Price | html %] + [% order.tax_value | $Price %] [% order.budget_name | html %] [% END %] @@ -293,10 +293,10 @@ [% tf.quantity | html %] - [% tf.total_tax_excluded | $Price | html %] - [% tf.total_tax_included | $Price | html %] + [% tf.total_tax_excluded | $Price %] + [% tf.total_tax_included | $Price %]   - [% tf.tax_value | $Price | html %] + [% tf.tax_value | $Price %]   [% END %] @@ -306,10 +306,10 @@ [% total_quantity | html %] - [% total_tax_excluded | $Price | html %] - [% total_tax_included | $Price | html %] + [% total_tax_excluded | $Price %] + [% total_tax_included | $Price %]   - [% total_tax_value | $Price | html %] + [% total_tax_value | $Price %]   @@ -318,10 +318,10 @@ [% total_quantity | html %] - [% total_tax_excluded_shipment + total_adj | $Price | html %] - [% total_tax_included_shipment | $Price | html %] + [% total_tax_excluded_shipment + total_adj | $Price %] + [% total_tax_included_shipment | $Price %]   - [% total_tax_value | $Price | html %] + [% total_tax_value | $Price %]   @@ -329,7 +329,7 @@ [% ELSE %]

    No orders yet

    [% IF adjustments && adjustments.count > 0 || shipmentcost && shipmentcost > 0 %] -

    Adjustments plus shipping:[% total_adj + shipmentcost | $Price | html %]

    +

    Adjustments plus shipping:[% total_adj + shipmentcost | $Price %]

    [% END %]
    [% END %] 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 5af060436a..39ee661680 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -239,12 +239,12 @@ [% END %] -
  • [% rrp | $Price | html %]
    • +
  • [% rrp | $Price %]
  • - +
    • -
  • [% ecost | $Price | html %]
    • +
  • [% ecost | $Price %]
  • 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 2b8d94a2ad..7b3e958045 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt @@ -171,10 +171,10 @@ MARC
    Card - [% loop_order.replacementprice | $Price | html %] + [% loop_order.replacementprice | $Price %] [% loop_order.quantity | html %] - [% loop_order.ecost | $Price | html %] - [% loop_order.total | $Price | html %] + [% loop_order.ecost | $Price %] + [% loop_order.total | $Price %] [% loop_order.budget_name | html %] Receive @@ -250,27 +250,27 @@ (Tax exc.) [% END %] Subtotal for [% key | html %] - [% subtotal_for_funds.$key.ecost | $Price | html %] - [% subtotal_for_funds.$key.unitprice | $Price | html %] + [% subtotal_for_funds.$key.ecost | $Price %] + [% subtotal_for_funds.$key.unitprice | $Price %]     [% END %] Total tax exc. - [% total_tax_excluded | $Price | html %] + [% total_tax_excluded | $Price %] [% FOREACH book_foot IN book_foot_loop %] Total (GST [% book_foot.tax_rate * 100 | html %]%) - [% book_foot.tax_value | $Price | html %] + [% book_foot.tax_value | $Price %] [% END %] Total tax inc. - [% total_tax_included | $Price | html %] + [% total_tax_included | $Price %] @@ -324,12 +324,12 @@ MARC
    Card - [% order.replacementprice | $Price | html %] + [% order.replacementprice | $Price %] [% order.quantityreceived | html %] [% order.budget.budget_name | html %] - [% order.ecost | $Price | html %] - [% order.unitprice | $Price | html %] - [% order.total | $Price | html %] + [% order.ecost | $Price %] + [% order.unitprice | $Price %] + [% order.total | $Price %] [% IF loop_receive.cannot_cancel or ( order.basket.effective_create_items == "receiving" and loop_receive.holds > 0 ) %] [% IF loop_receive.cannot_cancel %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt index 2ec02bc63a..22b6d2ea81 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -368,7 +368,7 @@ [% IF r.orders_moved.size > 0 %] [% FOR order IN r.orders_moved %] - [% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %]) Amount=[% r.budget.budget_amount | $Price | html %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price | html %] remaining has been moved)[% END %] + [% r.budget.budget_name | html %] (id=[% r.budget.budget_id | html %]) Amount=[% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %] [% order.basketname | html %] [% order.ordernumber | html %] Moved! @@ -385,7 +385,7 @@ [% ELSE %] [% IF r.error == 'budget_code_not_exists' %] - [% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price | html %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price | html %] remaining has been moved)[% END %] + [% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %] This fund code does not exist in the destination budget. @@ -439,7 +439,7 @@ Locked  [% END %] - [% period_active.budget_period_total | $Price | html %] + [% period_active.budget_period_total | $Price %] [% PROCESS action_menu block_budget=period_active %] @@ -471,7 +471,7 @@ [% period_loo.budget_period_startdate | $KohaDates %] [% period_loo.budget_period_enddate | $KohaDates %] [% IF ( period_loo.budget_period_locked ) %]Locked [% ELSE %][% END %] - [% period_loo.budget_period_total | $Price | html %] + [% period_loo.budget_period_total | $Price %] [% PROCESS action_menu block_budget=period_loo %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt index 707580b485..28792b7367 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -81,14 +81,14 @@ - Period allocated [% IF budget_period_total %][% budget_period_total | $Price | html %][% END %] - [% period_alloc_total | $Price | html %] + Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %] + [% period_alloc_total | $Price %] - [% ordered_total | $Price | html %] + [% ordered_total | $Price %] - [% spent_total | $Price | html %] + [% spent_total | $Price %] - [% available_total | $Price | html %] + [% available_total | $Price %] @@ -105,37 +105,37 @@ [% budget.budget_name | html %] [% IF budget.budget_parent_id %] - [% budget.budget_amount | $Price | html %] + [% budget.budget_amount | $Price %] [% ELSE %] - [% budget.budget_amount | $Price | html %] + [% budget.budget_amount | $Price %] [% END %] [% IF budget.budget_parent_id %] - [% budget.budget_ordered | $Price | html %] + [% budget.budget_ordered | $Price %] [% ELSE %] - [% budget.budget_ordered | $Price | html %] + [% budget.budget_ordered | $Price %] [% END %] [% IF budget.budget_parent_id %] - [% budget.total_ordered | $Price | html %] + [% budget.total_ordered | $Price %] [% ELSE %] - [% budget.total_ordered | $Price | html %] + [% budget.total_ordered | $Price %] [% END %] [% IF budget.budget_parent_id %] - [% budget.budget_spent | $Price | html %] + [% budget.budget_spent | $Price %] [% ELSE %] - [% budget.budget_spent | $Price | html %] + [% budget.budget_spent | $Price %] [% END %] [% IF budget.budget_parent_id %] - [% budget.total_spent | $Price | html %] + [% budget.total_spent | $Price %] [% ELSE %] - [% budget.total_spent | $Price | html %] + [% budget.total_spent | $Price %] [% END %] @@ -158,7 +158,7 @@ [% END %] [% END %] - [% value | $Price | html %] + [% value | $Price %] [% END %] @@ -376,7 +376,7 @@ - +
    Fund amount:[% budget_amount | $Price | html %][% budget_amount | $Price %]
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt index a7a7600860..941854a21b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tt @@ -76,7 +76,7 @@ [% END %] [% budget_line.budget_name | html %] - [% budget_line.budget_amount | $Price | html %]  + [% budget_line.budget_amount | $Price %]  @@ -129,7 +129,7 @@ [% ELSE %] [% END %] - [% budget_line.budget_est_remain | $Price | html %]  + [% budget_line.budget_est_remain | $Price %]  diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt index 585a47aef5..602fe11f0d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -279,10 +279,10 @@ Age required: [% category.dateofbirthrequired | html %] years Upperage limit: [% category.upperagelimit | html %] years - Enrollment fee: [% category.enrolmentfee | $Price | html %] + Enrollment fee: [% category.enrolmentfee | $Price %] Receives overdue notices: [% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %] Lost items in staff client[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %] - Hold fee: [% category.reservefee | $Price | html %] + Hold fee: [% category.reservefee | $Price %] [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %] @@ -397,14 +397,14 @@ - [% END %] [% IF (category.enrolmentfee > 0) %] - [% category.enrolmentfee | $Price | html %] + [% category.enrolmentfee | $Price %] [% ELSE %] - [% END %] [% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %] [% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %] [% IF (category.reservefee > 0) %] - [% category.reservefee | $Price | html %] + [% category.reservefee | $Price %] [% ELSE %] - [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt index b131f3a860..dbf11d319d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/itemtypes.tt @@ -307,7 +307,7 @@ Item types administration [% END %] - Rental charge[% itemtype.rentalcharge | $Price | html %] + Rental charge[% itemtype.rentalcharge | $Price %]
    @@ -369,11 +369,11 @@ Item types administration [% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %] [% UNLESS ( itemtype.notforloan ) %] - [% itemtype.rentalcharge | $Price | html %] + [% itemtype.rentalcharge | $Price %] [% END %] - [% itemtype.defaultreplacecost | $Price | html %] - [% itemtype.processfee | $Price | html %] + [% itemtype.defaultreplacecost | $Price %] + [% itemtype.processfee | $Price %] [% itemtype.checkinmsg | html_line_break | $raw %] Edit diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt index dbf3e2d37e..bec7d1dfe8 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt @@ -99,11 +99,11 @@ [% END %] [% IF ( DEBT ) %] -
  • The patron has a debt of [% DEBT | $Price | html %].
    • +
  • The patron has a debt of [% DEBT | $Price %].
    • [% END %] [% IF ( DEBT_GUARANTEES ) %] -
  • The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price | html %].
    • +
  • The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price %].
    • [% END %] [% IF ( RENTALCHARGE && RENTALCHARGE > 0 ) %] @@ -718,7 +718,7 @@ No patron matched [% message | html %] [% IF ( charges_guarantees ) %]
  • - Fees & Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price | html %]. + Fees & Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %]. [% IF noissues %] Checkouts are BLOCKED because fine balance is OVER THE LIMIT. [% END %] @@ -728,7 +728,7 @@ No patron matched [% message | html %] [% IF ( credits ) %]
  • - Credits: Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Price | html %][% END %] + Credits: Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Price %][% END %]
    • [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt index 37b34adc50..eada7334a2 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation_batch_checkouts.tt @@ -50,7 +50,7 @@ [% END %] [% IF charges_guarantees %]
  • - Fees & Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price | html %]. + Fees & Charges: Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %].
  • Checkouts are BLOCKED because fine balance is OVER THE LIMIT. @@ -249,7 +249,7 @@
  • The barcode was not found [% checkout_info.barcode | html %].
    • [% END %] [% IF checkout_info.DEBT %] -
  • The patron has a debt of [% checkout_info.DEBT | $Price | html %].
    • +
  • The patron has a debt of [% checkout_info.DEBT | $Price %].
    • [% END %]

    [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt index 1ffd01ec69..e5df6b84c4 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/accountline-details.tt @@ -61,11 +61,11 @@ - [% accountline.amount | $Price | html %] + [% accountline.amount | $Price %] - [% accountline.amountoutstanding | $Price | html %] + [% accountline.amountoutstanding | $Price %] @@ -107,13 +107,13 @@ [% offset_accountline.date | $KohaDates %] [% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %] - [% offset_accountline.amount | $Price | html %] - [% offset_accountline.amountoutstanding | $Price | html %] + [% offset_accountline.amount | $Price %] + [% offset_accountline.amountoutstanding | $Price %] [% INCLUDE 'accounttype.inc' account => offset_accountline %] [% offset_accountline.note | html %] [% IF offset_accountline.manager_id %][% offset_accountline.manager_id | html %][% END %] [% ao.created_on | $KohaDates with_hours => 1 | html %] - [% ao.amount | $Price | html %] + [% ao.amount | $Price %] [% INCLUDE 'account_offset_type.inc' account_offset => ao %] Details diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt index 1f64b17b90..8e2484daff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/boraccount.tt @@ -67,8 +67,8 @@  [% IF ( account.itemnumber ) %][% account.item.biblio.title | html %][% END %] [% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %] [% account.note | html_line_break %] - [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount | $Price | html %] - [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding | $Price | html %] + [% IF ( account.amountcredit ) %][% ELSE %][% END %][% account.amount | $Price %] + [% IF ( account.amountoutstandingcredit ) %][% ELSE %][% END %][% account.amountoutstanding | $Price %] [% IF ( account.payment ) %] Print @@ -96,9 +96,9 @@ Total due [% IF ( totalcredit ) %] - [% total | $Price | html %] + [% total | $Price %] [% ELSE %] - [% total | $Price | html %] + [% total | $Price %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt index ba9cbb5b38..aafb9615a6 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/deletemem.tt @@ -26,7 +26,7 @@
  • Patron has [% ItemsOnIssues | html %] item(s) checked out.
    • [% END %] [% IF ( charges ) %] -
  • Patron has [% charges | $Price | html %] in fines.
    • +
  • Patron has [% charges | $Price %] in fines.
    • [% END %] [% IF ( guarantees ) %]
  • Patron's record has guaranteed accounts attached.
    • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt index 89c557571b..d20a81eec5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tt @@ -128,14 +128,14 @@ [% ELSE %] - [% END %][% account.amount | $Price | html %] + [% END %][% account.amount | $Price %] [% IF ( account.amountoutstanding < 0 ) %] [% ELSE %] [% END %] - [% account.amountoutstanding | $Price | html %] + [% account.amountoutstanding | $Price %] [% END %] @@ -143,7 +143,7 @@ Total due - [% totaldue | $Price | html %] + [% totaldue | $Price %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt index ffac4d766c..62c830f48a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/pay.tt @@ -52,7 +52,7 @@ Total due: - [% total | $Price | html %] + [% total | $Price %] @@ -105,15 +105,15 @@ [% line.accounttype | html %] - [% line.amount | $Price | html %] - [% line.amountoutstanding | $Price | html %] + [% line.amount | $Price %] + [% line.amountoutstanding | $Price %] [% END %] [% IF ( account_grp.total ) %] Sub total: - [% account_grp.total | $Price | html %] + [% account_grp.total | $Price %] [% END %] @@ -155,7 +155,7 @@ $(document).ready(function(){ $('#pay-fines-form').preventDoubleFormSubmit(); $("#woall").click(function(event){ - var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | $Price | html %]" ); + var msg = _("Are you sure you want to write off %s in outstanding fines? This cannot be undone!").format( "[% total | $Price %]" ); var answer = confirm(msg); if (!answer){ event.preventDefault(); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt index 066ada1708..0dd7f19a3a 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/tables/members_results.tt @@ -29,7 +29,7 @@ "dt_od_checkouts": "[% IF data.overdues %][% data.overdues | html %][% ELSE %][% data.overdues | html %][% END %] / [% data.issues | html %]", "dt_fines": - "[% IF data.fines < 0 %][% data.fines | $Price | html %] [% ELSIF data.fines > 0 %] [% data.fines | $Price | html %] [% ELSE %] [% data.fines | $Price | html %] [% END %]", + "[% IF data.fines < 0 %][% data.fines | $Price %] [% ELSIF data.fines > 0 %] [% data.fines | $Price %] [% ELSE %] [% data.fines | $Price %] [% END %]", "dt_borrowernotes": "[% data.borrowernotes.replace('\\\\' , '\\\\') |html_line_break |collapse %]", "dt_action": diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt index 60ed3508b1..c01bd33ea5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/cash_register_stats.tt @@ -228,7 +228,7 @@ [% END %] [% loopresul.note | html %] - [% loopresul.amount | $Price | html %] + [% loopresul.amount | $Price %] [% loopresul.title | html %] [% loopresul.barcode | html %] [% ItemTypes.GetDescription(loopresul.itype) | html %] @@ -238,7 +238,7 @@ [% IF transaction_type == "ACT" %] TOTAL - [% total | $Price | html %] + [% total | $Price %]   [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt index 1b1c4d46c4..206fe2ab3b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/reports/orders_by_budget.tt @@ -64,12 +64,12 @@ [% ordersloo.authorisedbyname | html %] [% ordersloo.title | html %] [% ordersloo.currency | html %] - [% ordersloo.listprice | $Price | html %] - [% ordersloo.rrp | $Price | html %] - [% ordersloo.ecost | $Price | html %] + [% ordersloo.listprice | $Price %] + [% ordersloo.rrp | $Price %] + [% ordersloo.ecost | $Price %] [% ordersloo.quantity | html %] - [% ordersloo.total_rrp | $Price | html %] - [% ordersloo.total_ecost | $Price | html %] + [% ordersloo.total_rrp | $Price %] + [% ordersloo.total_ecost | $Price %] [% ordersloo.entrydate | html %] [% ordersloo.datereceived | html %] [% ordersloo.order_internalnote | html %] @@ -77,7 +77,7 @@ [% END %] - TOTAL[% total_quantity | html %][% total_rrp | $Price | html %][% total_ecost | $Price | html %] + TOTAL[% total_quantity | html %][% total_rrp | $Price %][% total_ecost | $Price %] [% END %] [% ELSE %] 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 e8e8364161..4f4817c1f6 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 @@ -387,13 +387,13 @@ [% order.fund.budget_name | html %] [% UNLESS order.datereceived %] - [% order.ecost_tax_excluded | $Price | html %] / [% order.ecost_tax_included | $Price | html %] + [% order.ecost_tax_excluded | $Price %] / [% order.ecost_tax_included | $Price %] [% END %] [% IF order.datereceived %] [%# FIXME What if unitprice has not been filled? %] - [% order.unitprice_tax_excluded | $Price | html %] / [% order.unitprice_tax_included | $Price | html %] + [% order.unitprice_tax_excluded | $Price %] / [% order.unitprice_tax_included | $Price %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt index 2543fb6a66..03cde0a100 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt @@ -205,10 +205,10 @@ Currency:[% currency | html %]
  • - Price:[% price | $Price | html %] + Price:[% price | $Price %]
  • - Total[% total | $Price | html %] + Total[% total | $Price %]
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt index 8fb0ec48e5..205921dee1 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-account.tt @@ -89,7 +89,7 @@ [%- SET COLSPAN = 3 -%] [%- END -%] Total due - [% total | $Price | html %] + [% total | $Price %] @@ -134,8 +134,8 @@ [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %] [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %] - [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount | $Price | html %] - [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding | $Price | html %] + [% IF ( ACCOUNT_LINE.amountcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amount | $Price %] + [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %][% ELSE %][% END %][% ACCOUNT_LINE.amountoutstanding | $Price %] [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt index aca8342f30..df8a690c48 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-reserve.tt @@ -65,7 +65,7 @@ [% IF ( too_much_oweing ) %]
  • - You have unpaid fines. Amount: [% too_much_oweing | $Price | html %]. + You have unpaid fines. Amount: [% too_much_oweing | $Price %].
    • [% END %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt index 728ddaf171..65714043d6 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt @@ -129,7 +129,7 @@
  • Please note: Your library card has been marked as lost or stolen. If this is an error, please contact the library.
    • [% END %] [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %] -
  • Please note: You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed [% renewal_blocked_fines | $Price | html %].[% ELSE %]You have fines.[% END %] +
  • Please note: You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed [% renewal_blocked_fines | $Price %].[% ELSE %]You have fines.[% END %] [% END %] @@ -145,9 +145,9 @@ [% IF relatives %]
  • Relatives' checkouts
    • [% END %] [% IF ( overdues_count ) %]
  • Overdue ([% overdues_count | html %])
    • [% END %] [% IF ( OPACFinesTab ) %] - [% IF ( borrower.amountoverfive ) %]
  • Fines ([% amountoutstanding | $Price | html %])
    • [% END %] - [% IF ( borrower.amountoverzero ) %]
  • Fines ([% amountoutstanding | $Price | html %])
    • [% END %] - [% IF ( borrower.amountlessthanzero ) %]
  • Credits ([% amountoutstanding | $Price | html %])
    • [% END %] + [% IF ( borrower.amountoverfive ) %]
  • Fines ([% amountoutstanding | $Price %])
    • [% END %] + [% IF ( borrower.amountoverzero ) %]
  • Fines ([% amountoutstanding | $Price %])
    • [% END %] + [% IF ( borrower.amountlessthanzero ) %]
  • Credits ([% amountoutstanding | $Price %])
    • [% END %] [% END %] [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] @@ -284,7 +284,7 @@ Renew [% END %] [% IF ISSUE.renewalfee > 0 %] - Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price | html %] + Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %] [% END %] ([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining) [% ELSIF ( ISSUE.on_reserve ) %] @@ -374,7 +374,7 @@ You currently owe fines and charges amounting to: - [% amountoutstanding | $Price | html %] + [% amountoutstanding | $Price %] @@ -388,7 +388,7 @@ You currently owe fines and charges amounting to: - [% amountoutstanding | $Price | html %] + [% amountoutstanding | $Price %] @@ -401,7 +401,7 @@ Amount - You have a credit of:[% amountoutstanding | $Price | html %] + You have a credit of:[% amountoutstanding | $Price %] diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt index dcfdb08a0d..018374418d 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt @@ -56,7 +56,7 @@ [% ELSIF ( circ_error_NOT_FOR_LOAN ) %] This item is not for loan. [% ELSIF ( circ_error_DEBT ) %] - You owe the library [% DEBT | $Price | html %] and cannot check out. + You owe the library [% DEBT | $Price %] and cannot check out. [% ELSIF ( circ_error_WTHDRAWN ) %] This item has been withdrawn from the collection. [% ELSIF ( circ_error_RESTRICTED ) %] -- 2.17.1 (Apple Git-112)