[FIX] product_replenishment_cost_mrp: adapt module to subcontracting

X-original-commit: 0f36826

Author: ced-adhoc

product_replenishment_cost_mrp/README.rst

@@ -14,8 +14,9 @@
 Integration between Replenishment Cost and Manufacture
 ======================================================
 
-#. Agregado de método para cálculo de costo de reposición utilizando el costo de reposición de la LdM.
-#. Modifica el reporte de "Estructura de Lista de Materiales" para que utilice el costo de reposición.
+#. Add a method to compute the replenishment cost using the BoM's replenishment cost.
+#. Modify the "Bill of Materials Structure" report to use the replenishment cost
+#. Support for replenishment cost calculation in subcontracted BOMs, adding the supplier/subcontractor cost to the components' cost
 
 Installation
 ============

product_replenishment_cost_mrp/models/product_template.py

@@ -46,7 +46,11 @@ def _compute_replenishment_cost(self):
                 rec.update({"replenishment_base_cost_on_currency": 0.0, "replenishment_cost": 0.0})
                 continue
             # el explode es para product.product, tomamos la primer variante
-            result, result2 = bom.explode(rec.with_context(active_test=rec.active).product_variant_ids[0], 1)
+            product_variant = rec.with_context(active_test=rec.active).product_variant_ids[:1]
+            if not product_variant:
+                rec.update({"replenishment_base_cost_on_currency": 0.0, "replenishment_cost": 0.0})
+                continue
+            result, result2 = bom.explode(product_variant, 1)
             for sbom, sbom_data in result2:
                 sbom_rep_cost = (
                     sbom.product_id.uom_id._compute_price(
@@ -57,6 +61,36 @@ def _compute_replenishment_cost(self):
                 price += sbom.product_id.product_tmpl_id.currency_id._convert(
                     sbom_rep_cost, product_currency, company, date, round=False
                 )
+
+            # Add subcontracting cost if bom type is 'subcontract'
+            if bom.type == "subcontract":
+                # Look for the seller/subcontractor set in the BOM
+                product = rec.product_variant_ids[:1]
+                if product:
+                    seller = product._select_seller(
+                        quantity=1, uom_id=bom.product_uom_id, params={"subcontractor_ids": bom.subcontractor_ids}
+                    )
+                else:
+                    # If no product variant, look for sellers in the template
+                    seller = rec.seller_ids.filtered(lambda s: s.partner_id in bom.subcontractor_ids)[:1]
+
+                if seller:
+                    if bom.product_uom_id.ratio == 0:
+                        raise ValueError(
+                            _(
+                                "El ratio de la unidad de medida del producto '%s' en el BOM es cero. "
+                                "Esto provocaría una división por cero. Verifique la configuración de la UoM."
+                            )
+                            % bom.display_name
+                        )
+                    # Calculate the subcontracting cost
+                    ratio_uom_seller = seller.product_uom.ratio / bom.product_uom_id.ratio
+                    subcontract_price = seller.currency_id._convert(
+                        seller.price, product_currency, company, date, round=False
+                    )
+                    # Add the subcontract price to the total price
+                    price += subcontract_price / ratio_uom_seller
+
             # NO implementamos total va a ser borrado. Ver si implementamos mas adelante (tener en cuenta convertir
             # moneda)
             # if bom.routing_id:

product_replenishment_cost_mrp/report/mrp_report_bom_structure.py

@@ -4,6 +4,31 @@
 class ReportReplenishmentBomStructure(models.AbstractModel):
     _inherit = "report.mrp.report_bom_structure"
 
+    @api.model
+    def _get_subcontracting_line(self, bom, seller, level, bom_quantity):
+        """Override to convert seller price to the proper currency"""
+        res = super()._get_subcontracting_line(bom, seller, level, bom_quantity)
+        currency = self.env.context.get("force_currency") or self.env.company.currency_id
+
+        # Convert the seller price to the proper currency
+        if bom.product_uom_id.ratio == 0:
+            raise ValueError(
+                "El ratio de la unidad de medida del producto en el BOM es cero. "
+                "Esto provocaría una división por cero. Verifique la configuración de la UoM."
+            )
+        ratio_uom_seller = seller.product_uom.ratio / bom.product_uom_id.ratio
+        price = seller.currency_id._convert(seller.price, currency, self.env.company, fields.Date.today(), round=True)
+        res.update(
+            {
+                "prod_cost": price / ratio_uom_seller * bom_quantity,
+                "bom_cost": price / ratio_uom_seller * bom_quantity,
+                "currency": currency,
+                "currency_id": currency.id,
+            }
+        )
+
+        return res
+
     @api.model
     def _get_bom_data(
         self,
@@ -22,7 +47,7 @@ def _get_bom_data(
     ):
         """Here we use the replenishment cost for the uom unit"""
         if not self.env.context.get("force_currency"):
-            self = self.with_context(force_currency=product.currency_id)
+            self = self.with_context(force_currency=product.currency_id if product else bom.product_tmpl_id.currency_id)
         res = super(ReportReplenishmentBomStructure, self)._get_bom_data(
             bom,
             warehouse,
@@ -43,6 +68,9 @@ def _get_bom_data(
         current_quantity = line_qty
         if bom_line:
             current_quantity = bom_line.product_uom_id._compute_quantity(line_qty, bom.product_uom_id) or 0
+
+        # Only update prod_cost (costo del producto final), not bom_cost
+        # bom_cost is automatically calculated as: components + operations + subcontracting
         if not is_minimized:
             if product:
                 price = product.uom_id._compute_price(product.replenishment_cost, bom.product_uom_id) * current_quantity
@@ -79,10 +107,13 @@ def _get_component_data(
             parent_bom, parent_product, warehouse, bom_line, line_quantity, level, index, product_info, ignore_stock
         )
         currency = self.env.context.get("force_currency") or self.env.company.currency_id
-        price = (
-            bom_line.product_id.uom_id._compute_price(bom_line.product_id.replenishment_cost, bom_line.product_uom_id)
-            * line_quantity
-        )
+
+        # Use replenishment_cost, if not defined use standard_price as fallback
+        component_cost = bom_line.product_id.replenishment_cost
+        if not component_cost:
+            component_cost = bom_line.product_id.standard_price
+
+        price = bom_line.product_id.uom_id._compute_price(component_cost, bom_line.product_uom_id) * line_quantity
         price = bom_line.product_id.currency_id._convert(
             price, currency, self.env.company, fields.Date.today(), round=True
         )