diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-23 11:23:08 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-23 11:23:08 +0200 |
| commit | 59f8b849fba3b53eee3682af64a757a32acc12da (patch) | |
| tree | d7242422b7d75898b480a5144656a07b3b720831 /odoo/models.py | |
| parent | dbdf994df8e0a618c78de2bb0d383a23f401e67e (diff) | |
| parent | d5f2a38b50ceb2fb9f5dcecb5eeaad3188555705 (diff) | |
[MERGE] forward port branch saas-15 up to d5f2a38b50c
Diffstat (limited to 'odoo/models.py')
| -rw-r--r-- | odoo/models.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/odoo/models.py b/odoo/models.py index bff10e28b38..d5540341b4b 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -771,7 +771,7 @@ class BaseModel(object): # avoid broken transaction) and keep going cr.execute('ROLLBACK TO SAVEPOINT model_load_save') except Exception as e: - message = (_('Unknown error during import:') + ' %s: %s' % (type(e), unicode(e))) + message = (_('Unknown error during import:') + ' %s: %s' % (type(e), unicode(e.message or e.name))) moreinfo = _('Resolve other errors first') messages.append(dict(info, type='error', message=message, moreinfo=moreinfo)) # Failed for some reason, perhaps due to invalid data supplied, |