From 5a7452a4105efe93ce868031ba0637a684374c28 Mon Sep 17 00:00:00 2001
From: Kunjal <kunjal@techreceptives.com>
Date: Thu, 3 May 2018 18:23:27 +0530
Subject: [PATCH] [FIX]: Improved branch.

---
 addons/base_branch_company/__manifest__.py       |  2 +-
 .../models/ir_branch_company.py                  |  7 +++++++
 .../views/res_branch_config_view.xml             | 16 ++++++++++------
 3 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/addons/base_branch_company/__manifest__.py b/addons/base_branch_company/__manifest__.py
index a3058720..844aab81 100644
--- a/addons/base_branch_company/__manifest__.py
+++ b/addons/base_branch_company/__manifest__.py
@@ -21,7 +21,7 @@ Main Features
     <field name="company_id" />
 """,
     'website': '',
-    'depends': ['base'],
+    'depends': ['base', 'base_setup'],
     'data': [
             'demo/branch_data.xml',
             'wizard/branch_config_view.xml',
diff --git a/addons/base_branch_company/models/ir_branch_company.py b/addons/base_branch_company/models/ir_branch_company.py
index 7b355b2b..e9d54bb7 100644
--- a/addons/base_branch_company/models/ir_branch_company.py
+++ b/addons/base_branch_company/models/ir_branch_company.py
@@ -13,3 +13,10 @@ class IrBranchCompanyMixin(models.AbstractModel):
     company_id = fields.Many2one(
         'res.company', 'Company', ondelete="restrict",
         default=lambda self: self.env.user.company_id)
+
+
+class ResConfigSettings(models.TransientModel):
+
+    _inherit = 'res.config.settings'
+
+    group_multi_branch = fields.Boolean("Multi Branch", implied_group='base_branch_company.group_multi_branch')
diff --git a/addons/base_branch_company/views/res_branch_config_view.xml b/addons/base_branch_company/views/res_branch_config_view.xml
index 87b422f7..05d048b6 100644
--- a/addons/base_branch_company/views/res_branch_config_view.xml
+++ b/addons/base_branch_company/views/res_branch_config_view.xml
@@ -4,28 +4,32 @@
         <field name="name">res.config.settings.view.form.inherit.base.setup</field>
         <field name="model">res.config.settings</field>
         <field name="priority" eval="100"/>
-        <field name="inherit_id" ref="base.res_config_settings_view_form"/>
+        <field name="inherit_id" ref="base_setup.res_config_settings_view_form"/>
         <field name="arch" type="xml">
-            <xpath expr="//div[hasclass('settings')]" position="inside">
-                <div class="app_settings_block">
+            <xpath expr="//div[hasclass('settings')]/div[hasclass('app_settings_block')]/div[@name='multi_company']" position="after">
                 <h2>Multi-Branch</h2>
-                    <div class="row mt16 o_settings_container" id="emails">
+                    <div class="row mt16 o_settings_container" id="multi_branch">
                         <div class="col-xs-12 col-md-6 o_setting_box">
+                            <div class="o_setting_left_pane">
+                                <field name="group_multi_branch"/>
+                            </div>
                             <div class="o_setting_left_pane"/>
                             <div class="o_setting_right_pane">
                                 <label string="Branches"/>
                                 <div class="text-muted">
                                     Configure your Branch
                                 </div>
-                                <div class="content-group">
+                                <div class="content-group" attrs="{'invisible': [('group_multi_branch','=',False)]}">
                                     <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>
             </xpath>
         </field>
     </record>