Odoo Server (MOVED TO GITHUB)

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

  1. 7.0-bug-1157560-tpa
  2. Merge into 7.0
Proposed by Turkesh Patel (openERP)
Status: Needs review
Proposed branch: lp:~openerp-dev/openobject-server/7.0-bug-1157560-tpa
Merge into: lp:openobject-server/7.0
Diff against target: 20 lines (+4/-7)
1 file modified
openerp/addons/base/res/res_partner.py (+4/-7)
To merge this branch: bzr merge lp:~openerp-dev/openobject-server/7.0-bug-1157560-tpa
Reviewer Review Type Date Requested Status
OpenERP Core Team Pending
Review via email: mp+156788@code.launchpad.net

Description of the change

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

To post a comment you must log in.
lp:~openerp-dev/openobject-server/7.0-bug-1157560-tpa updated
4919. By Turkesh Patel (openERP)

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

Unmerged revisions

4919. By Turkesh Patel (openERP)

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'openerp/addons/base/res/res_partner.py'
2--- openerp/addons/base/res/res_partner.py 2013-03-29 11:23:17 +0000
3+++ openerp/addons/base/res/res_partner.py 2013-04-03 12:55:25 +0000
4@@ -369,13 +369,10 @@
5 if partner.is_company:
6 domain_children = [('parent_id', '=', partner.id), ('use_parent_address', '=', True)]
7 update_ids = self.search(cr, uid, domain_children, context=context)
8- elif partner.parent_id:
9- if vals.get('use_parent_address')==True:
10- domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
11- update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
12- if 'use_parent_address' not in vals and partner.use_parent_address:
13- domain_siblings = [('parent_id', '=', partner.parent_id.id), ('use_parent_address', '=', True)]
14- update_ids = [partner.parent_id.id] + self.search(cr, uid, domain_siblings, context=context)
15+ elif partner.parent_id and vals.get('use_parent_address', partner.use_parent_address):
16+ parent_id = vals['parent_id'] if vals.get('parent_id') else partner.parent_id.id
17+ domain_siblings = [('parent_id', '=', parent_id), ('use_parent_address', '=', True)]
18+ update_ids = [parent_id] + self.search(cr, uid, domain_siblings, context=context)
19 self.update_address(cr, uid, update_ids, vals, context)
20 return super(res_partner,self).write(cr, uid, ids, vals, context=context)
21