From 7921a3325d44e190cbe7af2df0003c8f72a54286 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Tue, 25 Apr 2017 10:20:47 +0000 Subject: [PATCH] Bug 12310: Format prices on other pages Fields on thoses page are now automatically formatted. - cgi-bin/koha/admin/aqbudgetperiods.tt - cgi-bin/koha/admin/aqbudgets.tt - cgi-bin/koha/members/mancredit.tt - cgi-bin/koha/members/maninvoice.tt --- .../prog/en/modules/admin/aqbudgetperiods.tt | 2 +- .../prog/en/modules/admin/aqbudgets.tt | 49 ++++++++++++++++++++-- .../prog/en/modules/members/mancredit.tt | 33 ++++++++++++++- .../prog/en/modules/members/maninvoice.tt | 9 +++- 4 files changed, 86 insertions(+), 7 deletions(-) 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 0624c84..ad86143 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -379,7 +379,7 @@ [% IF Koha.Preference('DigitSeparator') %] - Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX", if you want to change it, click here here + Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX", if you want to change it, click here [% ELSE %] Please chose a digit separator by clicking here 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 a3c9ee9..6e25964 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tt @@ -1,6 +1,7 @@ [% USE AuthorisedValues %] [% USE Branches %] [% USE Price %] +[% USE Koha %] [% INCLUDE 'doc-head-open.inc' %] Koha › Administration › Funds[% IF op == 'add_form' %] › [% IF ( budget_id ) %]Modify fund[% IF ( budget_name ) %] '[% budget_name %]'[% END %][% ELSE %]Add fund [% END %][% END %] [% INCLUDE 'doc-head-close.inc' %] @@ -14,6 +15,7 @@ var MSG_PARENT_BENEATH_BUDGET = "- " + _("New budget-parent is beneath budget") [% IF op == 'add_form' %] +[% INCLUDE 'prices.inc' %] @@ -46,7 +66,16 @@ $(document).ready(function(){
  • -
  • Example: 5.00
  • +
  • Example: 5.00
  • + + [% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr( +0,1) %]XX", if you want to change it, click here + + [% ELSE %]Please chose a digit separator by clicking here + + [% END %] + +
    Cancel
    diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt index 826df17..40578c5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -68,7 +68,14 @@ $(document).ready(function(){
  • - Please use the "[% Koha.Preference('DigitSeparator').substr(0, 1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr(0,1) %]XX" + + [% IF Koha.Preference('DigitSeparator') %]Please use the "[% Koha.Preference('DigitSeparator').substr(0,1) %]" as separator : ex "XX[% Koha.Preference('DigitSeparator').substr( + 0,1) %]XX", if you want to change it, click here + + [% ELSE %]Please chose a digit separator by clicking here + + [% END %] +
  • Cancel
    -- 2.7.4