Merge lp:~openerp-dev/openobject-server/trunk-bug-1157560-tpa into lp:openobject-server

[Turkesh Patel (openERP)]

[FIX] Changing contact's company should not update former company's address with wrong data.

[Stefan Rijnhart (Opener) (stefan-opener)]

Do I understand correctly that the data on *all siblings* is modified, so that it becomes different from the parent even if it has the setting 'Use address from the parent'?

review: Needs Information

[lp:~openerp-dev/openobject-server/trunk-bug-1157560-tpa]

4851. By Turkesh Patel (openERP) on 2013-04-03

[IMP] improved code.

Unmerged revisions

4851. By Turkesh Patel (openERP) on 2013-04-03

[IMP] improved code.

4850. By Turkesh Patel (openERP) on 2013-04-03

[FIX] when edit contact's company it sets the address of old company same as selected new company.

=== modified file 'openerp/addons/base/res/res_partner.py'
--- openerp/addons/base/res/res_partner.py	2013-03-27 11:10:14 +0000
+++ openerp/addons/base/res/res_partner.py	2013-04-03 12:49:20 +0000
@@ -368,8 +368,9 @@
                 domain_children = [('parent_id', 'child_of', partner.id), ('use_parent_address', '=', True)]
                 update_ids = self.search(cr, uid, domain_children, context=context)
             elif partner.parent_id and vals.get('use_parent_address', partner.use_parent_address):
-                domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
-                update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
+                parent_id = vals['parent_id'] if vals.get('parent_id') else partner.parent_id.id
+                domain_siblings = [('parent_id', '=', parent_id), ('use_parent_address', '=', True)]
+                update_ids = [parent_id] + self.search(cr, uid, domain_siblings, context=context)
             self.update_address(cr, uid, update_ids, vals, context)
         return super(res_partner,self).write(cr, uid, ids, vals, context=context)