[MIG] mrp_bom_attribute_match: Migration to 19.0

hieulucky111 · huynh-ch · commit aaf74ba13ba4 · 2025-10-23T17:28:02.000+07:00
diff --git a/mrp_bom_attribute_match/README.rst b/mrp_bom_attribute_match/README.rst
@@ -21,13 +21,13 @@ BOM Attribute Match
     :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html
     :alt: License: AGPL-3
 .. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github
-    :target: https://github.com/OCA/manufacture/tree/18.0/mrp_bom_attribute_match
+    :target: https://github.com/OCA/manufacture/tree/19.0/mrp_bom_attribute_match
     :alt: OCA/manufacture
 .. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png
-    :target: https://translation.odoo-community.org/projects/manufacture-18-0/manufacture-18-0-mrp_bom_attribute_match
+    :target: https://translation.odoo-community.org/projects/manufacture-19-0/manufacture-19-0-mrp_bom_attribute_match
     :alt: Translate me on Weblate
 .. |badge5| image:: https://img.shields.io/badge/runboat-Try%20me-875A7B.png
-    :target: https://runboat.odoo-community.org/builds?repo=OCA/manufacture&target_branch=18.0
+    :target: https://runboat.odoo-community.org/builds?repo=OCA/manufacture&target_branch=19.0
     :alt: Try me on Runboat
 
 |badge1| |badge2| |badge3| |badge4| |badge5|
@@ -131,7 +131,7 @@ Bug Tracker
 Bugs are tracked on `GitHub Issues <https://github.com/OCA/manufacture/issues>`_.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-`feedback <https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_bom_attribute_match%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
+`feedback <https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_bom_attribute_match%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_.
 
 Do not contact contributors directly about support or help with technical issues.
 
@@ -159,6 +159,10 @@ Contributors
 
   - Eugenio Micó <eugenio@studio73.es>
 
+- `Komit <https://komit-consulting.com>`__
+
+  - Hieu Vo Minh Bao <hieu.vmb@komit-consulting.com>
+
 Maintainers
 -----------
 
@@ -172,6 +176,6 @@ OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.
 
-This module is part of the `OCA/manufacture <https://github.com/OCA/manufacture/tree/18.0/mrp_bom_attribute_match>`_ project on GitHub.
+This module is part of the `OCA/manufacture <https://github.com/OCA/manufacture/tree/19.0/mrp_bom_attribute_match>`_ project on GitHub.
 
 You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.
diff --git a/mrp_bom_attribute_match/__manifest__.py b/mrp_bom_attribute_match/__manifest__.py
@@ -1,6 +1,6 @@
 {
     "name": "BOM Attribute Match",
-    "version": "18.0.1.0.2",
+    "version": "19.0.1.0.0",
     "category": "Manufacturing",
     "author": "Ilyas, Ooops, Odoo Community Association (OCA)",
     "summary": "Dynamic BOM component based on product attribute",
diff --git a/mrp_bom_attribute_match/models/mrp_bom.py b/mrp_bom_attribute_match/models/mrp_bom.py
@@ -1,6 +1,6 @@
 import logging
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import UserError, ValidationError
 from odoo.tools import float_round
 
@@ -23,12 +23,6 @@ class MrpBomLine(models.Model):
         compute="_compute_match_on_attribute_ids",
         store=True,
     )
-    product_uom_category_id = fields.Many2one(
-        "uom.category",
-        related=None,
-        compute="_compute_product_uom_category_id",
-        compute_sudo=True,
-    )
 
     @api.model_create_multi
     def create(self, vals_list):
@@ -46,49 +40,19 @@ def create(self, vals_list):
                 )
         return super().create(vals_list)
 
-    @api.depends("product_id", "component_template_id")
-    def _compute_product_uom_category_id(self):
-        """Compute the product_uom_category_id field.
-
-        This is the product category that will be allowed to use on the product_uom_id
-        field, already covered by core module:
-        https://github.com/odoo/odoo/blob/331b9435c/addons/mrp/models/mrp_bom.py#L372
-
-        In core, though, this field is related to "product_id.uom_id.category_id".
-        Here we make it computed to choose between component_template_id and
-        product_id, depending on which one is set
-        """
-        # pylint: disable=missing-return
-        # NOTE: To play nice with other modules trying to do the same:
-        #   1) Set the field value as if it were a related field (core behaviour)
-        #   2) Call super (if it's there)
-        #   3) Update only the records we want
-        for rec in self:
-            rec.product_uom_category_id = rec.product_id.uom_id.category_id
-        if hasattr(super(), "_compute_product_uom_category_id"):
-            super()._compute_product_uom_category_id()
-        for rec in self:
-            if rec.component_template_id:
-                rec.product_uom_category_id = (
-                    rec.component_template_id.uom_id.category_id
-                )
-
     @api.onchange("component_template_id")
     def _onchange_component_template_id(self):
         if self.component_template_id:
             if self.product_id:
                 self.product_backup_id = self.product_id
                 self.product_id = False
-            if (
-                self.product_uom_id.category_id
-                != self.component_template_id.uom_id.category_id
-            ):
+            if not self.product_uom_id:
                 self.product_uom_id = self.component_template_id.uom_id
         else:
             if self.product_backup_id:
                 self.product_id = self.product_backup_id
                 self.product_backup_id = False
-            if self.product_uom_id.category_id != self.product_id.uom_id.category_id:
+            if not self.product_uom_id:
                 self.product_uom_id = self.product_id.uom_id
 
     @api.depends("component_template_id")
@@ -114,15 +78,15 @@ def _check_component_attributes(self):
             prod_attrs = bom_prod.valid_product_template_attribute_line_ids.attribute_id
             if not comp_attrs:
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "No match on attribute has been detected for Component "
                         "(Product Template) %s",
                         cmp_tmpl.display_name,
                     )
                 )
             if not all(attr in prod_attrs for attr in comp_attrs):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "Some attributes of the dynamic component are not included into"
                         " production product attributes."
                     )
@@ -141,7 +105,7 @@ def _check_variants_validity(self):
             same_attrs = self.env["product.attribute"].browse(same_attr_ids)
             if same_attrs:
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "You cannot use an attribute value for attribute(s) "
                         "%(attributes)s in the field “Apply on Variants” as it's the "
                         "same attribute used in the field “Match on Attribute” related "
@@ -281,7 +245,7 @@ def update_product_boms():
                         graph,
                     ):
                         raise UserError(
-                            _(
+                            self.env._(
                                 "Recursion error!  A product with a Bill of Material "
                                 "should not have itself in its BoM or child BoMs!"
                             )
diff --git a/mrp_bom_attribute_match/models/product.py b/mrp_bom_attribute_match/models/product.py
@@ -1,4 +1,4 @@
-from odoo import _, api, models
+from odoo import Command, api, models
 from odoo.exceptions import UserError
 
 
@@ -20,7 +20,7 @@ def _check_product_with_component_change_allowed(self):
                     diff = rec.env["product.attribute"].browse(diff_ids)
                     if diff:
                         raise UserError(
-                            _(
+                            self.env._(
                                 "The attributes you're trying to remove are used in "
                                 "the BoM as a match with Component (Product Template). "
                                 "To remove these attributes, first remove the BOM line "
@@ -47,7 +47,7 @@ def _check_component_change_allowed(self):
                 if len(diff) > 0:
                     attr_recs = self.env["product.attribute"].browse(diff)
                     raise UserError(
-                        _(
+                        self.env._(
                             "This product template is used as a component in the "
                             "BOMs for %(bom)s and attribute(s) %(attributes)s is "
                             "not present in all such product(s), and this would "
@@ -65,3 +65,33 @@ def _get_component_boms(self):
         if bom_lines:
             return bom_lines.mapped("bom_id")
         return False
+
+
+class ProductProduct(models.Model):
+    _inherit = "product.product"
+
+    def _compute_bom_price(self, bom, boms_to_recompute=False, byproduct_bom=False):
+        self.ensure_one()
+        # OVERRIDE to fill in the `line.product_id` if a component template is used.
+        # To avoid a complete override, we HACK the bom by replacing it with a virtual
+        # record, and modifying it's lines on-the-fly.
+        has_template_lines = any(
+            line.component_template_id for line in bom.bom_line_ids
+        )
+        if has_template_lines:
+            bom = bom.new(origin=bom)
+            to_ignore_line_ids = []
+            for line in bom.bom_line_ids:
+                if line._skip_bom_line(self) or not line.component_template_id:
+                    continue
+                line_product = bom._get_component_template_product(
+                    line, self, line.product_id
+                )
+                if not line_product:
+                    to_ignore_line_ids.append(line.id)
+                    continue
+                else:
+                    line.product_id = line_product
+            if to_ignore_line_ids:
+                bom.bom_line_ids = [Command.unlink(id) for id in to_ignore_line_ids]
+        return super()._compute_bom_price(bom, boms_to_recompute, byproduct_bom)
diff --git a/mrp_bom_attribute_match/readme/CONTRIBUTORS.md b/mrp_bom_attribute_match/readme/CONTRIBUTORS.md
@@ -4,3 +4,5 @@
   - Iván Todorovich \<<ivan.todorovich@camptocamp.com>\>
 - [Studio73](https://www.studio73.es)
   - Eugenio Micó \<<eugenio@studio73.es>\>
+- [Komit](https://komit-consulting.com)
+  - Hieu Vo Minh Bao \<<hieu.vmb@komit-consulting.com>\>
diff --git a/mrp_bom_attribute_match/reports/mrp_report_bom_structure.py b/mrp_bom_attribute_match/reports/mrp_report_bom_structure.py
@@ -3,6 +3,7 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import Command, api, models
+from odoo.api import NewId
 
 
 class ReportBomStructure(models.AbstractModel):
@@ -65,6 +66,6 @@ def _get_bom_data(
         if has_template_lines:
             for component in data.get("components", []):
                 for key, value in component.items():
-                    if isinstance(value, models.NewId):
+                    if isinstance(value, NewId):
                         component[key] = value.origin
         return data
diff --git a/mrp_bom_attribute_match/static/description/index.html b/mrp_bom_attribute_match/static/description/index.html
@@ -374,7 +374,7 @@ <h1>BOM Attribute Match</h1>
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 !! source digest: sha256:54f862e1aa9155a9900716afa6f3fd1d7f5249d1f04fd88dcf228eb4427018b6
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/manufacture/tree/18.0/mrp_bom_attribute_match"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/manufacture-18-0/manufacture-18-0-mrp_bom_attribute_match"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/manufacture&amp;target_branch=18.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
+<p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Beta" src="https://img.shields.io/badge/maturity-Beta-yellow.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/license-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/manufacture/tree/19.0/mrp_bom_attribute_match"><img alt="OCA/manufacture" src="https://img.shields.io/badge/github-OCA%2Fmanufacture-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/manufacture-19-0/manufacture-19-0-mrp_bom_attribute_match"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/manufacture&amp;target_branch=19.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module addresses the BoM case where the product to manufacture has
 one attribute with tens or hundreds of values (usually attribute
 “color”, eg: “Configurable Desk” can be produced in 900 different
@@ -476,7 +476,7 @@ <h2><a class="toc-backref" href="#toc-entry-2">Bug Tracker</a></h2>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/manufacture/issues">GitHub Issues</a>.
 In case of trouble, please check there if your issue has already been reported.
 If you spotted it first, help us to smash it by providing a detailed and welcomed
-<a class="reference external" href="https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_bom_attribute_match%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/manufacture/issues/new?body=module:%20mrp_bom_attribute_match%0Aversion:%2019.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -503,6 +503,10 @@ <h3><a class="toc-backref" href="#toc-entry-5">Contributors</a></h3>
 <li>Eugenio Micó &lt;<a class="reference external" href="mailto:eugenio&#64;studio73.es">eugenio&#64;studio73.es</a>&gt;</li>
 </ul>
 </li>
+<li><a class="reference external" href="https://komit-consulting.com">Komit</a><ul>
+<li>Hieu Vo Minh Bao &lt;<a class="reference external" href="mailto:hieu.vmb&#64;komit-consulting.com">hieu.vmb&#64;komit-consulting.com</a>&gt;</li>
+</ul>
+</li>
 </ul>
 </div>
 <div class="section" id="maintainers">
@@ -514,7 +518,7 @@ <h3><a class="toc-backref" href="#toc-entry-6">Maintainers</a></h3>
 <p>OCA, or the Odoo Community Association, is a nonprofit organization whose
 mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/manufacture/tree/18.0/mrp_bom_attribute_match">OCA/manufacture</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/manufacture/tree/19.0/mrp_bom_attribute_match">OCA/manufacture</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>
diff --git a/mrp_bom_attribute_match/tests/common.py b/mrp_bom_attribute_match/tests/common.py
@@ -91,7 +91,12 @@ def setUpClass(cls):
                 "value_ids": [Command.set(cls.product_attribute.value_ids.ids)],
             }
         )
-        cls.env.ref("uom.group_uom").write({"users": [(Command.link(cls.env.user.id))]})
+        cls.env.ref("uom.group_uom").write(
+            {"user_ids": [(Command.link(cls.env.user.id))]}
+        )
+        cls.env.ref("product.group_product_variant").write(
+            {"user_ids": [(Command.link(cls.env.user.id))]}
+        )
         # Create boms
         cls.bom_id = cls._create_bom(
             cls.product_sword,
diff --git a/mrp_bom_attribute_match/tests/test_mrp_bom_line.py b/mrp_bom_attribute_match/tests/test_mrp_bom_line.py
@@ -13,7 +13,6 @@ def setUpClass(cls):
         cls.product_plastic.write(
             {
                 "uom_id": cls.uom_dozen.id,
-                "uom_po_id": cls.uom_dozen.id,
             }
         )
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "BOM Attribute Match",`
`3`		`- "version": "18.0.1.0.2",`
	`3`	`+ "version": "19.0.1.0.0",`
`4`	`4`	`"category": "Manufacturing",`
`5`	`5`	`"author": "Ilyas, Ooops, Odoo Community Association (OCA)",`
`6`	`6`	`"summary": "Dynamic BOM component based on product attribute",`
Original file line number	Diff line number	Diff line change
`@@ -91,7 +91,12 @@ def setUpClass(cls):`
`91`	`91`	`"value_ids": [Command.set(cls.product_attribute.value_ids.ids)],`
`92`	`92`	`}`
`93`	`93`	`)`
`94`		`- cls.env.ref("uom.group_uom").write({"users": [(Command.link(cls.env.user.id))]})`
	`94`	`+ cls.env.ref("uom.group_uom").write(`
	`95`	`+ {"user_ids": [(Command.link(cls.env.user.id))]}`
	`96`	`+ )`
	`97`	`+ cls.env.ref("product.group_product_variant").write(`
	`98`	`+ {"user_ids": [(Command.link(cls.env.user.id))]}`
	`99`	`+ )`
`95`	`100`	`# Create boms`
`96`	`101`	`cls.bom_id = cls._create_bom(`
`97`	`102`	`cls.product_sword,`
Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,6 @@ def setUpClass(cls):`
`13`	`13`	`cls.product_plastic.write(`
`14`	`14`	`{`
`15`	`15`	`"uom_id": cls.uom_dozen.id,`
`16`		`- "uom_po_id": cls.uom_dozen.id,`
`17`	`16`	`}`
`18`	`17`	`)`
`19`	`18`