From fb3365e32d6c7c43444776c058b2244b00fe0171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?H=C3=A9ctor=20Villarreal=20Ortega?=
 <hector.villarreal@forgeflow.com>
Date: Wed, 2 Mar 2022 16:50:51 +0100
Subject: [PATCH] [FIX] mrp_bom_tracking: Correct UoM model when changing it on
 a bom line

---
 mrp_bom_tracking/models/mrp_bom.py            |  2 +-
 .../tests/test_mrp_bom_tracking.py            | 24 +++++++++++++++++--
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/mrp_bom_tracking/models/mrp_bom.py b/mrp_bom_tracking/models/mrp_bom.py
index 11b08307b..58a01fd06 100644
--- a/mrp_bom_tracking/models/mrp_bom.py
+++ b/mrp_bom_tracking/models/mrp_bom.py
@@ -69,7 +69,7 @@ class MrpBomLine(models.Model):
                     product_qty = values.get("product_qty") or lines.product_qty
                     product_uom_id = values.get("product_uom_id")
                     if product_uom_id:
-                        product_uom_id = self.env["product.uom"].browse(product_uom_id)
+                        product_uom_id = self.env["uom.uom"].browse(product_uom_id)
                     product_uom_id = product_uom_id or lines.product_uom_id
                     bom.message_post_with_view(
                         "mrp_bom_tracking.track_bom_line_template",
diff --git a/mrp_bom_tracking/tests/test_mrp_bom_tracking.py b/mrp_bom_tracking/tests/test_mrp_bom_tracking.py
index a1595e29f..405a96702 100644
--- a/mrp_bom_tracking/tests/test_mrp_bom_tracking.py
+++ b/mrp_bom_tracking/tests/test_mrp_bom_tracking.py
@@ -14,6 +14,10 @@ class TestBomTracking(common.SavepointCase):
         cls.bom_obj = cls.env["mrp.bom"]
         cls.bom_line_obj = cls.env["mrp.bom.line"]
 
+        # Define UoM:
+        cls.uom_unit_id = cls.env.ref("uom.product_uom_unit").id
+        cls.uom_dozen_id = cls.env.ref("uom.product_uom_dozen").id
+
         # Create products:
         cls.product_1 = cls.product_obj.create({"name": "TEST 01", "type": "product"})
         cls.component_1 = cls.product_obj.create({"name": "RM 01", "type": "product"})
@@ -27,10 +31,20 @@ class TestBomTracking(common.SavepointCase):
             {"product_tmpl_id": cls.product_1.product_tmpl_id.id}
         )
         cls.line_1 = cls.bom_line_obj.create(
-            {"product_id": cls.component_1.id, "bom_id": cls.bom.id, "product_qty": 2.0}
+            {
+                "product_id": cls.component_1.id,
+                "bom_id": cls.bom.id,
+                "product_qty": 2.0,
+                "product_uom_id": cls.uom_unit_id,
+            }
         )
         cls.line_2 = cls.bom_line_obj.create(
-            {"product_id": cls.component_2.id, "bom_id": cls.bom.id, "product_qty": 5.0}
+            {
+                "product_id": cls.component_2.id,
+                "bom_id": cls.bom.id,
+                "product_qty": 5.0,
+                "product_uom_id": cls.uom_unit_id,
+            }
         )
 
     def test_01_change_bom_line_qty(self):
@@ -44,3 +58,9 @@ class TestBomTracking(common.SavepointCase):
         self.line_2.product_id = self.component_2_alt
         after = self.bom.message_ids
         self.assertEqual(len(after - before), 1)
+
+    def test_03_change_bom_line_uom(self):
+        before = self.bom.message_ids
+        self.line_1.product_uom_id = self.uom_dozen_id
+        after = self.bom.message_ids
+        self.assertEqual(len(after - before), 1)