Merge lp:~therp-nl/therp-backports/server6.1-lp915975-related_x2m_writes_target_model_with_source_model_id into lp:therp-backports/server-6.1

[Stefan Rijnhart (Opener)]

Hi,

the related field's fnct_write attempts at writing the target model with the source model id if the target model's field value is a relational field and is currently empty.

As far as I could see the logic in this method was overly complicated and could not be fixed easily. In this branch I tried to simplify the code. This version at least fixes the issue.

Cheers,
Stefan.

[lp:~therp-nl/therp-backports/server6.1-lp915975-related_x2m_writes_target_model_with_source_model_id]

4292. By Stefan Rijnhart (Opener) on 2012-10-20

[IMP] Removed void assignment

=== modified file 'openerp/osv/fields.py'
--- openerp/osv/fields.py	2012-06-19 15:16:51 +0000
+++ openerp/osv/fields.py	2012-10-20 16:47:22 +0000
@@ -1179,25 +1179,16 @@
             ids=[ids]
         objlst = obj.browse(cr, uid, ids)
         for data in objlst:
-            t_id = data.id
             t_data = data
-            for i in range(len(self.arg)):
-                if not t_data: break
-                field_detail = self._relations[i]
+            for i in range(len(self.arg) - 1):
                 if not t_data[self.arg[i]]:
-                    if self._type not in ('one2many', 'many2many'):
-                        t_id = t_data['id']
-                    t_data = False
-                elif field_detail['type'] in ('one2many', 'many2many'):
-                    if self._type != "many2one":
-                        t_id = t_data.id
-                        t_data = t_data[self.arg[i]][0]
-                    else:
-                        t_data = False
+                    break
+                if self._relations[i]['type'] in ('one2many', 'many2many'):
+                    t_data = t_data[self.arg[i]][0]
                 else:
-                    t_id = t_data['id']
                     t_data = t_data[self.arg[i]]
             else:
+                t_id = t_data.id
                 model = obj.pool.get(self._relations[-1]['object'])
                 model.write(cr, uid, [t_id], {args[-1]: values}, context=context)