diff options
| author | Christophe Simonis <chs@odoo.com> | 2016-08-20 16:57:36 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2016-08-20 16:57:36 +0200 |
| commit | 3a2147d95c8005ab7c1dbe4d94315e404ea5e5f9 (patch) | |
| tree | 98b5b79e5f866a64849f349119e0855f6da5d7ff /addons/base_import/static/src | |
| parent | 99215a02c61ca8c470931955225e5db1cd402d43 (diff) | |
| parent | bc1a0a32ca80aaadd52e66115fe9c9ad4b26c2e0 (diff) | |
[MERGE] forward port branch saas-10 up to bc1a0a3
Diffstat (limited to 'addons/base_import/static/src')
| -rw-r--r-- | addons/base_import/static/src/js/import.js | 2 |
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 d12e9292fde..1901a2c180e 100644 --- a/addons/base_import/static/src/js/import.js +++ b/addons/base_import/static/src/js/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, }]); }) ; }, |