From deaae5dec3578cdb3ecb1098e15cf64de743b133 Mon Sep 17 00:00:00 2001 From: Vijaykumar Baladaniya Date: Tue, 30 Oct 2012 14:42:31 +0530 Subject: [PATCH] [IMP]Give a proper message When a validate or import is refused due to a problem. bzr revid: vba@tinyerp.com-20121030091231-ty2edtpcjyaxqzzx --- addons/base_import/models.py | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/addons/base_import/models.py b/addons/base_import/models.py index 996dbf7964d..7060e2752e6 100644 --- a/addons/base_import/models.py +++ b/addons/base_import/models.py @@ -316,9 +316,17 @@ class ir_import(orm.TransientModel): }] _logger.info('importing %d rows...', len(data)) - import_result = self.pool[record.res_model].load( - cr, uid, import_fields, data, context=context) - _logger.info('done') + try: + import_result = self.pool[record.res_model].load( + cr, uid, import_fields, data, context=context) + _logger.info('done') + except Exception, e: + _logger.info(e) + return [{ + 'type': 'error', + 'message': unicode('No data have been imported.'), + 'record': False, + }] # If transaction aborted, RELEASE SAVEPOINT is going to raise # an InternalError (ROLLBACK should work, maybe). Ignore that.