odoo-addon-rma 17.0.1.1.1__py3-none-any.whl → 17.0.2.0.0__py3-none-any.whl

odoo/addons/rma/models/stock_move.py

@@ -1,4 +1,5 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo import _, api, fields, models
@@ -23,7 +24,7 @@ class StockMove(models.Model):
         string="RMA receivers",
         copy=False,
     )
-    # RMA that create the delivery movement to the customer
+    # RMA that creates the out move
     rma_id = fields.Many2one(
         comodel_name="rma",
         string="RMA return",
@@ -33,8 +34,8 @@ class StockMove(models.Model):
     def unlink(self):
         # A stock user could have no RMA permissions, so the ids wouldn't
         # be accessible due to record rules.
-        rma_receiver = self.sudo().mapped("rma_receiver_ids")
-        rma = self.sudo().mapped("rma_id")
+        rma_receiver = self.sudo().rma_receiver_ids
+        rma = self.sudo().rma_id
         res = super().unlink()
         rma_receiver.filtered(lambda x: x.state != "cancelled").write(
             {"state": "draft"}
@@ -115,38 +116,22 @@ class StockMove(models.Model):
         res["rma_id"] = self.sudo().rma_id.id
         return res
 
-    def _prepare_return_rma_vals(self, original_picking):
-        """hook method for preparing an RMA from the 'return picking wizard'."""
-        self.ensure_one()
-        partner = original_picking.partner_id
-        if hasattr(original_picking, "sale_id") and original_picking.sale_id:
-            partner_invoice_id = original_picking.sale_id.partner_invoice_id.id
-            partner_shipping_id = original_picking.sale_id.partner_shipping_id.id
-        else:
-            partner_invoice_id = partner.address_get(["invoice"]).get("invoice", False)
-            partner_shipping_id = partner.address_get(["delivery"]).get(
-                "delivery", False
-            )
-        return {
-            "user_id": self.env.user.id,
-            "partner_id": partner.id,
-            "partner_shipping_id": partner_shipping_id,
-            "partner_invoice_id": partner_invoice_id,
-            "origin": original_picking.name,
-            "picking_id": original_picking.id,
-            "move_id": self.origin_returned_move_id.id,
-            "product_id": self.origin_returned_move_id.product_id.id,
-            "product_uom_qty": self.product_uom_qty,
-            "product_uom": self.product_uom.id,
-            "reception_move_id": self.id,
-            "company_id": self.company_id.id,
-            "location_id": self.location_dest_id.id,
-            "state": "confirmed",
-        }
+    def _prepare_procurement_values(self):
+        res = super()._prepare_procurement_values()
+        if self.rma_id:
+            res["rma_id"] = self.rma_id.id
+        return res
 
 
 class StockRule(models.Model):
     _inherit = "stock.rule"
 
     def _get_custom_move_fields(self):
-        return super()._get_custom_move_fields() + ["rma_id"]
+        move_fields = super()._get_custom_move_fields()
+        move_fields += [
+            "rma_id",
+            "origin_returned_move_id",
+            "move_orig_ids",
+            "rma_receiver_ids",
+        ]
+        return move_fields

odoo/addons/rma/models/stock_warehouse.py

@@ -1,7 +1,8 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
-from odoo import _, api, fields, models
+from odoo import _, fields, models
 
 
 class StockWarehouse(models.Model):
@@ -27,35 +28,39 @@ class StockWarehouse(models.Model):
         comodel_name="stock.location",
         string="RMA Location",
     )
+    rma_in_route_id = fields.Many2one("stock.route", "RMA in Route")
+    rma_out_route_id = fields.Many2one("stock.route", "RMA out Route")
 
-    @api.model_create_multi
-    def create(self, vals_list):
-        """To create an RMA location and link it with a new warehouse,
-        this method is overridden instead of '_get_locations_values'
-        method because the locations that are created with the
-        values ​​returned by that method are forced to be children
-        of view_location_id, and we don't want that.
-        """
-        res = super().create(vals_list)
-        stock_location = self.env["stock.location"]
-        for record in res:
-            rma_location_vals = record._get_rma_location_values()
-            record.rma_loc_id = stock_location.create(rma_location_vals).id
-        return res
-
-    def _get_rma_location_values(self):
+    def _get_rma_location_values(self, vals, code=False):
         """this method is intended to be used by 'create' method
         to create a new RMA location to be linked to a new warehouse.
         """
+        company_id = vals.get(
+            "company_id", self.default_get(["company_id"])["company_id"]
+        )
+        code = vals.get("code") or code or ""
+        code = code.replace(" ", "").upper()
+        view_location_id = vals.get("view_location_id")
+        view_location = (
+            view_location_id
+            and self.view_location_id.browse(view_location_id)
+            or self.view_location_id
+        )
         return {
-            "name": self.view_location_id.name,
+            "name": view_location.name,
             "active": True,
             "return_location": True,
             "usage": "internal",
-            "company_id": self.company_id.id,
+            "company_id": company_id,
             "location_id": self.env.ref("rma.stock_location_rma").id,
+            "barcode": self._valid_barcode(code + "-RMA", company_id),
         }
 
+    def _get_locations_values(self, vals, code=False):
+        res = super()._get_locations_values(vals, code)
+        res["rma_loc_id"] = self._get_rma_location_values(vals, code)
+        return res
+
     def _get_sequence_values(self, name=False, code=False):
         values = super()._get_sequence_values(name=name, code=code)
         values.update(
@@ -77,12 +82,14 @@ class StockWarehouse(models.Model):
         return values
 
     def _update_name_and_code(self, new_name=False, new_code=False):
+        res = super()._update_name_and_code(new_name, new_code)
         for warehouse in self:
             sequence_data = warehouse._get_sequence_values()
             warehouse.rma_in_type_id.sequence_id.write(sequence_data["rma_in_type_id"])
             warehouse.rma_out_type_id.sequence_id.write(
                 sequence_data["rma_out_type_id"]
             )
+        return res
 
     def _get_picking_type_create_values(self, max_sequence):
         data, next_sequence = super()._get_picking_type_create_values(max_sequence)
@@ -116,12 +123,13 @@ class StockWarehouse(models.Model):
 
     def _get_picking_type_update_values(self):
         data = super()._get_picking_type_update_values()
-        data.update(
-            {
-                "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id},
-                "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id},
-            }
-        )
+        picking_types = {
+            "rma_in_type_id": {"default_location_dest_id": self.rma_loc_id.id},
+            "rma_out_type_id": {"default_location_src_id": self.rma_loc_id.id},
+        }
+        if self.env.context.get("rma_post_init_hook"):
+            return picking_types
+        data.update(picking_types)
         return data
 
     def _create_or_update_sequences_and_picking_types(self):
@@ -138,3 +146,70 @@ class StockWarehouse(models.Model):
                 {"return_picking_type_id": data.get("rma_out_type_id", False)}
             )
         return data
+
+    def _get_routes_values(self):
+        res = super()._get_routes_values()
+        rma_routes = {
+            "rma_in_route_id": {
+                "routing_key": "rma_in",
+                "depends": ["active"],
+                "route_update_values": {
+                    "name": self._format_routename("RMA In"),
+                    "active": self.active,
+                },
+                "route_create_values": {
+                    "warehouse_selectable": True,
+                    "company_id": self.company_id.id,
+                    "sequence": 100,
+                },
+                "rules_values": {
+                    "active": True,
+                },
+            },
+            "rma_out_route_id": {
+                "routing_key": "rma_out",
+                "depends": ["active"],
+                "route_update_values": {
+                    "name": self._format_routename("RMA Out"),
+                    "active": self.active,
+                },
+                "route_create_values": {
+                    "warehouse_selectable": True,
+                    "company_id": self.company_id.id,
+                    "sequence": 110,
+                },
+                "rules_values": {
+                    "active": True,
+                },
+            },
+        }
+        if self.env.context.get("rma_post_init_hook"):
+            return rma_routes
+        res.update(rma_routes)
+        return res
+
+    def get_rules_dict(self):
+        res = super().get_rules_dict()
+        customer_loc, supplier_loc = self._get_partner_locations()
+        for warehouse in self:
+            res[warehouse.id].update(
+                {
+                    "rma_in": [
+                        self.Routing(
+                            customer_loc,
+                            warehouse.rma_loc_id,
+                            warehouse.rma_in_type_id,
+                            "pull",
+                        )
+                    ],
+                    "rma_out": [
+                        self.Routing(
+                            warehouse.rma_loc_id,
+                            customer_loc,
+                            warehouse.rma_out_type_id,
+                            "pull",
+                        )
+                    ],
+                }
+            )
+        return res

odoo/addons/rma/readme/CONTRIBUTORS.md

@@ -7,3 +7,4 @@
 - Giovanni Serra - Ooops \<<giovanni@ooops404.com>\>
 - [APSL-Nagarro](https://www.apsl.tech):
   - Antoni Marroig \<<amarroig@apsl.net>\>
+- Michael Tietz (MT Software) <mtietz@mt-software.de>

odoo/addons/rma/readme/ROADMAP.md

@@ -1,3 +1,6 @@
 - As soon as the picking is selected, the user should select the move,
   but perhaps stock.move \_rec_name could be improved to better show
   what the product of that move is.
+- Add RMA reception and/or RMA delivery on several steps - 2 or 3 - like
+  normal receptions/deliveries. It should be a separate option inside the
+  warehouse definition.

odoo/addons/rma/static/description/index.html

@@ -366,7 +366,7 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
+!! source digest: sha256:8f36869aece97a0f6af8aa5d76b446e9cf0bd589d914c1f5e12c628e87317021
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
 <p><a class="reference external image-reference" href="https://odoo-community.org/page/development-status"><img alt="Production/Stable" src="https://img.shields.io/badge/maturity-Production%2FStable-green.png" /></a> <a class="reference external image-reference" href="http://www.gnu.org/licenses/agpl-3.0-standalone.html"><img alt="License: AGPL-3" src="https://img.shields.io/badge/licence-AGPL--3-blue.png" /></a> <a class="reference external image-reference" href="https://github.com/OCA/rma/tree/17.0/rma"><img alt="OCA/rma" src="https://img.shields.io/badge/github-OCA%2Frma-lightgray.png?logo=github" /></a> <a class="reference external image-reference" href="https://translation.odoo-community.org/projects/rma-17-0/rma-17-0-rma"><img alt="Translate me on Weblate" src="https://img.shields.io/badge/weblate-Translate%20me-F47D42.png" /></a> <a class="reference external image-reference" href="https://runboat.odoo-community.org/builds?repo=OCA/rma&amp;target_branch=17.0"><img alt="Try me on Runboat" src="https://img.shields.io/badge/runboat-Try%20me-875A7B.png" /></a></p>
 <p>This module allows you to manage <a class="reference external" href="https://en.wikipedia.org/wiki/Return_merchandise_authorization">Return Merchandise Authorization
@@ -493,6 +493,9 @@ team will be the default one if no team is set.</li>
 <li>As soon as the picking is selected, the user should select the move,
 but perhaps stock.move _rec_name could be improved to better show
 what the product of that move is.</li>
+<li>Add RMA reception and/or RMA delivery on several steps - 2 or 3 -
+like normal receptions/deliveries. It should be a separate option
+inside the warehouse definition.</li>
 </ul>
 </div>
 <div class="section" id="bug-tracker">
@@ -527,6 +530,7 @@ If you spotted it first, help us to smash it by providing a detailed and welcome
 <li>Antoni Marroig &lt;<a class="reference external" href="mailto:amarroig&#64;apsl.net">amarroig&#64;apsl.net</a>&gt;</li>
 </ul>
 </li>
+<li>Michael Tietz (MT Software) <a class="reference external" href="mailto:mtietz&#64;mt-software.de">mtietz&#64;mt-software.de</a></li>
 </ul>
 </div>
 <div class="section" id="maintainers">

odoo/addons/rma/tests/test_rma.py

@@ -1,24 +1,20 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
-from odoo.tests import Form, TransactionCase, new_test_user, users
+from odoo.tests import Form, new_test_user, users
+from odoo.tools import mute_logger
 
+from odoo.addons.base.tests.common import BaseCommon
 
-class TestRma(TransactionCase):
+from .. import hooks
+
+
+class TestRma(BaseCommon):
     @classmethod
     def setUpClass(cls):
         super().setUpClass()
-        cls.env = cls.env(
-            context=dict(
-                cls.env.context,
-                mail_create_nolog=True,
-                mail_create_nosubscribe=True,
-                mail_notrack=True,
-                no_reset_password=True,
-                tracking_disable=True,
-            )
-        )
         cls.user_rma = new_test_user(
             cls.env,
             login="user_rma",
@@ -72,6 +68,7 @@ class TestRma(TransactionCase):
             {"name": "[Test] It's out of warranty. To be scrapped"}
         )
         cls.env.ref("rma.group_rma_manual_finalization").users |= cls.env.user
+        cls.warehouse = cls.env.ref("stock.warehouse0")
         # Ensure grouping
         cls.env.company.rma_return_grouping = True
 
@@ -95,7 +92,7 @@ class TestRma(TransactionCase):
         rma = self._create_rma(partner, product, qty, location)
         rma.action_confirm()
         rma.reception_move_id.quantity = rma.product_uom_qty
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         return rma
 
     def _create_delivery(self):
@@ -132,6 +129,49 @@ class TestRma(TransactionCase):
 
 
 class TestRmaCase(TestRma):
+    def test_post_init_hook(self):
+        warehouse = self.env["stock.warehouse"].create(
+            {
+                "name": "Test warehouse",
+                "code": "code",
+                "company_id": self.env.company.id,
+            }
+        )
+        hooks.post_init_hook(self.env)
+        self.assertTrue(warehouse.rma_in_type_id)
+        self.assertEqual(
+            warehouse.rma_in_type_id.default_location_dest_id, warehouse.rma_loc_id
+        )
+        self.assertEqual(
+            warehouse.rma_out_type_id.default_location_src_id, warehouse.rma_loc_id
+        )
+        self.assertTrue(warehouse.rma_loc_id)
+        self.assertTrue(warehouse.rma_in_route_id)
+        self.assertTrue(warehouse.rma_out_route_id)
+
+    def test_rma_replace_pick_ship(self):
+        self.warehouse.write({"delivery_steps": "pick_ship"})
+        rma = self._create_rma(self.partner, self.product, 1, self.rma_loc)
+        rma.action_confirm()
+        rma.reception_move_id.quantity = 1
+        rma.reception_move_id.picking_id.button_validate()
+        self.assertEqual(rma.reception_move_id.picking_id.state, "done")
+        self.assertEqual(rma.state, "received")
+        res = rma.action_replace()
+        wizard_form = Form(self.env[res["res_model"]].with_context(**res["context"]))
+        wizard_form.product_id = self.product
+        wizard_form.product_uom_qty = rma.product_uom_qty
+        wizard = wizard_form.save()
+        wizard.action_deliver()
+        self.assertEqual(rma.delivery_picking_count, 2)
+        out_pickings = rma.mapped("delivery_move_ids.picking_id")
+        self.assertIn(
+            self.warehouse.pick_type_id, out_pickings.mapped("picking_type_id")
+        )
+        self.assertIn(
+            self.warehouse.out_type_id, out_pickings.mapped("picking_type_id")
+        )
+
     def test_computed(self):
         # If partner changes, the invoice address is set
         rma = self.env["rma"].new()
@@ -169,7 +209,7 @@ class TestRmaCase(TestRma):
             move.product_id = product_2
             move.product_uom_qty = 15
         picking = picking_form.save()
-        picking._action_done()
+        picking.button_validate()
         rma.picking_id = picking
         rma.move_id = picking.move_ids
         self.assertEqual(rma.product_id, product_2)
@@ -207,13 +247,18 @@ class TestRmaCase(TestRma):
         self.assertEqual(rma.state, "confirmed")
         rma.reception_move_id.quantity = 9
         with self.assertRaises(ValidationError):
-            rma.reception_move_id.picking_id._action_done()
+            res = rma.reception_move_id.picking_id.button_validate()
+            wizard = (
+                self.env[res["res_model"]].with_context(**res["context"]).create({})
+            )
+            wizard.process()
         rma.reception_move_id.quantity = 10
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         self.assertEqual(rma.reception_move_id.picking_id.state, "done")
         self.assertEqual(rma.reception_move_id.quantity, 10)
         self.assertEqual(rma.state, "received")
 
+    @mute_logger("odoo.models.unlink")
     def test_cancel(self):
         # cancel a draft RMA
         rma = self._create_rma(self.partner, self.product)
@@ -333,7 +378,7 @@ class TestRmaCase(TestRma):
         # line of refund_1
         self.assertEqual(len(refund_1.invoice_line_ids), 3)
         self.assertEqual(
-            refund_1.invoice_line_ids.mapped("rma_id"),
+            refund_1.invoice_line_ids.rma_id,
             (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
@@ -524,6 +569,13 @@ class TestRmaCase(TestRma):
         all_rmas = rma_1 | rma_2 | rma_3 | rma_4
         self.assertEqual(all_rmas.mapped("state"), ["received"] * 4)
         self.assertEqual(all_rmas.mapped("can_be_returned"), [True] * 4)
+        all_in_pickings = all_rmas.mapped("reception_move_id.picking_id")
+        self.assertEqual(
+            all_in_pickings.mapped("picking_type_id"), self.warehouse.rma_in_type_id
+        )
+        self.assertEqual(
+            all_in_pickings.mapped("location_dest_id"), self.warehouse.rma_loc_id
+        )
         # Mass return of those four RMAs
         delivery_wizard = (
             self.env["rma.delivery.wizard"]
@@ -534,6 +586,10 @@ class TestRmaCase(TestRma):
         # Two pickings were created
         pick_1 = (rma_1 | rma_2 | rma_3).mapped("delivery_move_ids.picking_id")
         pick_2 = rma_4.delivery_move_ids.picking_id
+        self.assertEqual(pick_1.picking_type_id, self.warehouse.rma_out_type_id)
+        self.assertEqual(pick_1.location_id, self.warehouse.rma_loc_id)
+        self.assertEqual(pick_2.picking_type_id, self.warehouse.rma_out_type_id)
+        self.assertEqual(pick_2.location_id, self.warehouse.rma_loc_id)
         self.assertEqual(len(pick_1), 1)
         self.assertEqual(len(pick_2), 1)
         self.assertNotEqual(pick_1, pick_2)
@@ -549,7 +605,7 @@ class TestRmaCase(TestRma):
         # line of picking_1
         self.assertEqual(len(pick_1.move_ids), 3)
         self.assertEqual(
-            pick_1.move_ids.mapped("rma_id"),
+            pick_1.move_ids.rma_id,
             (rma_1 | rma_2 | rma_3),
         )
         self.assertEqual(
@@ -620,14 +676,14 @@ class TestRmaCase(TestRma):
         origin_moves = origin_delivery.move_ids
         self.assertTrue(origin_moves[0].rma_ids)
         self.assertTrue(origin_moves[1].rma_ids)
-        rmas = origin_moves.mapped("rma_ids")
+        rmas = origin_moves.rma_ids
         self.assertEqual(rmas.mapped("state"), ["confirmed"] * 2)
         # Each reception move is linked one of the generated RMAs
         reception = self.env["stock.picking"].browse(picking_action["res_id"])
         reception_moves = reception.move_ids
         self.assertTrue(reception_moves[0].rma_receiver_ids)
         self.assertTrue(reception_moves[1].rma_receiver_ids)
-        self.assertEqual(reception_moves.mapped("rma_receiver_ids"), rmas)
+        self.assertEqual(reception_moves.rma_receiver_ids, rmas)
         # Validate the reception picking to set rmas to 'received' state
         reception_moves[0].quantity = reception_moves[0].product_uom_qty
         reception_moves[1].quantity = reception_moves[1].product_uom_qty
@@ -645,7 +701,7 @@ class TestRmaCase(TestRma):
         rma = rma_form.save()
         rma.action_confirm()
         rma.reception_move_id.quantity = 10
-        rma.reception_move_id.picking_id._action_done()
+        rma.reception_move_id.picking_id.button_validate()
         # Return quantity 4 of the same product to the customer
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -686,6 +742,7 @@ class TestRmaCase(TestRma):
         self.assertEqual(new_rma.move_id.quantity, 10)
         self.assertEqual(new_rma.reception_move_id.quantity, 10)
 
+    @mute_logger("odoo.models.unlink")
     def test_rma_to_receive_on_delete_invoice(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         rma.action_refund()

odoo/addons/rma/wizard/stock_picking_return.py

@@ -1,8 +1,25 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
+# Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
+from copy import deepcopy
 
 from odoo import _, api, fields, models
 from odoo.exceptions import ValidationError
+from odoo.tools import float_compare
+
+
+class ReturnPickingLine(models.TransientModel):
+    _inherit = "stock.return.picking.line"
+
+    def _prepare_rma_vals(self):
+        self.ensure_one()
+        return {
+            "move_id": self.move_id.id,
+            "product_id": self.move_id.product_id.id,
+            "product_uom_qty": self.quantity,
+            "product_uom": self.product_id.uom_id.id,
+            "location_id": self.wizard_id.location_id.id or self.move_id.location_id.id,
+        }
 
 
 class ReturnPicking(models.TransientModel):
@@ -48,6 +65,52 @@ class ReturnPicking(models.TransientModel):
                 location_id = return_picking_type.default_location_dest_id.id
             self.location_id = location_id
 
+    def _prepare_rma_partner_values(self):
+        self.ensure_one()
+        partner = self.picking_id.partner_id
+        partner_address = partner.address_get(["invoice", "delivery"])
+        partner_invoice_id = partner_address.get("invoice", False)
+        partner_shipping_id = partner_address.get("delivery", False)
+        return (
+            partner,
+            partner_invoice_id and partner.browse(partner_invoice_id) or partner,
+            partner_shipping_id and partner.browse(partner_shipping_id) or partner,
+        )
+
+    def _prepare_rma_vals(self):
+        partner, partner_invoice, partner_shipping = self._prepare_rma_partner_values()
+        origin = self.picking_id.name
+        vals = self.env["rma"]._prepare_procurement_group_vals()
+        vals["partner_id"] = partner_shipping.id
+        vals["name"] = origin
+        group = self.env["procurement.group"].create(vals)
+        return {
+            "user_id": self.env.user.id,
+            "partner_id": partner.id,
+            "partner_shipping_id": partner_shipping.id,
+            "partner_invoice_id": partner_invoice.id,
+            "origin": origin,
+            "picking_id": self.picking_id.id,
+            "company_id": self.company_id.id,
+            "procurement_group_id": group.id,
+        }
+
+    def _prepare_rma_vals_list(self):
+        vals_list = []
+        for return_picking in self:
+            global_vals = return_picking._prepare_rma_vals()
+            for line in return_picking.product_return_moves:
+                if (
+                    not line.move_id
+                    or float_compare(line.quantity, 0, line.product_id.uom_id.rounding)
+                    <= 0
+                ):
+                    continue
+                vals = deepcopy(global_vals)
+                vals.update(line._prepare_rma_vals())
+                vals_list.append(vals)
+        return vals_list
+
     def create_returns(self):
         """Override create_returns method for creating one or more
         'confirmed' RMAs after return a delivery picking in case
@@ -57,10 +120,6 @@ class ReturnPicking(models.TransientModel):
         as the 'Receipt'.
         """
         if self.create_rma:
-            # set_rma_picking_type is to override the copy() method of stock
-            # picking and change the default picking type to rma picking type
-            self_with_context = self.with_context(set_rma_picking_type=True)
-            res = super(ReturnPicking, self_with_context).create_returns()
             if not self.picking_id.partner_id:
                 raise ValidationError(
                     _(
@@ -68,12 +127,30 @@ class ReturnPicking(models.TransientModel):
                         "'Stock Picking' from which RMAs will be created"
                     )
                 )
-            returned_picking = self.env["stock.picking"].browse(res["res_id"])
-            vals_list = [
-                move._prepare_return_rma_vals(self.picking_id)
-                for move in returned_picking.move_ids
-            ]
-            self.env["rma"].create(vals_list)
-            return res
-        else:
-            return super().create_returns()
+            vals_list = self._prepare_rma_vals_list()
+            rmas = self.env["rma"].create(vals_list)
+            rmas.action_confirm()
+            picking = rmas.reception_move_id.picking_id
+            picking = picking and picking[0] or picking
+            ctx = dict(self.env.context)
+            ctx.update(
+                {
+                    "default_partner_id": picking.partner_id.id,
+                    "search_default_picking_type_id": picking.picking_type_id.id,
+                    "search_default_draft": False,
+                    "search_default_assigned": False,
+                    "search_default_confirmed": False,
+                    "search_default_ready": False,
+                    "search_default_planning_issues": False,
+                    "search_default_available": False,
+                }
+            )
+            return {
+                "name": _("Returned Picking"),
+                "view_mode": "form,tree,calendar",
+                "res_model": "stock.picking",
+                "res_id": picking.id,
+                "type": "ir.actions.act_window",
+                "context": ctx,
+            }
+        return super().create_returns()

odoo/addons/rma/wizard/stock_picking_return_views.xml

@@ -17,6 +17,7 @@
                     <field name="rma_location_ids" invisible="1" />
                     <field name="picking_id" invisible="1" />
                     <field name="picking_type_code" invisible="1" />
+                    <field name="location_id" invisible="1" />
                 </group>
             </field>
         </field>

{odoo_addon_rma-17.0.1.1.1.dist-info → odoo_addon_rma-17.0.2.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: odoo-addon-rma
-Version: 17.0.1.1.1
+Version: 17.0.2.0.0
 Requires-Python: >=3.10
 Requires-Dist: odoo>=17.0a,<17.1dev
 Summary: Return Merchandise Authorization (RMA)
@@ -23,7 +23,7 @@ Return Merchandise Authorization Management
    !! This file is generated by oca-gen-addon-readme !!
    !! changes will be overwritten.                   !!
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-   !! source digest: sha256:ed3081bf9b94660a0e6b35acbc7a874023c57e4bc3a87f3762eabbb1c75ce2f4
+   !! source digest: sha256:8f36869aece97a0f6af8aa5d76b446e9cf0bd589d914c1f5e12c628e87317021
    !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 
 .. |badge1| image:: https://img.shields.io/badge/maturity-Production%2FStable-green.png
@@ -156,6 +156,9 @@ Known issues / Roadmap
 -  As soon as the picking is selected, the user should select the move,
    but perhaps stock.move \_rec_name could be improved to better show
    what the product of that move is.
+-  Add RMA reception and/or RMA delivery on several steps - 2 or 3 -
+   like normal receptions/deliveries. It should be a separate option
+   inside the warehouse definition.
 
 Bug Tracker
 ===========
@@ -191,6 +194,8 @@ Contributors
 
    -  Antoni Marroig <amarroig@apsl.net>
 
+-  Michael Tietz (MT Software) mtietz@mt-software.de
+
 Maintainers
 -----------