Yaltik/flectra
2
0
Fork 0
Code Pull Requests Releases Activity

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

Browse Source 
[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
1 changed files with 19 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
addons/base_branch_company/views/res_branch_config_view.xml
View File

@ -7,29 +7,31 @@
<field name="inherit_id" ref="base_setup.res_config_settings_view_form"/> <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
<field name="arch" type="xml"> <field name="arch" type="xml">
<xpath expr="//div[hasclass('settings')]/div[hasclass('app_settings_block')]/div[@name='multi_company']" position="after"> <xpath expr="//div[hasclass('settings')]/div[hasclass('app_settings_block')]/div[@name='multi_company']" position="after">
<h2>Multi-Branch</h2> <div name="multi_branch">
<div class="row mt16 o_settings_container" id="multi_branch"> <h2>Multi-Branch</h2>
<div class="col-xs-12 col-md-6 o_setting_box"> <div class="row mt16 o_settings_container" id="multi_branch">
<div class="o_setting_left_pane"> <div class="col-xs-12 col-md-6 o_setting_box">
<field name="group_multi_branch"/> <div class="o_setting_left_pane">
</div> <field name="group_multi_branch"/>
<div class="o_setting_left_pane"/>
<div class="o_setting_right_pane">
<label string="Branches"/>
<div class="text-muted">
Configure your Branch
</div> </div>
<div class="content-group" attrs="{'invisible': [('group_multi_branch','=',False)]}"> <div class="o_setting_left_pane"/>
<div class="mt16"> <div class="o_setting_right_pane">
<button name="%(action_view_branch_config)d" string="Branch Configuration" type="action" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/> <label string="Branches"/>
<div class="text-muted">
Configure your Branch
</div> </div>
<div class="mt16"> <div class="content-group" attrs="{'invisible': [('group_multi_branch','=',False)]}">
<button name="%(action_res_branch_tree)d" string="Branches" type="action" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/> <div class="mt16">
<button name="%(action_view_branch_config)d" string="Branch Configuration" type="action" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/>
</div>
<div class="mt16">
<button name="%(action_res_branch_tree)d" string="Branches" type="action" class="oe_link" groups="base.group_no_one" icon="fa-arrow-right"/>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</xpath> </xpath>
</field> </field>
</record> </record>