Merge PR #400 into 11.0

Signed-off-by jbeficent
OCA · Sep 13, 2019 · 7ba7d7e · 7ba7d7e
2 parents 28206fb + eaa0642
commit 7ba7d7e
Show file tree

Hide file tree

Showing 9 changed files with 67 additions and 0 deletions.
diff --git a/mrp_multi_level/models/mrp_area.py b/mrp_multi_level/models/mrp_area.py
@@ -15,6 +15,11 @@ class MrpArea(models.Model):
         comodel_name='stock.warehouse', string='Warehouse',
         required=True,
     )
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='warehouse_id.company_id',
+        store=True,
+    )
     location_id = fields.Many2one(
         comodel_name='stock.location', string='Location',
         required=True,

diff --git a/mrp_multi_level/models/mrp_inventory.py b/mrp_multi_level/models/mrp_inventory.py
@@ -28,6 +28,11 @@ class MrpInventory(models.Model):
         index=True,
         required=True,
     )
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='product_mrp_area_id.mrp_area_id.warehouse_id.company_id',
+        store=True,
+    )
     product_id = fields.Many2one(
         comodel_name='product.product',
         related='product_mrp_area_id.product_id',

diff --git a/mrp_multi_level/models/mrp_move.py b/mrp_multi_level/models/mrp_move.py
@@ -23,6 +23,11 @@ class MrpMove(models.Model):
         store=True,
         index=True,
     )
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='product_mrp_area_id.mrp_area_id.warehouse_id.company_id',
+        store=True,
+    )
     product_id = fields.Many2one(
         comodel_name='product.product',
         related='product_mrp_area_id.product_id',

diff --git a/mrp_multi_level/models/mrp_planned_order.py b/mrp_multi_level/models/mrp_planned_order.py
@@ -25,6 +25,11 @@ class MrpPlannedOrder(models.Model):
         index=True,
         readonly=True,
     )
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='product_mrp_area_id.mrp_area_id.warehouse_id.company_id',
+        store=True,
+    )
     product_id = fields.Many2one(
         comodel_name="product.product",
         related="product_mrp_area_id.product_id",

diff --git a/mrp_multi_level/models/product_mrp_area.py b/mrp_multi_level/models/product_mrp_area.py
@@ -19,6 +19,11 @@ class ProductMRPArea(models.Model):
         comodel_name='mrp.area',
         required=True,
     )
+    company_id = fields.Many2one(
+        comodel_name='res.company',
+        related='mrp_area_id.warehouse_id.company_id',
+        store=True,
+    )
     product_id = fields.Many2one(
         comodel_name='product.product',
         required=True,

diff --git a/mrp_multi_level/security/mrp_multi_level_security.xml b/mrp_multi_level/security/mrp_multi_level_security.xml
@@ -7,4 +7,39 @@
         <field name="category_id" ref="base.module_category_hidden"/>
     </record>
 
+    <record id="mrp_area_comp_rule" model="ir.rule">
+        <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>
+    </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>
+    </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>
+    </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>
+    </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>
+    </record>
+
 </odoo>
diff --git a/mrp_multi_level/views/mrp_area_views.xml b/mrp_multi_level/views/mrp_area_views.xml
@@ -9,6 +9,7 @@
             <tree string="MRP Area">
                 <field name="name"/>
                 <field name="warehouse_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="location_id"/>
                 <field name="calendar_id"/>
             </tree>
@@ -35,6 +36,7 @@
                         <group>
                             <field name="warehouse_id"/>
                             <field name="location_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                         </group>
                         <group name="settings">
                             <field name="calendar_id"/>

diff --git a/mrp_multi_level/views/mrp_inventory_views.xml b/mrp_multi_level/views/mrp_inventory_views.xml
@@ -11,6 +11,7 @@
                     <group>
                         <group>
                             <field name="mrp_area_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                             <field name="product_id"/>
                             <field name="product_mrp_area_id"/>
                             <field name="date"/>
@@ -36,6 +37,7 @@
         <field name="arch" type="xml">
             <tree string="MRP Inventory" create="false">
                 <field name="mrp_area_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="product_id"/>
                 <field name="date"/>
                 <field name="uom_id" groups="product.group_uom"/>
@@ -85,6 +87,7 @@
         <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"/>

diff --git a/mrp_multi_level/views/product_mrp_area_views.xml b/mrp_multi_level/views/product_mrp_area_views.xml
@@ -8,6 +8,7 @@
         <field name="arch" type="xml">
             <tree string="Product MRP Area parameters">
                 <field name="mrp_area_id"/>
+                <field name="company_id" groups="base.group_multi_company"/>
                 <field name="product_tmpl_id"/>
                 <field name="product_id" groups="product.group_product_variant"/>
                 <field name="mrp_exclude"/>
@@ -42,6 +43,7 @@
                     <group colspan="4" col="2">
                         <group>
                             <field name="mrp_area_id"/>
+                            <field name="company_id" groups="base.group_multi_company"/>
                             <field name="product_tmpl_id" invisible="1"/>
                             <field name="product_id"/>
                             <field name="location_id" invisible="1"/>