[MIG] stock_available_mrp: Migration to 13.0

stock_available_mrp/__manifest__.py

@@ -2,12 +2,12 @@
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 {
     "name": "Consider the production potential is available to promise",
-    "version": "12.0.1.0.2",
+    "version": "13.0.1.0.0",
     "author": "Numérigraphe," "Odoo Community Association (OCA)",
     "website": "https://github.com/OCA/stock-logistics-warehouse",
     "category": "Hidden",
     "depends": ["stock_available", "mrp"],
-    "demo": ["demo/mrp_data.xml",],
+    "demo": ["demo/mrp_data.xml"],
     "license": "AGPL-3",
     "installable": True,
 }

stock_available_mrp/demo/mrp_data.xml

@@ -7,19 +7,19 @@
             ref="mrp.product_product_table_kit_product_template"
         />
         <field
-            name="attribute_value_ids"
+            name="product_template_attribute_value_ids"
             eval="[(6,0,[ref('product.product_attribute_value_3')])]"
         />
     </record>
     <record id="mrp.product_product_table_kit" model="product.product">
         <field
-            name="attribute_value_ids"
+            name="product_template_attribute_value_ids"
             eval="[(6,0,[ref('product.product_attribute_value_4')])]"
         />
     </record>
     <record id="mrp.mrp_bom_kit_line_2" model="mrp.bom.line">
         <field
-            name="attribute_value_ids"
+            name="bom_product_template_attribute_value_ids"
             eval="[(6,0,[ref('product.product_attribute_value_4')])]"
         />
     </record>
@@ -40,7 +40,7 @@
         <field name="sequence">5</field>
         <field name="bom_id" ref="mrp.mrp_bom_kit" />
         <field
-            name="attribute_value_ids"
+            name="bom_product_template_attribute_value_ids"
             eval="[(6,0,[ref('product.product_attribute_value_3')])]"
         />
     </record>

stock_available_mrp/models/product_product.py

@@ -8,16 +8,16 @@ from odoo.fields import first
 
 
 class ProductProduct(models.Model):
-
     _inherit = "product.product"
 
-    bom_id = fields.Many2one("mrp.bom", compute="_compute_bom_id", string="BOM")
+    bom_id = fields.Many2one(
+        comodel_name="mrp.bom", compute="_compute_bom_id", string="BOM"
+    )
 
     @api.depends("virtual_available", "bom_id", "bom_id.product_qty")
     def _compute_available_quantities(self):
-        super(ProductProduct, self)._compute_available_quantities()
+        super()._compute_available_quantities()
 
-    @api.multi
     def _get_bom_id_domain(self):
         """
         Real multi domain
@@ -31,12 +31,12 @@ class ProductProduct(models.Model):
             ("product_tmpl_id", "in", self.mapped("product_tmpl_id.id")),
         ]
 
-    @api.multi
     @api.depends("product_tmpl_id")
     def _compute_bom_id(self):
         bom_obj = self.env["mrp.bom"]
-        boms = bom_obj.search(self._get_bom_id_domain(), order="sequence, product_id",)
+        boms = bom_obj.search(self._get_bom_id_domain(), order="sequence, product_id")
         for product in self:
+            product.bom_id = product.bom_id
             product_boms = boms.filtered(
                 lambda b: b.product_id == product
                 or (not b.product_id and b.product_tmpl_id == product.product_tmpl_id)
@@ -44,11 +44,8 @@ class ProductProduct(models.Model):
             if product_boms:
                 product.bom_id = first(product_boms)
 
-    @api.multi
     def _compute_available_quantities_dict(self):
-        res, stock_dict = super(
+        res, stock_dict = super()._compute_available_quantities_dict()
-            ProductProduct, self
-        )._compute_available_quantities_dict()
         # compute qty for product with bom
         product_with_bom = self.filtered("bom_id")
 
@@ -88,8 +85,7 @@ class ProductProduct(models.Model):
             component_needs = product._get_components_needs(exploded_components)
             if not component_needs:
                 # The BoM has no line we can use
-                potential_qty = 0.0
+                potential_qty = immediately_usable_qty = 0.0
-
             else:
                 # Find the lowest quantity we can make with the stock at hand
                 components_potential_qty = min(
@@ -113,11 +109,11 @@ class ProductProduct(models.Model):
                 )
 
             res[product.id]["potential_qty"] = potential_qty
-            res[product.id]["immediately_usable_qty"] += potential_qty
+            immediately_usable_qty = potential_qty if bom_id.type != "phantom" else 0
+            res[product.id]["immediately_usable_qty"] += immediately_usable_qty
 
         return res, stock_dict
 
-    @api.multi
     def _explode_boms(self):
         """
         return a dict by product_id of exploded bom lines

stock_available_mrp/readme/CONTRIBUTORS.rst

@@ -4,3 +4,7 @@
 * Laurent Mignon <laurent.mignon@acsone.eu>
 * Cédric Pigeon <cedric.pigeon@acsone.eu>
 * Florian da Costa <florian.dacosta@akretion.com>
+
+* `Tecnativa <https://www.tecnativa.com>`_:
+
+  * Víctor Martínez

stock_available_mrp/tests/test_potential_qty.py

@@ -1,4 +1,5 @@
 # Copyright 2014 Numérigraphe SARL
+# Copyright 2021 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html).
 
 from odoo.osv.expression import TRUE_LEAF
@@ -9,7 +10,7 @@ class TestPotentialQty(TransactionCase):
     """Test the potential quantity on a product with a multi-line BoM"""
 
     def setUp(self):
-        super(TestPotentialQty, self).setUp()
+        super().setUp()
 
         self.product_model = self.env["product.product"]
         self.bom_model = self.env["mrp.bom"]
@@ -17,13 +18,10 @@ class TestPotentialQty(TransactionCase):
         self.stock_quant_model = self.env["stock.quant"]
         self.config = self.env["ir.config_parameter"]
         self.location = self.env["stock.location"]
+        self.main_company = self.browse_ref("base.main_company")
         # Get the warehouses
         self.wh_main = self.browse_ref("stock.warehouse0")
         self.wh_ch = self.browse_ref("stock.stock_warehouse_shop0")
-
-        # We need to compute parent_left and parent_right of the locations as
-        # they are used to compute qty_available of the product.
-        self.location._parent_store_compute()
         #  An interesting product (multi-line BoM, variants)
         self.tmpl = self.browse_ref("mrp.product_product_table_kit_product_template")
         #  First variant
@@ -33,27 +31,20 @@ class TestPotentialQty(TransactionCase):
         # Make bolt a stockable product to be able to change its stock
         # we need to unreserve the existing move before being able to do it.
         bolt = self.env.ref("mrp.product_product_computer_desk_bolt")
-        bolt_moves = self.env["stock.move"].search(
+        bolt.stock_move_ids._do_unreserve()
-            [("product_id", "=", bolt.id), ("state", "not in", ("done", "cancel"))]
-        )
-        bolt_moves._do_unreserve()
         bolt.type = "product"
         # Components that can be used to make the product
-        component_ids = [
+        components = [
             # Bolt
-            bolt.id,
+            bolt,
             # Wood Panel
-            self.ref("mrp.product_product_wood_panel"),
+            self.browse_ref("mrp.product_product_wood_panel"),
         ]
 
         # Zero-out the inventory of all variants and components
-        for component_id in component_ids + [
+        for component in components + [v for v in self.tmpl.product_variant_ids]:
-            v.id for v in self.tmpl.product_variant_ids
+            component.stock_quant_ids.unlink()
-        ]:
-            prod = self.product_model.browse(component_id)
-            self.env["stock.quant"].search([("product_id", "=", prod.id)]).unlink()
 
-        self.product_model.invalidate_cache()
         #  A product without a BoM
         self.product_wo_bom = self.browse_ref("product.product_product_11")
 
@@ -63,22 +54,37 @@ class TestPotentialQty(TransactionCase):
             for i in [self.tmpl, self.var1, self.var2, self.product_wo_bom]
         }
 
-    def create_inventory(self, product_id, qty, location_id=None):
+    def _create_inventory(self, location_id, company_id):
-        if location_id is None:
-            location_id = self.wh_main.lot_stock_id.id
-
         inventory = self.env["stock.inventory"].create(
-            {"name": "Test inventory", "location_id": location_id, "filter": "partial"}
+            {
+                "name": "Test inventory",
+                "company_id": company_id,
+                "location_ids": [(4, location_id)],
+                "start_empty": True,
+            }
         )
         inventory.action_start()
+        return inventory
+
+    def _create_inventory_line(self, inventory_id, product_id, location_id, qty):
         self.env["stock.inventory.line"].create(
             {
-                "inventory_id": inventory.id,
+                "inventory_id": inventory_id,
                 "product_id": product_id,
                 "location_id": location_id,
                 "product_qty": qty,
             }
         )
