diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-04-05 20:08:50 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-04-05 20:08:50 +0200 |
| commit | 658989868c86295a371a72b6bb8981c2155ef46d (patch) | |
| tree | 24261643ab87466ea1f86bb0de08f6bbb0f1ba93 /addons/web/static/src/js/framework | |
| parent | f0c258553652de3cdbcbd6650a653c3acb6298c7 (diff) | |
| parent | aa6ebd146ad6ddaebb9ba7c5d93f2f87743dc248 (diff) | |
[MERGE] forward port of branch saas-10 up to aa6ebd1
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 { }; }); - |