Merge lp:~jfb-tempo-consulting/unifield-server/us-2708 into lp:unifield-server

Proposed by jftempo
Status: Merged
Merged at revision: 4285
Proposed branch: lp:~jfb-tempo-consulting/unifield-server/us-2708
Merge into: lp:unifield-server
Diff against target: 14 lines (+5/-0)
1 file modified
bin/addons/analytic_distribution/account.py (+5/-0)
To merge this branch: bzr merge lp:~jfb-tempo-consulting/unifield-server/us-2708
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+322198@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bin/addons/analytic_distribution/account.py'
2--- bin/addons/analytic_distribution/account.py 2017-02-13 13:09:54 +0000
3+++ bin/addons/analytic_distribution/account.py 2017-04-07 12:20:50 +0000
4@@ -101,6 +101,11 @@
5 }
6
7 def unlink(self, cr, uid, ids, context=None):
8+ if context is None:
9+ context = {}
10+ if context.get('sync_update_execution'):
11+ return super(account_destination_link, self).unlink(cr, uid, ids, context)
12+
13 self.write(cr, uid, ids, {'disabled': True}, context=context)
14 return True
15

Subscribers

People subscribed via source and target branches