odoo-addon-rma 17.0.2.2.1__py3-none-any.whl → 18.0.1.0.0.3__py3-none-any.whl

odoo/addons/rma/models/rma.py

@@ -9,7 +9,7 @@ from itertools import groupby
 
 from markupsafe import Markup
 
-from odoo import _, api, fields, models
+from odoo import api, fields, models
 from odoo.exceptions import AccessError, ValidationError
 from odoo.tools import html2plaintext
 
@@ -40,7 +40,7 @@ class Rma(models.Model):
     name = fields.Char(
         index=True,
         copy=False,
-        default=lambda self: _("New"),
+        default=lambda self: self.env._("New"),
     )
     origin = fields.Char(
         string="Source Document",
@@ -314,9 +314,7 @@ class Rma(models.Model):
         for r in self:
             r.remaining_qty = r.product_uom_qty - r.delivered_qty
 
-    @api.depends(
-        "state",
-    )
+    @api.depends("state")
     def _compute_can_be_refunded(self):
         """Compute 'can_be_refunded'. This field controls the visibility
         of 'Refund' button in the rma form view and determinates if
@@ -497,7 +495,7 @@ class Rma(models.Model):
     @api.model_create_multi
     def create(self, vals_list):
         for vals in vals_list:
-            if vals.get("name", _("New")) == _("New"):
+            if vals.get("name", self.env._("New")) == self.env._("New"):
                 ir_sequence = self.env["ir.sequence"]
                 if "company_id" in vals:
                     ir_sequence = ir_sequence.with_company(vals["company_id"])
@@ -514,18 +512,19 @@ class Rma(models.Model):
         return rmas
 
     def copy(self, default=None):
-        team = super().copy(default)
-        for follower in self.message_follower_ids:
-            team.message_subscribe(
-                partner_ids=follower.partner_id.ids,
-                subtype_ids=follower.subtype_ids.ids,
-            )
-        return team
+        new_rmas = super().copy(default)
+        for old_rma, new_rma in zip(self, new_rmas, strict=False):
+            for follower in old_rma.message_follower_ids:
+                new_rma.message_subscribe(
+                    partner_ids=follower.partner_id.ids,
+                    subtype_ids=follower.subtype_ids.ids,
+                )
+        return new_rmas
 
     def unlink(self):
         if self.filtered(lambda r: r.state != "draft"):
             raise ValidationError(
-                _("You cannot delete RMAs that are not in draft state")
+                self.env._("You cannot delete RMAs that are not in draft state")
             )
         return super().unlink()
 
@@ -601,10 +600,6 @@ class Rma(models.Model):
         if self.partner_id and self.partner_id not in self.message_partner_ids:
             self.message_subscribe([self.partner_id.id])
 
-    def _product_is_storable(self, product=None):
-        product = product or self.product_id
-        return product.type in ["product", "consu"]
-
     def _prepare_procurement_group_vals(self):
         return {
             "move_type": "direct",
@@ -643,7 +638,7 @@ class Rma(models.Model):
         procurements = []
         group_model = self.env["procurement.group"]
         for rma in self:
-            if not rma._product_is_storable():
+            if not rma.product_id.is_storable:
                 continue
             group = rma.procurement_group_id
             if not group:
@@ -824,7 +819,7 @@ class Rma(models.Model):
         """Invoked when 'Refund' smart button in rma form view is clicked."""
         self.ensure_one()
         return {
-            "name": _("Refund"),
+            "name": self.env._("Refund"),
             "type": "ir.actions.act_window",
             "view_type": "form",
             "view_mode": "form",
@@ -873,7 +868,7 @@ class Rma(models.Model):
                 )
                 desc += f"\n{field_record.field_description}"
             if desc:
-                raise ValidationError(_("Required field(s):%s") % desc)
+                raise ValidationError(self.env._("Required field(s):%s") % desc)
 
     def _ensure_can_be_returned(self):
         """This method is intended to be invoked after user click on
@@ -888,9 +883,11 @@ class Rma(models.Model):
         """
         if len(self) == 1:
             if not self.can_be_returned:
-                raise ValidationError(_("This RMA cannot perform a return."))
+                raise ValidationError(self.env._("This RMA cannot perform a return."))
         elif not self.filtered("can_be_returned"):
-            raise ValidationError(_("None of the selected RMAs can perform a return."))
+            raise ValidationError(
+                self.env._("None of the selected RMAs can perform a return.")
+            )
 
     def _ensure_can_be_replaced(self):
         """This method is intended to be invoked after user click on
@@ -903,10 +900,12 @@ class Rma(models.Model):
         """
         if len(self) == 1:
             if not self.can_be_replaced:
-                raise ValidationError(_("This RMA cannot perform a replacement."))
+                raise ValidationError(
+                    self.env._("This RMA cannot perform a replacement.")
+                )
         elif not self.filtered("can_be_replaced"):
             raise ValidationError(
-                _("None of the selected RMAs can perform a replacement.")
+                self.env._("None of the selected RMAs can perform a replacement.")
             )
 
     def _ensure_can_be_split(self):
@@ -917,7 +916,7 @@ class Rma(models.Model):
         """
         self.ensure_one()
         if not self.can_be_split:
-            raise ValidationError(_("This RMA cannot be split."))
+            raise ValidationError(self.env._("This RMA cannot be split."))
 
     def _ensure_qty_to_return(self, qty=None, uom=None):
         """This method is intended to be invoked after confirm the wizard.
@@ -928,7 +927,9 @@ class Rma(models.Model):
                 qty = uom._compute_quantity(qty, self.product_uom)
             if qty > self.remaining_qty:
                 raise ValidationError(
-                    _("The quantity to return is greater than " "remaining quantity.")
+                    self.env._(
+                        "The quantity to return is greater than " "remaining quantity."
+                    )
                 )
 
     def _ensure_qty_to_extract(self, qty, uom):
@@ -940,7 +941,7 @@ class Rma(models.Model):
             to_split_uom_qty = uom._compute_quantity(qty, self.product_uom)
         if to_split_uom_qty > self.remaining_qty:
             raise ValidationError(
-                _(
+                self.env._(
                     "Quantity to extract cannot be greater than remaining"
                     " delivery quantity (%(remaining_qty)s %(product_uom)s)"
                 )
@@ -980,7 +981,7 @@ class Rma(models.Model):
         )
         self.message_post(
             body=Markup(
-                _(
+                self.env._(
                     'Split: <a href="#" data-oe-model="rma" '
                     'data-oe-id="%(id)d">%(name)s</a> has been created.'
                 )
@@ -1103,7 +1104,7 @@ class Rma(models.Model):
         self._ensure_can_be_returned()
         self._ensure_qty_to_return(qty, uom)
         rmas_to_return = self.filtered(
-            lambda rma: rma.can_be_returned and rma._product_is_storable()
+            lambda rma: rma.can_be_returned and rma.product_id.is_storable
         )
         procurements = rmas_to_return._prepare_delivery_procurements(
             scheduled_date, qty, uom
@@ -1116,7 +1117,7 @@ class Rma(models.Model):
             pickings[picking] |= rma
             rma.message_post(
                 body=Markup(
-                    _(
+                    self.env._(
                         'Return: <a href="#" data-oe-model="stock.picking" '
                         'data-oe-id="%(id)d">%(name)s</a> has been created.'
                     )
@@ -1146,7 +1147,7 @@ class Rma(models.Model):
         procurements = []
         group_model = self.env["procurement.group"]
         for rma in self:
-            if not rma._product_is_storable(product):
+            if not product.is_storable:
                 continue
 
             if not rma.procurement_group_id:
@@ -1186,7 +1187,7 @@ class Rma(models.Model):
         # MRP BoM Kits
         for new_move in new_moves:
             body += Markup(
-                _(
+                self.env._(
                     'Replacement: Move <a href="#" data-oe-model="stock.move"'
                     ' data-oe-id="%(move_id)d">%(move_name)s</a> (Picking <a'
                     ' href="#" data-oe-model="stock.picking"'
@@ -1212,7 +1213,7 @@ class Rma(models.Model):
         self.message_post(
             body=body
             or Markup(
-                _(
+                self.env._(
                     "Replacement:<br/>"
                     'Product <a href="#" data-oe-model="product.product" '
                     'data-oe-id="%(id)d">%(name)s</a><br/>'
@@ -1255,14 +1256,14 @@ class Rma(models.Model):
             custom_values = {}
         subject = msg_dict.get("subject", "")
         body = html2plaintext(msg_dict.get("body", ""))
-        desc = _(
+        desc = self.env._(
             "<b>E-mail subject:</b> %(subject)s<br/><br/><b>E-mail"
             " body:</b><br/>%(body)s"
         ) % ({"subject": subject, "body": body})
         defaults = {
             "description": desc,
-            "name": _("New"),
-            "origin": _("Incoming e-mail"),
+            "name": self.env._("New"),
+            "origin": self.env._("Incoming e-mail"),
         }
         if msg_dict.get("author_id"):
             partner = self.env["res.partner"].browse(msg_dict.get("author_id"))
@@ -1298,7 +1299,7 @@ class Rma(models.Model):
         try:
             for record in self.filtered("partner_id"):
                 record._message_add_suggested_recipient(
-                    recipients, partner=record.partner_id, reason=_("Customer")
+                    recipients, partner=record.partner_id, reason=self.env._("Customer")
                 )
         except AccessError as e:  # no read access rights
             _logger.debug(e)
@@ -1307,7 +1308,7 @@ class Rma(models.Model):
     # Reporting business methods
     def _get_report_base_filename(self):
         self.ensure_one()
-        return "RMA Report - %s" % self.name
+        return f"RMA Report - {self.name}"
 
     # Other business methods
 

odoo/addons/rma/models/rma_team.py

@@ -3,7 +3,7 @@
 
 import ast
 
-from odoo import _, fields, models
+from odoo import fields, models
 
 
 class RmaTeam(models.Model):
@@ -40,18 +40,17 @@ class RmaTeam(models.Model):
     )
 
     def copy(self, default=None):
-        self.ensure_one()
-        if default is None:
-            default = {}
-        if not default.get("name"):
-            default["name"] = _("%s (copy)") % self.name
-        team = super().copy(default)
-        for follower in self.message_follower_ids:
-            team.message_subscribe(
-                partner_ids=follower.partner_id.ids,
-                subtype_ids=follower.subtype_ids.ids,
-            )
-        return team
+        default = dict(default or {})
+        new_teams = super().copy(default)
+        for old_team, new_team in zip(self, new_teams, strict=False):
+            if not default.get("name"):
+                new_team.name = self.env._("%s (copy)") % old_team.name
+            for follower in old_team.message_follower_ids:
+                new_team.message_subscribe(
+                    partner_ids=follower.partner_id.ids,
+                    subtype_ids=follower.subtype_ids.ids,
+                )
+        return new_teams
 
     def _alias_get_creation_values(self):
         values = super()._alias_get_creation_values()

odoo/addons/rma/models/stock_move.py

@@ -2,7 +2,7 @@
 # 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 api, fields, models
 from odoo.exceptions import ValidationError
 from odoo.tools import float_compare
 
@@ -72,7 +72,7 @@ class StockMove(models.Model):
                 != 0
             ):
                 raise ValidationError(
-                    _(
+                    self.env._(
                         "The quantity done for the product '%(id)s' must "
                         "be equal to its initial demand because the "
                         "stock move is linked to an RMA (%(name)s)."

odoo/addons/rma/models/stock_picking.py

@@ -16,18 +16,6 @@ class StockPicking(models.Model):
         for rec in self:
             rec.rma_count = len(rec.move_ids.mapped("rma_ids"))
 
-    def copy(self, default=None):
-        self.ensure_one()
-        if self.env.context.get("set_rma_picking_type"):
-            location_dest_id = default.get("location_dest_id")
-            if location_dest_id:
-                warehouse = self.env["stock.warehouse"].search(
-                    [("rma_loc_id", "parent_of", location_dest_id)], limit=1
-                )
-                if warehouse:
-                    default["picking_type_id"] = warehouse.rma_in_type_id.id
-        return super().copy(default)
-
     def action_view_rma(self):
         self.ensure_one()
         action = self.env["ir.actions.act_window"]._for_xml_id("rma.rma_action")

odoo/addons/rma/models/stock_warehouse.py

@@ -2,7 +2,7 @@
 # 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 _, fields, models
+from odoo import fields, models
 
 
 class StockWarehouse(models.Model):
@@ -19,17 +19,24 @@ class StockWarehouse(models.Model):
     rma_in_type_id = fields.Many2one(
         comodel_name="stock.picking.type",
         string="RMA In Type",
+        check_company=True,
+        copy=False,
     )
     rma_out_type_id = fields.Many2one(
         comodel_name="stock.picking.type",
         string="RMA Out Type",
+        check_company=True,
+        copy=False,
     )
     rma_loc_id = fields.Many2one(
-        comodel_name="stock.location",
-        string="RMA Location",
+        comodel_name="stock.location", string="RMA Location", check_company=True
+    )
+    rma_in_route_id = fields.Many2one(
+        "stock.route", "RMA in Route", ondelete="restrict", copy=False
+    )
+    rma_out_route_id = fields.Many2one(
+        "stock.route", "RMA out Route", ondelete="restrict", copy=False
     )
-    rma_in_route_id = fields.Many2one("stock.route", "RMA in Route")
-    rma_out_route_id = fields.Many2one("stock.route", "RMA out Route")
 
     def _get_rma_location_values(self, vals, code=False):
         """this method is intended to be used by 'create' method
@@ -49,7 +56,6 @@ class StockWarehouse(models.Model):
         return {
             "name": view_location.name,
             "active": True,
-            "return_location": True,
             "usage": "internal",
             "company_id": company_id,
             "location_id": self.env.ref("rma.stock_location_rma").id,
@@ -63,17 +69,19 @@ class StockWarehouse(models.Model):
 
     def _get_sequence_values(self, name=False, code=False):
         values = super()._get_sequence_values(name=name, code=code)
+        name = name if name else self.name
+        code = code if code else self.code
         values.update(
             {
                 "rma_in_type_id": {
-                    "name": self.name + " " + _("Sequence RMA in"),
-                    "prefix": self.code + "/RMA/IN/",
+                    "name": name + " " + self.env._("Sequence RMA in"),
+                    "prefix": code + "/RMA/IN/",
                     "padding": 5,
                     "company_id": self.company_id.id,
                 },
                 "rma_out_type_id": {
-                    "name": self.name + " " + _("Sequence RMA out"),
-                    "prefix": self.code + "/RMA/OUT/",
+                    "name": name + " " + self.env._("Sequence RMA out"),
+                    "prefix": code + "/RMA/OUT/",
                     "padding": 5,
                     "company_id": self.company_id.id,
                 },
@@ -96,23 +104,21 @@ class StockWarehouse(models.Model):
         data.update(
             {
                 "rma_in_type_id": {
-                    "name": _("RMA Receipts"),
+                    "name": self.env._("RMA Receipts"),
                     "code": "incoming",
                     "use_create_lots": False,
                     "use_existing_lots": True,
-                    "default_location_src_id": False,
                     "default_location_dest_id": self.rma_loc_id.id,
                     "sequence": max_sequence + 1,
                     "sequence_code": "RMA/IN",
                     "company_id": self.company_id.id,
                 },
                 "rma_out_type_id": {
-                    "name": _("RMA Delivery Orders"),
+                    "name": self.env._("RMA Delivery Orders"),
                     "code": "outgoing",
                     "use_create_lots": False,
                     "use_existing_lots": True,
                     "default_location_src_id": self.rma_loc_id.id,
-                    "default_location_dest_id": False,
                     "sequence": max_sequence + 2,
                     "sequence_code": "RMA/OUT",
                     "company_id": self.company_id.id,

odoo/addons/rma/security/rma_security.xml

@@ -71,25 +71,19 @@
         <field name="name">RMA multi-company</field>
         <field name="model_id" ref="model_rma" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <record id="rma_team_rule_multi_company" model="ir.rule">
         <field name="name">RMA team multi-company</field>
         <field name="model_id" ref="model_rma_team" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        >['|',('company_id','=',False),('company_id','in',company_ids)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <record id="rma_finalization_comp_rule" model="ir.rule">
         <field name="name">RMA Finalization Reason multi-company</field>
         <field name="model_id" ref="model_rma_finalization" />
         <field name="global" eval="True" />
-        <field
-            name="domain_force"
-        > ['|', ('company_id', 'in', company_ids), ('company_id', '=', False)]</field>
+        <field name="domain_force">[('company_id', 'in', company_ids + [False])]</field>
     </record>
     <!-- Allow to refund RMAs -->
     <record id="rma_account_move_personal_rule" model="ir.rule">

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

@@ -367,9 +367,9 @@ ul.auto-toc {
 !! This file is generated by oca-gen-addon-readme !!
 !! changes will be overwritten.                   !!
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-!! source digest: sha256:4226ff2ccfc01069320dd563138ac30c4252f24babc494801a90c1e3411ae38f
+!! source digest: sha256:6ea461b6c1041acb71b7933199e58032ecb6d1fb5cb65544d84ec0e1758065d0
 !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
-<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><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/18.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-18-0/rma-18-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=18.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
 (RMA)</a>.
 RMA documents can be created from scratch, from a delivery order or from
@@ -504,7 +504,7 @@ the warehouse definition.</li>
 <p>Bugs are tracked on <a class="reference external" href="https://github.com/OCA/rma/issues">GitHub Issues</a>.
 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
-<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2017.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
+<a class="reference external" href="https://github.com/OCA/rma/issues/new?body=module:%20rma%0Aversion:%2018.0%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**">feedback</a>.</p>
 <p>Do not contact contributors directly about support or help with technical issues.</p>
 </div>
 <div class="section" id="credits">
@@ -547,7 +547,7 @@ mission is to support the collaborative development of Odoo features and
 promote its widespread use.</p>
 <p>Current <a class="reference external" href="https://odoo-community.org/page/maintainer-role">maintainers</a>:</p>
 <p><a class="reference external image-reference" href="https://github.com/pedrobaeza"><img alt="pedrobaeza" src="https://github.com/pedrobaeza.png?size=40px" /></a> <a class="reference external image-reference" href="https://github.com/chienandalu"><img alt="chienandalu" src="https://github.com/chienandalu.png?size=40px" /></a></p>
-<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/17.0/rma">OCA/rma</a> project on GitHub.</p>
+<p>This module is part of the <a class="reference external" href="https://github.com/OCA/rma/tree/18.0/rma">OCA/rma</a> project on GitHub.</p>
 <p>You are welcome to contribute. To learn how please visit <a class="reference external" href="https://odoo-community.org/page/Contribute">https://odoo-community.org/page/Contribute</a>.</p>
 </div>
 </div>

odoo/addons/rma/tests/test_rma.py

@@ -1,5 +1,6 @@
 # Copyright 2020 Tecnativa - Ernesto Tejeda
 # Copyright 2023 Michael Tietz (MT Software) <mtietz@mt-software.de>
+# Copyright 2025 Tecnativa - Víctor Martínez
 # License AGPL-3.0 or later (https://www.gnu.org/licenses/agpl).
 
 from odoo.exceptions import UserError, ValidationError
@@ -28,7 +29,7 @@ class TestRma(BaseCommon):
         )
         cls.rma_loc = cls.warehouse_company.rma_loc_id
         cls.product = cls.product_product.create(
-            {"name": "Product test 1", "type": "product"}
+            {"name": "Product test 1", "type": "consu", "is_storable": True}
         )
         cls.account_receiv = cls.env["account.account"].create(
             {
@@ -123,7 +124,7 @@ class TestRma(BaseCommon):
             move.product_uom_qty = 10
         with picking_form.move_ids_without_package.new() as move:
             move.product_id = self.product_product.create(
-                {"name": "Product 2 test", "type": "product"}
+                {"name": "Product 2 test", "type": "consu", "is_storable": True}
             )
             move.product_uom_qty = 20
         picking = picking_form.save()
@@ -169,14 +170,44 @@ class TestRmaCase(TestRma):
         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")
+        out_picking = rma.delivery_move_ids.picking_id
+        out_picking.move_ids.quantity = 1
+        out_picking.button_validate()
+        self.assertEqual(out_picking.state, "done")
+        self.assertEqual(out_picking.picking_type_id, self.warehouse.pick_type_id)
+        next_transfer = out_picking._get_next_transfers()
+        self.assertEqual(next_transfer.picking_type_id, self.warehouse.out_type_id)
+        self.assertEqual(rma.delivery_picking_count, 1)
+
+    def test_rma_replace_pick_pack_ship(self):
+        self.warehouse.write({"delivery_steps": "pick_pack_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()
+        out_picking = rma.delivery_move_ids.picking_id
+        out_picking.move_ids.quantity = 1
+        out_picking.button_validate()
+        self.assertEqual(out_picking.state, "done")
+        self.assertEqual(out_picking.picking_type_id, self.warehouse.pick_type_id)
+        next_transfer = out_picking._get_next_transfers()
+        self.assertEqual(next_transfer.picking_type_id, self.warehouse.pack_type_id)
+        next_transfer.move_ids.quantity = 1
+        next_transfer.button_validate()
+        self.assertEqual(next_transfer.state, "done")
+        next_transfer_extra = next_transfer._get_next_transfers()
+        self.assertEqual(
+            next_transfer_extra.picking_type_id, self.warehouse.out_type_id
         )
+        self.assertEqual(rma.delivery_picking_count, 1)
 
     def test_computed(self):
         # If partner changes, the invoice address is set
@@ -193,7 +224,12 @@ class TestRmaCase(TestRma):
             }
         )
         product_2 = self.product_product.create(
-            {"name": "Product test 2", "type": "product", "uom_id": uom_ten.id}
+            {
+                "name": "Product test 2",
+                "type": "consu",
+                "is_storable": True,
+                "uom_id": uom_ten.id,
+            }
         )
         outgoing_picking_type = self.env["stock.picking.type"].search(
             [
@@ -305,6 +341,7 @@ class TestRmaCase(TestRma):
         self.assertEqual(rma_2.state, "received")
 
     @users("__system__", "user_rma")
+    @mute_logger("odoo.models.unlink")
     def test_action_refund(self):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         self.assertEqual(rma.state, "received")
@@ -339,6 +376,7 @@ class TestRmaCase(TestRma):
         self.assertFalse(rma.can_be_returned)
         self.assertFalse(rma.can_be_replaced)
 
+    @mute_logger("odoo.models.unlink")
     def test_mass_refund(self):
         # Create, confirm and receive rma_1
         rma_1 = self._create_confirm_receive(
@@ -351,7 +389,7 @@ class TestRmaCase(TestRma):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -424,7 +462,7 @@ class TestRmaCase(TestRma):
         rma = self._create_confirm_receive(self.partner, self.product, 10, self.rma_loc)
         # Replace with another product with quantity 2.
         product_2 = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -450,7 +488,7 @@ class TestRmaCase(TestRma):
         picking = first_move.picking_id
         # Replace again with another product with the remaining quantity
         product_3 = self.product_product.create(
-            {"name": "Product 3 test", "type": "product"}
+            {"name": "Product 3 test", "type": "consu", "is_storable": True}
         )
         delivery_form = Form(
             self.env["rma.delivery.wizard"].with_context(
@@ -572,7 +610,7 @@ class TestRmaCase(TestRma):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -653,7 +691,7 @@ class TestRmaCase(TestRma):
         )
         # rma_3: Same partner and different product than rma_1
         product = self.product_product.create(
-            {"name": "Product 2 test", "type": "product"}
+            {"name": "Product 2 test", "type": "consu", "is_storable": True}
         )
         rma_3 = self._create_confirm_receive(self.partner, product, 20, self.rma_loc)
         # rma_4: Different partner and same product as rma_1
@@ -685,7 +723,11 @@ class TestRmaCase(TestRma):
         stock_return_picking_form.create_rma = True
         stock_return_picking_form.rma_operation_id = self.operation
         return_wizard = stock_return_picking_form.save()
-        picking_action = return_wizard.create_returns()
+        for move in origin_delivery.move_ids_without_package:
+            return_wizard.product_return_moves.filtered(
+                lambda x, move=move: x.move_id == move
+            ).quantity = move.quantity
+        picking_action = return_wizard.action_create_returns()
         # Each origin move is linked to a different RMA
         origin_moves = origin_delivery.move_ids
         self.assertTrue(origin_moves[0].rma_ids)