From 3894a64eefed6dd59d81a93f9511c12403ee49c0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 14 Dec 2018 17:34:59 -0300 Subject: [PATCH] Bug 22007: Generated with add_missing_filters.pl --- .../intranet-tmpl/prog/en/modules/acqui/basket.tt | 24 +++++++++++----------- .../prog/en/modules/acqui/orderreceive.tt | 4 ++-- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 4 ++-- .../prog/en/modules/admin/categories.tt | 4 ++-- .../prog/en/modules/members/paycollect.tt | 2 +- .../opac-tmpl/bootstrap/en/modules/opac-main.tt | 2 +- t/LangInstaller/templates/simple.tt | 1 + 8 files changed, 22 insertions(+), 21 deletions(-) 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 f098dfec15..9328a90a97 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basket.tt @@ -518,14 +518,14 @@ [% 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.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 %] [% books_loo.budget_name | html %] @@ -634,14 +634,14 @@

[% 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.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 %] [% order.budget_name | html %] 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 a566b5adbd..28e8e47691 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt @@ -292,12 +292,12 @@
  • [% rrp | $Price %] (adjusted for [% cur_active | html %], [% IF (listincgst == 1) %]tax inclusive[% ELSE %]tax exclusive[% END %])
  • - +
  • [% ecost | $Price %] [% IF (listincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
  • - [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %] + [% IF (invoiceincgst == 1) %](tax inclusive)[% ELSE %](tax exclusive)[% END %]
    • [% IF order_vendornote %] 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 498486ccb2..c165e8d10c 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -230,7 +230,7 @@ + size="10" maxlength="80" value="[% budget_period_total | $Price on_editing => 1 %]" />
  • 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 ce45d2589c..5266f29bca 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -232,7 +232,7 @@
  • - +
  • @@ -243,7 +243,7 @@
  • - + 0 to disable
    • 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 c5f0e89e18..fd656f497d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/categories.tt @@ -108,7 +108,7 @@
  • - +
  • @@ -136,7 +136,7 @@
  • - +
  • diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt index 4ffb01716f..e0af674642 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/paycollect.tt @@ -157,7 +157,7 @@
  • - +
    • diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt index b7c74966b6..35812fdc76 100644 --- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt +++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-main.tt @@ -161,7 +161,7 @@
  • [% holds_waiting | html %] hold(s) waiting
    • [% END %] [% IF total_owing && total_owing > 0 %] -
  • [% total_owing | $Price with_symbol => 1 | html %] due in fines and charges
    • +
  • [% total_owing | $Price with_symbol => 1 %] due in fines and charges
    • [% END %] diff --git a/t/LangInstaller/templates/simple.tt b/t/LangInstaller/templates/simple.tt index 872e66714d..dbc4ce3882 100644 --- a/t/LangInstaller/templates/simple.tt +++ b/t/LangInstaller/templates/simple.tt @@ -1,3 +1,4 @@ +[% USE raw %] [% PROCESS 'i18n.inc' %] [% t('hello') | $raw %] [% tx('hello {name}', { name = 'Bob' }) | $raw %] -- 2.11.0