Unifield Server

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

  1. US-3912
  2. Merge into trunk
Proposed by jftempo
Status: Merged
Merged at revision: 4843
Proposed branch: lp:~julie-w/unifield-server/US-3912
Merge into: lp:unifield-server
Diff against target: 29 lines (+4/-4)
2 files modified
bin/addons/analytic_distribution/analytic_account_view.xml (+2/-3)
bin/addons/msf_instance/msf_instance_view.xml (+2/-1)
To merge this branch: bzr merge lp:~julie-w/unifield-server/US-3912
Reviewer Review Type Date Requested Status
UniField Reviewer Team Pending
Review via email: mp+342273@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/analytic_account_view.xml'
2--- bin/addons/analytic_distribution/analytic_account_view.xml 2017-05-10 12:47:14 +0000
3+++ bin/addons/analytic_distribution/analytic_account_view.xml 2018-03-28 07:26:51 +0000
4@@ -72,9 +72,8 @@
5 <field name="parent_id" position="replace">
6 <field name="category" select="1" required="1" on_change="on_change_category(category)"/>
7 <field name="parent_id" on_change="on_change_parent(parent_id, category)" required="1"
8- attrs="{'readonly': [('category', '=', 'FUNDING')], 'required': [('category', 'not in', ['FREE1', 'FREE2'])]}"
9- domain="[('type', '=', 'view'), ('category', '=', category)]"
10- />
11+ attrs="{'readonly': [('category', '=', 'FUNDING')], 'required': [('category', 'not in', ['FREE1', 'FREE2', 'FUNDING'])]}"
12+ domain="[('type', '=', 'view'), ('category', '=', category)]"/>
13 <newline/>
14 <field name="for_fx_gain_loss"/>
15 </field>
16
17=== modified file 'bin/addons/msf_instance/msf_instance_view.xml'
18--- bin/addons/msf_instance/msf_instance_view.xml 2018-02-22 14:23:17 +0000
19+++ bin/addons/msf_instance/msf_instance_view.xml 2018-03-28 07:26:51 +0000
20@@ -366,7 +366,8 @@
21 <data>
22 <field name="parent_id" position="before">
23 <field name="current_instance_type" invisible="1"/>
24- <field name="instance_id" domain="[('level', '=', 'coordo')]" attrs="{'required': [('category', '=', 'FUNDING')], 'invisible': [('category', '!=', 'FUNDING')], 'readonly': [('current_instance_type', '!=', 'section')]}"/>
25+ <field name="instance_id" domain="[('level', '=', 'coordo')]"
26+ attrs="{'required': [('category', '=', 'FUNDING'), ('current_instance_type', '=', 'section')], 'invisible': [('category', '!=', 'FUNDING')], 'readonly': [('current_instance_type', '!=', 'section')]}"/>
27 </field>
28 </data>
29 </field>

Subscribers

People subscribed via source and target branches