diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index d1fab62c68f..b34bbdc21ae 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1212,7 +1212,6 @@ class BaseModel(object): if not context: context = {} fields = map(fix_import_export_id_paths, fields) - logger = netsvc.Logger() ir_model_data_obj = self.pool.get('ir.model.data') # mode: id (XML id) or .id (database id) or False for name_get @@ -1290,7 +1289,7 @@ class BaseModel(object): # ID of the record using a XML ID if field_name == 'id': try: - data_res_id = _get_id(model_name, line[i], current_module, 'id') + data_res_id = _get_id(model_name, line[i], current_module) except ValueError: pass xml_id = line[i] @@ -1363,8 +1362,7 @@ class BaseModel(object): row[field_name] = res or False - result = (row, nbrmax, warning, data_res_id, xml_id) - return result + return row, nbrmax, warning, data_res_id, xml_id fields_def = self.fields_get(cr, uid, context=context) @@ -1375,20 +1373,18 @@ class BaseModel(object): position = data.get(filename, 0) while position