From c2c2f9e4fca86c4b091f3376896f17f97e99839d Mon Sep 17 00:00:00 2001
From: Kunjal <kunjal@techreceptives.com>
Date: Mon, 22 Jan 2018 18:58:04 +0530
Subject: [PATCH] [FIX]: Multi branch improvement.

---
 .../security/branch_security.xml              |  7 +++--
 .../views/res_branch_view.xml                 | 29 +++++++++++++++++--
 addons/mail/__init__.py                       |  7 +++++
 addons/mail/__manifest__.py                   |  1 +
 addons/stock/security/stock_security.xml      | 14 ++++-----
 5 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/addons/base_branch_company/security/branch_security.xml b/addons/base_branch_company/security/branch_security.xml
index c35a3964..902c1a2d 100644
--- a/addons/base_branch_company/security/branch_security.xml
+++ b/addons/base_branch_company/security/branch_security.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<flectra noupdate="1">
-
+<flectra>
     <record id="branch_comp_rule" model="ir.rule">
         <field name="name">Branch</field>
         <field name="model_id" ref="model_res_branch"/>
@@ -17,4 +16,8 @@
         <field name="global" eval="True"/>
     </record>
 
+    <record model="res.groups" id="group_multi_branch">
+        <field name="name">Multi Branch</field>
+        <field name="category_id" ref="base.module_category_usability"/>
+    </record>
 </flectra>
diff --git a/addons/base_branch_company/views/res_branch_view.xml b/addons/base_branch_company/views/res_branch_view.xml
index 9c508303..c7fb3aa3 100644
--- a/addons/base_branch_company/views/res_branch_view.xml
+++ b/addons/base_branch_company/views/res_branch_view.xml
@@ -4,7 +4,7 @@
         <field name="name">res.branch.form</field>
         <field name="model">res.branch</field>
         <field name="arch" type="xml">
-            <form string="Branch">
+            <form string="Branch" create="false">
                 <sheet>
                     <div class="oe_button_box" name="button_box">
                         <button name="toggle_active" type="object"
@@ -47,7 +47,7 @@
         <field name="name">res.branch.tree</field>
         <field name="model">res.branch</field>
         <field name="arch" type="xml">
-            <tree string="Branch">
+            <tree string="Branch" create="false">
                 <field name="code"/>
                 <field name="name"/>
                 <field name="company_id" groups="base.group_multi_company"/>
@@ -99,4 +99,29 @@
         </field>
     </record>
 
+
+    <record id="view_res_branch_form_editable" model="ir.ui.view">
+        <field name="name">res.branch.form.editable</field>
+        <field name="model">res.branch</field>
+        <field name="inherit_id" ref="base_branch_company.view_res_branch_form"/>
+        <field name="groups_id" eval="[(4, ref('base_branch_company.group_multi_branch'))]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//form" position="attributes">
+                <attribute name="create">true</attribute>
+            </xpath>
+        </field>
+    </record>
+
+    <record id="stock_warehouse_view_tree_editable" model="ir.ui.view">
+        <field name="name">res.branch.tree.editable</field>
+        <field name="model">res.branch</field>
+        <field name="inherit_id" ref="base_branch_company.view_res_branch_tree"/>
+        <field name="groups_id" eval="[(4, ref('base_branch_company.group_multi_branch'))]"/>
+        <field name="arch" type="xml">
+            <xpath expr="//tree" position="attributes">
+                <attribute name="create">true</attribute>
+            </xpath>
+        </field>
+    </record>
+
 </flectra>
\ No newline at end of file
diff --git a/addons/mail/__init__.py b/addons/mail/__init__.py
index 71bbda56..b915fa55 100644
--- a/addons/mail/__init__.py
+++ b/addons/mail/__init__.py
@@ -4,3 +4,10 @@ from . import models
 from . import wizard
 from . import controllers
 from .tests import test_mail_model
+
+
+def post_init(cr, registry):
+    from flectra import api, SUPERUSER_ID
+
+    env = api.Environment(cr, SUPERUSER_ID, {})
+    env['publisher_warranty.contract'].update_notification()
\ No newline at end of file
diff --git a/addons/mail/__manifest__.py b/addons/mail/__manifest__.py
index 72c663b6..6d61cf9b 100644
--- a/addons/mail/__manifest__.py
+++ b/addons/mail/__manifest__.py
@@ -44,6 +44,7 @@
     ],
     'installable': True,
     'application': True,
+    'post_init_hook': 'post_init',
     'qweb': [
         'static/src/xml/activity.xml',
         'static/src/xml/client_action.xml',
diff --git a/addons/stock/security/stock_security.xml b/addons/stock/security/stock_security.xml
index af5762ac..01528090 100644
--- a/addons/stock/security/stock_security.xml
+++ b/addons/stock/security/stock_security.xml
@@ -166,13 +166,13 @@
         </field>
     </record>
 
-    <!--<record id="picking_type_multi_branch_rule" model="ir.rule">-->
-        <!--<field name="name">Picking type multi-branch</field>-->
-        <!--<field name="model_id" ref="model_stock_picking_type"/>-->
-        <!--<field name="global" eval="True"/>-->
-        <!--<field name="domain_force">['|',('warehouse_id.branch_id','=',False),('warehouse_id.branch_id','in',[branch for branch in user.branch_ids.ids])]-->
-        <!--</field>-->
-    <!--</record>-->
+    <record id="picking_type_multi_branch_rule" model="ir.rule">
+        <field name="name">Picking type multi-branch</field>
+        <field name="model_id" ref="model_stock_picking_type"/>
+        <field name="global" eval="True"/>
+        <field name="domain_force">['|',('warehouse_id.branch_id','=',False), '|', ('warehouse_id.branch_id','in',[branch for branch in user.branch_ids.ids]), ('warehouse_id.branch_id','=', user.default_branch_id.id)]
+        </field>
+    </record>
 
     <record id="warehouse_multi_branch_rule" model="ir.rule">
         <field name="name">Warehouse multi-branch</field>