[FIX] fp-style merge

bzr revid: xmo@openerp.com-20110927144316-js6cceeyu5fx6ess
2011-09-27 16:43:16 +02:00
parent a515aad374 ae0649df5f
commit 1b2ac73edd
1 changed files with 12 additions and 1 deletions
@@ -941,7 +941,18 @@ class orm_template(object):
                            else:
                                r = d['name']
                        else:
-                            break
+                            postfix = 0
+                            while True:
+                                n = self._table+'_'+str(r['id']) + (postfix and ('_'+str(postfix)) or '' )
+                                if not model_data.search(cr, uid, [('name', '=', n)]):
+                                    break
+                                postfix += 1
+                            model_data.create(cr, uid, {
+                                'name': n,
+                                'model': self._name,
+                                'res_id': r['id'],
+                            })
+                            r = n
                    else:
                        r = r[f[i]]
                        # To display external name of selection field when its exported