diff options
| author | Christophe Simonis <chs@odoo.com> | 2015-01-22 18:47:13 +0100 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2015-01-22 18:47:13 +0100 |
| commit | 6f841038f33176bb89ac5bd4083703d95eed1ff2 (patch) | |
| tree | aa4c309e98dd2bf39408f2752a7764c9ef9dea54 /addons/web/static/src/js | |
| parent | 5f987f87457fac54935388e7dde86dbef3affcc5 (diff) | |
| parent | 373539425e268f41d7d74e3f4e6f9d622863dcd4 (diff) | |
[MERGE] forward port of branch 8.0 up to 3735394
Diffstat (limited to 'addons/web/static/src/js')
| -rw-r--r-- | addons/web/static/src/js/core.js | 3 | ||||
| -rw-r--r-- | addons/web/static/src/js/data_export.js | 2 | ||||
| -rw-r--r-- | addons/web/static/src/js/view_form.js | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/addons/web/static/src/js/core.js b/addons/web/static/src/js/core.js index bbbc59d7bd5..ef7523ee440 100644 --- a/addons/web/static/src/js/core.js +++ b/addons/web/static/src/js/core.js @@ -437,7 +437,8 @@ instance.web.Session.include( /** @lends instance.web.Session# */{ try { if (options.error) { var body = this.contentDocument.body; - var node = body.childNodes[1] || body.childNodes[0]; + var nodes = body.children.length === 0 ? body.childNodes : body.children; + var node = nodes[1] || nodes[0]; options.error(JSON.parse(node.textContent)); } } finally { diff --git a/addons/web/static/src/js/data_export.js b/addons/web/static/src/js/data_export.js index f64ae7c139c..b36a927307a 100644 --- a/addons/web/static/src/js/data_export.js +++ b/addons/web/static/src/js/data_export.js @@ -413,6 +413,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ exported_fields.unshift({name: 'id', label: 'External ID'}); var export_format = this.$el.find("#export_format").val(); + var c = instance.webclient.crashmanager; instance.web.blockUI(); this.session.get_file({ @@ -426,6 +427,7 @@ instance.web.DataExport = instance.web.Dialog.extend({ import_compat: !!this.$el.find("#import_compat").val(), })}, complete: instance.web.unblockUI, + error: c.rpc_error.bind(c), }); }, close: function() { diff --git a/addons/web/static/src/js/view_form.js b/addons/web/static/src/js/view_form.js index c87fa98b15c..aedee94a4ab 100644 --- a/addons/web/static/src/js/view_form.js +++ b/addons/web/static/src/js/view_form.js @@ -2616,7 +2616,7 @@ instance.web.form.FieldFloat = instance.web.form.FieldChar.extend({ value_ = 0; } if (this.digits !== undefined && this.digits.length === 2) { - value_ = instance.web.round_precision(value_, this.digits[1]); + value_ = instance.web.round_decimals(value_, this.digits[1]); } this._super.apply(this, [value_]); }, |