diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-09-11 08:20:46 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-09-11 08:20:46 +0200 |
| commit | 80c2e5e2e869ea56b13faab596e2e51fad6e2db7 (patch) | |
| tree | 56d08a6c157413f9046e2e351ce1f0921acb69ee /addons/project | |
| parent | 5cf0ec526052fb28f38907c1618162fe8f919954 (diff) | |
| parent | 063c548209a9669fe05f494555521fc92bd51af0 (diff) | |
[MERGE] from trunk
bzr revid: xmo@openerp.com-20120910142154-rp2wv8l84c5cat2x
bzr revid: xmo@openerp.com-20120911062046-r0otrm9pizuv26sv
Diffstat (limited to 'addons/project')
| -rw-r--r-- | addons/project/project_view.xml | 6 | ||||
| -rw-r--r-- | addons/project/security/project_security.xml | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/addons/project/project_view.xml b/addons/project/project_view.xml index a4ba5a233a1..4f2fe7d54f1 100644 --- a/addons/project/project_view.xml +++ b/addons/project/project_view.xml @@ -139,8 +139,10 @@ <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> <field name="priority"/> <field name="active" attrs="{'invisible':[('state','in',['open', 'pending', 'template'])]}"/> - <field name="currency_id" groups="base.group_multi_company" required="1"/> - <field name="company_id" groups="base.group_multi_company" widget="selection" required="1"/> + + <field name="currency_id" groups="base.group_multi_currency" required="1"/> + <field name="parent_id" domain="[('id','!=',analytic_account_id)]" context="{'current_model': 'project.project'}"/> + </group> </group> </page> diff --git a/addons/project/security/project_security.xml b/addons/project/security/project_security.xml index 3afe0f14e7a..b499e682669 100644 --- a/addons/project/security/project_security.xml +++ b/addons/project/security/project_security.xml @@ -45,7 +45,7 @@ <field name="name">public Members</field> <field name="model_id" ref="model_project_project"/> <field name="global" eval="True"/> - <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('follower_ids','in',[user.partner_id.id])]</field> + <field name="domain_force">['|','|',('privacy_visibility','in',[False,'public']),('members','in',[user.id]),('message_follower_ids','in',[user.partner_id.id])]</field> </record> <record model="ir.rule" id="task_comp_rule"> |