Unifield Server

Merge lp:~julie-w/unifield-server/US-2610 into lp:unifield-server

  1. US-2610
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4295
Proposed branch: lp:~julie-w/unifield-server/US-2610
Merge into: lp:unifield-server
Diff against target: 43 lines (+8/-4)
2 files modified
bin/addons/analytic/analytic.py (+6/-2)
bin/addons/analytic_distribution/analytic_account_view.xml (+2/-2)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-2610
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+320194@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/analytic.py'
2--- bin/addons/analytic/analytic.py 2016-02-26 08:12:21 +0000
3+++ bin/addons/analytic/analytic.py 2017-03-17 14:38:34 +0000
4@@ -206,10 +206,10 @@
5 currency = self.pool.get('res.company').read(cr, uid, [company_id], ['currency_id'])[0]['currency_id']
6 return {'value': {'currency_id': currency}}
7
8- def on_change_parent(self, cr, uid, id, parent_id):
9+ def on_change_parent(self, cr, uid, id, parent_id, category=False):
10 if not parent_id:
11 return {}
12- parent = self.read(cr, uid, [parent_id], ['partner_id','code'])[0]
13+ parent = self.read(cr, uid, [parent_id], ['partner_id', 'code', 'category', 'type'])[0]
14 if parent['partner_id']:
15 partner = parent['partner_id'][0]
16 else:
17@@ -217,6 +217,10 @@
18 res = {'value': {}}
19 if partner:
20 res['value']['partner_id'] = partner
21+ # if a new account has been created via the "Parent Analytic Account" Search View, check its category and type
22+ if (category and 'category' in parent and parent['category'] != category) or \
23+ ('type' in parent and parent['type'] != 'view'):
24+ res['value']['parent_id'] = {}
25 return res
26
27 def name_search(self, cr, uid, name, args=None, operator='ilike', context=None, limit=100):
28
29=== modified file 'bin/addons/analytic_distribution/analytic_account_view.xml'
30--- bin/addons/analytic_distribution/analytic_account_view.xml 2017-02-10 08:51:30 +0000
31+++ bin/addons/analytic_distribution/analytic_account_view.xml 2017-03-17 14:38:34 +0000
32@@ -71,9 +71,9 @@
33 </field>
34 <field name="parent_id" position="replace">
35 <field name="category" select="1" required="1" on_change="on_change_category(category)"/>
36- <field name="parent_id" on_change="on_change_parent(parent_id)" required="1"
37+ <field name="parent_id" on_change="on_change_parent(parent_id, category)" required="1"
38 attrs="{'readonly': [('category', '=', 'FUNDING')], 'required': [('category', 'not in', ['FREE1', 'FREE2'])]}"
39- domain="[('type', '=', 'view')]"
40+ domain="[('type', '=', 'view'), ('category', '=', category)]"
41 />
42 <newline/>
43 <field name="for_fx_gain_loss"/>

Subscribers

People subscribed via source and target branches