From ae92ec17ea46cbf1cec414ed9e1a0c756fe22426 Mon Sep 17 00:00:00 2001 From: Fabien Pinckaers Date: Wed, 28 Dec 2011 20:45:06 +0100 Subject: [PATCH] [FIX] import/export bzr revid: fp@tinyerp.com-20111228194506-nag2kqk1w1uyk43p --- openerp/osv/orm.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py index 91ea19eccac..14ed4948dd9 100644 --- a/openerp/osv/orm.py +++ b/openerp/osv/orm.py @@ -1106,7 +1106,7 @@ class BaseModel(object): 'res_id': r['id'], 'module': '__export__', }) - r = n + r = '__export__.'+n else: r = r[f[i]] # To display external name of selection field when its exported @@ -1330,7 +1330,7 @@ class BaseModel(object): newfd = relation_obj.fields_get( cr, uid, context=context ) pos = position - res = many_ids(line[i], relation, current_module, mode) + res = [] first = 0 while pos < len(datas): @@ -1342,9 +1342,6 @@ class BaseModel(object): warning += w2 first += 1 - if data_res_id2: - res.append((4, data_res_id2)) - if (not newrow) or not reduce(lambda x, y: x or y, newrow.values(), 0): break