From f270f586e918d4c8db8cc7e7f534cb9ead347598 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 22 Aug 2024 14:50:29 +0200 Subject: [PATCH 1/3] [ADD] add rma_lot --- rma_lot/README.rst | 93 ++++ rma_lot/__init__.py | 2 + rma_lot/__manifest__.py | 15 + rma_lot/models/__init__.py | 1 + rma_lot/models/rma.py | 22 + rma_lot/readme/CONTRIBUTORS.md | 2 + rma_lot/readme/DESCRIPTION.md | 15 + rma_lot/static/description/icon.png | Bin 0 -> 9455 bytes rma_lot/static/description/index.html | 435 +++++++++++++++++++ rma_lot/tests/__init__.py | 1 + rma_lot/tests/test_rma_lot.py | 95 ++++ rma_lot/views/rma.xml | 41 ++ rma_lot/wizards/__init__.py | 1 + rma_lot/wizards/stock_return_picking_line.py | 14 + setup/rma_lot/odoo/addons/rma_lot | 1 + setup/rma_lot/setup.py | 6 + 16 files changed, 744 insertions(+) create mode 100644 rma_lot/README.rst create mode 100644 rma_lot/__init__.py create mode 100644 rma_lot/__manifest__.py create mode 100644 rma_lot/models/__init__.py create mode 100644 rma_lot/models/rma.py create mode 100644 rma_lot/readme/CONTRIBUTORS.md create mode 100644 rma_lot/readme/DESCRIPTION.md create mode 100644 rma_lot/static/description/icon.png create mode 100644 rma_lot/static/description/index.html create mode 100644 rma_lot/tests/__init__.py create mode 100644 rma_lot/tests/test_rma_lot.py create mode 100644 rma_lot/views/rma.xml create mode 100644 rma_lot/wizards/__init__.py create mode 100644 rma_lot/wizards/stock_return_picking_line.py create mode 120000 setup/rma_lot/odoo/addons/rma_lot create mode 100644 setup/rma_lot/setup.py diff --git a/rma_lot/README.rst b/rma_lot/README.rst new file mode 100644 index 000000000..d473ba7c1 --- /dev/null +++ b/rma_lot/README.rst @@ -0,0 +1,93 @@ +======= +Rma Lot +======= + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:179ae979736d64a8afa520769acb7d060690a304e812587c70bf43b4542d2ea6 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Frma-lightgray.png?logo=github + :target: https://github.com/OCA/rma/tree/16.0/rma_lot + :alt: OCA/rma +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma_lot + :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/rma&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +Tracking returned products by lot or serial number is crucial for +businesses that require precise monitoring, especially in industries +where quality control, compliance, and inventory accuracy are critical. +By enabling returns to be tracked by lot or serial numbers, this module +ensures that each returned item is handled correctly, reducing the risk +of errors, fraud, or compliance issues. + +This level of detail is essential for maintaining the integrity of +inventory records, meeting regulatory requirements, and providing +excellent customer service. + +The module extends the existing RMA functionality by adding a lot field +to the RMA model, allowing users to associate returns with specific lot +or serial numbers. This enhancement enforces stricter controls over +return processes, ensuring that only the correct items are accepted +during a return and that inventory records remain accurate. + +**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 +------- + +* ACSONE SA/NV +* BCIM + +Contributors +------------ + +- Jacques-Etienne Baudoux - BCIM je@bcim.be +- Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu + +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. + +This module is part of the `OCA/rma `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/rma_lot/__init__.py b/rma_lot/__init__.py new file mode 100644 index 000000000..aee8895e7 --- /dev/null +++ b/rma_lot/__init__.py @@ -0,0 +1,2 @@ +from . import models +from . import wizards diff --git a/rma_lot/__manifest__.py b/rma_lot/__manifest__.py new file mode 100644 index 000000000..55c32a6fd --- /dev/null +++ b/rma_lot/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Rma Lot", + "summary": """ + Manage lot in RMA""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,BCIM,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/rma", + "depends": ["rma", "stock_picking_return_lot"], + "data": ["views/rma.xml"], + "demo": [], +} diff --git a/rma_lot/models/__init__.py b/rma_lot/models/__init__.py new file mode 100644 index 000000000..0031f431f --- /dev/null +++ b/rma_lot/models/__init__.py @@ -0,0 +1 @@ +from . import rma diff --git a/rma_lot/models/rma.py b/rma_lot/models/rma.py new file mode 100644 index 000000000..faa7d7cb4 --- /dev/null +++ b/rma_lot/models/rma.py @@ -0,0 +1,22 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class Rma(models.Model): + + _inherit = "rma" + + lot_id = fields.Many2one(comodel_name="stock.lot", string="Lot/Serial Number") + lots_visible = fields.Boolean(compute="_compute_lots_visible") + + @api.depends("product_id.tracking") + def _compute_lots_visible(self): + for rec in self: + rec.lots_visible = rec.product_id.tracking != "none" + + def _prepare_reception_procurement_vals(self, group=None): + vals = super()._prepare_reception_procurement_vals(group=group) + vals["restrict_lot_id"] = self.lot_id.id + return vals diff --git a/rma_lot/readme/CONTRIBUTORS.md b/rma_lot/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..0d74d13b4 --- /dev/null +++ b/rma_lot/readme/CONTRIBUTORS.md @@ -0,0 +1,2 @@ +- Jacques-Etienne Baudoux - BCIM +- Souheil Bejaoui - ACSONE SA/NV \ No newline at end of file diff --git a/rma_lot/readme/DESCRIPTION.md b/rma_lot/readme/DESCRIPTION.md new file mode 100644 index 000000000..637ea4605 --- /dev/null +++ b/rma_lot/readme/DESCRIPTION.md @@ -0,0 +1,15 @@ +Tracking returned products by lot or serial number is crucial for businesses +that require precise monitoring, especially in industries where quality control, +compliance, and inventory accuracy are critical. +By enabling returns to be tracked by lot or serial numbers, this module ensures +that each returned item is handled correctly, reducing the risk of errors, +fraud, or compliance issues. + +This level of detail is essential for maintaining the integrity of inventory +records, meeting regulatory requirements, and providing excellent customer service. + +The module extends the existing RMA functionality by adding a lot field to the +RMA model, allowing users to associate returns with specific lot or serial numbers. +This enhancement enforces stricter controls over return processes, +ensuring that only the correct items are accepted during a return and that +inventory records remain accurate. diff --git a/rma_lot/static/description/icon.png b/rma_lot/static/description/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..3a0328b516c4980e8e44cdb63fd945757ddd132d GIT binary patch literal 9455 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 z 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 Xviia!U7SGha1wx#SCgwmn*{w2TRX*I literal 0 HcmV?d00001 diff --git a/rma_lot/static/description/index.html b/rma_lot/static/description/index.html new file mode 100644 index 000000000..78f04070d --- /dev/null +++ b/rma_lot/static/description/index.html @@ -0,0 +1,435 @@ + + + + + +Rma Lot + + + +
+

