Merge lp:~acsone-openerp/web-addons/web_easy_switch_company-userform-fix-sbi into lp:~webaddons-core-editors/web-addons/7.0

Proposed by Stéphane Bidoul (Acsone)
Status: Merged
Merged at revision: 30
Proposed branch: lp:~acsone-openerp/web-addons/web_easy_switch_company-userform-fix-sbi
Merge into: lp:~webaddons-core-editors/web-addons/7.0
Diff against target: 14 lines (+3/-1)
1 file modified
web_easy_switch_company/view/res_users_view.xml (+3/-1)
To merge this branch: bzr merge lp:~acsone-openerp/web-addons/web_easy_switch_company-userform-fix-sbi
Reviewer Review Type Date Requested Status
Guewen Baconnier @ Camptocamp code review Approve
arthru (community) code review Approve
Pedro Manuel Baeza code review Approve
Review via email: mp+216170@code.launchpad.net

Description of the change

web_easy_switch_company removes the company_id field from the user preferences form.

Some module extending the form and relying on the presence of that field break when web_easy_switch_company (sale_crm for instance).

This MP fixes this by hiding the field instead of removing it.

To post a comment you must log in.
Revision history for this message
Pedro Manuel Baeza (pedro.baeza) wrote :

Thanks for the fix!

Regards.

review: Approve (code review)
Revision history for this message
arthru (arthru) :
review: Approve (code review)
Revision history for this message
Guewen Baconnier @ Camptocamp (gbaconnier-c2c) :
review: Approve (code review)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'web_easy_switch_company/view/res_users_view.xml'
2--- web_easy_switch_company/view/res_users_view.xml 2014-03-10 20:13:54 +0000
3+++ web_easy_switch_company/view/res_users_view.xml 2014-04-16 17:59:26 +0000
4@@ -8,7 +8,9 @@
5 <field name="inherit_id" ref="base.view_users_form_simple_modif"/>
6 <field name="arch" type="xml">
7 <!-- hide old behaviour to change company -->
8- <field name="company_id" position="replace" />
9+ <field name="company_id" position="attributes">
10+ <attribute name="invisible">1</attribute>
11+ </field>
12 </field>
13 </record>
14 </data>

Subscribers

People subscribed via source and target branches