diff options
| author | Yannick Tivisse <yti@odoo.com> | 2016-03-07 11:14:59 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-03-07 15:53:30 +0100 |
| commit | 8a2f4e7d3fc4abe4bf449123f8b9598bb4a48d14 (patch) | |
| tree | 497af8bcb2d567c4049ec5f85809dc3a3ac0c445 /openerp/addons | |
| parent | abdca55ea2f5a4296ef46d3b9562a21eb955272f (diff) | |
[IMP] base: Merge group_light_multi_company into group_multi_company
This distinction is useless and confusing.
Diffstat (limited to 'openerp/addons')
| -rw-r--r-- | openerp/addons/base/module/module_data.xml | 4 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_users_view.xml | 8 | ||||
| -rw-r--r-- | openerp/addons/base/security/base_security.xml | 5 |
3 files changed, 4 insertions, 13 deletions
diff --git a/openerp/addons/base/module/module_data.xml b/openerp/addons/base/module/module_data.xml index ca4fdb1b459..1eaf3b296eb 100644 --- a/openerp/addons/base/module/module_data.xml +++ b/openerp/addons/base/module/module_data.xml @@ -143,10 +143,6 @@ <field name="category_id" ref="module_category_usability"/> </record> - <record model="res.groups" id="group_light_multi_company"> - <field name="category_id" ref="module_category_hidden"/> - </record> - <record model="res.groups" id="group_multi_currency"> <field name="category_id" ref="module_category_usability"/> </record> diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index cb693aaadea..89d50dc362b 100644 --- a/openerp/addons/base/res/res_users_view.xml +++ b/openerp/addons/base/res/res_users_view.xml @@ -144,8 +144,8 @@ <field name="login" placeholder="email@yourcompany.com"/> </h2> - <label for="company_id" class="oe_edit_only" groups="base.group_light_multi_company"/> - <field name="company_id" context="{'user_preference': 0}" groups="base.group_light_multi_company"/> + <label for="company_id" class="oe_edit_only" groups="base.group_multi_currency"/> + <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_currency"/> </div> <group> <label for="groups_id" string="Access Rights" @@ -236,7 +236,7 @@ <field name="arch" type="xml"> <search string="Users"> <field name="name" filter_domain="['|', '|', ('name','ilike',self), ('login','ilike',self), ('email','ilike',self)]" string="User"/> - <field name="company_ids" string="Company" groups="base.group_light_multi_company"/> + <field name="company_ids" string="Company" groups="base.group_multi_currency"/> <field name="share"/> <filter name="no_share" string="Internal Users" domain="[('share','=',False)]"/> <filter name="Inactive" string="Inactive Users" domain="[('active','=',False)]"/> @@ -294,7 +294,7 @@ <field name="tz" widget="timezone_mismatch" options="{'tz_offset_field': 'tz_offset'}" readonly="0"/> <field name="tz_offset" invisible="1"/> <field name="company_id" options="{'no_create': True}" readonly="0" - groups="base.group_light_multi_company"/> + groups="base.group_multi_currency"/> </group> <group string="Email Preferences"> <field name="email" widget="email" readonly="0"/> diff --git a/openerp/addons/base/security/base_security.xml b/openerp/addons/base/security/base_security.xml index 416f965ae94..3e9b0bed0dd 100644 --- a/openerp/addons/base/security/base_security.xml +++ b/openerp/addons/base/security/base_security.xml @@ -29,13 +29,8 @@ <field name="groups_id" eval="[(4,ref('base.group_user'))]"/> </record> - <record model="res.groups" id="group_light_multi_company"> - <field name="name">Enable Light Multi Company</field> - </record> - <record model="res.groups" id="group_multi_company"> <field name="name">Multi Companies</field> - <field name="implied_ids" eval="[(4, ref('group_light_multi_company'))]"/> </record> <record model="res.groups" id="group_multi_currency"> |