unifield-wm

Merge lp:~unifield-team/unifield-wm/us-896 into lp:unifield-wm

  1. us-896
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 2755
Proposed branch: lp:~unifield-team/unifield-wm/us-896
Merge into: lp:unifield-wm
Diff against target: 24 lines (+10/-4)
1 file modified
account_override/account.py (+10/-4)
To merge this branch: bzr merge lp:~unifield-team/unifield-wm/us-896
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+285314@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 'account_override/account.py'
2--- account_override/account.py 2016-01-29 11:15:41 +0000
3+++ account_override/account.py 2016-02-08 10:33:08 +0000
4@@ -489,10 +489,16 @@
5 context=context)[0].company_id.instance_id
6 if self_instance:
7 forbid_levels = []
8- if self_instance.level and self_instance.level == 'coordo':
9- # BKLG-19/7: forbid creation of MANUAL journal entries
10- # from COORDO on a PROJECT journal
11- forbid_levels.append('project')
12+ if self_instance.level:
13+ if self_instance.level == 'coordo':
14+ # BKLG-19/7: forbid creation of MANUAL journal entries
15+ # from COORDO on a PROJECT journal
16+ forbid_levels = [ 'project', ]
17+ elif self_instance.level == 'project':
18+ # US-896: project should only see project journals
19+ # (coordo register journals sync down to project for
20+ # example)
21+ forbid_levels = [ 'coordo', 'section', ]
22 if forbid_levels:
23 msf_instance_obj = self.pool.get('msf.instance')
24 forbid_instance_ids = msf_instance_obj.search(cr, uid,

Subscribers

People subscribed via source and target branches