diff options
| author | Christophe Simonis <chs@odoo.com> | 2017-08-22 17:20:15 +0200 |
|---|---|---|
| committer | Christophe Simonis <chs@odoo.com> | 2017-08-22 17:20:15 +0200 |
| commit | d5f2a38b50ceb2fb9f5dcecb5eeaad3188555705 (patch) | |
| tree | 5ad6be44887a1980ca1703f3fd80c38c10ddf1e5 /odoo/models.py | |
| parent | e38de9dfa4c09f861253cb85643a47153d448e3c (diff) | |
| parent | 6956ad54de52055910539118a34355f818e57c4a (diff) | |
[MERGE] forward port branch saas-14 up to 6956ad54de5
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 d6417b0b7cd..e6862d70e15 100644 --- a/odoo/models.py +++ b/odoo/models.py @@ -781,7 +781,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, |