From 0880d90ea20ed70bde58992a10d53397ee8ecd3b Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Thu, 15 Aug 2024 13:21:00 +0200
Subject: [PATCH 1/7] [IMP] rma: configurable workflow

---
 rma/__manifest__.py               |   1 +
 rma/models/rma.py                 | 137 +++++++++++++++--
 rma/models/rma_operation.py       |  31 ++++
 rma/static/description/index.html |  11 +-
 rma/tests/__init__.py             |   1 +
 rma/tests/test_rma_operation.py   | 235 ++++++++++++++++++++++++++++++
 rma/views/rma_operation.xml       |  76 ++++++++++
 rma/views/rma_views.xml           |  20 ++-
 8 files changed, 486 insertions(+), 26 deletions(-)
 create mode 100644 rma/tests/test_rma_operation.py
 create mode 100644 rma/views/rma_operation.xml

diff --git a/rma/__manifest__.py b/rma/__manifest__.py
index 14f304282..117e870bd 100644
--- a/rma/__manifest__.py
+++ b/rma/__manifest__.py
@@ -35,6 +35,7 @@
         "views/stock_picking_views.xml",
         "views/stock_warehouse_views.xml",
         "views/res_config_settings_views.xml",
+        "views/rma_operation.xml",
     ],
     "post_init_hook": "post_init_hook",
     "application": True,
diff --git a/rma/models/rma.py b/rma/models/rma.py
index 5921848e9..90112535a 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -317,6 +317,55 @@ def _domain_location_id(self):
         copy=False,
     )
 
+    show_create_receipt = fields.Boolean(
+        string="Show Create Receipt Button", compute="_compute_show_create_receipt"
+    )
+    show_create_return = fields.Boolean(
+        string="Show Create Return Button", compute="_compute_show_create_return"
+    )
+    show_create_replace = fields.Boolean(
+        string="Show Create replace Button", compute="_compute_show_create_replace"
+    )
+    show_create_refund = fields.Boolean(
+        string="Show Create refund Button", compute="_compute_show_refund_replace"
+    )
+
+    @api.depends("operation_id.action_create_receipt", "state", "reception_move_id")
+    def _compute_show_create_receipt(self):
+        for rec in self:
+            rec.show_create_receipt = (
+                not rec.reception_move_id
+                and rec.operation_id.action_create_receipt == "manual_on_confirm"
+                and rec.state == "confirmed"
+            )
+
+    @api.depends("operation_id.action_create_delivery", "can_be_returned")
+    def _compute_show_create_return(self):
+        for rec in self:
+            rec.show_create_return = (
+                rec.operation_id.action_create_delivery
+                in ("manual_on_confirm", "manual_after_receipt")
+                and rec.can_be_returned
+            )
+
+    @api.depends("operation_id.action_create_delivery", "can_be_replaced")
+    def _compute_show_create_replace(self):
+        for rec in self:
+            rec.show_create_replace = (
+                rec.operation_id.action_create_delivery
+                in ("manual_on_confirm", "manual_after_receipt")
+                and rec.can_be_replaced
+            )
+
+    @api.depends("operation_id.action_create_refund", "can_be_refunded")
+    def _compute_show_refund_replace(self):
+        for rec in self:
+            rec.show_create_refund = (
+                rec.operation_id.action_create_refund
+                in ("manual_on_confirm", "manual_after_receipt")
+                and rec.can_be_refunded
+            )
+
     def _compute_delivery_picking_count(self):
         for rma in self:
             rma.delivery_picking_count = len(rma.delivery_move_ids.picking_id)
@@ -394,9 +443,17 @@ def _compute_can_be_refunded(self):
         an rma can be refunded. It is used in rma.action_refund method.
         """
         for record in self:
-            record.can_be_refunded = record.state == "received"
+            record.can_be_refunded = (
+                record.operation_id.action_create_refund
+                in ("manual_after_receipt", "automatic_after_receipt")
+                and record.state == "received"
+            ) or (
+                record.operation_id.action_create_refund
+                in ("manual_on_confirm", "automatic_on_confirm")
+                and record.state == "confirmed"
+            )
 
-    @api.depends("remaining_qty", "state")
+    @api.depends("remaining_qty", "state", "operation_id.action_create_delivery")
     def _compute_can_be_returned(self):
         """Compute 'can_be_returned'. This field controls the visibility
         of the 'Return to customer' button in the rma form
@@ -406,8 +463,17 @@ def _compute_can_be_returned(self):
         rma._ensure_can_be_returned.
         """
         for r in self:
-            r.can_be_returned = (
-                r.state in ["received", "waiting_return"] and r.remaining_qty > 0
+            r.can_be_returned = r.remaining_qty > 0 and (
+                (
+                    r.operation_id.action_create_delivery
+                    in ("manual_after_receipt", "automatic_after_receipt")
+                    and r.state in ["received", "waiting_return"]
+                )
+                or (
+                    r.operation_id.action_create_delivery
+                    in ("manual_on_confirm", "automatic_on_confirm")
+                    and r.state == "confirmed"
+                )
             )
 
     @api.depends("state")
@@ -420,11 +486,20 @@ def _compute_can_be_replaced(self):
         rma._ensure_can_be_replaced.
         """
         for r in self:
-            r.can_be_replaced = r.state in [
-                "received",
-                "waiting_replacement",
-                "replaced",
-            ]
+            r.can_be_replaced = (
+                r.operation_id.action_create_delivery
+                in ("manual_after_receipt", "automatic_after_receipt")
+                and r.state
+                in [
+                    "received",
+                    "waiting_replacement",
+                    "replaced",
+                ]
+            ) or (
+                r.operation_id.action_create_delivery
+                in ("manual_on_confirm", "automatic_on_confirm")
+                and r.state == "confirmed"
+            )
 
     @api.depends("state", "remaining_qty")
     def _compute_can_be_finished(self):
@@ -726,20 +801,47 @@ def _prepare_reception_procurements(self):
             )
         return procurements
 
