Bugzilla – Attachment 79705 Details for
Bug 21454
Price filtered variables should not need to be html filtered
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21454: Remove html filter for Price filtered variables
Bug-21454-Remove-html-filter-for-Price-filtered-va.patch (text/plain), 67.30 KB, created by
Kyle M Hall (khall)
on 2018-10-01 11:20:56 UTC
(
hide
)
Description:
Bug 21454: Remove html filter for Price filtered variables
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-10-01 11:20:56 UTC
Size:
67.30 KB
patch
obsolete
>From 2ca57f71067eceeb0c86f872a9fc1e4e315107ba Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >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 <kyle@bywatersolutions.com> >--- > .../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 %] > <li> > <span class="circ-hlt">Fees & Charges:</span> >- Patron has outstanding fees & charges of [% fines | $Price | html %]. >+ Patron has outstanding fees & charges of [% fines | $Price %]. > [% IF !Koha.Preference('AllowFineOverride') && NoIssuesCharge && fines > NoIssuesCharge %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% 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 @@ > <td>[% Branches.GetName( loop_budge.budget_branchcode ) | html %]</td> > <td class="data"> > [% IF loop_budge.budget_parent_id %] >- [% loop_budge.budget_amount | $Price | html %] >+ [% loop_budge.budget_amount | $Price %] > [% ELSE %] >- <span class="total_amount">[% loop_budge.budget_amount | $Price | html %]</span> >+ <span class="total_amount">[% loop_budge.budget_amount | $Price %]</span> > [% END %] > </td> > <td class="data"> > <a href="ordered.pl?fund=[% loop_budge.budget_id | html %]&fund_code=[% loop_budge.budget_code | html %]"> > [% IF loop_budge.budget_parent_id %] >- [% loop_budge.budget_ordered | $Price | html %] >+ [% loop_budge.budget_ordered | $Price %] > [% ELSE %] >- <span class="total_amount">[% loop_budge.budget_ordered | $Price | html %]</span> >+ <span class="total_amount">[% loop_budge.budget_ordered | $Price %]</span> > [% END %] > </a> > </td> > <td class="data"> > <a href="spent.pl?fund=[% loop_budge.budget_id | html %]&fund_code=[% loop_budge.budget_code | html %]"> > [% IF loop_budge.budget_parent_id %] >- [% loop_budge.budget_spent | $Price | html %] >+ [% loop_budge.budget_spent | $Price %] > [% ELSE %] >- <span class="total_amount">[% loop_budge.budget_spent | $Price | html %]</span> >+ <span class="total_amount">[% loop_budge.budget_spent | $Price %]</span> > [% END %] > </a> > </td> > <td class="data"> > [% IF loop_budge.budget_parent_id %] >- [% loop_budge.budget_avail | $Price | html %] >+ [% loop_budge.budget_avail | $Price %] > [% ELSE %] >- <span class="total_amount">[% loop_budge.budget_avail | $Price | html %]</span> >+ <span class="total_amount">[% loop_budge.budget_avail | $Price %]</span> > [% END %] > </td> > </tr> >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 @@ > <th class="tax_included"> </th> > <th class="replacementprice"> </th> > <th>[% foot_loo.quantity | html %]</th> >- <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price | html %]</th> >- <th class="tax_included">[% foot_loo.total_tax_included | $Price | html %]</th> >+ <th class="tax_excluded">[% foot_loo.total_tax_excluded | $Price %]</th> >+ <th class="tax_included">[% foot_loo.total_tax_included | $Price %]</th> > <th> </th> >- <th>[% foot_loo.tax_value | $Price | html %]</th> >+ <th>[% foot_loo.tax_value | $Price %]</th> > <th> </th> > <th> </th> > [% IF ( active ) %] >@@ -408,10 +408,10 @@ > <th class="tax_included"> </th> > <th class="replacementprice"> </th> > <th>[% total_quantity | html %]</th> >- <th class="tax_excluded">[% total_tax_excluded | $Price | html %]</th> >- <th class="tax_included">[% total_tax_included | $Price | html %]</th> >+ <th class="tax_excluded">[% total_tax_excluded | $Price %]</th> >+ <th class="tax_included">[% total_tax_included | $Price %]</th> > <th> </th> >- <th>[% total_tax_value | $Price | html %]</th> >+ <th>[% total_tax_value | $Price %]</th> > <th> </th> > <th> </th> > [% IF ( active ) %] >@@ -478,16 +478,16 @@ > </td> > [% 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 %] >- <td class="number tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price | html %]</td> >- <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price | html %]</td> >- <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price | html %]</td> >- <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price | html %]</td> >- <td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price | html %]</td> >+ <td class="number tax_excluded [% IF books_loo.rrp_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_excluded | $Price %]</td> >+ <td class="number tax_excluded [% IF books_loo.ecost_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_excluded | $Price %]</td> >+ <td class="number tax_included [% IF books_loo.rrp_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.rrp_tax_included | $Price %]</td> >+ <td class="number tax_included [% IF books_loo.ecost_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.ecost_tax_included | $Price %]</td> >+ <td class="number replacementprice [% IF books_loo.replacementprice.search(zero_regex) %]error[% END %]">[% books_loo.replacementprice | $Price %]</td> > <td class="number [% IF books_loo.quantity.search(zero_regex) %]error[% END %]">[% books_loo.quantity | html %]</td> >- <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price | html %]</td> >- <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price | html %]</td> >+ <td class="number tax_excluded [% IF books_loo.total_tax_excluded.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_excluded | $Price %]</td> >+ <td class="number tax_included [% IF books_loo.total_tax_included.search(zero_regex) %]error[% END %]">[% books_loo.total_tax_included | $Price %]</td> > <td class="number">[% books_loo.tax_rate * 100 | html %]</td> >- <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price | html %]</td> >+ <td class="number [% IF books_loo.tax_value.search(zero_regex) %]error[% END %]">[% books_loo.tax_value | $Price %]</td> > <td>[% books_loo.budget_name | html %]</td> > <td>[% books_loo.suppliers_report | html %]</td> > [% IF ( active ) %] >@@ -594,16 +594,16 @@ > </p> > [% END %] > </td> >- <td class="number tax_excluded">[% order.rrp_tax_excluded | $Price | html %]</td> >- <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price | html %]</td> >- <td class="number tax_included">[% order.rrp_tax_included | $Price | html %]</td> >- <td class="number tax_included">[% order.ecost_tax_included | $Price | html %]</td> >- <td class="number replacementprice">[% order.replacementprice | $Price | html %]</td> >+ <td class="number tax_excluded">[% order.rrp_tax_excluded | $Price %]</td> >+ <td class="number tax_excluded">[% order.ecost_tax_excluded | $Price %]</td> >+ <td class="number tax_included">[% order.rrp_tax_included | $Price %]</td> >+ <td class="number tax_included">[% order.ecost_tax_included | $Price %]</td> >+ <td class="number replacementprice">[% order.replacementprice | $Price %]</td> > <td class="number">[% order.quantity | html %]</td> >- <td class="number tax_excluded">[% order.total_tax_excluded | $Price | html %]</td> >- <td class="number tax_included">[% order.total_tax_included | $Price | html %]</td> >+ <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td> >+ <td class="number tax_included">[% order.total_tax_included | $Price %]</td> > <td class="number">[% order.tax_rate * 100 | html %]</td> >- <td class="number">[% order.tax_value | $Price | html %]</td> >+ <td class="number">[% order.tax_value | $Price %]</td> > <td>[% order.budget_name | html %] > </tr> > [% 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 %] > </a>, <br /> >- Total: [% basket.total | $Price | html %] >+ Total: [% basket.total | $Price %] > <input type="hidden" class="basket" name="basket" value="[% basket.basketno | html %]" /> > </li> > [% END %] >@@ -268,7 +268,7 @@ function submitForm(form) { > No name, basketnumber: [% selectedbasket.basketno | html %] > [% END %] > </a>, <br /> >- Total: [% selectedbasket.total | $Price | html %] >+ Total: [% selectedbasket.total | $Price %] > <input type="hidden" class="basket" name="basket" value="[% selectedbasket.basketno | html %]" /> > </li> > [% 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 %] > <tr> > <td><input type="hidden" name="adjustment_id" value="[% adjustment.adjustment_id | html %]" />[% adjustment.adjustment_id | html %]</td> >- <td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price | html %]" /></td> >+ <td><input type="text" name="adjustment" id="adjustment_[% adjustment.adjustment_id | html %]" value="[% adjustment.adjustment | $Price %]" /></td> > <td> > [% reasons = AuthorisedValues.Get("ADJ_REASON") | html %] > [% IF reasons.0 %] >@@ -273,14 +273,14 @@ > [% END %] > </td> > <td><p>[% order.branchcode | html %]</p></td> >- <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price | html %]</td> >- <td class="number tax_included">[% order.unitprice_tax_included | $Price | html %]</td> >- <td class="number replacementprice">[% order.replacementprice | $Price | html %]</td> >+ <td class="number tax_excluded">[% order.unitprice_tax_excluded | $Price %]</td> >+ <td class="number tax_included">[% order.unitprice_tax_included | $Price %]</td> >+ <td class="number replacementprice">[% order.replacementprice | $Price %]</td> > <td class="number">[% order.quantity | html %]</td> >- <td class="number tax_excluded">[% order.total_tax_excluded | $Price | html %]</td> >- <td class="number tax_included">[% order.total_tax_included | $Price | html %]</td> >+ <td class="number tax_excluded">[% order.total_tax_excluded | $Price %]</td> >+ <td class="number tax_included">[% order.total_tax_included | $Price %]</td> > <td class="number">[% order.tax_rate * 100 | html %]</td> >- <td class="number">[% order.tax_value | $Price | html %]</td> >+ <td class="number">[% order.tax_value | $Price %]</td> > <td>[% order.budget_name | html %]</td> > </tr> > [% END %] >@@ -293,10 +293,10 @@ > <th class="tax_included"></th> > <th class="replacementprice"/> > <th>[% tf.quantity | html %]</th> >- <th class="tax_excluded">[% tf.total_tax_excluded | $Price | html %]</th> >- <th class="tax_included">[% tf.total_tax_included | $Price | html %]</th> >+ <th class="tax_excluded">[% tf.total_tax_excluded | $Price %]</th> >+ <th class="tax_included">[% tf.total_tax_included | $Price %]</th> > <th> </th> >- <th>[% tf.tax_value | $Price | html %]</th> >+ <th>[% tf.tax_value | $Price %]</th> > <th> </th> > </tr> > [% END %] >@@ -306,10 +306,10 @@ > <th class="tax_included"></th> > <th class="replacementprice"/> > <th>[% total_quantity | html %]</th> >- <th class="tax_excluded">[% total_tax_excluded | $Price | html %]</th> >- <th class="tax_included">[% total_tax_included | $Price | html %]</th> >+ <th class="tax_excluded">[% total_tax_excluded | $Price %]</th> >+ <th class="tax_included">[% total_tax_included | $Price %]</th> > <th> </th> >- <th>[% total_tax_value | $Price | html %]</th> >+ <th>[% total_tax_value | $Price %]</th> > <th> </th> > </tr> > <tr> >@@ -318,10 +318,10 @@ > <th class="tax_included"></th> > <th class="replacementprice"/> > <th>[% total_quantity | html %]</th> >- <th class="tax_excluded">[% total_tax_excluded_shipment + total_adj | $Price | html %]</th> >- <th class="tax_included">[% total_tax_included_shipment | $Price | html %]</th> >+ <th class="tax_excluded">[% total_tax_excluded_shipment + total_adj | $Price %]</th> >+ <th class="tax_included">[% total_tax_included_shipment | $Price %]</th> > <th> </th> >- <th>[% total_tax_value | $Price | html %]</th> >+ <th>[% total_tax_value | $Price %]</th> > <th> </th> > </tr> > </tfoot> >@@ -329,7 +329,7 @@ > [% ELSE %] > <div class="dialog message"><p>No orders yet</p> > [% IF adjustments && adjustments.count > 0 || shipmentcost && shipmentcost > 0 %] >- <p>Adjustments plus shipping:[% total_adj + shipmentcost | $Price | html %]</p> >+ <p>Adjustments plus shipping:[% total_adj + shipmentcost | $Price %]</p> > [% END %] > </div> > [% 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 @@ > <input type="hidden" name="tax_rate" value="0" /> > [% END %] > >- <li><label for="rrp">Retail price: </label>[% rrp | $Price | html %]</li> >+ <li><label for="rrp">Retail price: </label>[% rrp | $Price %]</li> > <li> > <label for="replacementprice">Replacement price:</label> >- <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price | html %]" /> >+ <input type="text" size="20" name="replacementprice" id="replacementprice" value="[% replacementprice | $Price %]" /> > </li> >- <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price | html %]</li> >+ <li><label for="ecost">Budgeted cost: </label>[% ecost | $Price %]</li> > <li> > <label for="unitprice">Actual cost:</label> > <input type="text" size="20" name="unitprice" id="unitprice" value="[% unitprice | $Price on_editing => 1 | html %]" /> >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 @@ > <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% loop_order.biblionumber | html %]" class="previewData">MARC</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% loop_order.biblionumber | html %]" class="previewData">Card</a> > </td> >- <td>[% loop_order.replacementprice | $Price | html %]</td> >+ <td>[% loop_order.replacementprice | $Price %]</td> > <td>[% loop_order.quantity | html %]</td> >- <td>[% loop_order.ecost | $Price | html %]</td> >- <td>[% loop_order.total | $Price | html %]</td> >+ <td>[% loop_order.ecost | $Price %]</td> >+ <td>[% loop_order.total | $Price %]</td> > <td>[% loop_order.budget_name | html %]</td> > <td> > <a href="orderreceive.pl?ordernumber=[% loop_order.ordernumber | html %]&invoiceid=[% invoiceid | html %]">Receive</a> >@@ -250,27 +250,27 @@ > <td colspan="6" class="total">(Tax exc.)</td> > [% END %] > <td colspan="3"><i>Subtotal for</i> [% key | html %]</td> >- <td>[% subtotal_for_funds.$key.ecost | $Price | html %]</td> >- <td>[% subtotal_for_funds.$key.unitprice | $Price | html %]</td> >+ <td>[% subtotal_for_funds.$key.ecost | $Price %]</td> >+ <td>[% subtotal_for_funds.$key.unitprice | $Price %]</td> > <td> </td> > <td> </td> > </tr> > [% END %] > <tr> > <th colspan="11" class="total">Total tax exc.</th> >- <th>[% total_tax_excluded | $Price | html %]</th> >+ <th>[% total_tax_excluded | $Price %]</th> > <th></th> > </tr> > [% FOREACH book_foot IN book_foot_loop %] > <tr> > <th colspan="11">Total (GST [% book_foot.tax_rate * 100 | html %]%)</th> >- <th>[% book_foot.tax_value | $Price | html %]</th> >+ <th>[% book_foot.tax_value | $Price %]</th> > <th></th> > </tr> > [% END %] > <tr> > <th colspan="11" class="total">Total tax inc.</th> >- <th>[% total_tax_included | $Price | html %]</th> >+ <th>[% total_tax_included | $Price %]</th> > <th></th> > </tr> > </tfoot> >@@ -324,12 +324,12 @@ > <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% order.biblionumber | html %]" class="previewData">MARC</a><br> > <a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&id=[% order.biblionumber | html %]" class="previewData">Card</a> > </td> >- <td>[% order.replacementprice | $Price | html %]</td> >+ <td>[% order.replacementprice | $Price %]</td> > <td>[% order.quantityreceived | html %]</td> > <td>[% order.budget.budget_name | html %]</td> >- <td>[% order.ecost | $Price | html %]</td> >- <td>[% order.unitprice | $Price | html %]</td> >- <td>[% order.total | $Price | html %]</td> >+ <td>[% order.ecost | $Price %]</td> >+ <td>[% order.unitprice | $Price %]</td> >+ <td>[% order.total | $Price %]</td> > <td> > [% 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 %] > <tr> >- <td>[% 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 %]</td> >+ <td>[% 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 %]</td> > <td>[% order.basketname | html %]</td> > <td>[% order.ordernumber | html %]</td> > <td>Moved!</td> >@@ -385,7 +385,7 @@ > [% ELSE %] > [% IF r.error == 'budget_code_not_exists' %] > <tr> >- <td>[% 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 %]</td> >+ <td>[% r.budget.budget_id | html %] [% r.budget.budget_amount | $Price %][% IF r.unspent_moved %] ([% r.unspent_moved | $Price %] remaining has been moved)[% END %]</td> > <td></td> > <td></td> > <td>This fund code does not exist in the destination budget.</td> >@@ -439,7 +439,7 @@ > <span style="color:green;">Locked</span> > [% END %] > </td> >- <td class="data">[% period_active.budget_period_total | $Price | html %]</td> >+ <td class="data">[% period_active.budget_period_total | $Price %]</td> > <td> > [% PROCESS action_menu block_budget=period_active %] > </td> >@@ -471,7 +471,7 @@ > <td><span title="[% period_loo.budget_period_startdate | html %]">[% period_loo.budget_period_startdate | $KohaDates %]</span></td> > <td><span title="[% period_loo.budget_period_enddate | html %]">[% period_loo.budget_period_enddate | $KohaDates %]</span></td> > <td> [% IF ( period_loo.budget_period_locked ) %]<span style="color:green;">Locked</span> [% ELSE %][% END %] </td> >- <td class="data">[% period_loo.budget_period_total | $Price | html %]</td> >+ <td class="data">[% period_loo.budget_period_total | $Price %]</td> > <td> > [% PROCESS action_menu block_budget=period_loo %] > </td> >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 @@ > <tr> > <th></th> > <th></th> >- <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price | html %][% END %] </th> >- <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price | html %]</th> >+ <th colspan="2" style="text-align: left;" nowrap="nowrap">Period allocated [% IF budget_period_total %][% budget_period_total | $Price %][% END %] </th> >+ <th nowrap="nowrap" class="data"> [% period_alloc_total | $Price %]</th> > <th></th> >- <th class="data">[% ordered_total | $Price | html %]</th> >+ <th class="data">[% ordered_total | $Price %]</th> > <th></th> >- <th class="data">[% spent_total | $Price | html %]</th> >+ <th class="data">[% spent_total | $Price %]</th> > <th></th> >- <th class="data">[% available_total | $Price | html %]</th> >+ <th class="data">[% available_total | $Price %]</th> > <th></th> > </tr> > </tfoot> >@@ -105,37 +105,37 @@ > <td>[% budget.budget_name | html %]</td> > <td class="data"> > [% IF budget.budget_parent_id %] >- <span class="child_fund_amount">[% budget.budget_amount | $Price | html %]</span> >+ <span class="child_fund_amount">[% budget.budget_amount | $Price %]</span> > [% ELSE %] >- <span class="total_amount">[% budget.budget_amount | $Price | html %]</span> >+ <span class="total_amount">[% budget.budget_amount | $Price %]</span> > [% END %] > </td> > <td class="data"> > [% IF budget.budget_parent_id %] >- <span class="child_fund_amount">[% budget.budget_ordered | $Price | html %]</span> >+ <span class="child_fund_amount">[% budget.budget_ordered | $Price %]</span> > [% ELSE %] >- <span class="total_amount">[% budget.budget_ordered | $Price | html %]</span> >+ <span class="total_amount">[% budget.budget_ordered | $Price %]</span> > [% END %] > </td> > <td class="data"> > [% IF budget.budget_parent_id %] >- <span class="child_fund_amount">[% budget.total_ordered | $Price | html %]</span> >+ <span class="child_fund_amount">[% budget.total_ordered | $Price %]</span> > [% ELSE %] >- <span class="total_amount">[% budget.total_ordered | $Price | html %]</span> >+ <span class="total_amount">[% budget.total_ordered | $Price %]</span> > [% END %] > </td> > <td class="data"> > [% IF budget.budget_parent_id %] >- <span class="child_fund_amount">[% budget.budget_spent | $Price | html %]</span> >+ <span class="child_fund_amount">[% budget.budget_spent | $Price %]</span> > [% ELSE %] >- <span class="total_amount">[% budget.budget_spent | $Price | html %]</span> >+ <span class="total_amount">[% budget.budget_spent | $Price %]</span> > [% END %] > </td> > <td class="data"> > [% IF budget.budget_parent_id %] >- <span class="child_fund_amount">[% budget.total_spent | $Price | html %]</span> >+ <span class="child_fund_amount">[% budget.total_spent | $Price %]</span> > [% ELSE %] >- <span class="total_amount">[% budget.total_spent | $Price | html %]</span> >+ <span class="total_amount">[% budget.total_spent | $Price %]</span> > [% END %] > </td> > >@@ -158,7 +158,7 @@ > <span class="totalamount"> > [% END %] > [% END %] >- [% value | $Price | html %] >+ [% value | $Price %] > </span> > [% END %] > <td class="data"> >@@ -376,7 +376,7 @@ > <table> > <tr> > <th scope="row">Fund amount:</th> >- <td>[% budget_amount | $Price | html %]</td> >+ <td>[% budget_amount | $Price %]</td> > </tr> > </table> > >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 @@ > <td> > [% END %] > <a href="/cgi-bin/koha/admin/aqbudgets.pl?op=add_form&budget_id=[% budget_line.budget_id | html %]&budget_period_id=[% budget_period_id | html %]">[% budget_line.budget_name | html %]</a></td> >- <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price | html %] </span> >+ <td><span id="[% budget_line.budget_amount | html %]">[% budget_line.budget_amount | $Price %] </span> > > > <!-- NEXT DIV ELEMENT IS USED BY JS FOR CALC-ING AUTO-FILL AND ESTIMATED AMOUNTS --> >@@ -129,7 +129,7 @@ > [% ELSE %] > <td id="budget_est_[% budget_line.budget_id | html %]"> > [% END %] >- [% budget_line.budget_est_remain | $Price | html %] >+ [% budget_line.budget_est_remain | $Price %] > </td> > </tr> > </table> >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 @@ > </tr> > <tr><th scope="row">Age required: </th><td>[% category.dateofbirthrequired | html %] years</td></tr> > <tr><th scope="row">Upperage limit: </th><td>[% category.upperagelimit | html %] years</td></tr> >- <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price | html %]</td></tr> >+ <tr><th scope="row">Enrollment fee: </th><td>[% category.enrolmentfee | $Price %]</td></tr> > <tr><th scope="row">Receives overdue notices: </th><td>[% IF category. overduenoticerequired %]Yes[% ELSE %]No[% END %]</td></tr> > <tr><th scope="row">Lost items in staff client</th><td>[% IF category.hidelostitems %]Hidden by default[% ELSE %]Shown[% END %]</td></tr> >- <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price | html %]</td></tr> >+ <tr><th scope="row">Hold fee: </th><td>[% category.reservefee | $Price %]</td></tr> > > [% IF ( Koha.Preference('CheckPrevCheckout') == 'softyes' || Koha.Preference('CheckPrevCheckout') == 'softno' ) %] > <tr> >@@ -397,14 +397,14 @@ > <td>-</td> > [% END %] > [% IF (category.enrolmentfee > 0) %] >- <td>[% category.enrolmentfee | $Price | html %]</td> >+ <td>[% category.enrolmentfee | $Price %]</td> > [% ELSE %] > <td>-</td> > [% END %] > <td>[% IF ( category.overduenoticerequired ) %]Yes[% ELSE %]No[% END %]</td> > <td>[% IF ( category.hidelostitems ) %]Hidden[% ELSE %]Shown[% END %]</td> > [% IF (category.reservefee > 0) %] >- <td>[% category.reservefee | $Price | html %]</td> >+ <td>[% category.reservefee | $Price %]</td> > [% ELSE %] > <td>-</td> > [% 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 > </td> > </tr> > [% END %] >- <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price | html %]</td></tr> >+ <tr><th scope="row">Rental charge</th><td>[% itemtype.rentalcharge | $Price %]</td></tr> > </table> > <form action="/cgi-bin/koha/admin/itemtypes.pl" method="post"> > <input type="hidden" name="op" value="delete_confirmed" /><input type="hidden" name="itemtype" value="[% itemtype.itemtype | html %]" /> >@@ -369,11 +369,11 @@ Item types administration > <td>[% IF ( itemtype.hideinopac ) %]Yes[% ELSE %] [% END %]</td> > <td> > [% UNLESS ( itemtype.notforloan ) %] >- [% itemtype.rentalcharge | $Price | html %] >+ [% itemtype.rentalcharge | $Price %] > [% END %] > </td> >- <td>[% itemtype.defaultreplacecost | $Price | html %]</td> >- <td>[% itemtype.processfee | $Price | html %]</td> >+ <td>[% itemtype.defaultreplacecost | $Price %]</td> >+ <td>[% itemtype.processfee | $Price %]</td> > <td>[% itemtype.checkinmsg | html_line_break | $raw %]</td> > <td class="actions"> > <a href="/cgi-bin/koha/admin/itemtypes.pl?op=add_form&itemtype=[% itemtype.itemtype | html %]" class="btn btn-default btn-xs"><i class="fa fa-pencil"></i> Edit</a> >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 ) %] >- <li>The patron has a debt of [% DEBT | $Price | html %].</li> >+ <li>The patron has a debt of [% DEBT | $Price %].</li> > [% END %] > > [% IF ( DEBT_GUARANTEES ) %] >- <li>The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price | html %].</li> >+ <li>The patron's guarantees collectively have a debt of [% DEBT_GUARANTEES | $Price %].</li> > [% END %] > > [% IF ( RENTALCHARGE && RENTALCHARGE > 0 ) %] >@@ -718,7 +718,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( charges_guarantees ) %] > <li> >- <span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price | html %]. >+ <span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %]. > [% IF noissues %] > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> > [% END %] >@@ -728,7 +728,7 @@ No patron matched <span class="ex">[% message | html %]</span> > > [% IF ( credits ) %] > <li> >- <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Price | html %][% END %] >+ <span class="circ-hlt">Credits:</span> Patron has a credit[% IF ( creditsamount ) %] of [% creditsamount | $Price %][% END %] > </li> > [% 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 %] > <li> >- <span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price | html %]. >+ <span class="circ-hlt">Fees & Charges:</span> Patron's guarantees collectively owe [% chargesamount_guarantees | $Price %]. > </li> > <li> > <span class="circ-hlt">Checkouts are BLOCKED because fine balance is OVER THE LIMIT.</span> >@@ -249,7 +249,7 @@ > <li><i class="fa fa-li fa-exclamation"></i>The barcode was not found [% checkout_info.barcode | html %].</li> > [% END %] > [% IF checkout_info.DEBT %] >- <li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT | $Price | html %].</li> <!-- Need debt_confirmed --> >+ <li><i class="fa fa-li fa-exclamation"></i>The patron has a debt of [% checkout_info.DEBT | $Price %].</li> <!-- Need debt_confirmed --> > [% END %] > </p> > [% 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 @@ > </td> > > <td> >- [% accountline.amount | $Price | html %] >+ [% accountline.amount | $Price %] > </td> > > <td> >- [% accountline.amountoutstanding | $Price | html %] >+ [% accountline.amountoutstanding | $Price %] > </td> > </tr> > </tbody> >@@ -107,13 +107,13 @@ > <tr> > <td>[% offset_accountline.date | $KohaDates %]</td> > <td>[% offset_accountline.timestamp | $KohaDates with_hours => 1 | html %]</td> >- <td>[% offset_accountline.amount | $Price | html %]</td> >- <td>[% offset_accountline.amountoutstanding | $Price | html %]</td> >+ <td>[% offset_accountline.amount | $Price %]</td> >+ <td>[% offset_accountline.amountoutstanding | $Price %]</td> > <td>[% INCLUDE 'accounttype.inc' account => offset_accountline %]</td> > <td>[% offset_accountline.note | html %]</td> > <td>[% IF offset_accountline.manager_id %]<a href="moremember.pl?borrowernumber=[% offset_accountline.manager_id | html %]">[% offset_accountline.manager_id | html %]</a>[% END %]</td> > <td>[% ao.created_on | $KohaDates with_hours => 1 | html %]</td> >- <td>[% ao.amount | $Price | html %]</td> >+ <td>[% ao.amount | $Price %]</td> > <td>[% INCLUDE 'account_offset_type.inc' account_offset => ao %]</td> > <td><a href="accountline-details.pl?accountlines_id=[% offset_accountline.id | html %]" class="btn btn-default btn-xs"><i class="fa fa-list"></i> Details</a></td> > </tr> >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 ) %]<a href="/cgi-bin/koha/catalogue/moredetail.pl?biblionumber=[% account.item.biblionumber | html %]&itemnumber=[% account.itemnumber | html %]">[% account.item.biblio.title | html %]</a>[% END %]</td> > <td>[% IF account.itemnumber %][% Branches.GetName( account.item.homebranch ) | html %][% END %]</td> > <td>[% account.note | html_line_break %]</td> >- [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price | html %]</td> >- [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price | html %]</td> >+ [% IF ( account.amountcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amount | $Price %]</td> >+ [% IF ( account.amountoutstandingcredit ) %]<td class="credit" style="text-align: right;">[% ELSE %]<td class="debit" style="text-align: right;">[% END %][% account.amountoutstanding | $Price %]</td> > <td class="actions"> > [% IF ( account.payment ) %] > <a target="_blank" href="printfeercpt.pl?action=print&accountlines_id=[% account.accountlines_id | html %]&borrowernumber=[% account.borrowernumber | html %]" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print</a> >@@ -96,9 +96,9 @@ > <tr> > <td colspan="5">Total due</td> > [% IF ( totalcredit ) %] >- <td class="credit" style="text-align: right;">[% total | $Price | html %]</td> >+ <td class="credit" style="text-align: right;">[% total | $Price %]</td> > [% ELSE %] >- <td class="debit"style="text-align: right;">[% total | $Price | html %]</td> >+ <td class="debit"style="text-align: right;">[% total | $Price %]</td> > [% END %] > <td></td> > </tr> >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 @@ > <li>Patron has [% ItemsOnIssues | html %] item(s) checked out.</li> > [% END %] > [% IF ( charges ) %] >- <li>Patron has [% charges | $Price | html %] in fines.</li> >+ <li>Patron has [% charges | $Price %] in fines.</li> > [% END %] > [% IF ( guarantees ) %] > <li>Patron's record has guaranteed accounts attached.</li> >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 @@ > <td class="credit" style="text-align: right;"> > [% ELSE %] > <td class="debit" style="text-align: right;"> >- [% END %][% account.amount | $Price | html %] >+ [% END %][% account.amount | $Price %] > </td> > [% IF ( account.amountoutstanding < 0 ) %] > <td class="credit" style="text-align: right;"> > [% ELSE %] > <td class="debit" style="text-align: right;"> > [% END %] >- [% account.amountoutstanding | $Price | html %] >+ [% account.amountoutstanding | $Price %] > </td> > </tr> > [% END %] >@@ -143,7 +143,7 @@ > <tfoot> > <tr> > <td colspan="4">Total due</td> >- <td colspan="2" style="text-align:right;">[% totaldue | $Price | html %]</td> >+ <td colspan="2" style="text-align:right;">[% totaldue | $Price %]</td> > </tr> > </tfoot> > </table> >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 @@ > <tfoot> > <tr> > <td class="total" colspan="6">Total due:</td> >- <td style="text-align: right;">[% total | $Price | html %]</td> >+ <td style="text-align: right;">[% total | $Price %]</td> > </tr> > </tfoot> > <tbody> >@@ -105,15 +105,15 @@ > </td> > <td><input type="text" name="payment_note_[% line.accountlines_id | html %]" /></td> > <td>[% line.accounttype | html %]</td> >- <td class="debit" style="text-align: right;">[% line.amount | $Price | html %]</td> >- <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price | html %]</td> >+ <td class="debit" style="text-align: right;">[% line.amount | $Price %]</td> >+ <td class="debit" style="text-align: right;">[% line.amountoutstanding | $Price %]</td> > </tr> > [% END %] > [% IF ( account_grp.total ) %] > <tr> > > <td class="total" colspan="8" style="text-align: right;">Sub total:</td> >- <td style="text-align: right;">[% account_grp.total | $Price | html %]</td> >+ <td style="text-align: right;">[% account_grp.total | $Price %]</td> > </tr> > [% END %] > </tbody> >@@ -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 %]<span class='overdue'><strong>[% data.overdues | html %]</strong></span>[% ELSE %][% data.overdues | html %][% END %] / [% data.issues | html %]", > "dt_fines": >- "<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines | $Price | html %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines | $Price | html %]</strong></span> [% ELSE %] [% data.fines | $Price | html %] [% END %]</span>", >+ "<span style='text-align: right; display: block;'>[% IF data.fines < 0 %]<span class='credit'>[% data.fines | $Price %]</span> [% ELSIF data.fines > 0 %] <span class='debit'><strong>[% data.fines | $Price %]</strong></span> [% ELSE %] [% data.fines | $Price %] [% END %]</span>", > "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 %] > </td> > <td>[% loopresul.note | html %]</td> >- <td style="text-align:right;">[% loopresul.amount | $Price | html %]</td> >+ <td style="text-align:right;">[% loopresul.amount | $Price %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% loopresul.biblionumber | html %]">[% loopresul.title | html %]</a></td> > <td>[% loopresul.barcode | html %]</td> > <td>[% ItemTypes.GetDescription(loopresul.itype) | html %]</td> >@@ -238,7 +238,7 @@ > <tr> > [% IF transaction_type == "ACT" %] > <th colspan="7" style="text-align:right;">TOTAL</th> >- <th style="text-align:right;">[% total | $Price | html %]</th> >+ <th style="text-align:right;">[% total | $Price %]</th> > <th colspan="3"> </th> > [% END %] > </tr> >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 @@ > <td>[% ordersloo.authorisedbyname | html %]</td> > <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% ordersloo.biblionumber | html %]"> [% ordersloo.title | html %]</a></td> > <td>[% ordersloo.currency | html %]</td> >- <td>[% ordersloo.listprice | $Price | html %]</td> >- <td>[% ordersloo.rrp | $Price | html %]</td> >- <td>[% ordersloo.ecost | $Price | html %]</td> >+ <td>[% ordersloo.listprice | $Price %]</td> >+ <td>[% ordersloo.rrp | $Price %]</td> >+ <td>[% ordersloo.ecost | $Price %]</td> > <td>[% ordersloo.quantity | html %]</td> >- <td>[% ordersloo.total_rrp | $Price | html %]</td> >- <td>[% ordersloo.total_ecost | $Price | html %]</td> >+ <td>[% ordersloo.total_rrp | $Price %]</td> >+ <td>[% ordersloo.total_ecost | $Price %]</td> > <td>[% ordersloo.entrydate | html %]</td> > <td>[% ordersloo.datereceived | html %]</td> > <td>[% ordersloo.order_internalnote | html %]</td> >@@ -77,7 +77,7 @@ > </tr> > [% END %] > </tbody> >- <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price | html %]</th><th>[% total_ecost | $Price | html %]</th><th></th><th></th><th></th><th></th></tr></tfoot> >+ <tfoot><tr><th>TOTAL</th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th></th><th>[% total_quantity | html %]</th><th>[% total_rrp | $Price %]</th><th>[% total_ecost | $Price %]</th><th></th><th></th><th></th><th></th></tr></tfoot> > </table> > [% 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 @@ > <td>[% order.fund.budget_name | html %]</td> > <td> > [% 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 %] > </td> > <td> > [% 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 %] > </td> > </tr> >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 @@ > <span class="label">Currency:</span>[% currency | html %] > </li> > <li> >- <span class="label">Price:</span>[% price | $Price | html %] >+ <span class="label">Price:</span>[% price | $Price %] > </li> > <li> >- <span class="label">Total</span>[% total | $Price | html %] >+ <span class="label">Total</span>[% total | $Price %] > </li> > </ol> > </fieldset> >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 -%] > <th class="sum" colspan="[% COLSPAN | html %]">Total due</th> >- <td class="sum">[% total | $Price | html %]</td> >+ <td class="sum">[% total | $Price %]</td> > </tr> > </tfoot> > >@@ -134,8 +134,8 @@ > [%- IF ACCOUNT_LINE.description %], [% ACCOUNT_LINE.description | html %][% END %] > [% IF ACCOUNT_LINE.title %]([% ACCOUNT_LINE.title | html %])[% END %] > </td> >- [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price | html %]</td> >- [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding | $Price | html %]</td> >+ [% IF ( ACCOUNT_LINE.amountcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amount | $Price %]</td> >+ [% IF ( ACCOUNT_LINE.amountoutstandingcredit ) %]<td class="credit">[% ELSE %]<td class="debit">[% END %][% ACCOUNT_LINE.amountoutstanding | $Price %]</td> > </tr> > [% END %] > </tbody> >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 ) %] > <li id="too_much_oweing"> >- You have unpaid fines. Amount: [% too_much_oweing | $Price | html %]. >+ You have unpaid fines. Amount: [% too_much_oweing | $Price %]. > </li> > [% 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 @@ > <li id="lost"><strong>Please note: </strong> Your library card has been marked as lost or stolen. <em>If this is an error, please contact the library.</em></li> > [% END %] > [% IF ( renewal_blocked_fines.defined ) && ( OpacRenewalAllowed ) %] >- <li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines | $Price | html %]</span>.[% ELSE %]You have fines.[% END %] >+ <li id="renewal_blocked_fines"><strong>Please note: </strong>You cannot renew your books online. Reason: [% IF ( renewal_blocked_fines ) > 0 %]Your fines exceed <span id="renewal_blocked_fines_amount">[% renewal_blocked_fines | $Price %]</span>.[% ELSE %]You have fines.[% END %] > [% END %] > </ul> > </div> >@@ -145,9 +145,9 @@ > [% IF relatives %]<li><a href="#opac-user-relative-issues">Relatives' checkouts</a></li>[% END %] > [% IF ( overdues_count ) %]<li><a href="#opac-user-overdues">Overdue ([% overdues_count | html %])</a></li>[% END %] > [% IF ( OPACFinesTab ) %] >- [% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price | html %])</a></li>[% END %] >- [% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price | html %])</a></li>[% END %] >- [% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price | html %])</a></li>[% END %] >+ [% IF ( borrower.amountoverfive ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( borrower.amountoverzero ) %]<li><a href="#opac-user-fines">Fines ([% amountoutstanding | $Price %])</a></li>[% END %] >+ [% IF ( borrower.amountlessthanzero ) %]<li><a href="#opac-user-fines">Credits ([% amountoutstanding | $Price %])</a></li>[% END %] > [% END %] > > [% IF borrower_club_enrollments.count || borrower_enrollable_clubs.count %] >@@ -284,7 +284,7 @@ > <input type="checkbox" name="item" value="[% ISSUE.itemnumber | html %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber | html %]&borrowernumber=[% ISSUE.borrowernumber | html %]">Renew</a> > [% END %] > [% IF ISSUE.renewalfee > 0 %] >- <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price | html %]</span> >+ <span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) | html %]': [% ISSUE.renewalfee | $Price %]</span> > [% END %] > <span class="renewals">([% ISSUE.renewsleft | html %] of [% ISSUE.renewsallowed | html %] renewals remaining)</span> > [% ELSIF ( ISSUE.on_reserve ) %] >@@ -374,7 +374,7 @@ > <tbody> > <tr> > <td>You currently owe fines and charges amounting to:</td> >- <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price | html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td> > </tr> > </tbody> > </table> >@@ -388,7 +388,7 @@ > <tbody> > <tr> > <td>You currently owe fines and charges amounting to:</td> >- <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price | html %]</a></td> >+ <td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td> > </tr> > </tbody> > </table> >@@ -401,7 +401,7 @@ > <thead><tr><th colspan="2">Amount</th></tr></thead> > <tbody> > <tr> >- <td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price | html %]</a></td> >+ <td>You have a credit of:</td><td><a href="/cgi-bin/koha/opac-account.pl">[% amountoutstanding | $Price %]</a></td> > </tr> > </tbody> > </table> >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)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 21454
:
79614
|
79615
|
79616
|
79703
|
79704
| 79705