diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-04-30 15:45:03 +0200 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-04-30 15:45:03 +0200 |
| commit | 41f4b11ef4cf14d98c75eb3af221c1262eef6329 (patch) | |
| tree | a3ba59cebed9da73c8b68b65e29acd4053d85638 /addons/web/static/src | |
| parent | cff65f57ebda32858c7eed111509d63890e460bc (diff) | |
| parent | e552e098736e3047dc41a7e55053611aee7aa35c (diff) | |
[MERGE] forward port of branch saas-3 up to e552e09
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/search.js | 4 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/addons/web/static/src/js/search.js b/addons/web/static/src/js/search.js index 8b82ed0cbd2..189afae257a 100644 --- a/addons/web/static/src/js/search.js +++ b/addons/web/static/src/js/search.js @@ -2274,6 +2274,10 @@ instance.web.search.ExtendedSearchProposition.Float = instance.web.search.Extend {value: "∃", text: _lt("is set")}, {value: "∄", text: _lt("is not set")} ], + init: function (parent) { + this._super(parent); + this.decimal_point = instance.web._t.database.parameters.decimal_point; + }, toString: function () { return this.$el.val(); }, diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml index cbda567d356..d28d021e298 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1789,7 +1789,11 @@ <input type="number" class="field_integer" value = "0" step="1"/> </t> <t t-name="SearchView.extended_search.proposition.float"> - <input type="number" class="field_float" value = "0.0" step="0.01"/> + <input class="field_float" + t-att-type="widget.decimal_point === '.' ? 'number' : 'text'" + t-attf-title="Number using #{widget.decimal_point || '.' } as decimal separator." + t-attf-pattern="[0-9]+([\\#{widget.decimal_point || '.' }][0-9]+)?" + t-attf-value="0#{widget.decimal_point || '.' }0" step="0.01"/> </t> <t t-name="SearchView.extended_search.proposition.selection"> <select> |