Merge lp:~nemry/openerp-mexico-localization/7.0-multicompany into lp:openerp-mexico-localization/7.0

Proposed by Jonathan Nemry (Acsone)
Status: Needs review
Proposed branch: lp:~nemry/openerp-mexico-localization/7.0-multicompany
Merge into: lp:openerp-mexico-localization/7.0
Diff against target: 25 lines (+2/-2)
2 files modified
email_template_multicompany/email_server_view.xml (+1/-1)
email_template_multicompany/email_template_view.xml (+1/-1)
To merge this branch: bzr merge lp:~nemry/openerp-mexico-localization/7.0-multicompany
Reviewer Review Type Date Requested Status
Nhomar - Vauxoo Approve
Acsone OpenErp Team Pending
Review via email: mp+193768@code.launchpad.net

Description of the change

We propose to show company_id fields only to users belonging to "Usability / Multi Companies" group (as in most OpenERP addons providing similar multi-company purpose).

To post a comment you must log in.
Revision history for this message
Nhomar - Vauxoo (nhomar) wrote :

I am agreed.

Thanks.

review: Approve

Unmerged revisions

322. By Jonathan Nemry (Acsone)

[ADD] attribute 'groups' on multicompany

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'email_template_multicompany/email_server_view.xml'
2--- email_template_multicompany/email_server_view.xml 2013-08-07 17:38:15 +0000
3+++ email_template_multicompany/email_server_view.xml 2013-11-04 12:58:07 +0000
4@@ -7,7 +7,7 @@
5 <field name="inherit_id" ref="base.ir_mail_server_form"/>
6 <field name="arch" type="xml">
7 <xpath expr="//field[@name='sequence']" position="after">
8- <field name="company_id"/>
9+ <field name="company_id" groups="base.group_multi_company"/>
10 </xpath>
11 </field>
12 </record>
13
14=== modified file 'email_template_multicompany/email_template_view.xml'
15--- email_template_multicompany/email_template_view.xml 2013-05-06 18:02:02 +0000
16+++ email_template_multicompany/email_template_view.xml 2013-11-04 12:58:07 +0000
17@@ -8,7 +8,7 @@
18 <field name="inherit_id" ref="email_template.email_template_form"/>
19 <field name="arch" type="xml">
20 <xpath expr="//field[@name='model_id']" position="after">
21- <field name="company_id"/>
22+ <field name="company_id" groups="base.group_multi_company"/>
23 </xpath>
24 </field>
25 </record>