From 01309cdc4c06ecbd0beafa100eb73da95fcbf009 Mon Sep 17 00:00:00 2001 From: Baptiste Wojtkowski Date: Tue, 21 Feb 2017 15:47:36 +0000 Subject: [PATCH] BUG 12310 : Modified scripts in order to convert any string to the good format paxed's solution is obsolete since the form asks for a number. The script includes 2 function which check if it is possible to transform properly into the format "XX.XX" and which do it. The money symbols are ignored. All spaces (before or after) are ignored. Test plan : 1) Check you can't enter any string except like "XX.XX" when - you create a Budget (Administration->Budget) - you write a fine (Circulation->[select a Borrower]->new fine ) 2) Apply patch 3) Check you can enter any string with - $, "Euro" (before or after), or nothing - , or . as separator - no more than 2 digits after separator - as much digits as you wish before the separator - as much spaces as you wish before or after the number --- .../intranet-tmpl/prog/en/includes/prices.inc | 23 ++++++++++++++++++ .../prog/en/modules/admin/aqbudgetperiods.tt | 5 +++- .../prog/en/modules/members/maninvoice.tt | 28 +++++++++++++++++++++- 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc new file mode 100644 index 0000000..1188448 --- /dev/null +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prices.inc @@ -0,0 +1,23 @@ +[% USE Koha %] + 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 a74329c..aa2c35b 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tt @@ -27,6 +27,7 @@ [% END -%] [% INCLUDE 'doc-head-open.inc' %] +[% INCLUDE 'prices.inc' %] [% INCLUDE 'doc-head-close.inc' %] [% INCLUDE 'calendar.inc' %] @@ -87,8 +88,10 @@ _alertString += "\n- " + _("Description missing"); } - if (!(isNum(f.budget_period_total))) { + if (!(isPrice(f.budget_period_total.value))) { _alertString += "\n- " + _("Amount must be a valid number, or empty"); + }else{ + f.budget_period_total.value=Price_from_string(f.budget_period_total.value); } /* 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 7d35c73..d67e946 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/maninvoice.tt @@ -70,7 +70,7 @@ type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.li
  • -
  • Example: 5.00
  • +
  • Cancel
    @@ -85,4 +85,30 @@ type_fees['[% invoice_types_loo.authorised_value %]'] = "[% invoice_types_loo.li [% INCLUDE 'circ-menu.inc' %] + +[% INCLUDE 'prices.inc' %] + + + [% INCLUDE 'intranet-bottom.inc' %] -- 2.7.4