summaryrefslogtreecommitdiff
path: root/addons/base_import/static/src/js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-19 16:59:29 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-19 16:59:29 +0200
commitbc1a0a32ca80aaadd52e66115fe9c9ad4b26c2e0 (patch)
treee2ca10dde39d78301e100c76a76f3ab86fd509f3 /addons/base_import/static/src/js
parent2331bbf4b05d9e9f2ad5e56814ad440683882e3d (diff)
parent58cbcbae318f613c0e8239fbcfea59d0c3c33612 (diff)
[MERGE] forward port branch 9.0 up to 58cbcba
Diffstat (limited to 'addons/base_import/static/src/js')
-rw-r--r--addons/base_import/static/src/js/import.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_import/static/src/js/import.js b/addons/base_import/static/src/js/import.js
index 496a25bc9ab..7b5b801b8be 100644
--- a/addons/base_import/static/src/js/import.js
+++ b/addons/base_import/static/src/js/import.js
@@ -411,7 +411,7 @@ var DataImport = Widget.extend(ControlPanelMixin, {
return $.when([{
type: 'error',
record: false,
- message: error.data.arguments[1],
+ message: error.data.arguments && error.data.arguments[1] || error.message,
}]);
}) ;
},