From 8614f833501d849e09fe0094f66bbf723d47e1b1 Mon Sep 17 00:00:00 2001 From: Akim Juillerat Date: Thu, 18 Jan 2024 18:56:39 +0100 Subject: [PATCH] Add module mrp_repair_reuse_component --- mrp_repair_reuse_component/README.rst | 88 ++++ mrp_repair_reuse_component/__init__.py | 1 + mrp_repair_reuse_component/__manifest__.py | 17 + mrp_repair_reuse_component/models/__init__.py | 1 + mrp_repair_reuse_component/models/product.py | 32 ++ .../readme/CONTRIBUTORS.md | 1 + .../readme/DESCRIPTION.md | 4 + .../static/description/index.html | 427 ++++++++++++++++++ mrp_repair_reuse_component/tests/__init__.py | 0 .../tests/test_mrp_repair_reuse_component.py | 226 +++++++++ .../odoo/addons/mrp_repair_reuse_component | 1 + setup/mrp_repair_reuse_component/setup.py | 6 + 12 files changed, 804 insertions(+) create mode 100644 mrp_repair_reuse_component/README.rst create mode 100644 mrp_repair_reuse_component/__init__.py create mode 100644 mrp_repair_reuse_component/__manifest__.py create mode 100644 mrp_repair_reuse_component/models/__init__.py create mode 100644 mrp_repair_reuse_component/models/product.py create mode 100644 mrp_repair_reuse_component/readme/CONTRIBUTORS.md create mode 100644 mrp_repair_reuse_component/readme/DESCRIPTION.md create mode 100644 mrp_repair_reuse_component/static/description/index.html create mode 100644 mrp_repair_reuse_component/tests/__init__.py create mode 100644 mrp_repair_reuse_component/tests/test_mrp_repair_reuse_component.py create mode 120000 setup/mrp_repair_reuse_component/odoo/addons/mrp_repair_reuse_component create mode 100644 setup/mrp_repair_reuse_component/setup.py diff --git a/mrp_repair_reuse_component/README.rst b/mrp_repair_reuse_component/README.rst new file mode 100644 index 000000000..e375941f8 --- /dev/null +++ b/mrp_repair_reuse_component/README.rst @@ -0,0 +1,88 @@ +========================== +MRP Repair Reuse Component +========================== + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:f9073ff88664a37cdfd4d953be75f4b2bed733692b37dbae79cbda505221208f + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Fmanufacture-lightgray.png?logo=github + :target: https://github.com/OCA/manufacture/tree/14.0/mrp_repair_reuse_component + :alt: OCA/manufacture +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/manufacture-14-0/manufacture-14-0-mrp_repair_reuse_component + :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=14.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module allows to bypass the limitation of Odoo, where a component +that was added and removed from a finished product through repair +orders, and built in a finished product using manufacturing order, +before being removed or unbuilt, cannot be used again in a manufacturing +order. + +**Table of contents** + +.. contents:: + :local: + +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 +------- + +* Camptocamp + +Contributors +------------ + +- Akim Juillerat akim.juillerat@camptocamp.com + +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-grindtildeath| image:: https://github.com/grindtildeath.png?size=40px + :target: https://github.com/grindtildeath + :alt: grindtildeath + +Current `maintainer `__: + +|maintainer-grindtildeath| + +This module is part of the `OCA/manufacture `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/mrp_repair_reuse_component/__init__.py b/mrp_repair_reuse_component/__init__.py new file mode 100644 index 000000000..0650744f6 --- /dev/null +++ b/mrp_repair_reuse_component/__init__.py @@ -0,0 +1 @@ +from . import models diff --git a/mrp_repair_reuse_component/__manifest__.py b/mrp_repair_reuse_component/__manifest__.py new file mode 100644 index 000000000..25c31d738 --- /dev/null +++ b/mrp_repair_reuse_component/__manifest__.py @@ -0,0 +1,17 @@ +# Copyright 2024 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +{ + "name": "MRP Repair Reuse Component", + "summary": "Allow to reuse component in manufacturing after removal in repair", + "version": "14.0.1.0.0", + "development_status": "Beta", + "category": "Uncategorized", + "website": "https://github.com/OCA/manufacture", + "author": "Camptocamp, Odoo Community Association (OCA)", + "maintainers": ["grindtildeath"], + "license": "AGPL-3", + "depends": [ + "mrp", + "repair", + ], +} diff --git a/mrp_repair_reuse_component/models/__init__.py b/mrp_repair_reuse_component/models/__init__.py new file mode 100644 index 000000000..9649db77a --- /dev/null +++ b/mrp_repair_reuse_component/models/__init__.py @@ -0,0 +1 @@ +from . import product diff --git a/mrp_repair_reuse_component/models/product.py b/mrp_repair_reuse_component/models/product.py new file mode 100644 index 000000000..38f5c60f8 --- /dev/null +++ b/mrp_repair_reuse_component/models/product.py @@ -0,0 +1,32 @@ +# Copyright 2024 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo import models + + +class Product(models.Model): + _inherit = "product.product" + + def _count_returned_sn_products(self, sn_lot): + """Consider repair lines where: + + - Product was added into another + - Product was removed in a destination that is not internal + """ + res = self.env["repair.line"].search_count( + [ + ("type", "=", "add"), + ("product_uom_qty", "=", 1), + ("lot_id", "=", sn_lot.id), + ("state", "=", "done"), + ("location_dest_id.usage", "=", "production"), + ] + ) - self.env["repair.line"].search_count( + [ + ("type", "=", "remove"), + ("product_uom_qty", "=", 1), + ("lot_id", "=", sn_lot.id), + ("state", "=", "done"), + ("location_dest_id.usage", "!=", "internal"), + ] + ) + return super()._count_returned_sn_products(sn_lot) - res diff --git a/mrp_repair_reuse_component/readme/CONTRIBUTORS.md b/mrp_repair_reuse_component/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..c5b86defe --- /dev/null +++ b/mrp_repair_reuse_component/readme/CONTRIBUTORS.md @@ -0,0 +1 @@ +- Akim Juillerat diff --git a/mrp_repair_reuse_component/readme/DESCRIPTION.md b/mrp_repair_reuse_component/readme/DESCRIPTION.md new file mode 100644 index 000000000..b9542cfef --- /dev/null +++ b/mrp_repair_reuse_component/readme/DESCRIPTION.md @@ -0,0 +1,4 @@ +This module allows to bypass the limitation of Odoo, where a component +that was added and removed from a finished product through repair orders, +and built in a finished product using manufacturing order, before being +removed or unbuilt, cannot be used again in a manufacturing order. diff --git a/mrp_repair_reuse_component/static/description/index.html b/mrp_repair_reuse_component/static/description/index.html new file mode 100644 index 000000000..573fcfce3 --- /dev/null +++ b/mrp_repair_reuse_component/static/description/index.html @@ -0,0 +1,427 @@ + + + + + + +MRP Repair Reuse Component + + + +
+

