pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[FIX] base: Replace (correctly) group_light_multi_company

Browse Source 
Because sometimes shit happens (see 8a2f4e7d3f)
This commit is contained in:
Yannick Tivisse
2016-03-07 16:53:45 +01:00
parent f6c0418a80
commit 7ab4f6e669
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/base_setup/res_config.py
+2 -2
View File
@@ -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',
addons/base_setup/res_config_view.xml
+5 -5
View File
@@ -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">
openerp/addons/base/res/res_users_view.xml
+4 -4
View File
@@ -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"/>