From 48ee353ce30c236344ce1fcfa6193ef7c1b1a682 Mon Sep 17 00:00:00 2001
From: Lois Rilo <lois.rilo@forgeflow.com>
Date: Thu, 6 Feb 2020 15:26:50 +0100
Subject: [PATCH 1/2] [13.0][FIX] mrp_multi_level: wrong multi company rules

---
 mrp_multi_level/security/mrp_multi_level_security.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/mrp_multi_level/security/mrp_multi_level_security.xml b/mrp_multi_level/security/mrp_multi_level_security.xml
index 075492f63..09474c798 100644
--- a/mrp_multi_level/security/mrp_multi_level_security.xml
+++ b/mrp_multi_level/security/mrp_multi_level_security.xml
@@ -11,35 +11,35 @@
         <field name="name">MRP Area multi-company rule</field>
         <field name="model_id" ref="model_mrp_area"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
     <record id="mrp_product_mrp_area_comp_rule" model="ir.rule">
         <field name="name">Product MRP Area multi-company rule</field>
         <field name="model_id" ref="model_product_mrp_area"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
     <record id="mrp_inventory_comp_rule" model="ir.rule">
         <field name="name">MRP Inventory multi-company rule</field>
         <field name="model_id" ref="model_mrp_inventory"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
     <record id="mrp_move_comp_rule" model="ir.rule">
         <field name="name">MRP Move multi-company rule</field>
         <field name="model_id" ref="model_mrp_move"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
     <record id="mrp_planned_order_comp_rule" model="ir.rule">
         <field name="name">MRP Planned Order multi-company rule</field>
         <field name="model_id" ref="model_mrp_planned_order"/>
         <field name="global" eval="True"/>
-        <field name="domain_force">['|',('company_id','=',False),('company_id','child_of',[user.company_id.id])]</field>
+        <field name="domain_force">['|',('company_id','=',False),('company_id', 'in', company_ids)]</field>
     </record>
 
 </odoo>

From 0fce2d806f668aed66281774ebe2ba5e0e9454a0 Mon Sep 17 00:00:00 2001
From: Lois Rilo <lois.rilo@forgeflow.com>
Date: Thu, 6 Feb 2020 08:55:29 +0100
Subject: [PATCH 2/2] [FIX] mrp_multi_level: company in the search view move to
 the last position. It isn't the most common filter used.

---
 mrp_multi_level/views/mrp_inventory_views.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mrp_multi_level/views/mrp_inventory_views.xml b/mrp_multi_level/views/mrp_inventory_views.xml
index 976910e69..21f62c6b5 100644
--- a/mrp_multi_level/views/mrp_inventory_views.xml
+++ b/mrp_multi_level/views/mrp_inventory_views.xml
@@ -87,10 +87,10 @@
         <field name="type">search</field>
         <field name="arch" type="xml">
             <search string="MRP Inventory">
-                <field name="company_id" groups="base.group_multi_company"/>
                 <group name="select" expand="0" string="Selection...">
                     <field name="product_id"/>
                     <field name="mrp_area_id"/>
+                    <field name="company_id" groups="base.group_multi_company"/>
                 </group>
                 <separator/>
                 <filter string="To Procure" name="filter_to_procure"