MRP Repair Reuse Component

+ + +

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

+

This module allows to bypass the limitation of Odoo, where a component +that was added and removed from a finished product through repair +orders, and built in a finished product using manufacturing order, +before being removed or unbuilt, cannot be used again in a manufacturing +order.

+

Table of contents

+ +
+

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

+
    +
  • Camptocamp
    • +
+
+ +
+

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:

+

grindtildeath

+

This module is part of the OCA/manufacture project on GitHub.

+

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

+
+
+
+ + diff --git a/mrp_repair_reuse_component/tests/__init__.py b/mrp_repair_reuse_component/tests/__init__.py new file mode 100644 index 000000000..e69de29bb diff --git a/mrp_repair_reuse_component/tests/test_mrp_repair_reuse_component.py b/mrp_repair_reuse_component/tests/test_mrp_repair_reuse_component.py new file mode 100644 index 000000000..6a8d1aeb2 --- /dev/null +++ b/mrp_repair_reuse_component/tests/test_mrp_repair_reuse_component.py @@ -0,0 +1,226 @@ +# Copyright 2024 Camptocamp SA +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl) +from odoo.tests import Form, tagged + +from odoo.addons.repair.tests.test_repair import TestRepair + + +@tagged("post_install", "-at_install") +class TestMrpRepairReuseComponent(TestRepair): + @classmethod + def setUpClass(cls, chart_template_ref=None): + super().setUpClass(chart_template_ref=chart_template_ref) + cls.stock_location = cls.stock_warehouse.lot_stock_id + cls.scrap_location = cls.env["stock.location"].search( + [ + ("scrap_location", "=", True), + ("company_id", "=", cls.stock_location.company_id.id), + ] + ) + cls.component_serial = cls.env["product.product"].create( + {"name": "Comp serial", "tracking": "serial"} + ) + cls.finished_serial = cls.env["product.product"].create( + {"name": "Finished serial", "tracking": "serial"} + ) + cls.bom = cls.env["mrp.bom"].create( + { + "product_tmpl_id": cls.finished_serial.product_tmpl_id.id, + "type": "normal", + "bom_line_ids": [ + (0, 0, {"product_id": cls.component_serial.id, "product_qty": 1}), + ], + } + ) + cls.finished_serial_1 = cls._create_serial(cls.finished_serial, "SN0001") + cls.finished_serial_2 = cls._create_serial(cls.finished_serial, "SN0002") + cls.finished_serial_3 = cls._create_serial(cls.finished_serial, "SN0003") + cls.finished_serial_4 = cls._create_serial(cls.finished_serial, "SN0004") + cls.finished_serial_5 = cls._create_serial(cls.finished_serial, "SN0005") + cls.component_serial_1 = cls._create_serial(cls.component_serial, "SN0001") + cls.component_serial_2 = cls._create_serial(cls.component_serial, "SN0002") + cls.component_serial_3 = cls._create_serial(cls.component_serial, "SN0003") + cls.component_serial_4 = cls._create_serial(cls.component_serial, "SN0004") + cls.component_serial_5 = cls._create_serial(cls.component_serial, "SN0005") + cls.component_serial_6 = cls._create_serial(cls.component_serial, "SN0006") + + @classmethod + def _create_serial(cls, product, serial_no): + return cls.env["stock.production.lot"].create( + {"name": serial_no, "product_id": product.id} + ) + + @classmethod + def _produce_finished(cls, finished_serial, component_serial): + mo_form = Form(cls.env["mrp.production"]) + mo_form.product_id = cls.finished_serial + mo = mo_form.save() + mo.action_confirm() + mo_form = Form(mo) + mo_form.lot_producing_id = finished_serial + mo_form.save() + details_operation_form = Form( + mo.move_raw_ids, view=cls.env.ref("stock.view_stock_move_operations") + ) + with details_operation_form.move_line_ids.edit(0) as move_line_form: + move_line_form.lot_id = component_serial + move_line_form.qty_done = 1 + details_operation_form.save() + mo.button_mark_done() + return mo + + @classmethod + def _repair_switch_component( + cls, repair_serial, remove_component_serial, add_component_serial, scrap=True + ): + repair_form = Form(cls.env["repair.order"]) + repair_form.product_id = cls.finished_serial + repair_form.lot_id = repair_serial + with repair_form.operations.new() as repair_line: + repair_line.type = "add" + repair_line.product_id = cls.component_serial + repair_line.lot_id = add_component_serial + repair_line.product_uom_qty = 1 + with repair_form.operations.new() as repair_line: + repair_line.type = "remove" + repair_line.product_id = cls.component_serial + repair_line.lot_id = remove_component_serial + repair_line.product_uom_qty = 1 + if not scrap: + repair_line.location_dest_id = cls.stock_location + repair = repair_form.save() + repair.action_validate() + repair.action_repair_start() + repair.action_repair_end() + return repair + + @classmethod + def _move_product(cls, product, location, location_dest, lot): + move_form = Form(cls.env["stock.move"]) + move_form.name = "Move product" + move_form.product_id = product + move_form.location_id = location + move_form.location_dest_id = location_dest + move_form.product_uom = product.uom_id + move_form.product_uom_qty = 1.0 + move = move_form.save() + move._action_confirm() + move_form = Form(move, view=cls.env.ref("stock.view_stock_move_operations")) + with move_form.move_line_ids.new() as move_line_form: + move_line_form.lot_id = lot + move_line_form.qty_done = 1.0 + move_form.save() + move._action_done() + return move + + @classmethod + def _unbuild_product(cls, original_mo, finished_serial): + unbuild_form = Form(cls.env["mrp.unbuild"]) + unbuild_form.product_id = cls.finished_serial + unbuild_form.lot_id = finished_serial + unbuild_form.mo_id = original_mo + unbuild_order = unbuild_form.save() + unbuild_order.action_unbuild() + return unbuild_order + + def test_reuse_component_repair_with_scrap(self): + # Create Finished 0001 with Component 0001 + self._produce_finished(self.finished_serial_1, self.component_serial_1) + # Create Finished 0002 with Component 0002 + self._produce_finished(self.finished_serial_2, self.component_serial_2) + # Create Finished 0003 with Component 0003 + self._produce_finished(self.finished_serial_3, self.component_serial_3) + # Repair Finished 0001, removing Component 0001 and adding Component 0004 + self._repair_switch_component( + self.finished_serial_1, self.component_serial_1, self.component_serial_4 + ) + # Move Component 0001 from scrap back to stock + self._move_product( + self.component_serial, + self.scrap_location, + self.stock_location, + self.component_serial_1, + ) + # Repair Finished 0002, removing Component 0002 and adding (reuse) Component 0001 + self._repair_switch_component( + self.finished_serial_2, + self.component_serial_2, + self.component_serial_1, + scrap=False, + ) + # Repair Finished 0002, removing Component 0001 and adding Component 0005 + self._repair_switch_component( + self.finished_serial_2, + self.component_serial_1, + self.component_serial_5, + scrap=False, + ) + # Repair Finished 0003, removing Component 0003 and adding (reuse) Component 0001 + self._repair_switch_component( + self.finished_serial_3, + self.component_serial_3, + self.component_serial_1, + scrap=False, + ) + # Repair Finished 0003, removing Component 0001 and adding Component 0006 + self._repair_switch_component( + self.finished_serial_3, + self.component_serial_1, + self.component_serial_6, + scrap=False, + ) + # Create Finished 0004 with Component 0001 (reuse) + mo_4 = self._produce_finished(self.finished_serial_4, self.component_serial_1) + # Unbuild Finished 0004 + self._unbuild_product(mo_4, self.finished_serial_4) + # Create Finished 0005 with Component 0001 (reuse) + self._produce_finished(self.finished_serial_5, self.component_serial_1) + + def test_reuse_component_repair_without_scrap(self): + # Create Finished 0001 with Component 0001 + self._produce_finished(self.finished_serial_1, self.component_serial_1) + # Create Finished 0002 with Component 0002 + self._produce_finished(self.finished_serial_2, self.component_serial_2) + # Create Finished 0003 with Component 0003 + self._produce_finished(self.finished_serial_3, self.component_serial_3) + # Repair Finished 0001, removing Component 0001 and adding Component 0004 + self._repair_switch_component( + self.finished_serial_1, + self.component_serial_1, + self.component_serial_4, + scrap=False, + ) + # Repair Finished 0002, removing Component 0002 and adding (reuse) Component 0001 + self._repair_switch_component( + self.finished_serial_2, + self.component_serial_2, + self.component_serial_1, + scrap=False, + ) + # Repair Finished 0002, removing Component 0001 and adding Component 0005 + self._repair_switch_component( + self.finished_serial_2, + self.component_serial_1, + self.component_serial_5, + scrap=False, + ) + # Repair Finished 0003, removing Component 0003 and adding (reuse) Component 0001 + self._repair_switch_component( + self.finished_serial_3, + self.component_serial_3, + self.component_serial_1, + scrap=False, + ) + # Repair Finished 0003, removing Component 0001 and adding Component 0006 + self._repair_switch_component( + self.finished_serial_3, + self.component_serial_1, + self.component_serial_6, + scrap=False, + ) + # Create Finished 0004 with Component 0001 (reuse) + mo_4 = self._produce_finished(self.finished_serial_4, self.component_serial_1) + # Unbuild Finished 0004 + self._unbuild_product(mo_4, self.finished_serial_4) + # Create Finished 0005 with Component 0001 (reuse) + self._produce_finished(self.finished_serial_5, self.component_serial_1) diff --git a/setup/mrp_repair_reuse_component/odoo/addons/mrp_repair_reuse_component b/setup/mrp_repair_reuse_component/odoo/addons/mrp_repair_reuse_component new file mode 120000 index 000000000..59855062e --- /dev/null +++ b/setup/mrp_repair_reuse_component/odoo/addons/mrp_repair_reuse_component @@ -0,0 +1 @@ +../../../../mrp_repair_reuse_component \ No newline at end of file diff --git a/setup/mrp_repair_reuse_component/setup.py b/setup/mrp_repair_reuse_component/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/mrp_repair_reuse_component/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +)