diff options
| author | Yannick Tivisse <yti@odoo.com> | 2016-03-07 16:30:00 +0100 |
|---|---|---|
| committer | Yannick Tivisse <yti@odoo.com> | 2016-03-07 16:53:45 +0100 |
| commit | 7ab4f6e6694ae043c488ed2bfbd522ccf5d9fea7 (patch) | |
| tree | 4f645c6b06b0fd25669b8a9e7a2aebfa9b084ec7 | |
| parent | f6c0418a80740da04a64672385f3af0ec6980c53 (diff) | |
[FIX] base: Replace (correctly) group_light_multi_company
Because sometimes shit happens (see 8a2f4e7d3fc4abe4bf449123f8b9598bb4a48d14)
| -rw-r--r-- | addons/base_setup/res_config.py | 4 | ||||
| -rw-r--r-- | addons/base_setup/res_config_view.xml | 10 | ||||
| -rw-r--r-- | openerp/addons/base/res/res_users_view.xml | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/addons/base_setup/res_config.py b/addons/base_setup/res_config.py index ed2f5dc53d1..43ebbf2bd18 100644 --- a/addons/base_setup/res_config.py +++ b/addons/base_setup/res_config.py @@ -9,9 +9,9 @@ class base_config_settings(osv.osv_memory): _inherit = 'res.config.settings' _columns = { - 'group_multi_currency': fields.boolean('Manage multiple companies', + 'group_multi_company': fields.boolean('Manage multiple companies', help='Work in multi-company environments, with appropriate security access between companies.', - implied_group='base.group_multi_currency'), + implied_group='base.group_multi_company'), 'module_share': fields.boolean('Allow documents sharing', help="""Share or embbed any screen of Odoo."""), 'module_portal': fields.boolean('Activate the customer portal', diff --git a/addons/base_setup/res_config_view.xml b/addons/base_setup/res_config_view.xml index 3106810bd07..0326069a744 100644 --- a/addons/base_setup/res_config_view.xml +++ b/addons/base_setup/res_config_view.xml @@ -57,9 +57,9 @@ </group> <group> <label for="id" string="Multi Company"/> - <div name="group_multi_currency"> - <field name="group_multi_currency" class="oe_inline"/> - <label for="group_multi_currency"/> + <div name="group_multi_company"> + <field name="group_multi_company" class="oe_inline"/> + <label for="group_multi_company"/> </div> </group> <group> @@ -69,7 +69,7 @@ <label for="group_multi_currency"/> </div> </group> - <group attrs="{'invisible': [('group_multi_currency','=',False)]}"> + <group attrs="{'invisible': [('group_multi_company','=',False)]}"> <label for="module_inter_company_rules" string="Inter company"/> <div name="inter_company"> <div name="module_inter_company_rules"> @@ -78,7 +78,7 @@ </div> </div> </group> - <group string="Shared resources" name="company_share_resources" attrs="{'invisible': [('group_multi_currency','=',False)]}"> + <group string="Shared resources" name="company_share_resources" attrs="{'invisible': [('group_multi_company','=',False)]}"> <field name="company_share_partner" class="oe_inline" /> </group> <group string="Google Integration" name="google"> diff --git a/openerp/addons/base/res/res_users_view.xml b/openerp/addons/base/res/res_users_view.xml index 89d50dc362b..3ab620e20fb 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_multi_currency"/> - <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_currency"/> + <label for="company_id" class="oe_edit_only" groups="base.group_multi_company"/> + <field name="company_id" context="{'user_preference': 0}" groups="base.group_multi_company"/> </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_multi_currency"/> + <field name="company_ids" string="Company" groups="base.group_multi_company"/> <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_multi_currency"/> + groups="base.group_multi_company"/> </group> <group string="Email Preferences"> <field name="email" widget="email" readonly="0"/> |