[REV] garbage

bzr revid: xmo@openerp.com-20121102140127-69e3ae5vca1ni46r
This commit is contained in:
Xavier Morel 2012-11-02 15:01:27 +01:00
parent a360547db8
commit 956bfd007d
1 changed files with 3 additions and 11 deletions

View File

@ -316,17 +316,9 @@ class ir_import(orm.TransientModel):
}]
_logger.info('importing %d rows...', len(data))
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,
}]
import_result = self.pool[record.res_model].load(
cr, uid, import_fields, data, context=context)
_logger.info('done')
# If transaction aborted, RELEASE SAVEPOINT is going to raise
# an InternalError (ROLLBACK should work, maybe). Ignore that.