Rma Lot

+ + +

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

+

Tracking returned products by lot or serial number is crucial for +businesses that require precise monitoring, especially in industries +where quality control, compliance, and inventory accuracy are critical. +By enabling returns to be tracked by lot or serial numbers, this module +ensures that each returned item is handled correctly, reducing the risk +of errors, fraud, or compliance issues.

+

This level of detail is essential for maintaining the integrity of +inventory records, meeting regulatory requirements, and providing +excellent customer service.

+

The module extends the existing RMA functionality by adding a lot field +to the RMA model, allowing users to associate returns with specific lot +or serial numbers. This enhancement enforces stricter controls over +return processes, ensuring that only the correct items are accepted +during a return and that inventory records remain accurate.

+

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

+
    +
  • ACSONE SA/NV
    • +
  • BCIM
    • +
+
+
+

Contributors

+ +
+
+

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.

+

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

+

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

+
+
+
+ + diff --git a/rma_lot/tests/__init__.py b/rma_lot/tests/__init__.py new file mode 100644 index 000000000..25cf26216 --- /dev/null +++ b/rma_lot/tests/__init__.py @@ -0,0 +1 @@ +from . import test_rma_lot diff --git a/rma_lot/tests/test_rma_lot.py b/rma_lot/tests/test_rma_lot.py new file mode 100644 index 000000000..5cd033e8a --- /dev/null +++ b/rma_lot/tests/test_rma_lot.py @@ -0,0 +1,95 @@ +# Copyright 2020 Iryna Vyshnevska Camptocamp +# License AGPL-3.0 or later (http://www.gnu.org/licenses/agpl.html). + +from odoo import Command +from odoo.tests.common import Form, TransactionCase + + +class TestRMALot(TransactionCase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.picking_obj = cls.env["stock.picking"] + partner = cls.env["res.partner"].create({"name": "Test"}) + cls.product = cls.env["product.product"].create( + {"name": "test_product", "type": "product", "tracking": "lot"} + ) + cls.lot_1 = cls.env["stock.lot"].create( + {"name": "000001", "product_id": cls.product.id} + ) + cls.lot_2 = cls.env["stock.lot"].create( + {"name": "000002", "product_id": cls.product.id} + ) + picking_type_out = cls.env.ref("stock.picking_type_out") + stock_location = cls.env.ref("stock.stock_location_stock") + customer_location = cls.env.ref("stock.stock_location_customers") + cls.env["stock.quant"]._update_available_quantity( + cls.product, stock_location, 1, lot_id=cls.lot_1 + ) + cls.env["stock.quant"]._update_available_quantity( + cls.product, stock_location, 2, lot_id=cls.lot_2 + ) + cls.picking = cls.picking_obj.create( + { + "partner_id": partner.id, + "picking_type_id": picking_type_out.id, + "location_id": stock_location.id, + "location_dest_id": customer_location.id, + "move_ids": [ + Command.create( + { + "name": cls.product.name, + "product_id": cls.product.id, + "product_uom_qty": 3, + "product_uom": cls.product.uom_id.id, + "location_id": stock_location.id, + "location_dest_id": customer_location.id, + }, + ) + ], + } + ) + cls.picking.action_confirm() + cls.picking.action_assign() + cls.picking.action_set_quantities_to_reservation() + cls.picking._action_done() + cls.operation = cls.env.ref("rma.rma_operation_replace") + + @classmethod + def create_return_wiz(cls): + return ( + cls.env["stock.return.picking"] + .with_context(active_id=cls.picking.id, active_model="stock.picking") + .create({"create_rma": True}) + ) + + def test_00(self): + """ + Check the process of creating RMAs when returning products tracked by lot + - The correct number of RMAs is created + - The RMAs are correctly associated with the lot + """ + stock_return_picking_form = Form( + self.env["stock.return.picking"].with_context( + active_ids=self.picking.ids, + active_id=self.picking.id, + active_model="stock.picking", + ) + ) + stock_return_picking_form.create_rma = True + stock_return_picking_form.rma_operation_id = self.operation + return_wizard = stock_return_picking_form.save() + self.assertEqual(len(return_wizard.product_return_moves), 2) + return_wizard.create_returns() + self.assertEqual(self.picking.rma_count, 2) + rmas = self.picking.move_ids.rma_ids + rma_lot_1 = rmas.filtered(lambda r, lot=self.lot_1: r.lot_id == lot) + rma_lot_2 = rmas.filtered(lambda r, lot=self.lot_2: r.lot_id == lot) + self.assertTrue(rma_lot_1) + self.assertEqual(rma_lot_1.reception_move_id.restrict_lot_id, self.lot_1) + self.assertEqual(rma_lot_1.reception_move_id.state, "assigned") + self.assertEqual(rma_lot_1.reception_move_id.move_line_ids.lot_id, self.lot_1) + self.assertTrue(rma_lot_2) + self.assertEqual(rma_lot_2.reception_move_id.restrict_lot_id, self.lot_2) + self.assertEqual(rma_lot_2.reception_move_id.state, "assigned") + self.assertEqual(rma_lot_2.reception_move_id.move_line_ids.lot_id, self.lot_2) diff --git a/rma_lot/views/rma.xml b/rma_lot/views/rma.xml new file mode 100644 index 000000000..45dbfaeac --- /dev/null +++ b/rma_lot/views/rma.xml @@ -0,0 +1,41 @@ + + + + + + rma + + + + + + + + + + + rma + + + + + + + + + + rma + + + + + + + + + diff --git a/rma_lot/wizards/__init__.py b/rma_lot/wizards/__init__.py new file mode 100644 index 000000000..2ed06ea13 --- /dev/null +++ b/rma_lot/wizards/__init__.py @@ -0,0 +1 @@ +from . import stock_return_picking_line diff --git a/rma_lot/wizards/stock_return_picking_line.py b/rma_lot/wizards/stock_return_picking_line.py new file mode 100644 index 000000000..f96353b87 --- /dev/null +++ b/rma_lot/wizards/stock_return_picking_line.py @@ -0,0 +1,14 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class StockReturnPickingLine(models.TransientModel): + + _inherit = "stock.return.picking.line" + + def _prepare_rma_vals(self): + vals = super()._prepare_rma_vals() + vals.update({"lot_id": self.lot_id.id}) + return vals diff --git a/setup/rma_lot/odoo/addons/rma_lot b/setup/rma_lot/odoo/addons/rma_lot new file mode 120000 index 000000000..d1c73ea9f --- /dev/null +++ b/setup/rma_lot/odoo/addons/rma_lot @@ -0,0 +1 @@ +../../../../rma_lot \ No newline at end of file diff --git a/setup/rma_lot/setup.py b/setup/rma_lot/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/rma_lot/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From c44de133e24f12a8a840c69688a67fa7d1be4e89 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Tue, 27 Aug 2024 15:32:07 +0200 Subject: [PATCH 2/3] [ADD] add rma_sale_lot --- rma_sale_lot/README.rst | 84 ++++ rma_sale_lot/__init__.py | 2 + rma_sale_lot/__manifest__.py | 15 + rma_sale_lot/models/__init__.py | 2 + rma_sale_lot/models/sale_order.py | 14 + rma_sale_lot/models/sale_order_line.py | 75 +++ rma_sale_lot/readme/CONTRIBUTORS.md | 2 + rma_sale_lot/readme/DESCRIPTION.md | 7 + rma_sale_lot/static/description/icon.png | 0 rma_sale_lot/static/description/index.html | 427 ++++++++++++++++++ rma_sale_lot/tests/__init__.py | 1 + rma_sale_lot/tests/test_rma_sale_lot.py | 66 +++ rma_sale_lot/wizards/__init__.py | 2 + .../wizards/sale_order_line_rma_wizard.py | 23 + rma_sale_lot/wizards/sale_order_rma_wizard.py | 9 + .../wizards/sale_order_rma_wizard.xml | 23 + setup/rma_sale_lot/odoo/addons/rma_sale_lot | 1 + setup/rma_sale_lot/setup.py | 6 + 18 files changed, 759 insertions(+) create mode 100644 rma_sale_lot/README.rst create mode 100644 rma_sale_lot/__init__.py create mode 100644 rma_sale_lot/__manifest__.py create mode 100644 rma_sale_lot/models/__init__.py create mode 100644 rma_sale_lot/models/sale_order.py create mode 100644 rma_sale_lot/models/sale_order_line.py create mode 100644 rma_sale_lot/readme/CONTRIBUTORS.md create mode 100644 rma_sale_lot/readme/DESCRIPTION.md create mode 100644 rma_sale_lot/static/description/icon.png create mode 100644 rma_sale_lot/static/description/index.html create mode 100644 rma_sale_lot/tests/__init__.py create mode 100644 rma_sale_lot/tests/test_rma_sale_lot.py create mode 100644 rma_sale_lot/wizards/__init__.py create mode 100644 rma_sale_lot/wizards/sale_order_line_rma_wizard.py create mode 100644 rma_sale_lot/wizards/sale_order_rma_wizard.py create mode 100644 rma_sale_lot/wizards/sale_order_rma_wizard.xml create mode 120000 setup/rma_sale_lot/odoo/addons/rma_sale_lot create mode 100644 setup/rma_sale_lot/setup.py diff --git a/rma_sale_lot/README.rst b/rma_sale_lot/README.rst new file mode 100644 index 000000000..bac91c966 --- /dev/null +++ b/rma_sale_lot/README.rst @@ -0,0 +1,84 @@ +============ +Rma Sale Lot +============ + +.. + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! This file is generated by oca-gen-addon-readme !! + !! changes will be overwritten. !! + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + !! source digest: sha256:b78509745350922121af05dc007a0cbd04294051b18538e0e52ba5ce0eb984c4 + !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! + +.. |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%2Frma-lightgray.png?logo=github + :target: https://github.com/OCA/rma/tree/16.0/rma_sale_lot + :alt: OCA/rma +.. |badge4| image:: https://img.shields.io/badge/weblate-Translate%20me-F47D42.png + :target: https://translation.odoo-community.org/projects/rma-16-0/rma-16-0-rma_sale_lot + :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/rma&target_branch=16.0 + :alt: Try me on Runboat + +|badge1| |badge2| |badge3| |badge4| |badge5| + +This module extends the rma_lot module by integrating lot tracking into +the return wizard in the sales orders. It assists salespeople in +accurately recording returns by ensuring that customers are returning +the correct lot that was originally delivered. + +This enhancement improves both tracking and inventory accuracy, leading +to more efficient and reliable return processing. + +**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 +------- + +* ACSONE SA/NV +* BCIM + +Contributors +------------ + +- Jacques-Etienne Baudoux - BCIM je@bcim.be +- Souheil Bejaoui - ACSONE SA/NV souheil.bejaoui@acsone.eu + +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. + +This module is part of the `OCA/rma `_ project on GitHub. + +You are welcome to contribute. To learn how please visit https://odoo-community.org/page/Contribute. diff --git a/rma_sale_lot/__init__.py b/rma_sale_lot/__init__.py new file mode 100644 index 000000000..976591c99 --- /dev/null +++ b/rma_sale_lot/__init__.py @@ -0,0 +1,2 @@ +from . import wizards +from . import models diff --git a/rma_sale_lot/__manifest__.py b/rma_sale_lot/__manifest__.py new file mode 100644 index 000000000..6025d231d --- /dev/null +++ b/rma_sale_lot/__manifest__.py @@ -0,0 +1,15 @@ +# Copyright 2024 ACSONE SA/NV,BCIM +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +{ + "name": "Rma Sale Lot", + "summary": """ + Manage sale returns with lot.""", + "version": "16.0.1.0.0", + "license": "AGPL-3", + "author": "ACSONE SA/NV,BCIM,Odoo Community Association (OCA)", + "website": "https://github.com/OCA/rma", + "depends": ["rma_lot", "rma_sale"], + "data": ["wizards/sale_order_rma_wizard.xml"], + "demo": [], +} diff --git a/rma_sale_lot/models/__init__.py b/rma_sale_lot/models/__init__.py new file mode 100644 index 000000000..e7e9273fc --- /dev/null +++ b/rma_sale_lot/models/__init__.py @@ -0,0 +1,2 @@ +from . import sale_order_line +from . import sale_order diff --git a/rma_sale_lot/models/sale_order.py b/rma_sale_lot/models/sale_order.py new file mode 100644 index 000000000..a117d1036 --- /dev/null +++ b/rma_sale_lot/models/sale_order.py @@ -0,0 +1,14 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class SaleOrder(models.Model): + + _inherit = "sale.order" + + def _prepare_rma_wizard_line_vals(self, data): + vals = super()._prepare_rma_wizard_line_vals(data) + vals["lot_id"] = data.get("lot_id") + return vals diff --git a/rma_sale_lot/models/sale_order_line.py b/rma_sale_lot/models/sale_order_line.py new file mode 100644 index 000000000..c6f9a55b7 --- /dev/null +++ b/rma_sale_lot/models/sale_order_line.py @@ -0,0 +1,75 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from collections import defaultdict + +from odoo import models +from odoo.tools.float_utils import float_round + + +class SaleOrderLine(models.Model): + + _inherit = "sale.order.line" + + def _get_qty_done_by_product_lot(self, moves): + res = defaultdict(float) + for group in self.env["stock.move.line"].read_group( + [ + ("move_id", "in", moves.ids), + ("state", "=", "done"), + ("move_id.scrapped", "=", False), + ], + ["qty_done:sum"], + ["product_id", "lot_id"], + lazy=False, + ): + lot_id = group.get("lot_id")[0] if group.get("lot_id") else False + product_id = group.get("product_id")[0] + qty_done = group.get("qty_done") + res[(product_id, lot_id)] += qty_done + return res + + def prepare_sale_rma_data(self): + self.ensure_one() + if self.product_id.type not in ["product", "consu"]: + return {} + if not self.product_id.tracking or self.product_id.tracking == "none": + return super().prepare_sale_rma_data() + moves = self.get_delivery_move() + data = [] + qty_done_by_product_lot = self._get_qty_done_by_product_lot(moves) + for (product_id, lot_id), qty_done in qty_done_by_product_lot.items(): + data.append( + self._prepare_sale_rma_data_line(moves, product_id, lot_id, qty_done) + ) + return data + + def _prepare_sale_rma_data_line(self, moves, product_id, lot_id, qty_done): + moves = moves.move_line_ids.filtered( + lambda ml, p_id=product_id, l_id=lot_id: ml.product_id.id == p_id + and ml.lot_id.id == l_id + ).move_id + quantity = qty_done + for returned_move in moves.returned_move_ids.filtered( + lambda r: r.state in ["partially_available", "assigned", "done"] + ): + if ( + returned_move.restrict_lot_id + and returned_move.restrict_lot_id.id == lot_id + or not lot_id + ): + if returned_move.state in ("partially_available", "assigned"): + quantity -= sum(returned_move.move_line_ids.mapped("reserved_qty")) + elif returned_move.state == "done": + quantity -= returned_move.product_qty + quantity = float_round( + quantity, precision_rounding=moves.product_id.uom_id.rounding + ) + return { + "product": moves.product_id, + "quantity": quantity, + "uom": moves.product_uom, + "picking": moves.picking_id[0], + "sale_line_id": self, + "lot_id": lot_id, + } diff --git a/rma_sale_lot/readme/CONTRIBUTORS.md b/rma_sale_lot/readme/CONTRIBUTORS.md new file mode 100644 index 000000000..0d74d13b4 --- /dev/null +++ b/rma_sale_lot/readme/CONTRIBUTORS.md @@ -0,0 +1,2 @@ +- Jacques-Etienne Baudoux - BCIM +- Souheil Bejaoui - ACSONE SA/NV \ No newline at end of file diff --git a/rma_sale_lot/readme/DESCRIPTION.md b/rma_sale_lot/readme/DESCRIPTION.md new file mode 100644 index 000000000..fc2a778bb --- /dev/null +++ b/rma_sale_lot/readme/DESCRIPTION.md @@ -0,0 +1,7 @@ +This module extends the rma_lot module by integrating lot tracking into the +return wizard in the sales orders. It assists salespeople in accurately +recording returns by ensuring that customers are returning the correct lot that +was originally delivered. + +This enhancement improves both tracking and inventory accuracy, leading to +more efficient and reliable return processing. diff --git a/rma_sale_lot/static/description/icon.png b/rma_sale_lot/static/description/icon.png new file mode 100644 index 000000000..e69de29bb diff --git a/rma_sale_lot/static/description/index.html b/rma_sale_lot/static/description/index.html new file mode 100644 index 000000000..f6162af29 --- /dev/null +++ b/rma_sale_lot/static/description/index.html @@ -0,0 +1,427 @@ + + + + + +Rma Sale Lot + + + +
+

