Merge lp:~therp-nl/ocb-server/lp1210186 into lp:ocb-server

Proposed by Holger Brunn (Therp)
Status: Rejected
Rejected by: Stefan Rijnhart (Opener)
Proposed branch: lp:~therp-nl/ocb-server/lp1210186
Merge into: lp:ocb-server
Diff against target: 15 lines (+4/-1)
1 file modified
openerp/addons/base/res/res_partner.py (+4/-1)
To merge this branch: bzr merge lp:~therp-nl/ocb-server/lp1210186
Reviewer Review Type Date Requested Status
Stefan Rijnhart (Opener) Approve
Review via email: mp+179224@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Thanks! I checked _commercial_sync_to_children and all it does is indeed update the children's commercial fields so it seems clear that this will not be needed if only non-commercial fields are written to the commercial partner.

review: Approve
Revision history for this message
Stefan Rijnhart (Opener) (stefan-opener) wrote :

Rejecting, because the same proposal upstream has been merged in upstream
(http://bazaar.launchpad.net/~openerp/openobject-server/7.0/revision/5056)

Unmerged revisions

5060. By Holger Brunn (Therp)

[FIX] only descend to children when necessary

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-06-12 09:53:00 +0000
3+++ openerp/addons/base/res/res_partner.py 2013-08-08 16:14:37 +0000
4@@ -465,7 +465,10 @@
5 # 2. To DOWNSTREAM: sync children
6 if partner.child_ids:
7 # 2a. Commercial Fields: sync if commercial entity
8- if partner.commercial_partner_id == partner:
9+ if partner.commercial_partner_id == partner and any(
10+ field in update_values
11+ for field in self._commercial_fields(
12+ cr, uid, context=context)):
13 self._commercial_sync_to_children(cr, uid, partner, context=context)
14 # 2b. Address fields: sync if address changed
15 address_fields = self._address_fields(cr, uid, context=context)

Subscribers

People subscribed via source and target branches

to status/vote changes: