From 910938a838878387d356a1dbabbf218b958c7171 Mon Sep 17 00:00:00 2001 From: bosd Date: Tue, 13 May 2025 08:50:20 +0200 Subject: [PATCH 1/2] [ADD] sale_order_add_consumed_components --- sale_order_add_consumed_components/README.rst | 146 ++++++ .../__init__.py | 1 + .../__manifest__.py | 14 + .../demo/sale_demo.xml | 58 +++ .../models/__init__.py | 5 + .../models/mrp_production.py | 91 ++++ .../models/sale_order_line.py | 13 + .../pyproject.toml | 3 + .../readme/CONTEXT.md | 32 ++ .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 1 + .../readme/ROADMAP.md | 1 + .../readme/USAGE.md | 5 + .../static/description/icon.png | Bin 0 -> 10254 bytes .../static/description/icon.svg | 1 + .../static/description/index.html | 484 ++++++++++++++++++ .../tests/__init__.py | 4 + .../tests/test_sale_order_component_sync.py | 189 +++++++ 18 files changed, 1049 insertions(+) create mode 100644 sale_order_add_consumed_components/README.rst create mode 100644 sale_order_add_consumed_components/__init__.py create mode 100644 sale_order_add_consumed_components/__manifest__.py create mode 100644 sale_order_add_consumed_components/demo/sale_demo.xml create mode 100644 sale_order_add_consumed_components/models/__init__.py create mode 100644 sale_order_add_consumed_components/models/mrp_production.py create mode 100644 sale_order_add_consumed_components/models/sale_order_line.py create mode 100644 sale_order_add_consumed_components/pyproject.toml create mode 100644 sale_order_add_consumed_components/readme/CONTEXT.md create mode 100644 sale_order_add_consumed_components/readme/CONTRIBUTORS.md create mode 100644 sale_order_add_consumed_components/readme/DESCRIPTION.md create mode 100644 sale_order_add_consumed_components/readme/ROADMAP.md create mode 100644 sale_order_add_consumed_components/readme/USAGE.md create mode 100644 sale_order_add_consumed_components/static/description/icon.png create mode 100644 sale_order_add_consumed_components/static/description/icon.svg create mode 100644 sale_order_add_consumed_components/static/description/index.html create mode 100644 sale_order_add_consumed_components/tests/__init__.py create mode 100644 sale_order_add_consumed_components/tests/test_sale_order_component_sync.py diff --git a/sale_order_add_consumed_components/README.rst b/sale_order_add_consumed_components/README.rst new file mode 100644 index 00000000000..703188f77a7 --- /dev/null +++ b/sale_order_add_consumed_components/README.rst @@ -0,0 +1,146 @@ +================================== +Sale Order add consumed components +================================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:108bac1d4201008f5801a728bc3ff6e92dae1e898ec0351042b9af78c2f6b09e + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |badge1| image:: https://img.shields.io/badge/maturity-Beta-yellow.png + :target: https://odoo-community.org/page/development-status + :alt: Beta +.. |badge2| image:: https://img.shields.io/badge/licence-AGPL--3-blue.png + :target: http://www.gnu.org/licenses/agpl-3.0-standalone.html + :alt: License: AGPL-3 +.. |badge3| image:: https://img.shields.io/badge/github-OCA%2Fsale--workflow-lightgray.png?logo=github + :target: https://github.com/OCA/sale-workflow/tree/18.0/sale_order_add_consumed_components + :alt: OCA/sale-workflow +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/sale-workflow-18-0/sale-workflow-18-0-sale_order_add_consumed_components + :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/sale-workflow&target_branch=18.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows you to update a sales order with the actual consumed +(and sellable) components used from the manufacturing order. + +**Table of contents** + +.. contents:: + :local: + +Use Cases / Context +=================== + +Business Need In many manufacturing workflows, products are sold to +customers via Sales Orders and subsequently manufactured through +Manufacturing Orders (MOs). Often, these manufactured products require +various components that are consumed during production and tracked via +Bills of Materials (BoMs). + +However, in certain business scenarios, it's necessary not only to +manufacture a finished product but also to invoice the customer for the +individual components used in production, especially when the components +themselves are valuable, consumable, or customer-specific. + +Odoo, by default, does not automatically add consumed components to the +related Sale Order. This leads to: + +- Manual effort in identifying and adding consumed items for invoicing. +- Risk of underbilling customers for actual material usage. +- Inconsistencies between manufacturing records and customer billing. + +Module Purpose This module addresses the above gap by automatically +adding all ``sale_ok=True`` components that were actually consumed in a +Manufacturing Order to the linked Sale Order. It ensures: + +- Full traceability and billing accuracy of component usage. +- Avoidance of double entry by manufacturing and sales teams. + +Compatibility with multiple MOs linked to the same SO (incrementing +quantities when the same component is used more than once). + +Real word use case: This module is very usefull in a subcontractee +scenario. E.g. the customer is the owner of the component and +endproduct. But the subcontractee is providing operations over the +product and adding components. These components need to be invoiced +separately to the customer. In this scenario, the raw material supplied +by the customer is not saleble. (He already owns it and gives it in +consinee to the subcontractee.) The added components should be set up as +salebale products. + +With this module installed and the scenario where consumption of the +components are added to a mo. Upon "mark done" of the MO the consumed +components are added to the sale order. Making them invoicable to the +customer. + +Usage +===== + +- Sell an end product with a BoM. (Make sure the product is configured + as an MTO) +- Create and process the manufacturing order. +- The BoM components are automatically added to the related sales order + after production is marked as done. +- You can now create an invoice from the sale order with the consumed + components. + +Known issues / Roadmap +====================== + + + +Bug Tracker +=========== + +Bugs are tracked on `GitHub 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 `_. + +Do not contact contributors directly about support or help with technical issues. + +Credits +======= + +Authors +------- + +* OBS Solutions BV + +Contributors +------------ + +- bosd + +Maintainers +----------- + +This module is maintained by the OCA. + +.. image:: https://odoo-community.org/logo.png + :alt: Odoo Community Association + :target: https://odoo-community.org + +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. + +.. |maintainer-bosd| image:: https://github.com/bosd.png?size=40px + :target: https://github.com/bosd + :alt: bosd + +Current `maintainer `__: + +|maintainer-bosd| + +This module is part of the `OCA/sale-workflow `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/sale_order_add_consumed_components/__init__.py b/sale_order_add_consumed_components/__init__.py new file mode 100644 index 00000000000..0650744f6bc --- /dev/null +++ b/sale_order_add_consumed_components/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/sale_order_add_consumed_components/__manifest__.py b/sale_order_add_consumed_components/__manifest__.py new file mode 100644 index 00000000000..d344dd4d8dd --- /dev/null +++ b/sale_order_add_consumed_components/__manifest__.py @@ -0,0 +1,14 @@ +{ + "name": "Sale Order add consumed components", + "version": "18.0.2.0.0", + "category": "Sales Management", + "summary": "Add consumed components from Manufacturing Order " + "to the originating Sales Order as invoiceable lines.", + "author": "Odoo Community Association (OCA), OBS Solutions BV", + "website": "https://github.com/OCA/sale-workflow", + "license": "AGPL-3", + "depends": ["sale_management", "mrp"], + "demo": ["demo/sale_demo.xml"], + "maintainers": ["bosd"], + "installable": True, +} diff --git a/sale_order_add_consumed_components/demo/sale_demo.xml b/sale_order_add_consumed_components/demo/sale_demo.xml new file mode 100644 index 00000000000..a3482503a3b --- /dev/null +++ b/sale_order_add_consumed_components/demo/sale_demo.xml @@ -0,0 +1,58 @@ + + + + Finished Product + 100.0 + consu + + + + + Component 1 + 10.0 + + consu + + + + Component 2 + 15.0 + consu + + + + + 1.0 + + + + + + 2.0 + + + + + + 3.0 + + + + + + + diff --git a/sale_order_add_consumed_components/models/__init__.py b/sale_order_add_consumed_components/models/__init__.py new file mode 100644 index 00000000000..22fd2c8a1d3 --- /dev/null +++ b/sale_order_add_consumed_components/models/__init__.py @@ -0,0 +1,5 @@ +# © 2025 OBS Solutions +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import mrp_production +from . import sale_order_line diff --git a/sale_order_add_consumed_components/models/mrp_production.py b/sale_order_add_consumed_components/models/mrp_production.py new file mode 100644 index 00000000000..0155da52035 --- /dev/null +++ b/sale_order_add_consumed_components/models/mrp_production.py @@ -0,0 +1,91 @@ +# © 2025 OBS Solutions +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +import logging + +from odoo import api, models + +_logger = logging.getLogger(__name__) + + +class MrpProduction(models.Model): + _inherit = "mrp.production" + + def action_add_consumed_components_to_sale(self): + for mo in self: + if not mo.origin: + continue + + sale_order = self.env["sale.order"].search( + [("name", "=", mo.origin)], limit=1 + ) + if not sale_order: + _logger.info(f"No Sale Order found with origin {mo.origin}") + continue + + so_line_map = {line.product_id.id: line for line in sale_order.order_line} + + for move in mo.move_raw_ids: + product = move.product_id + if not product.sale_ok: + continue + + quantity = move.quantity + if not quantity: + continue + + if product.id in so_line_map: + # Update existing sale order line quantity + so_line = so_line_map[product.id] + so_line.product_uom_qty += quantity + so_line.qty_delivered += quantity + else: + SaleOrderLine = self.env["sale.order.line"] + so_line = SaleOrderLine.create( + { + "order_id": sale_order.id, + "product_id": product.id, + "product_uom_qty": quantity, + "product_uom": product.uom_id.id, + "price_unit": product.lst_price, + "name": product.display_name, + "qty_delivered_method": "manual", + "is_mrp_component_line": True, + # 'qty_delivered': quantity, + # 'route_id': False, + } + ) + so_line.qty_delivered = quantity + # so_line.product_uom_qty = quantity + _logger.info( + "Added product %s to sale order %s", + product.display_name, + sale_order.name, + ) + + def button_mark_done(self): + res = super().button_mark_done() + for mo in self: + mo.action_add_consumed_components_to_sale() + return res + + # Fix the domain so the smartbutton on the SO + # will not show the individual components + @api.depends("procurement_group_id") + def _compute_mrp_production_ids(self): + for sale in self: + productions = ( + self.env["mrp.production"].search( + [ + ( + "procurement_group_id", + "=", + sale.procurement_group_id.id, + ) + ] + ) + if sale.procurement_group_id + else self.env["mrp.production"] + ) + sale.mrp_production_ids = productions + sale.mrp_production_count = len(productions) diff --git a/sale_order_add_consumed_components/models/sale_order_line.py b/sale_order_add_consumed_components/models/sale_order_line.py new file mode 100644 index 00000000000..67ec029d66f --- /dev/null +++ b/sale_order_add_consumed_components/models/sale_order_line.py @@ -0,0 +1,13 @@ +from odoo import fields, models + + +class SaleOrderLine(models.Model): + _inherit = "sale.order.line" + + is_mrp_component_line = fields.Boolean("Added from MO Component", default=False) + + def _action_launch_stock_rule(self, previous_product_uom_qty=False): + lines = self.filtered(lambda ln: not ln.is_mrp_component_line) + return super(SaleOrderLine, lines)._action_launch_stock_rule( + previous_product_uom_qty=previous_product_uom_qty + ) diff --git a/sale_order_add_consumed_components/pyproject.toml b/sale_order_add_consumed_components/pyproject.toml new file mode 100644 index 00000000000..4231d0cccb3 --- /dev/null +++ b/sale_order_add_consumed_components/pyproject.toml @@ -0,0 +1,3 @@ +[build-system] +requires = ["whool"] +build-backend = "whool.buildapi" diff --git a/sale_order_add_consumed_components/readme/CONTEXT.md b/sale_order_add_consumed_components/readme/CONTEXT.md new file mode 100644 index 00000000000..2a1139fabb1 --- /dev/null +++ b/sale_order_add_consumed_components/readme/CONTEXT.md @@ -0,0 +1,32 @@ +Business Need +In many manufacturing workflows, products are sold to customers via Sales Orders and subsequently manufactured through Manufacturing Orders (MOs). Often, these manufactured products require various components that are consumed during production and tracked via Bills of Materials (BoMs). + +However, in certain business scenarios, it's necessary not only to manufacture a finished product but also to invoice the customer for the individual components used in production, especially when the components themselves are valuable, consumable, or customer-specific. + + +Odoo, by default, does not automatically add consumed components to the related Sale Order. This leads to: + +- Manual effort in identifying and adding consumed items for invoicing. +- Risk of underbilling customers for actual material usage. +- Inconsistencies between manufacturing records and customer billing. + +Module Purpose +This module addresses the above gap by automatically adding all `sale_ok=True` components that were actually consumed in a Manufacturing Order to the linked Sale Order. It ensures: + +- Full traceability and billing accuracy of component usage. +- Avoidance of double entry by manufacturing and sales teams. + +Compatibility with multiple MOs linked to the same SO (incrementing quantities when the same component is used more than once). + +Real word use case: +This module is very usefull in a subcontractee scenario. +E.g. the customer is the owner of the component and endproduct. +But the subcontractee is providing operations over the product and adding components. +These components need to be invoiced separately to the customer. +In this scenario, the raw material supplied by the customer is not saleble. +(He already owns it and gives it in consinee to the subcontractee.) +The added components should be set up as salebale products. + +With this module installed and the scenario where consumption of the components are added to a mo. +Upon "mark done" of the MO the consumed components are added to the sale order. +Making them invoicable to the customer. diff --git a/sale_order_add_consumed_components/readme/CONTRIBUTORS.md b/sale_order_add_consumed_components/readme/CONTRIBUTORS.md new file mode 100644 index 00000000000..1b22f2a4d7f --- /dev/null +++ b/sale_order_add_consumed_components/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- bosd diff --git a/sale_order_add_consumed_components/readme/DESCRIPTION.md b/sale_order_add_consumed_components/readme/DESCRIPTION.md new file mode 100644 index 00000000000..b4538dd41fe --- /dev/null +++ b/sale_order_add_consumed_components/readme/DESCRIPTION.md @@ -0,0 +1 @@ +This module allows you to update a sales order with the actual consumed (and sellable) components used from the manufacturing order. diff --git a/sale_order_add_consumed_components/readme/ROADMAP.md b/sale_order_add_consumed_components/readme/ROADMAP.md new file mode 100644 index 00000000000..8b137891791 --- /dev/null +++ b/sale_order_add_consumed_components/readme/ROADMAP.md @@ -0,0 +1 @@ + diff --git a/sale_order_add_consumed_components/readme/USAGE.md b/sale_order_add_consumed_components/readme/USAGE.md new file mode 100644 index 00000000000..f8979520303 --- /dev/null +++ b/sale_order_add_consumed_components/readme/USAGE.md @@ -0,0 +1,5 @@ +- Sell an end product with a BoM. + (Make sure the product is configured as an MTO) +- Create and process the manufacturing order. +- The BoM components are automatically added to the related sales order after production is marked as done. +- You can now create an invoice from the sale order with the consumed components. diff --git a/sale_order_add_consumed_components/static/description/icon.png b/sale_order_add_consumed_components/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..1dcc49c24f364e9adf0afbc6fc0bac6dbecdeb11 GIT binary patch literal 10254 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 \ No newline at end of file diff --git a/sale_order_add_consumed_components/static/description/index.html b/sale_order_add_consumed_components/static/description/index.html new file mode 100644 index 00000000000..819c6791890 --- /dev/null +++ b/sale_order_add_consumed_components/static/description/index.html @@ -0,0 +1,484 @@ + + + + + +Sale Order add consumed components + + + +
+

Sale Order add consumed components

+ + +

Beta License: AGPL-3 OCA/sale-workflow Translate me on Weblate Try me on Runboat

+

This module allows you to update a sales order with the actual consumed +(and sellable) components used from the manufacturing order.

+

Table of contents

+ +
+

Use Cases / Context

+

Business Need In many manufacturing workflows, products are sold to +customers via Sales Orders and subsequently manufactured through +Manufacturing Orders (MOs). Often, these manufactured products require +various components that are consumed during production and tracked via +Bills of Materials (BoMs).

+

However, in certain business scenarios, it’s necessary not only to +manufacture a finished product but also to invoice the customer for the +individual components used in production, especially when the components +themselves are valuable, consumable, or customer-specific.

+

Odoo, by default, does not automatically add consumed components to the +related Sale Order. This leads to:

+
    +
  • Manual effort in identifying and adding consumed items for invoicing.
    • +
  • Risk of underbilling customers for actual material usage.
    • +
  • Inconsistencies between manufacturing records and customer billing.
    • +
+

Module Purpose This module addresses the above gap by automatically +adding all sale_ok=True components that were actually consumed in a +Manufacturing Order to the linked Sale Order. It ensures:

+
    +
  • Full traceability and billing accuracy of component usage.
    • +
  • Avoidance of double entry by manufacturing and sales teams.
    • +
+

Compatibility with multiple MOs linked to the same SO (incrementing +quantities when the same component is used more than once).

+

Real word use case: This module is very usefull in a subcontractee +scenario. E.g. the customer is the owner of the component and +endproduct. But the subcontractee is providing operations over the +product and adding components. These components need to be invoiced +separately to the customer. In this scenario, the raw material supplied +by the customer is not saleble. (He already owns it and gives it in +consinee to the subcontractee.) The added components should be set up as +salebale products.

+

With this module installed and the scenario where consumption of the +components are added to a mo. Upon “mark done” of the MO the consumed +components are added to the sale order. Making them invoicable to the +customer.

+
+
+

Usage

+
    +
  • Sell an end product with a BoM. (Make sure the product is configured +as an MTO)
    • +
  • Create and process the manufacturing order.
    • +
  • The BoM components are automatically added to the related sales order +after production is marked as done.
    • +
  • You can now create an invoice from the sale order with the consumed +components.
    • +
+
+ +
+

Bug Tracker

+

Bugs are tracked on GitHub 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.

+

Do not contact contributors directly about support or help with technical issues.

+
+
+

Credits

+
+

Authors

+
    +
  • OBS Solutions BV
    • +
+
+
+

Contributors

+
    +
  • bosd
    • +
+
+
+

Maintainers

+

This module is maintained by the OCA.

+ +Odoo Community Association + +

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.

+

Current maintainer:

+

bosd

+

This module is part of the OCA/sale-workflow project on GitHub.

+

You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute.

+
+
+
+ + diff --git a/sale_order_add_consumed_components/tests/__init__.py b/sale_order_add_consumed_components/tests/__init__.py new file mode 100644 index 00000000000..f17a2f44195 --- /dev/null +++ b/sale_order_add_consumed_components/tests/__init__.py @@ -0,0 +1,4 @@ +# © 2025 OBS Solutions +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from . import test_sale_order_component_sync diff --git a/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py b/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py new file mode 100644 index 00000000000..3dcf31de950 --- /dev/null +++ b/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py @@ -0,0 +1,189 @@ +# © 2025 OBS Solutions +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import tests +from odoo.tests import tagged + + +@tagged("post_install", "-at_install") +class TestSaleOrderComponentSync(tests.TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + Product = cls.env["product.product"] + SaleOrder = cls.env["sale.order"] + MrpBom = cls.env["mrp.bom"] + + cls.partner = cls.env["res.partner"].create( + { + "name": "Test Customer", + } + ) + + cls.product_main = Product.create( + { + "name": "Custom Table", + "type": "consu", + "sale_ok": True, + } + ) + + cls.product_component = Product.create( + { + "name": "Component A", + "type": "consu", + "sale_ok": True, + "tracking": "none", + } + ) + + cls.product_component1 = Product.create( + { + "name": "Table Top", + "type": "consu", + "sale_ok": True, + } + ) + + cls.product_component2 = Product.create( + { + "name": "Screws", + "type": "consu", + "sale_ok": False, + } + ) + + cls.bom = MrpBom.create( + { + "product_tmpl_id": cls.product_main.product_tmpl_id.id, + "type": "normal", + "bom_line_ids": [ + ( + 0, + 0, + { + "product_id": cls.product_component.id, + "product_qty": 2.0, + }, + ), + ( + 0, + 0, + { + "product_id": cls.product_component1.id, + "product_qty": 2.0, + }, + ), + ( + 0, + 0, + { + "product_id": cls.product_component2.id, + "product_qty": 10.0, + }, + ), + ], + } + ) + + cls.sale_order = SaleOrder.create( + { + "partner_id": cls.partner.id, + "order_line": [ + ( + 0, + 0, + { + "product_id": cls.product_main.id, + "product_uom_qty": 1.0, + "price_unit": 100.0, + }, + ) + ], + } + ) + # Confirm the sale order + cls.sale_order.action_confirm() + + def create_and_confirm_mo(self, component): + MrpProduction = self.env["mrp.production"] + + self.mo = MrpProduction.create( + { + "product_id": self.product_main.id, + "product_qty": 1.0, + "bom_id": self.bom.id, + "origin": self.sale_order.name, + } + ) + + self.mo.action_confirm() + for move in self.mo.move_raw_ids.filtered(lambda m: m.product_id == component): + move.quantity = 1.0 + + self.mo.action_add_consumed_components_to_sale() + return self.mo + + def test_components_added_to_sale_order(self): + self.create_and_confirm_mo(self.product_component) + component_lines = self.sale_order.order_line.filtered( + lambda li: li.product_id == self.product_component + ) + + self.assertTrue(component_lines, "Sellable component should be added to SO") + self.assertEqual( + component_lines.product_uom_qty, + 1.0, + "Quantity should match consumption", + ) + self.assertTrue( + all(line.is_mrp_component_line for line in component_lines), + "Component lines should be marked as is_mrp_component_line", + ) + + # Should NOT contain the non-sellable component + non_sellable_lines = self.sale_order.order_line.filtered( + lambda li: li.product_id == self.product_component2 + ) + self.assertFalse( + non_sellable_lines, + "Non-sellable component should NOT be added to SO", + ) + + def test_multiple_mos_increment_quantity(self): + self.create_and_confirm_mo(self.product_component) + self.create_and_confirm_mo(self.product_component) + + component_lines = self.sale_order.order_line.filtered( + lambda li: li.product_id == self.product_component + ) + + self.assertEqual( + component_lines.product_uom_qty, + 2.0, + "Quantity should be cumulative from both MOs", + ) + + def test_mo_confirmation_with_sale_only_component(self): + # This component is sellable, but has no stock/routing setup + product = self.env["product.product"].create( + { + "name": "Sellable No-Route (no inventory tracked) Component ", + "type": "consu", + "sale_ok": True, + "tracking": "none", + # Intentionally no route or stock config + } + ) + + self.bom.write( + {"bom_line_ids": [(0, 0, {"product_id": product.id, "product_qty": 1.0})]} + ) + + # Confirming MO should not raise any error + try: + self.create_and_confirm_mo(product) + except Exception as e: + self.fail( + f"MO confirmation raised unexpected error for sale-only component: {e}" + ) From 123bb404273eda4b963ed67e1ccb3fb13e01dd4c Mon Sep 17 00:00:00 2001 From: bosd Date: Wed, 15 Oct 2025 20:38:18 +0200 Subject: [PATCH 2/2] [IMP] sale_order_add_consumed_components: Use pricelist price Use the price of the applicable pricelist instead of price on the product form. --- .../models/mrp_production.py | 19 ++++- .../tests/test_sale_order_component_sync.py | 83 +++++++++++++++++++ 2 files changed, 100 insertions(+), 2 deletions(-) diff --git a/sale_order_add_consumed_components/models/mrp_production.py b/sale_order_add_consumed_components/models/mrp_production.py index 0155da52035..42d05a35f55 100644 --- a/sale_order_add_consumed_components/models/mrp_production.py +++ b/sale_order_add_consumed_components/models/mrp_production.py @@ -3,7 +3,7 @@ import logging -from odoo import api, models +from odoo import api, fields, models _logger = logging.getLogger(__name__) @@ -41,13 +41,28 @@ def action_add_consumed_components_to_sale(self): so_line.qty_delivered += quantity else: SaleOrderLine = self.env["sale.order.line"] + + # Calculate price based on the sale order's pricelist + # Get the price from the product with the pricelist applied + date_order = sale_order.date_order or fields.Date.context_today( + sale_order + ) + # Get price from pricelist for this product + price = sale_order.pricelist_id._get_product_price( + product, + quantity=quantity, + uom=product.uom_id, + date=date_order, + partner=sale_order.partner_id, + ) + so_line = SaleOrderLine.create( { "order_id": sale_order.id, "product_id": product.id, "product_uom_qty": quantity, "product_uom": product.uom_id.id, - "price_unit": product.lst_price, + "price_unit": price, "name": product.display_name, "qty_delivered_method": "manual", "is_mrp_component_line": True, diff --git a/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py b/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py index 3dcf31de950..8a5e18d3a61 100644 --- a/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py +++ b/sale_order_add_consumed_components/tests/test_sale_order_component_sync.py @@ -187,3 +187,86 @@ def test_mo_confirmation_with_sale_only_component(self): self.fail( f"MO confirmation raised unexpected error for sale-only component: {e}" ) + + def test_pricelist_price_respected(self): + """Test that the pricelist price is used instead of the product's list price""" + # Create a pricelist with specific rules - before creating the SO + Pricelist = self.env["product.pricelist"] + PricelistItem = self.env["product.pricelist.item"] + + # Create a new sale order with specific pricelist (not the confirmed one) + partner = self.env["res.partner"].create({"name": "Test Customer 2"}) + + # Change the original product's list price to something different + self.product_component.lst_price = 50.0 + + # Create a pricelist with a specific price for the component + pricelist = Pricelist.create( + { + "name": "Test Pricelist", + "currency_id": self.env.ref("base.USD").id, + } + ) + + # Create a pricelist item that gives the product a specific price + PricelistItem.create( + { + "pricelist_id": pricelist.id, + "product_tmpl_id": self.product_component.product_tmpl_id.id, + "fixed_price": 75.0, + } + ) + + # Create a new sale order with this pricelist + new_sale_order = self.env["sale.order"].create( + { + "partner_id": partner.id, + "pricelist_id": pricelist.id, + "order_line": [ + ( + 0, + 0, + { + "product_id": self.product_main.id, + "product_uom_qty": 1.0, + "price_unit": 100.0, + }, + ) + ], + } + ) + # Confirm the new sale order + new_sale_order.action_confirm() + + # Create MO for the new SO and add components to SO + MrpProduction = self.env["mrp.production"] + mo = MrpProduction.create( + { + "product_id": self.product_main.id, + "product_qty": 1.0, + "bom_id": self.bom.id, + "origin": new_sale_order.name, + } + ) + + mo.action_confirm() + component_moves = mo.move_raw_ids.filtered( + lambda m: m.product_id == self.product_component + ) + for move in component_moves: + move.quantity = 1.0 + + mo.action_add_consumed_components_to_sale() + + # Get the added component line + component_lines = new_sale_order.order_line.filtered( + lambda li: li.product_id == self.product_component + ) + + self.assertTrue(component_lines, "Component should be added to SO") + # Check that the price used is from the pricelist, not the product's list price + self.assertEqual( + component_lines.price_unit, + 75.0, + "Price should come from the pricelist, not the product's list price", + )