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
=== modified file 'email_template_multicompany/email_server_view.xml'
--- email_template_multicompany/email_server_view.xml 2013-08-07 17:38:15 +0000
+++ email_template_multicompany/email_server_view.xml 2013-11-04 12:58:07 +0000
@@ -7,7 +7,7 @@
7 <field name="inherit_id" ref="base.ir_mail_server_form"/>7 <field name="inherit_id" ref="base.ir_mail_server_form"/>
8 <field name="arch" type="xml">8 <field name="arch" type="xml">
9 <xpath expr="//field[@name='sequence']" position="after">9 <xpath expr="//field[@name='sequence']" position="after">
10 <field name="company_id"/>10 <field name="company_id" groups="base.group_multi_company"/>
11 </xpath>11 </xpath>
12 </field>12 </field>
13 </record>13 </record>
1414
=== modified file 'email_template_multicompany/email_template_view.xml'
--- email_template_multicompany/email_template_view.xml 2013-05-06 18:02:02 +0000
+++ email_template_multicompany/email_template_view.xml 2013-11-04 12:58:07 +0000
@@ -8,7 +8,7 @@
8 <field name="inherit_id" ref="email_template.email_template_form"/>8 <field name="inherit_id" ref="email_template.email_template_form"/>
9 <field name="arch" type="xml">9 <field name="arch" type="xml">
10 <xpath expr="//field[@name='model_id']" position="after">10 <xpath expr="//field[@name='model_id']" position="after">
11 <field name="company_id"/>11 <field name="company_id" groups="base.group_multi_company"/>
12 </xpath>12 </xpath>
13 </field>13 </field>
14 </record>14 </record>