Merge branch 'master-multi-branch' into 'master'

[FIX]: Added div block in multi branch

See merge request flectra-hq/flectra!141
This commit is contained in:
Parthiv Patel 2018-09-05 11:29:17 +00:00
commit 912137e639

View File

@ -7,6 +7,7 @@
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]/div[hasclass('app_settings_block')]/div[@name='multi_company']" position="after">
<div name="multi_branch">
<h2>Multi-Branch</h2>
<div class="row mt16 o_settings_container" id="multi_branch">
<div class="col-xs-12 col-md-6 o_setting_box">
@ -30,6 +31,7 @@
</div>
</div>
</div>
</div>
</xpath>
</field>
</record>