summaryrefslogtreecommitdiff
path: root/addons/base_import/static/src/js/base_import.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-08-20 18:08:19 +0200
committerChristophe Simonis <chs@odoo.com>2016-08-20 18:08:19 +0200
commit235ed4b2c1099720a6d5cfc5ada920f19fcef315 (patch)
tree2ddc3ae85462fe3cc6e70f9598958797695d12ff /addons/base_import/static/src/js/base_import.js
parentc3734ec5b622085a36e94bee36f92daabbae3e34 (diff)
parent9ad5f26b3fb98cd14527de80d19bf6554a6981e2 (diff)
[MERGE] forward port branch saas-12 up to 9ad5f26
Diffstat (limited to 'addons/base_import/static/src/js/base_import.js')
-rw-r--r--addons/base_import/static/src/js/base_import.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/base_import/static/src/js/base_import.js b/addons/base_import/static/src/js/base_import.js
index d12e9292fde..1901a2c180e 100644
--- a/addons/base_import/static/src/js/base_import.js
+++ b/addons/base_import/static/src/js/base_import.js
@@ -532,7 +532,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,
}]);
}) ;
},