Rma Sale Lot

+ + +

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

+

This module extends the rma_lot module by integrating lot tracking into +the return wizard in the sales orders. It assists salespeople in +accurately recording returns by ensuring that customers are returning +the correct lot that was originally delivered.

+

This enhancement improves both tracking and inventory accuracy, leading +to more efficient and reliable return processing.

+

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

+
    +
  • ACSONE SA/NV
    • +
  • BCIM
    • +
+
+
+

Contributors

+ +
+
+

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.

+

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

+

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

+
+
+
+ + diff --git a/rma_sale_lot/tests/__init__.py b/rma_sale_lot/tests/__init__.py new file mode 100644 index 000000000..c65ce3d57 --- /dev/null +++ b/rma_sale_lot/tests/__init__.py @@ -0,0 +1 @@ +from . import test_rma_sale_lot diff --git a/rma_sale_lot/tests/test_rma_sale_lot.py b/rma_sale_lot/tests/test_rma_sale_lot.py new file mode 100644 index 000000000..31e0d954f --- /dev/null +++ b/rma_sale_lot/tests/test_rma_sale_lot.py @@ -0,0 +1,66 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo.addons.rma_sale.tests.test_rma_sale import TestRmaSaleBase + + +class TestRmaSaleLot(TestRmaSaleBase): + @classmethod + def setUpClass(cls): + super().setUpClass() + cls.product = cls.env["product.product"].create( + {"name": "test_product", "type": "product", "tracking": "lot"} + ) + cls.lot_1 = cls.env["stock.lot"].create( + {"name": "000001", "product_id": cls.product.id} + ) + cls.lot_2 = cls.env["stock.lot"].create( + {"name": "000002", "product_id": cls.product.id} + ) + stock_location = cls.env.ref("stock.stock_location_stock") + cls.env["stock.quant"]._update_available_quantity( + cls.product, stock_location, 1, lot_id=cls.lot_1 + ) + cls.env["stock.quant"]._update_available_quantity( + cls.product, stock_location, 2, lot_id=cls.lot_2 + ) + cls.sale_order = cls._create_sale_order(cls, [[cls.product, 3]]) + cls.sale_order.action_confirm() + cls.order_line = cls.sale_order.order_line + cls.order_out_picking = cls.sale_order.picking_ids + cls.order_out_picking.action_set_quantities_to_reservation() + cls.order_out_picking._action_done() + cls.operation = cls.env.ref("rma.rma_operation_replace") + + def test_partial_return(self): + wizard = self._rma_sale_wizard(self.sale_order) + line_1 = wizard.line_ids.filtered( + lambda line, lot=self.lot_1: line.lot_id == lot + ) + line_2 = wizard.line_ids.filtered( + lambda line, lot=self.lot_2: line.lot_id == lot + ) + self.assertEqual(line_1.quantity, 1) + self.assertEqual(line_2.quantity, 2) + line_2.quantity = 1 + rma = self.env["rma"].search(wizard.create_and_open_rma()["domain"]) + rma_1 = rma.filtered(lambda r, lot=self.lot_1: r.lot_id == lot) + rma_2 = rma.filtered(lambda r, lot=self.lot_2: r.lot_id == lot) + self.assertEqual(rma_1.reception_move_id.restrict_lot_id, self.lot_1) + self.assertEqual(rma_2.reception_move_id.restrict_lot_id, self.lot_2) + self.assertEqual(rma_2.product_uom_qty, 1) + + def test_full_return_after_partial_return(self): + self.test_partial_return() + wizard = self._rma_sale_wizard(self.sale_order) + line_1 = wizard.line_ids.filtered( + lambda line, lot=self.lot_1: line.lot_id == lot + ) + line_2 = wizard.line_ids.filtered( + lambda line, lot=self.lot_2: line.lot_id == lot + ) + self.assertEqual(line_1.quantity, 0) + self.assertEqual(line_2.quantity, 1) + rma_2 = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"]) + self.assertEqual(rma_2.reception_move_id.restrict_lot_id, self.lot_2) + self.assertEqual(rma_2.product_uom_qty, 1) diff --git a/rma_sale_lot/wizards/__init__.py b/rma_sale_lot/wizards/__init__.py new file mode 100644 index 000000000..dca5a8b16 --- /dev/null +++ b/rma_sale_lot/wizards/__init__.py @@ -0,0 +1,2 @@ +from . import sale_order_rma_wizard +from . import sale_order_line_rma_wizard diff --git a/rma_sale_lot/wizards/sale_order_line_rma_wizard.py b/rma_sale_lot/wizards/sale_order_line_rma_wizard.py new file mode 100644 index 000000000..ff50d2e08 --- /dev/null +++ b/rma_sale_lot/wizards/sale_order_line_rma_wizard.py @@ -0,0 +1,23 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import api, fields, models + + +class SaleOrderLineRmaWizard(models.TransientModel): + + _inherit = "sale.order.line.rma.wizard" + + lot_id = fields.Many2one(comodel_name="stock.lot", string="Lot/Serial Number") + lots_visible = fields.Boolean(compute="_compute_lots_visible") + + @api.depends("product_id.tracking") + def _compute_lots_visible(self): + for rec in self: + rec.lots_visible = rec.product_id.tracking != "none" + + def _prepare_rma_values(self): + self.ensure_one() + values = super()._prepare_rma_values() + values["lot_id"] = self.lot_id.id + return values diff --git a/rma_sale_lot/wizards/sale_order_rma_wizard.py b/rma_sale_lot/wizards/sale_order_rma_wizard.py new file mode 100644 index 000000000..bdbf914ef --- /dev/null +++ b/rma_sale_lot/wizards/sale_order_rma_wizard.py @@ -0,0 +1,9 @@ +# Copyright 2024 ACSONE SA/NV +# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). + +from odoo import models + + +class SaleOrderRmaWizard(models.TransientModel): + + _inherit = "sale.order.rma.wizard" diff --git a/rma_sale_lot/wizards/sale_order_rma_wizard.xml b/rma_sale_lot/wizards/sale_order_rma_wizard.xml new file mode 100644 index 000000000..4a45e331f --- /dev/null +++ b/rma_sale_lot/wizards/sale_order_rma_wizard.xml @@ -0,0 +1,23 @@ + + + + + + sale.order.rma.wizard + + + + + + + + + + + + diff --git a/setup/rma_sale_lot/odoo/addons/rma_sale_lot b/setup/rma_sale_lot/odoo/addons/rma_sale_lot new file mode 120000 index 000000000..682ac8117 --- /dev/null +++ b/setup/rma_sale_lot/odoo/addons/rma_sale_lot @@ -0,0 +1 @@ +../../../../rma_sale_lot \ No newline at end of file diff --git a/setup/rma_sale_lot/setup.py b/setup/rma_sale_lot/setup.py new file mode 100644 index 000000000..28c57bb64 --- /dev/null +++ b/setup/rma_sale_lot/setup.py @@ -0,0 +1,6 @@ +import setuptools + +setuptools.setup( + setup_requires=['setuptools-odoo'], + odoo_addon=True, +) From 3a71bc9ec459ca4eff10322721c00d5238f2c3f0 Mon Sep 17 00:00:00 2001 From: sbejaoui Date: Thu, 17 Oct 2024 10:02:22 +0200 Subject: [PATCH 3/3] [IMP] rma_lot: add onchange lot&product --- rma_lot/models/rma.py | 21 ++++++++++++++++++- rma_lot/tests/test_rma_lot.py | 8 +++++++ rma_sale_lot/wizards/__init__.py | 1 - rma_sale_lot/wizards/sale_order_rma_wizard.py | 9 -------- 4 files changed, 28 insertions(+), 11 deletions(-) delete mode 100644 rma_sale_lot/wizards/sale_order_rma_wizard.py diff --git a/rma_lot/models/rma.py b/rma_lot/models/rma.py index faa7d7cb4..55d18a984 100644 --- a/rma_lot/models/rma.py +++ b/rma_lot/models/rma.py @@ -8,7 +8,14 @@ class Rma(models.Model): _inherit = "rma" - lot_id = fields.Many2one(comodel_name="stock.lot", string="Lot/Serial Number") + lot_id = fields.Many2one( + comodel_name="stock.lot", + string="Lot/Serial Number", + domain="[('product_id', '=?', product_id)]", + compute="_compute_lot_id", + store=True, + readonly=False, + ) lots_visible = fields.Boolean(compute="_compute_lots_visible") @api.depends("product_id.tracking") @@ -20,3 +27,15 @@ def _prepare_reception_procurement_vals(self, group=None): vals = super()._prepare_reception_procurement_vals(group=group) vals["restrict_lot_id"] = self.lot_id.id return vals + + @api.depends("move_id", "lot_id") + def _compute_product_id(self): + res = super()._compute_product_id() + for rec in self: + if not rec.move_id and rec.lot_id: + self.product_id = rec.lot_id.product_id + return res + + @api.depends("product_id") + def _compute_lot_id(self): + self.update({"lot_id": False}) diff --git a/rma_lot/tests/test_rma_lot.py b/rma_lot/tests/test_rma_lot.py index 5cd033e8a..7f16241b9 100644 --- a/rma_lot/tests/test_rma_lot.py +++ b/rma_lot/tests/test_rma_lot.py @@ -93,3 +93,11 @@ def test_00(self): self.assertEqual(rma_lot_2.reception_move_id.restrict_lot_id, self.lot_2) self.assertEqual(rma_lot_2.reception_move_id.state, "assigned") self.assertEqual(rma_lot_2.reception_move_id.move_line_ids.lot_id, self.lot_2) + + def test_rma_form(self): + rma_form = Form(self.env["rma"]) + self.assertFalse(rma_form.product_id) + rma_form.lot_id = self.lot_1 + self.assertEqual(rma_form.product_id, self.product) + rma_form.product_id = self.env.ref("product.product_product_4") + self.assertFalse(rma_form.lot_id) diff --git a/rma_sale_lot/wizards/__init__.py b/rma_sale_lot/wizards/__init__.py index dca5a8b16..8efcbacda 100644 --- a/rma_sale_lot/wizards/__init__.py +++ b/rma_sale_lot/wizards/__init__.py @@ -1,2 +1 @@ -from . import sale_order_rma_wizard from . import sale_order_line_rma_wizard diff --git a/rma_sale_lot/wizards/sale_order_rma_wizard.py b/rma_sale_lot/wizards/sale_order_rma_wizard.py deleted file mode 100644 index bdbf914ef..000000000 --- a/rma_sale_lot/wizards/sale_order_rma_wizard.py +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright 2024 ACSONE SA/NV -# License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). - -from odoo import models - - -class SaleOrderRmaWizard(models.TransientModel): - - _inherit = "sale.order.rma.wizard"