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

[IMP] base: Merge group_light_multi_company into group_multi_company

Browse Source 
This distinction is useless and confusing.
This commit is contained in:
Yannick Tivisse
2016-03-07 15:53:30 +01:00
parent abdca55ea2
commit 8a2f4e7d3f
5 changed files with 11 additions and 20 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_light_multi_company': fields.boolean('Manage multiple companies',
'group_multi_currency': fields.boolean('Manage multiple companies',
help='Work in multi-company environments, with appropriate security access between companies.',
implied_group='base.group_light_multi_company'),
implied_group='base.group_multi_currency'),
'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_light_multi_company">
<field name="group_light_multi_company" class="oe_inline"/>
<label for="group_light_multi_company"/>
<div name="group_multi_currency">
<field name="group_multi_currency" class="oe_inline"/>
<label for="group_multi_currency"/>
</div>
</group>
<group>
@@ -69,7 +69,7 @@
<label for="group_multi_currency"/>
</div>
</group>
<group attrs="{'invisible': [('group_light_multi_company','=',False)]}">
<group attrs="{'invisible': [('group_multi_currency','=',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_light_multi_company','=',False)]}">
<group string="Shared resources" name="company_share_resources" attrs="{'invisible': [('group_multi_currency','=',False)]}">
<field name="company_share_partner" class="oe_inline" />
</group>
<group string="Google Integration" name="google">