+    def _create_receipt(self):
+        procurements = self._prepare_reception_procurements()
+        if procurements:
+            self.env["procurement.group"].run(procurements)
+        self.reception_move_id.picking_id.action_assign()
+
+    def action_create_receipt(self):
+        self.ensure_one()
+        self._create_receipt()
+        self.ensure_one()
+        return {
+            "name": _("Receipt"),
+            "type": "ir.actions.act_window",
+            "view_type": "form",
+            "view_mode": "form",
+            "res_model": "stock.picking",
+            "views": [[False, "form"]],
+            "res_id": self.reception_move_id.picking_id.id,
+        }
+
     def action_confirm(self):
         """Invoked when 'Confirm' button in rma form view is clicked."""
         self._ensure_required_fields()
         self = self.filtered(lambda rma: rma.state == "draft")
         if not self:
             return
-        procurements = self._prepare_reception_procurements()
-        if procurements:
-            self.env["procurement.group"].run(procurements)
-        self.reception_move_id.picking_id.action_assign()
         self.write({"state": "confirmed"})
         for rma in self:
             rma._add_message_subscribe_partner()
         self._send_confirmation_email()
+        for rec in self:
+            if rec.operation_id.action_create_receipt == "automatic_on_confirm":
+                rec._create_receipt()
+            if rec.operation_id.action_create_delivery == "automatic_on_confirm":
+                rec.with_context(
+                    rma_return_grouping=rec.env.company.rma_return_grouping
+                ).create_return(
+                    fields.Datetime.now(), rec.product_uom_qty, rec.product_uom
+                )
+            if rec.operation_id.action_create_refund == "automatic_on_confirm":
+                rec.action_refund()
 
     def action_refund(self):
         """Invoked when 'Refund' button in rma form view is clicked
@@ -1376,6 +1478,15 @@ def update_received_state_on_reception(self):
         """
         self.write({"state": "received"})
         self._send_receipt_confirmation_email()