+
+    def create_inventory(self, product_id, qty, location_id=None, company_id=None):
+        if location_id is None:
+            location_id = self.wh_main.lot_stock_id.id
+
+        if company_id is None:
+            company_id = self.main_company.id
+
+        inventory = self._create_inventory(location_id, company_id)
+        self._create_inventory_line(inventory.id, product_id, location_id, qty)
         inventory._action_done()
 
     def create_simple_bom(
@@ -121,48 +127,20 @@ class TestPotentialQty(TransactionCase):
 
     def test_potential_qty_no_bom_for_company(self):
         chicago_id = self.ref("stock.res_company_1")
-
         # Receive 1000x Wood Panel owned by Chicago
-        inventory = self.env["stock.inventory"].create(
+        self.create_inventory(
-            {
+            product_id=self.env.ref("mrp.product_product_wood_panel").id,
-                "name": "Receive CPUa8",
+            qty=1000.0,
-                "company_id": chicago_id,
+            location_id=self.wh_ch.lot_stock_id.id,
-                "location_id": self.wh_ch.lot_stock_id.id,
+            company_id=chicago_id,
-                "filter": "partial",
-            }
         )
-        inventory.action_start()
-        self.env["stock.inventory.line"].create(
-            {
-                "inventory_id": inventory.id,
-                "company_id": chicago_id,
-                "product_id": self.ref("mrp.product_product_wood_panel"),
-                "location_id": self.wh_ch.lot_stock_id.id,
-                "product_qty": 1000.0,
-            }
-        )
-        inventory._action_done()
-
         # Put Bolt owned by Chicago for 1000x the 1st variant in main WH
-        inventory = self.env["stock.inventory"].create(
+        self.create_inventory(
-            {
+            product_id=self.env.ref("mrp.product_product_computer_desk_bolt").id,
-                "name": "components for 1st variant",
+            qty=1000.0,
-                "company_id": chicago_id,
+            location_id=self.wh_ch.lot_stock_id.id,
-                "location_id": self.wh_ch.lot_stock_id.id,
+            company_id=chicago_id,
-                "filter": "partial",
-            }
         )
-        inventory.action_start()
-        self.env["stock.inventory.line"].create(
-            {
-                "inventory_id": inventory.id,
-                "company_id": chicago_id,
-                "product_id": self.ref("mrp.product_product_computer_desk_bolt"),
-                "location_id": self.wh_ch.lot_stock_id.id,
-                "product_qty": 1000.0,
-            }
-        )
-        inventory._action_done()
         self.assertPotentialQty(
             self.tmpl, 250.0, "Wrong template potential after receiving components"
         )
@@ -171,8 +149,8 @@ class TestPotentialQty(TransactionCase):
             {
                 "name": "test_demo",
                 "login": "test_demo",
-                "company_id": self.ref("base.main_company"),
+                "company_id": self.main_company.id,
-                "company_ids": [(4, self.ref("base.main_company"))],
+                "company_ids": [(4, self.main_company.id), (4, chicago_id)],
                 "groups_id": [
                     (4, self.ref("stock.group_stock_user")),
                     (4, self.ref("mrp.group_mrp_user")),
@@ -182,7 +160,7 @@ class TestPotentialQty(TransactionCase):
 
         bom = self.env["mrp.bom"].search([("product_tmpl_id", "=", self.tmpl.id)])
 
-        test_user_tmpl = self.tmpl.sudo(test_user)
+        test_user_tmpl = self.tmpl.with_user(test_user)
         self.assertPotentialQty(
             test_user_tmpl, 250.0, "Simple user can access to the potential_qty"
         )
@@ -191,8 +169,8 @@ class TestPotentialQty(TransactionCase):
         # and all products without company (visible to all)
         # and the demo user on Chicago (child of main company)
         self.env["product.product"].search([TRUE_LEAF]).write({"company_id": False})
-        test_user.write({"company_id": chicago_id, "company_ids": [(4, chicago_id)]})
+        test_user.write({"company_ids": [(6, 0, self.main_company.ids)]})
-        bom.company_id = self.ref("base.main_company")
+        bom.company_id = self.main_company
         self.assertPotentialQty(
             test_user_tmpl,
             0,
@@ -200,6 +178,7 @@ class TestPotentialQty(TransactionCase):
             "company or company child of the bom's company",
         )
         bom.company_id = chicago_id
+        test_user.write({"company_ids": [(4, chicago_id)]})
         self.assertPotentialQty(test_user_tmpl, 250.0, "")
 
     def test_potential_qty(self):
@@ -207,23 +186,11 @@ class TestPotentialQty(TransactionCase):
             self.assertPotentialQty(i, 0.0, "The potential quantity should start at 0")
 
         # Receive 1000x Wood Panel
-        inventory = self.env["stock.inventory"].create(
+        self.create_inventory(
-            {
+            product_id=self.env.ref("mrp.product_product_wood_panel").id,
-                "name": "Receive Mouses",
+            qty=1000.0,
-                "location_id": self.wh_main.lot_stock_id.id,
+            location_id=self.wh_main.lot_stock_id.id,
-                "filter": "partial",
-            }
         )
-        inventory.action_start()
-        self.env["stock.inventory.line"].create(
-            {
-                "inventory_id": inventory.id,
-                "product_id": self.ref("mrp.product_product_wood_panel"),
-                "location_id": self.wh_main.lot_stock_id.id,
-                "product_qty": 1000.0,
-            }
-        )
-        inventory._action_done()
         for i in [self.tmpl, self.var1, self.var2]:
             self.assertPotentialQty(
                 i,
@@ -233,23 +200,11 @@ class TestPotentialQty(TransactionCase):
             )
 
         # Receive enough bolt to make 1000x the 1st variant in main WH
-        inventory = self.env["stock.inventory"].create(
+        self.create_inventory(
-            {
+            product_id=self.env.ref("mrp.product_product_computer_desk_bolt").id,
-                "name": "components for 1st variant",
+            qty=1000.0,
-                "location_id": self.wh_main.lot_stock_id.id,
+            location_id=self.wh_main.lot_stock_id.id,
-                "filter": "partial",
-            }
         )
-        inventory.action_start()
-        self.env["stock.inventory.line"].create(
-            {
-                "inventory_id": inventory.id,
-                "product_id": self.ref("mrp.product_product_computer_desk_bolt"),
-                "location_id": self.wh_main.lot_stock_id.id,
-                "product_qty": 1000.0,
-            }
-        )
-        inventory._action_done()
         self.assertPotentialQty(
             self.tmpl, 250.0, "Wrong template potential after receiving components"
         )
@@ -264,31 +219,20 @@ class TestPotentialQty(TransactionCase):
         )
 
         # Receive enough components to make 213 the 2nd variant at Chicago
-        inventory = self.env["stock.inventory"].create(
+        inventory = self._create_inventory(
-            {
+            self.wh_ch.lot_stock_id.id, self.ref("stock.res_company_1")
-                "name": "components for 2nd variant",
-                "location_id": self.wh_ch.lot_stock_id.id,
-                "filter": "partial",
-            }
         )
-        inventory.action_start()
+        self._create_inventory_line(
-        self.env["stock.inventory.line"].create(
+            inventory.id,
-            {
+            self.ref("mrp.product_product_wood_panel"),
-                "inventory_id": inventory.id,
+            self.wh_ch.lot_stock_id.id,
-                "product_id": self.ref("mrp.product_product_wood_panel"),
+            1000.0,
-                "location_id": self.wh_ch.lot_stock_id.id,
-                "product_qty": 1000.0,
-            }
         )
-        self.env["stock.inventory.line"].create(
+        self._create_inventory_line(
-            {
+            inventory.id,
-                "inventory_id": inventory.id,
+            self.ref("stock_available_mrp.product_computer_desk_bolt_white"),
-                "product_id": self.ref(
+            self.wh_ch.lot_stock_id.id,
-                    "stock_available_mrp.product_computer_desk_bolt_white"
+            852.0,
-                ),
-                "location_id": self.wh_ch.lot_stock_id.id,
-                "product_qty": 852.0,
-            }
         )
         inventory._action_done()
         self.assertPotentialQty(
@@ -357,7 +301,7 @@ class TestPotentialQty(TransactionCase):
         )
 
         bom_p1 = self.bom_model.create(
-            {"product_tmpl_id": p1.product_tmpl_id.id, "product_id": p1.id,}
+            {"product_tmpl_id": p1.product_tmpl_id.id, "product_id": p1.id}
         )
 
         self.bom_line_model.create(