From 4a3340a3d84b9bec800426dcc8ff892521504847 Mon Sep 17 00:00:00 2001
From: ced <>
Date: Thu, 23 Aug 2007 14:07:19 +0000
Subject: [PATCH] Fix import csv when there is id and many one2many

bzr revid: ced-24ea3f412755abe792ff6a51d04a402537f5455e
---
 bin/osv/orm.py |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/bin/osv/orm.py b/bin/osv/orm.py
index 97dd56e..b045477 100644
--- a/bin/osv/orm.py
+++ b/bin/osv/orm.py
@@ -704,7 +704,7 @@ class orm(object):
 			for field in todo:
 				newfd = self.pool.get(fields_def[field]['relation']).fields_get(cr, uid, context=context)
 				res = process_liness(self, datas, prefix+[field], newfd, position)
-				(newrow,max2,w2, translate2,data_id) = res
+				(newrow, max2, w2, translate2, data_id2) = res
 				nbrmax = max(nbrmax, max2)
 				warning = warning+w2
 				reduce(lambda x,y: x and y, newrow)
@@ -719,7 +719,8 @@ class orm(object):
 					if not ok:
 						break
 
-					(newrow,max2,w2, translate2,data_id) = process_liness(self, datas, prefix+[field], newfd, position+i)
+					(newrow, max2, w2, translate2, data_id2) = process_liness(
+							self, datas, prefix+[field], newfd, position+i)
 					warning = warning+w2
 					if reduce(lambda x,y: x or y, newrow.values()):
 						row[field].append((0,0,newrow))
-- 
1.7.10.4