+        for rec in self:
+            if rec.operation_id.action_create_delivery == "automatic_after_receipt":
+                rec.with_context(
+                    rma_return_grouping=rec.env.company.rma_return_grouping
+                ).create_return(
+                    fields.Datetime.now(), rec.product_uom_qty, rec.product_uom
+                )
+            if rec.operation_id.action_create_refund == "automatic_after_receipt":
+                rec.action_refund()
 
     def update_received_state(self):
         """Invoked by:
diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
index cb4c08bb0..39f25d9ae 100644
--- a/rma/models/rma_operation.py
+++ b/rma/models/rma_operation.py
@@ -10,6 +10,37 @@ class RmaOperation(models.Model):
 
     active = fields.Boolean(default=True)
     name = fields.Char(required=True, translate=True)
+    action_create_receipt = fields.Selection(
+        [
+            ("manual_on_confirm", "Manually on Confirm"),
+            ("automatic_on_confirm", "Automatically on Confirm"),
+        ],
+        string="Create Receipt",
+        default="automatic_on_confirm",
+        help="Define how the receipt action should be handled.",
+    )
+    action_create_delivery = fields.Selection(
+        [
+            ("manual_on_confirm", "Manually on Confirm"),
+            ("automatic_on_confirm", "Automatically on Confirm"),
+            ("manual_after_receipt", "Manually After Receipt"),
+            ("automatic_after_receipt", "Automatically After Receipt"),
+        ],
+        string="Delivery Action",
+        help="Define how the delivery action should be handled.",
+        default="manual_after_receipt",
+    )
+    action_create_refund = fields.Selection(
+        [
+            ("manual_on_confirm", "Manually on Confirm"),
+            ("automatic_on_confirm", "Automatically on Confirm"),
+            ("manual_after_receipt", "Manually After Receipt"),
+            ("automatic_after_receipt", "Automatically After Receipt"),
+        ],
+        string="Refund Action",
+        default="manual_after_receipt",
+        help="Define how the refund action should be handled.",
+    )
 
     _sql_constraints = [
         ("name_uniq", "unique (name)", "That operation name already exists !"),
diff --git a/rma/static/description/index.html b/rma/static/description/index.html
index 9975dc84f..635e3aee7 100644
--- a/rma/static/description/index.html
+++ b/rma/static/description/index.html
@@ -8,11 +8,10 @@
 
 /*
 :Author: David Goodger (goodger@python.org)
-:Id: $Id: html4css1.css 9511 2024-01-13 09:50:07Z milde $
+:Id: $Id: html4css1.css 8954 2022-01-20 10:10:25Z milde $
 :Copyright: This stylesheet has been placed in the public domain.
 
 Default cascading style sheet for the HTML output of Docutils.
-Despite the name, some widely supported CSS2 features are used.
 
 See https://docutils.sourceforge.io/docs/howto/html-stylesheets.html for how to
 customize this style sheet.
@@ -275,7 +274,7 @@
   margin-left: 2em ;
   margin-right: 2em }
 
-pre.code .ln { color: gray; } /* line numbers */
+pre.code .ln { color: grey; } /* line numbers */
 pre.code, code { background-color: #eeeeee }
 pre.code .comment, code .comment { color: #5C6576 }
 pre.code .keyword, code .keyword { color: #3B0D06; font-weight: bold }
@@ -301,7 +300,7 @@
 span.pre {
   white-space: pre }
 
-span.problematic, pre.problematic {
+span.problematic {
   color: red }
 
 span.section-subtitle {
@@ -530,9 +529,7 @@ <h2><a class="toc-backref" href="#toc-entry-7">Contributors</a></h2>
 <div class="section" id="maintainers">
 <h2><a class="toc-backref" href="#toc-entry-8">Maintainers</a></h2>
 <p>This module is maintained by the OCA.</p>
-<a class="reference external image-reference" href="https://odoo-community.org">
-<img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" />
-</a>
+<a class="reference external image-reference" href="https://odoo-community.org"><img alt="Odoo Community Association" src="https://odoo-community.org/logo.png" /></a>
 <p>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.</p>
diff --git a/rma/tests/__init__.py b/rma/tests/__init__.py
index 5f9ab818b..8556dc3aa 100644
--- a/rma/tests/__init__.py
+++ b/rma/tests/__init__.py
@@ -1,3 +1,4 @@
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from . import test_rma
+from . import test_rma_operation
diff --git a/rma/tests/test_rma_operation.py b/rma/tests/test_rma_operation.py
new file mode 100644
index 000000000..c90f60381
--- /dev/null
+++ b/rma/tests/test_rma_operation.py
@@ -0,0 +1,235 @@
+# 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 ValidationError
+from odoo.tests.common import Form
+
+from .test_rma import TestRma
+
+
+class TestRmaOperation(TestRma):
+    def test_01(self):
+        """
+        ensure that the receipt creation behaves correctly according to the
+        action_create_receipt setting.
+        - "automatic_on_confirm":
+            - receipts are created automatically
+            - the manual button is hidden
+        - "manual_on_confirm"
+            - manual button is visible after confirmation
+            - disappears once a receipt is manually created
+        """
+        self.assertEqual(self.operation.action_create_receipt, "automatic_on_confirm")
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.show_create_receipt)
+        rma.action_confirm()
+        self.assertTrue(rma.reception_move_id)
+        self.assertFalse(rma.show_create_receipt)
+        self.operation.action_create_receipt = "manual_on_confirm"
+        rma2 = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma2.action_confirm()
+        self.assertTrue(rma2.show_create_receipt)
+        self.assertFalse(rma2.reception_move_id)
+        rma2.action_create_receipt()
+        self.assertFalse(rma2.show_create_receipt)
+
+    def test_02(self):
+        """
+        test delivery button visibility based on operation settings.
+        No deliver possible
+        """
+        self.operation.action_create_delivery = False
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.show_create_return)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertFalse(rma.show_create_replace)
+
+    def test_03(self):
+        """
+        test delivery button visibility based on operation settings.
+        deliver manually after confirm
+        """
+        self.operation.action_create_delivery = "manual_on_confirm"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertTrue(rma.can_be_returned)
+        self.assertTrue(rma.show_create_return)
+        self.assertTrue(rma.can_be_replaced)
+        self.assertTrue(rma.show_create_replace)
+
+    def test_04(self):
+        """
+        test delivery button visibility based on operation settings.
+        deliver automatically after confirm, return same product
+        """
+        self.operation.action_create_delivery = "automatic_on_confirm"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "waiting_return")
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.show_create_return)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertFalse(rma.show_create_replace)
+        self.assertTrue(rma.delivery_move_ids)
+        self.assertEqual(rma.delivery_move_ids.product_id, self.product)
+        self.assertEqual(rma.delivery_move_ids.product_uom_qty, 10)
+
+    def test_05(self):
+        """
+        test delivery button visibility based on operation settings.
+        deliver manually after receipt
+        """
+        self.operation.action_create_delivery = "manual_after_receipt"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.show_create_return)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertFalse(rma.show_create_replace)
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(rma.state, "received")
+        self.assertTrue(rma.can_be_returned)
+        self.assertTrue(rma.show_create_return)
+        self.assertTrue(rma.can_be_replaced)
+        self.assertTrue(rma.show_create_replace)
+
+    def test_06(self):
+        """
+        test delivery button visibility based on operation settings.
+        deliver automatically after receipt
+        """
+        self.operation.action_create_delivery = "automatic_after_receipt"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.can_be_replaced)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.show_create_return)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertFalse(rma.show_create_replace)
+        self.assertFalse(rma.delivery_move_ids)
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(rma.delivery_move_ids.product_id, self.product)
+        self.assertEqual(rma.delivery_move_ids.product_uom_qty, 10)
+        self.assertEqual(rma.state, "waiting_return")
+        self.assertFalse(rma.can_be_returned)
+        self.assertFalse(rma.show_create_return)
+        self.assertFalse(rma.can_be_replaced)
+        self.assertFalse(rma.show_create_replace)
+
+    def test_07(self):
+        """
+        test delivery button visibility based on operation settings.
+        deliver automatically after confirm, different product
+        """
+        self.operation.action_create_delivery = "automatic_on_confirm"
+        self.operation.different_return_product = True
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        with self.assertRaises(AssertionError, msg="Replacement fields are required"):
+            with Form(rma) as rma_form:
+                rma_form.save()
+        with self.assertRaises(
+            ValidationError, msg="Complete the replacement information"
+        ):
+            rma.action_confirm()
+        rma.action_confirm()
+
+    def test_08(self):
+        """test refund, manually after confirm"""
+        self.operation.action_create_refund = "manual_on_confirm"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertTrue(rma.can_be_refunded)
+        self.assertTrue(rma.show_create_refund)
+
+    def test_09(self):
+        """test refund, manually after receipt"""
+        self.operation.action_create_refund = "manual_after_receipt"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.show_create_refund)
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(rma.state, "received")
+        self.assertTrue(rma.can_be_refunded)
+        self.assertTrue(rma.show_create_refund)
+
+    def test_10(self):
+        """test refund, automatic after confirm"""
+        self.operation.action_create_refund = "automatic_on_confirm"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "refunded")
+        self.assertTrue(rma.refund_id)
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.show_create_refund)
+
+    def test_11(self):
+        """test refund, automatic after confirm"""
+        self.operation.action_create_refund = "automatic_after_receipt"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "confirmed")
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(rma.state, "refunded")
+        self.assertTrue(rma.refund_id)
+        self.assertFalse(rma.can_be_refunded)
+        self.assertFalse(rma.show_create_refund)
+
+    def test_12(self):
+        """
+        Refund without product return
+        Some companies may offer refunds without requiring the return of the product,
+        often in cases of low-value items or when the cost of return shipping is
+        prohibitive.
+            - no receipt
+            - no return
+            - automatically refund on confirm
+        """
+        self.operation.action_create_receipt = False
+        self.operation.action_create_refund = "automatic_on_confirm"
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "refunded")
+        self.assertFalse(rma.reception_move_id)
+        self.assertTrue(rma.refund_id)
+
+    def test_13(self):
+        """
+        Return of non-ordered product
+        Occasionally, customers receive items they did not order and need a process for
+        returning these products. The delivered product don't figure on the sale order
+        - receipt
+        - no return
+        - no refund
+        """
+        self.operation.action_create_receipt = "automatic_on_confirm"
+        self.operation.action_create_delivery = False
+        self.operation.action_create_refund = False
+        rma = self._create_rma(self.partner, self.product, 10, self.rma_loc)
+        rma.action_confirm()
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(rma.state, "received")
+        self.assertFalse(rma.delivery_move_ids)
diff --git a/rma/views/rma_operation.xml b/rma/views/rma_operation.xml
new file mode 100644
index 000000000..02de01896
--- /dev/null
+++ b/rma/views/rma_operation.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<!-- Copyright 2024 ACSONE SA/NV
+     License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl). -->
+<odoo>
+
+    <record model="ir.ui.view" id="rma_operation_form_view">
+        <field name="model">rma.operation</field>
+        <field name="arch" type="xml">
+            <form>
+                <sheet>
+                    <group>
+                        <field name="name" />
+                        <field name="active" widget="boolean_toggle" />
+                    </group>
+                    <group string="Settings" name="settings">
+                        <group>
+                            <field name="action_create_receipt" />
+
+                        </group>
+                        <group />
+                        <group>
+                        <field name="action_create_delivery" />
+
+                        </group>
+                        <group />
+                        <group>
+                            <field name="action_create_refund" />
+
+                        </group>
+                        <group />
+
+
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="rma_operation_search_view">
+        <field name="model">rma.operation</field>
+        <field name="arch" type="xml">
+            <search>
+                <field name="name" />
+            </search>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="rma_operation_tree_view">
+        <field name="model">rma.operation</field>
+        <field name="arch" type="xml">
+            <tree>
+                <field name="name" />
+                <field name="action_create_receipt" />
+                <field name="action_create_delivery" />
+                <field name="action_create_refund" />
+                <field name="active" widget="boolean_toggle" />
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="rma_operation_act_window">
+        <field name="name">Operations</field>
+        <field name="res_model">rma.operation</field>
+        <field name="view_mode">tree,form</field>
+        <field name="domain">[]</field>
+        <field name="context">{}</field>
+    </record>
+
+    <record model="ir.ui.menu" id="rma_operation_menu">
+        <field name="name">Operations</field>
+        <field name="parent_id" ref="rma_configuration_menu" />
+        <field name="action" ref="rma_operation_act_window" />
+        <field name="sequence" eval="16" />
+    </record>
+
+</odoo>
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index 8ad666162..e100dcac9 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -136,25 +136,32 @@
                         states="draft"
                         class="btn-primary"
                     />
+                    <button
+                        name="action_create_receipt"
+                        type="object"
+                        string="Create Receipt"
+                        attrs="{'invisible': [('show_create_receipt', '=', False)]}"
+                        class="btn-primary"
+                    />
                     <button
                         type="object"
                         string="To Refund"
                         name="action_refund"
-                        attrs="{'invisible': [('can_be_refunded', '=', False)]}"
+                        attrs="{'invisible': [('show_create_refund', '=', False)]}"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Replace"
                         name="action_replace"
-                        attrs="{'invisible': [('can_be_replaced', '=', False)]}"
+                        attrs="{'invisible': [('show_create_replace', '=', False)]}"
                         class="btn-primary"
                     />
                     <button
                         type="object"
                         string="Return to customer"
                         name="action_return"
-                        attrs="{'invisible': [('can_be_returned', '=', False)]}"
+                        attrs="{'invisible': [('show_create_return', '=', False)]}"
                         class="btn-primary"
                     />
                     <button
@@ -341,9 +348,10 @@
                     <field name="sent" invisible="1" />
                     <field name="reception_move_id" invisible="1" />
                     <field name="refund_id" invisible="1" />
-                    <field name="can_be_refunded" invisible="1" />
-                    <field name="can_be_returned" invisible="1" />
-                    <field name="can_be_replaced" invisible="1" />
+                    <field name="show_create_receipt" invisible="1" />
+                    <field name="show_create_refund" invisible="1" />
+                    <field name="show_create_return" invisible="1" />
+                    <field name="show_create_replace" invisible="1" />
                     <field name="can_be_split" invisible="1" />
                     <field name="can_be_locked" invisible="1" />
                     <field name="can_be_finished" invisible="1" />

From df0e95e907c713521da47b5e64cb6e8d31225419 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Wed, 28 Aug 2024 14:27:16 +0200
Subject: [PATCH 2/7] [IMP] rma: allow standard refund

---
 rma/models/rma.py               |  1 +
 rma/models/rma_operation.py     |  1 +
 rma/tests/test_rma_operation.py | 48 +++++++++++++++++++++++++++++++++
 rma_sale/models/rma.py          | 21 +++++++++++++++
 rma_sale/tests/test_rma_sale.py | 44 ++++++++++++++++++++++++++++++
 5 files changed, 115 insertions(+)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 90112535a..697e1bca7 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -774,6 +774,7 @@ def _prepare_reception_procurement_vals(self, group=None):
         vals = self._prepare_common_procurement_vals(group=group)
         vals["route_ids"] = self.warehouse_id.rma_in_route_id
         vals["rma_receiver_ids"] = [(6, 0, self.ids)]
+        vals["to_refund"] = self.operation_id.action_create_refund == "update_quantity"
         if self.move_id:
             vals["origin_returned_move_id"] = self.move_id.id
         return vals
diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
index 39f25d9ae..32ddef1fd 100644
--- a/rma/models/rma_operation.py
+++ b/rma/models/rma_operation.py
@@ -36,6 +36,7 @@ class RmaOperation(models.Model):
             ("automatic_on_confirm", "Automatically on Confirm"),
             ("manual_after_receipt", "Manually After Receipt"),
             ("automatic_after_receipt", "Automatically After Receipt"),
+            ("update_quantity", "Update Quantities"),
         ],
         string="Refund Action",
         default="manual_after_receipt",
diff --git a/rma/tests/test_rma_operation.py b/rma/tests/test_rma_operation.py
index c90f60381..49dc92b45 100644
--- a/rma/tests/test_rma_operation.py
+++ b/rma/tests/test_rma_operation.py
@@ -233,3 +233,51 @@ def test_13(self):
         rma.reception_move_id.picking_id._action_done()
         self.assertEqual(rma.state, "received")
         self.assertFalse(rma.delivery_move_ids)
+
+    def test_14(self):
+        """if the refund action is not ment to update quantity, return picking line
+        to_refund field should be False"""
+        self.operation.action_create_refund = "manual_after_receipt"
+        origin_delivery = self._create_delivery()
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
+                active_ids=origin_delivery.ids,
+                active_id=origin_delivery.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()
+        return_line = return_wizard.product_return_moves.filtered(
+            lambda m, p=self.product: m.product_id == p
+        )
+        self.assertEqual(return_line.rma_operation_id, self.operation)
+        picking_action = return_wizard.create_returns()
+        reception = self.env["stock.picking"].browse(picking_action["res_id"])
+        move = reception.move_ids.filtered(lambda m, p=self.product: m.product_id == p)
+        self.assertFalse(move.to_refund)
+
+    def test_15(self):
+        """if the refund action is ment to update quantity, return picking line
+        to_refund field should be True"""
+        self.operation.action_create_refund = "update_quantity"
+        origin_delivery = self._create_delivery()
+        stock_return_picking_form = Form(
+            self.env["stock.return.picking"].with_context(
+                active_ids=origin_delivery.ids,
+                active_id=origin_delivery.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()
+        return_line = return_wizard.product_return_moves.filtered(
+            lambda m, p=self.product: m.product_id == p
+        )
+        self.assertEqual(return_line.rma_operation_id, self.operation)
+        picking_action = return_wizard.create_returns()
+        reception = self.env["stock.picking"].browse(picking_action["res_id"])
+        move = reception.move_ids.filtered(lambda m, p=self.product: m.product_id == p)
+        self.assertTrue(move.to_refund)
diff --git a/rma_sale/models/rma.py b/rma_sale/models/rma.py
index 7662ba5fa..1898e717c 100644
--- a/rma_sale/models/rma.py
+++ b/rma_sale/models/rma.py
@@ -175,3 +175,24 @@ def _prepare_delivery_procurements(self, scheduled_date=None, qty=None, uom=None
         return super()._prepare_delivery_procurements(
             scheduled_date=scheduled_date, qty=qty, uom=uom
         )
+
+    def _prepare_delivery_procurement_vals(self, scheduled_date=None):
+        vals = super()._prepare_delivery_procurement_vals(scheduled_date=scheduled_date)
+        if (
+            self.move_id
+            and self.move_id.sale_line_id
+            and self.operation_id.action_create_refund == "update_quantity"
+        ):
+            vals["sale_line_id"] = self.move_id.sale_line_id.id
+        return vals
+
+    def _prepare_reception_procurement_vals(self, group=None):
+        """This method is used only for reception and a specific RMA IN route."""
+        vals = super()._prepare_reception_procurement_vals(group=group)
+        if (
+            self.move_id
+            and self.move_id.sale_line_id
+            and self.operation_id.action_create_refund == "update_quantity"
+        ):
+            vals["sale_line_id"] = self.move_id.sale_line_id.id
+        return vals
diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py
index 532230d1d..f670f2918 100644
--- a/rma_sale/tests/test_rma_sale.py
+++ b/rma_sale/tests/test_rma_sale.py
@@ -222,3 +222,47 @@ def test_report_rma(self):
         res = str(res[0])
         self.assertRegex(res, self.sale_order.name)
         self.assertRegex(res, operation.name)
+
+    def test_manual_refund_no_quantity_impact(self):
+        """If the operation is meant for a manual refund, the delivered quantity
+        should not be updated."""
+        self.operation.action_create_refund = "manual_after_receipt"
+        order = self.sale_order
+        order_line = order.order_line
+        self.assertEqual(order_line.qty_delivered, 5)
+        wizard = self._rma_sale_wizard(order)
+        rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
+        self.assertEqual(rma.reception_move_id.sale_line_id, order_line)
+        rma.action_confirm()
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(order.order_line.qty_delivered, 5)
+
+    def test_no_manual_refund_quantity_impact(self):
+        """If the operation is meant for a manual refund, the delivered quantity
+        should not be updated."""
+        self.operation.action_create_refund = "update_quantity"
+        order = self.sale_order
+        order_line = order.order_line
+        self.assertEqual(order_line.qty_delivered, 5)
+        wizard = self._rma_sale_wizard(order)
+        rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
+        self.assertEqual(rma.reception_move_id.sale_line_id, order_line)
+        rma.action_confirm()
+        self.assertFalse(rma.can_be_refunded)
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(order.order_line.qty_delivered, 0)
+        delivery_form = Form(
+            self.env["rma.delivery.wizard"].with_context(
+                active_ids=rma.ids,
+                rma_delivery_type="return",
+            )
+        )
+        delivery_form.product_uom_qty = rma.product_uom_qty
+        delivery_wizard = delivery_form.save()
+        delivery_wizard.action_deliver()
+        picking = rma.delivery_move_ids.picking_id
+        picking.move_ids.quantity_done = rma.product_uom_qty
+        picking._action_done()
+        self.assertEqual(order.order_line.qty_delivered, 5)

From 9737b31ee7a2af9d76ca99056599a2fa4a454a2d Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Thu, 29 Aug 2024 14:19:06 +0200
Subject: [PATCH 3/7] [IMP] rma: allow return different product

---
 rma/models/rma.py                             | 23 +++++++++++++--
 rma/models/rma_operation.py                   |  4 +++
 rma/tests/test_rma_operation.py               |  6 ++++
 rma/views/rma_operation.xml                   |  8 +++++-
 rma/views/rma_views.xml                       |  6 ++++
 rma/wizard/stock_picking_return.py            |  9 ++++++
 rma/wizard/stock_picking_return_views.xml     |  5 ++++
 rma_sale/tests/test_rma_sale.py               | 28 +++++++++++++++++--
 rma_sale/wizard/sale_order_rma_wizard.py      |  9 ++++++
 .../wizard/sale_order_rma_wizard_views.xml    |  5 ++++
 10 files changed, 98 insertions(+), 5 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 697e1bca7..126a05515 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -329,6 +329,14 @@ def _domain_location_id(self):
     show_create_refund = fields.Boolean(
         string="Show Create refund Button", compute="_compute_show_refund_replace"
     )
+    return_product_id = fields.Many2one(
+        "product.product",
+        help="Product to be returned if it's different from the originally delivered "
+        "item.",
+    )
+    different_return_product = fields.Boolean(
+        related="operation_id.different_return_product"
+    )
 
     @api.depends("operation_id.action_create_receipt", "state", "reception_move_id")
     def _compute_show_create_receipt(self):
@@ -788,13 +796,24 @@ def _prepare_reception_procurements(self):
             group = rma.procurement_group_id
             if not group:
                 group = group_model.create(rma._prepare_procurement_group_vals())
+            product = self.product_id
+            if self.different_return_product:
+                if not self.return_product_id:
+                    raise ValidationError(
+                        _(
+                            "The selected operation requires a return product different"
+                            " from the originally delivered item. Please select the "
+                            "product to return."
+                        )
+                    )
+                product = self.return_product_id
             procurements.append(
                 group_model.Procurement(
-                    rma.product_id,
+                    product,
                     rma.product_uom_qty,
                     rma.product_uom,
                     rma.location_id,
-                    rma.product_id.display_name,
+                    product.display_name,
                     group.name,
                     rma.company_id,
                     rma._prepare_reception_procurement_vals(group),
diff --git a/rma/models/rma_operation.py b/rma/models/rma_operation.py
index 32ddef1fd..17a05af0e 100644
--- a/rma/models/rma_operation.py
+++ b/rma/models/rma_operation.py
@@ -19,6 +19,10 @@ class RmaOperation(models.Model):
         default="automatic_on_confirm",
         help="Define how the receipt action should be handled.",
     )
+    different_return_product = fields.Boolean(
+        help="If checked, allows the return of a product different from the one "
+        "originally ordered. Used if the delivery is created automatically",
+    )
     action_create_delivery = fields.Selection(
         [
             ("manual_on_confirm", "Manually on Confirm"),
diff --git a/rma/tests/test_rma_operation.py b/rma/tests/test_rma_operation.py
index 49dc92b45..2957ed4bd 100644
--- a/rma/tests/test_rma_operation.py
+++ b/rma/tests/test_rma_operation.py
@@ -149,7 +149,13 @@ def test_07(self):
             ValidationError, msg="Complete the replacement information"
         ):
             rma.action_confirm()
+        rma.return_product_id = self.product_product.create(
+            {"name": "return Product test 1", "type": "product"}
+        )
         rma.action_confirm()
+        self.assertEqual(rma.delivery_move_ids.product_id, rma.product_id)
+        self.assertEqual(rma.reception_move_id.product_id, rma.return_product_id)
+        self.assertEqual(rma.state, "waiting_return")
 
     def test_08(self):
         """test refund, manually after confirm"""
diff --git a/rma/views/rma_operation.xml b/rma/views/rma_operation.xml
index 02de01896..1ed1d82f6 100644
--- a/rma/views/rma_operation.xml
+++ b/rma/views/rma_operation.xml
@@ -17,7 +17,13 @@
                             <field name="action_create_receipt" />
 
                         </group>
-                        <group />
+                        <group>
+                            <field
+                                name="different_return_product"
+                                widget="boolean_toggle"
+                                attrs="{'invisible': [('action_create_receipt', '=', False)]}"
+                            />
+                        </group>
                         <group>
                         <field name="action_create_delivery" />
 
diff --git a/rma/views/rma_views.xml b/rma/views/rma_views.xml
index e100dcac9..b95aaaeb1 100644
--- a/rma/views/rma_views.xml
+++ b/rma/views/rma_views.xml
@@ -272,6 +272,11 @@
                                 force_save="1"
                                 attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')]}"
                             />
+                            <field
+                                name="return_product_id"
+                                force_save="1"
+                                attrs="{'readonly': ['|', ('picking_id', '!=', False), ('state', '!=', 'draft')], 'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True)]}"
+                            />
                             <field name="uom_category_id" invisible="1" />
                             <label for="product_uom_qty" />
                             <div class="o_row">
@@ -352,6 +357,7 @@
                     <field name="show_create_refund" invisible="1" />
                     <field name="show_create_return" invisible="1" />
                     <field name="show_create_replace" invisible="1" />
+                    <field name="different_return_product" invisible="1" />
                     <field name="can_be_split" invisible="1" />
                     <field name="can_be_locked" invisible="1" />
                     <field name="can_be_finished" invisible="1" />
diff --git a/rma/wizard/stock_picking_return.py b/rma/wizard/stock_picking_return.py
index 3bed8265a..cf9fe49fd 100644
--- a/rma/wizard/stock_picking_return.py
+++ b/rma/wizard/stock_picking_return.py
@@ -18,6 +18,14 @@ class ReturnPickingLine(models.TransientModel):
         store=True,
         readonly=False,
     )
+    return_product_id = fields.Many2one(
+        "product.product",
+        help="Product to be returned if it's different from the originally delivered "
+        "item.",
+    )
+    different_return_product = fields.Boolean(
+        related="rma_operation_id.different_return_product"
+    )
 
     @api.depends("wizard_id.rma_operation_id")
     def _compute_rma_operation_id(self):
@@ -34,6 +42,7 @@ def _prepare_rma_vals(self):
             "product_uom": self.product_id.uom_id.id,
             "location_id": self.wizard_id.location_id.id or self.move_id.location_id.id,
             "operation_id": self.rma_operation_id.id,
+            "return_product_id": self.return_product_id.id,
         }
 
 
diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index ce127da35..ed6e062f9 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -13,6 +13,11 @@
                     name="rma_operation_id"
                     attrs="{'column_invisible': [('parent.create_rma', '=', False)], 'required': [('parent.create_rma', '=', True), ('quantity', '>', 0)]}"
                 />
+                <field
+                    name="return_product_id"
+                    attrs="{'column_invisible': [('parent.create_rma', '=', False)], 'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True)]}"
+                />
+                    <field name="different_return_product" invisible="1" />
             </xpath>
             <field name="product_return_moves" position="before">
                 <group name="group_rma">
diff --git a/rma_sale/tests/test_rma_sale.py b/rma_sale/tests/test_rma_sale.py
index f670f2918..003340c86 100644
--- a/rma_sale/tests/test_rma_sale.py
+++ b/rma_sale/tests/test_rma_sale.py
@@ -3,6 +3,7 @@
 # Copyright 2023 Tecnativa - Pedro M. Baeza
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
+from odoo.exceptions import ValidationError
 from odoo.tests import Form, TransactionCase
 from odoo.tests.common import users
 
@@ -232,7 +233,7 @@ def test_manual_refund_no_quantity_impact(self):
         self.assertEqual(order_line.qty_delivered, 5)
         wizard = self._rma_sale_wizard(order)
         rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
-        self.assertEqual(rma.reception_move_id.sale_line_id, order_line)
+        self.assertFalse(rma.reception_move_id.sale_line_id)
         rma.action_confirm()
         rma.reception_move_id.quantity_done = rma.product_uom_qty
         rma.reception_move_id.picking_id._action_done()
@@ -248,7 +249,6 @@ def test_no_manual_refund_quantity_impact(self):
         wizard = self._rma_sale_wizard(order)
         rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
         self.assertEqual(rma.reception_move_id.sale_line_id, order_line)
-        rma.action_confirm()
         self.assertFalse(rma.can_be_refunded)
         rma.reception_move_id.quantity_done = rma.product_uom_qty
         rma.reception_move_id.picking_id._action_done()
@@ -266,3 +266,27 @@ def test_no_manual_refund_quantity_impact(self):
         picking.move_ids.quantity_done = rma.product_uom_qty
         picking._action_done()
         self.assertEqual(order.order_line.qty_delivered, 5)
+
+    def test_return_different_product(self):
+        self.operation.action_create_delivery = False
+        self.operation.different_return_product = True
+        self.operation.action_create_refund = "update_quantity"
+        order = self.sale_order
+        order_line = order.order_line
+        self.assertEqual(order_line.qty_delivered, 5)
+        wizard = self._rma_sale_wizard(order)
+        with self.assertRaises(
+            ValidationError, msg="Complete the replacement information"
+        ):
+            rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
+        return_product = self.product_product.create(
+            {"name": "return Product test 1", "type": "product"}
+        )
+        wizard.line_ids.return_product_id = return_product
+        rma = self.env["rma"].browse(wizard.create_and_open_rma()["res_id"])
+        self.assertEqual(rma.reception_move_id.sale_line_id, order_line)
+        self.assertEqual(rma.reception_move_id.product_id, return_product)
+        self.assertFalse(rma.can_be_refunded)
+        rma.reception_move_id.quantity_done = rma.product_uom_qty
+        rma.reception_move_id.picking_id._action_done()
+        self.assertEqual(order.order_line.qty_delivered, 5)
diff --git a/rma_sale/wizard/sale_order_rma_wizard.py b/rma_sale/wizard/sale_order_rma_wizard.py
index 60146c84f..69c35d6a3 100644
--- a/rma_sale/wizard/sale_order_rma_wizard.py
+++ b/rma_sale/wizard/sale_order_rma_wizard.py
@@ -157,6 +157,14 @@ class SaleOrderLineRmaWizard(models.TransientModel):
         comodel_name="sale.order.line",
     )
     description = fields.Text()
+    return_product_id = fields.Many2one(
+        "product.product",
+        help="Product to be returned if it's different from the originally delivered "
+        "item.",
+    )
+    different_return_product = fields.Boolean(
+        related="operation_id.different_return_product"
+    )
 
     @api.depends("wizard_id.operation_id")
     def _compute_operation_id(self):
@@ -223,4 +231,5 @@ def _prepare_rma_values(self):
             "product_uom": self.uom_id.id,
             "operation_id": self.operation_id.id,
             "description": description,
+            "return_product_id": self.return_product_id.id,
         }
diff --git a/rma_sale/wizard/sale_order_rma_wizard_views.xml b/rma_sale/wizard/sale_order_rma_wizard_views.xml
index 24e0f0cb4..02da5b965 100644
--- a/rma_sale/wizard/sale_order_rma_wizard_views.xml
+++ b/rma_sale/wizard/sale_order_rma_wizard_views.xml
@@ -35,6 +35,11 @@
                                 name="operation_id"
                                 attrs="{'required': [('quantity', '>', 0)]}"
                             />
+                                <field
+                                name="return_product_id"
+                                attrs="{'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True)]}"
+                            />
+                            <field name="different_return_product" invisible="1" />
                         </tree>
                     </field>
                 </group>

From 0712bb673292b8a809ea218280d4991b521d7977 Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Fri, 20 Sep 2024 11:22:49 +0200
Subject: [PATCH 4/7] [FIX] rma: use replacement action for automatic return

---
 rma/models/rma.py               | 17 +++++++++++++----
 rma/tests/test_rma_operation.py | 23 +++++++++++++++++++----
 rma_sale/models/rma.py          | 12 ++++++++++++
 3 files changed, 44 insertions(+), 8 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 126a05515..d84b79af9 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -857,8 +857,12 @@ def action_confirm(self):
             if rec.operation_id.action_create_delivery == "automatic_on_confirm":
                 rec.with_context(
                     rma_return_grouping=rec.env.company.rma_return_grouping
-                ).create_return(
-                    fields.Datetime.now(), rec.product_uom_qty, rec.product_uom
+                ).create_replace(
+                    fields.Datetime.now(),
+                    self.warehouse_id,
+                    self.product_id,
+                    rec.product_uom_qty,
+                    rec.product_uom,
                 )
             if rec.operation_id.action_create_refund == "automatic_on_confirm":
                 rec.action_refund()
@@ -1502,9 +1506,14 @@ def update_received_state_on_reception(self):
             if rec.operation_id.action_create_delivery == "automatic_after_receipt":
                 rec.with_context(
                     rma_return_grouping=rec.env.company.rma_return_grouping
-                ).create_return(
-                    fields.Datetime.now(), rec.product_uom_qty, rec.product_uom
+                ).create_replace(
+                    fields.Datetime.now(),
+                    self.warehouse_id,
+                    self.product_id,
+                    rec.product_uom_qty,
+                    rec.product_uom,
                 )
+
             if rec.operation_id.action_create_refund == "automatic_after_receipt":
                 rec.action_refund()
 
diff --git a/rma/tests/test_rma_operation.py b/rma/tests/test_rma_operation.py
index 2957ed4bd..ab1478df0 100644
--- a/rma/tests/test_rma_operation.py
+++ b/rma/tests/test_rma_operation.py
@@ -76,7 +76,7 @@ def test_04(self):
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
         rma.action_confirm()
-        self.assertEqual(rma.state, "waiting_return")
+        self.assertEqual(rma.state, "waiting_replacement")
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.show_create_return)
         self.assertFalse(rma.can_be_replaced)
@@ -128,10 +128,10 @@ def test_06(self):
         rma.reception_move_id.picking_id._action_done()
         self.assertEqual(rma.delivery_move_ids.product_id, self.product)
         self.assertEqual(rma.delivery_move_ids.product_uom_qty, 10)
-        self.assertEqual(rma.state, "waiting_return")
+        self.assertEqual(rma.state, "waiting_replacement")
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.show_create_return)
-        self.assertFalse(rma.can_be_replaced)
+        self.assertTrue(rma.can_be_replaced)
         self.assertFalse(rma.show_create_replace)
 
     def test_07(self):
@@ -155,7 +155,7 @@ def test_07(self):
         rma.action_confirm()
         self.assertEqual(rma.delivery_move_ids.product_id, rma.product_id)
         self.assertEqual(rma.reception_move_id.product_id, rma.return_product_id)
-        self.assertEqual(rma.state, "waiting_return")
+        self.assertEqual(rma.state, "waiting_replacement")
 
     def test_08(self):
         """test refund, manually after confirm"""
@@ -287,3 +287,18 @@ def test_15(self):
         reception = self.env["stock.picking"].browse(picking_action["res_id"])
         move = reception.move_ids.filtered(lambda m, p=self.product: m.product_id == p)
         self.assertTrue(move.to_refund)
+
+    def test_rma_replace_pick_ship(self):
+        self.operation.action_create_delivery = "automatic_on_confirm"
+        self.warehouse.write({"delivery_steps": "pick_ship"})
+        rma = self._create_rma(self.partner, self.product, 1, self.rma_loc)
+        rma.action_confirm()
+        self.assertEqual(rma.state, "waiting_replacement")
+        out_pickings = rma.mapped("delivery_move_ids.picking_id")
+        self.assertEqual(rma.delivery_picking_count, 2)
+        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")
+        )
diff --git a/rma_sale/models/rma.py b/rma_sale/models/rma.py
index 1898e717c..0da46b5aa 100644
--- a/rma_sale/models/rma.py
+++ b/rma_sale/models/rma.py
@@ -186,6 +186,18 @@ def _prepare_delivery_procurement_vals(self, scheduled_date=None):
             vals["sale_line_id"] = self.move_id.sale_line_id.id
         return vals
 
+    def _prepare_replace_procurement_vals(self, warehouse=None, scheduled_date=None):
+        vals = super()._prepare_replace_procurement_vals(
+            warehouse=warehouse, scheduled_date=scheduled_date
+        )
+        if (
+            self.move_id
+            and self.move_id.sale_line_id
+            and self.operation_id.action_create_refund == "update_quantity"
+        ):
+            vals["sale_line_id"] = self.move_id.sale_line_id.id
+        return vals
+
     def _prepare_reception_procurement_vals(self, group=None):
         """This method is used only for reception and a specific RMA IN route."""
         vals = super()._prepare_reception_procurement_vals(group=group)

From 3923802780ee99e97f5f21cdec29d86cbdfbe79c Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Mon, 16 Sep 2024 16:19:18 +0200
Subject: [PATCH 5/7] [FIX] don't link moves if the operation required
 different return product

---
 rma/models/rma.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index d84b79af9..902a17233 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -785,6 +785,8 @@ def _prepare_reception_procurement_vals(self, group=None):
         vals["to_refund"] = self.operation_id.action_create_refund == "update_quantity"
         if self.move_id:
             vals["origin_returned_move_id"] = self.move_id.id
+            if not self.operation_id.different_return_product:
+                vals["move_orig_ids"] = [(6, 0, self.move_id.ids)]
         return vals
 
     def _prepare_reception_procurements(self):

From 159ea7b16c85b18f4b42cb0d2b74f49cee76856b Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Mon, 14 Oct 2024 23:27:47 +0200
Subject: [PATCH 6/7] [FIX] fix create_replace: call create replace on single
 rma

---
 rma/models/rma.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/rma/models/rma.py b/rma/models/rma.py
index 902a17233..1fde32ef0 100644
--- a/rma/models/rma.py
+++ b/rma/models/rma.py
@@ -861,8 +861,8 @@ def action_confirm(self):
                     rma_return_grouping=rec.env.company.rma_return_grouping
                 ).create_replace(
                     fields.Datetime.now(),
-                    self.warehouse_id,
-                    self.product_id,
+                    rec.warehouse_id,
+                    rec.product_id,
                     rec.product_uom_qty,
                     rec.product_uom,
                 )
@@ -1510,8 +1510,8 @@ def update_received_state_on_reception(self):
                     rma_return_grouping=rec.env.company.rma_return_grouping
                 ).create_replace(
                     fields.Datetime.now(),
-                    self.warehouse_id,
-                    self.product_id,
+                    rec.warehouse_id,
+                    rec.product_id,
                     rec.product_uom_qty,
                     rec.product_uom,
                 )

From 4c747d9239d4d09b6defd4bea658a913af98c63b Mon Sep 17 00:00:00 2001
From: sbejaoui <souheil.bejaoui@acsone.eu>
Date: Wed, 30 Oct 2024 19:52:05 +0100
Subject: [PATCH 7/7] [IMP] rma: return product required if qty>0

---
 rma/wizard/stock_picking_return_views.xml       | 2 +-
 rma_sale/wizard/sale_order_rma_wizard_views.xml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rma/wizard/stock_picking_return_views.xml b/rma/wizard/stock_picking_return_views.xml
index ed6e062f9..8be27a19b 100644
--- a/rma/wizard/stock_picking_return_views.xml
+++ b/rma/wizard/stock_picking_return_views.xml
@@ -15,7 +15,7 @@
                 />
                 <field
                     name="return_product_id"
-                    attrs="{'column_invisible': [('parent.create_rma', '=', False)], 'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True)]}"
+                    attrs="{'column_invisible': [('parent.create_rma', '=', False)], 'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True), ('quantity', '>', 0)]}"
                 />
                     <field name="different_return_product" invisible="1" />
             </xpath>
diff --git a/rma_sale/wizard/sale_order_rma_wizard_views.xml b/rma_sale/wizard/sale_order_rma_wizard_views.xml
index 02da5b965..23fe07e54 100644
--- a/rma_sale/wizard/sale_order_rma_wizard_views.xml
+++ b/rma_sale/wizard/sale_order_rma_wizard_views.xml
@@ -37,7 +37,7 @@
                             />
                                 <field
                                 name="return_product_id"
-                                attrs="{'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True)]}"
+                                attrs="{'invisible': [('different_return_product', '=', False)], 'required': [('different_return_product', '=', True), ('quantity', '>', 0)]}"
                             />
                             <field name="different_return_product" invisible="1" />
                         </tree>