diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-04-05 19:06:25 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-04-05 19:06:25 +0200 |
| commit | 3e639f4bea5563f9852fd2c1b2c00f24c6b32b10 (patch) | |
| tree | cbe33268cf6294e7710ca1b0592a5f909eca2f63 /addons/web/static/src/js/framework | |
| parent | 83a08c47916e5535a39df47f2cab8c4bc3acf810 (diff) | |
| parent | 9e2de9b1ae397fabb0d907586f13b982328dcfa6 (diff) | |
[MERGE] forward port of branch 9.0 up to 9e2de9b
Diffstat (limited to 'addons/web/static/src/js/framework')
| -rw-r--r-- | addons/web/static/src/js/framework/mixins.js | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/web/static/src/js/framework/mixins.js b/addons/web/static/src/js/framework/mixins.js index 40bdaeb51b4..05d4105e466 100644 --- a/addons/web/static/src/js/framework/mixins.js +++ b/addons/web/static/src/js/framework/mixins.js @@ -336,9 +336,8 @@ var PropertiesMixin = _.extend({}, EventDispatcherMixin, { // remove this, or move it elsewhere. Also, learn OO programming. if (key === 'value' && self.field && self.field.type === 'float' && tmp && val){ var digits = self.field.digits; - if (digits !== 0){ - digits = digits ? digits[1] : 2; - if (utils.float_is_zero(tmp - val, digits)) { + if (_.isArray(digits)) { + if (utils.float_is_zero(tmp - val, digits[1])) { return; } } @@ -366,4 +365,3 @@ return { }; }); - |