diff --git a/rma/models/rma_order_line.py b/rma/models/rma_order_line.py
index 44c1a961..e1f777e0 100644
--- a/rma/models/rma_order_line.py
+++ b/rma/models/rma_order_line.py
@@ -587,7 +587,19 @@ class RmaOrderLine(models.Model):
             self.reference_move_id = False
         return True
 
+    def _check_production_lot_assigned(self):
+        for rec in self:
+            if rec.product_id.tracking == "serial" and rec.product_qty != 1:
+                raise ValidationError(
+                    _(
+                        "Product %s has serial tracking configuration, "
+                        "quantity to receive should be 1"
+                    )
+                    % (rec.product_id.display_name)
+                )
+
     def action_rma_to_approve(self):
+        self._check_production_lot_assigned()
         self.write({"state": "to_approve"})
         for rec in self:
             if rec.product_id.rma_approval_policy == "one_step":
diff --git a/rma/models/stock.py b/rma/models/stock.py
index 01d79647..2cab4bb3 100644
--- a/rma/models/stock.py
+++ b/rma/models/stock.py
@@ -60,3 +60,9 @@ class StockMove(models.Model):
             return self.move_dest_ids[0]._get_last_usage()
         else:
             return self.location_dest_id.usage
+
+    def _should_bypass_reservation(self):
+        res = super(StockMove, self)._should_bypass_reservation()
+        if self.env.context.get("force_no_bypass_reservation"):
+            return False
+        return res
diff --git a/rma/wizards/rma_add_stock_move.py b/rma/wizards/rma_add_stock_move.py
index 8b1a3607..0352a1f3 100644
--- a/rma/wizards/rma_add_stock_move.py
+++ b/rma/wizards/rma_add_stock_move.py
@@ -36,6 +36,36 @@ class RmaAddStockMove(models.TransientModel):
         string="Stock Moves",
         domain="[('state', '=', 'done')]",
     )
+    show_lot_filter = fields.Boolean(
+        string="Show lot filter?", compute="_compute_lot_domain",
+    )
+    lot_domain_ids = fields.Many2many(
+        comodel_name="stock.production.lot",
+        string="Lots Domain",
+        compute="_compute_lot_domain",
+    )
+
+    @api.depends("move_ids.move_line_ids.lot_id")
+    def _compute_lot_domain(self):
+        for rec in self:
+            rec.lot_domain_ids = rec.mapped("move_ids.move_line_ids.lot_id").ids
+            rec.show_lot_filter = bool(rec.lot_domain_ids)
+
+    lot_ids = fields.Many2many(
+        comodel_name="stock.production.lot", string="Lots/Serials selected"
+    )
+
+    def select_all(self):
+        self.ensure_one()
+        self.write({"lot_ids": [(6, 0, self.lot_domain_ids.ids)]})
+        return {
+            "type": "ir.actions.act_window",
+            "name": _("Add from Stock Move"),
+            "view_mode": "form",
+            "res_model": self._name,
+            "res_id": self.id,
+            "target": "new",
+        }
 
     def _prepare_rma_line_from_stock_move(self, sm, lot=False):
         if self.env.context.get("customer"):
@@ -74,6 +104,15 @@ class RmaAddStockMove(models.TransientModel):
                 raise ValidationError(
                     _("Please define a warehouse with a default RMA location")
                 )
+        product_qty = sm.product_uom_qty
+        if sm.product_id.tracking == "serial":
+            product_qty = 1
+        elif sm.product_id.tracking == "lot":
+            product_qty = sum(
+                sm.move_line_ids.filtered(lambda x: x.lot_id.id == lot.id).mapped(
+                    "qty_done"
+                )
+            )
         data = {
             "partner_id": self.partner_id.id,
             "reference_move_id": sm.id,
@@ -82,7 +121,7 @@ class RmaAddStockMove(models.TransientModel):
             "origin": sm.picking_id.name or sm.name,
             "uom_id": sm.product_uom.id,
             "operation_id": operation.id,
-            "product_qty": sm.product_uom_qty,
+            "product_qty": product_qty,
             "delivery_address_id": sm.picking_id.partner_id.id,
             "rma_id": self.rma_id.id,
             "receipt_policy": operation.receipt_policy,
@@ -110,16 +149,21 @@ class RmaAddStockMove(models.TransientModel):
         rma_line_obj = self.env["rma.order.line"]
         existing_stock_moves = self._get_existing_stock_moves()
         for sm in self.move_ids:
-            if sm not in existing_stock_moves:
+            tracking_move = sm.product_id.tracking in ("serial", "lot")
+            if sm not in existing_stock_moves or tracking_move:
                 if sm.product_id.tracking == "none":
                     data = self._prepare_rma_line_from_stock_move(sm, lot=False)
                     rma_line_obj.with_context(default_rma_id=self.rma_id.id).create(
                         data
                     )
                 else:
-                    lot_ids = [x.lot_id.id for x in sm.move_line_ids if x.lot_id]
-                    data = self._prepare_rma_line_from_stock_move(sm, lot=lot_ids[0])
-                    rma_line_obj.with_context(default_rma_id=self.rma_id.id).create(
-                        data
-                    )
+                    for lot in sm.move_line_ids.mapped("lot_id").filtered(
+                        lambda x: x.id in self.lot_ids.ids
+                    ):
+                        if lot.id in self.rma_id.rma_line_ids.mapped("lot_id").ids:
+                            continue
+                        data = self._prepare_rma_line_from_stock_move(sm, lot)
+                        rma_line_obj.with_context(default_rma_id=self.rma_id.id).create(
+                            data
+                        )
         return {"type": "ir.actions.act_window_close"}
diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index e0b4cbc5..226b07c1 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -40,6 +40,35 @@
                         <field name="state" />
                     </tree>
                 </field>
+                <field name="show_lot_filter" invisible="1" />
+                <field name="lot_domain_ids" widget="many2many_tags" invisible="1" />
+                <div
+                    class="oe_grey"
+                    attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                >
+                    The creation of the RMA Lines will be separated according to the lots or serials selected
+                </div>
+                <div class="o_row">
+                    <label
+                        for="lot_ids"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                        string="Selected Lot/Serial Numbers"
+                    />
+                    <field
+                        name="lot_ids"
+                        widget="many2many_tags"
+                        domain="[('id', 'in', lot_domain_ids)]"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                        options="{'no_create': True}"
+                    />
+                    <button
+                        name="select_all"
+                        type="object"
+                        string="Select all"
+                        class="oe_inline"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                    />
+                </div>
                 <footer>
                     <button
                         string="Confirm"
diff --git a/rma/wizards/rma_make_picking.py b/rma/wizards/rma_make_picking.py
index 5a446c57..6951950f 100644
--- a/rma/wizards/rma_make_picking.py
+++ b/rma/wizards/rma_make_picking.py
@@ -189,11 +189,46 @@ class RmaMakePicking(models.TransientModel):
 
     def action_create_picking(self):
         self._create_picking()
+        move_line_model = self.env["stock.move.line"]
         picking_type = self.env.context.get("picking_type")
+        pickings = self.env["stock.picking"].browse()
         if picking_type == "outgoing":
+            pickings = self.mapped("item_ids.line_id")._get_out_pickings()
             action = self.item_ids.line_id.action_view_out_shipments()
         else:
+            pickings = self.mapped("item_ids.line_id")._get_in_pickings()
             action = self.item_ids.line_id.action_view_in_shipments()
+        for move in pickings.move_lines.filtered(
+            lambda x: x.state not in ("draft", "cancel", "done")
+            and x.rma_line_id
+            and x.product_id.tracking in ("lot", "serial")
+            and x.rma_line_id.lot_id
+        ):
+            move.move_line_ids.unlink()
+            if move.product_id.tracking == "serial":
+                move.write({"lot_ids": [(6, 0, move.rma_line_id.lot_id.ids)]})
+                move.move_line_ids.write({"product_uom_qty": 1, "qty_done": 0})
+            elif move.product_id.tracking == "lot":
+                if picking_type == "incoming":
+                    qty = self.item_ids.filtered(
+                        lambda x: x.line_id.id == move.rma_line_id.id
+                    ).qty_to_receive
+                else:
+                    qty = self.item_ids.filtered(
+                        lambda x: x.line_id.id == move.rma_line_id.id
+                    ).qty_to_deliver
+                move_line_data = move._prepare_move_line_vals()
+                move_line_data.update(
+                    {
+                        "lot_id": move.rma_line_id.lot_id.id,
+                        "product_uom_id": move.product_id.uom_id.id,
+                        "qty_done": 0,
+                        "product_uom_qty": qty,
+                    }
+                )
+                move_line_model.create(move_line_data)
+        if picking_type == "incoming":
+            pickings.with_context(force_no_bypass_reservation=True).action_assign()
         return action
 
     def action_cancel(self):
diff --git a/rma_sale/wizards/rma_add_sale.py b/rma_sale/wizards/rma_add_sale.py
index 9d4d356f..eda14eae 100644
--- a/rma_sale/wizards/rma_add_sale.py
+++ b/rma_sale/wizards/rma_add_sale.py
@@ -41,8 +41,43 @@ class RmaAddSale(models.TransientModel):
         readonly=False,
         string="Sale Lines",
     )
+    show_lot_filter = fields.Boolean(
+        string="Show lot filter?", compute="_compute_lot_domain",
+    )
+    lot_domain_ids = fields.Many2many(
+        comodel_name="stock.production.lot",
+        string="Lots Domain",
+        compute="_compute_lot_domain",
+    )
 
-    def _prepare_rma_line_from_sale_order_line(self, line):
+    @api.depends("sale_line_ids.move_ids.move_line_ids.lot_id",)
+    def _compute_lot_domain(self):
+        for rec in self:
+            rec.lot_domain_ids = (
+                rec.mapped("sale_line_ids.move_ids")
+                .filtered(lambda x: x.state == "done")
+                .mapped("move_line_ids.lot_id")
+                .ids
+            )
+            rec.show_lot_filter = bool(rec.lot_domain_ids)
+
+    lot_ids = fields.Many2many(
+        comodel_name="stock.production.lot", string="Lots/Serials selected"
+    )
+
+    def select_all(self):
+        self.ensure_one()
+        self.write({"lot_ids": [(6, 0, self.lot_domain_ids.ids)]})
+        return {
+            "type": "ir.actions.act_window",
+            "name": _("Add Sale Order"),
+            "view_mode": "form",
+            "res_model": self._name,
+            "res_id": self.id,
+            "target": "new",
+        }
+
+    def _prepare_rma_line_from_sale_order_line(self, line, lot=None):
         operation = line.product_id.rma_customer_operation_id
         if not operation:
             operation = line.product_id.categ_id.rma_customer_operation_id
@@ -70,14 +105,24 @@ class RmaAddSale(models.TransientModel):
                 raise ValidationError(
                     _("Please define a warehouse with a " "default rma location.")
                 )
+        product_qty = line.product_uom_qty
+        if line.product_id.tracking == "serial":
+            product_qty = 1
+        elif line.product_id.tracking == "lot":
+            product_qty = sum(
+                line.mapped("move_ids.move_line_ids")
+                .filtered(lambda x: x.lot_id.id == lot.id)
+                .mapped("qty_done")
+            )
         data = {
             "partner_id": self.partner_id.id,
             "sale_line_id": line.id,
             "product_id": line.product_id.id,
+            "lot_id": lot and lot.id or False,
             "origin": line.order_id.name,
             "uom_id": line.product_uom.id,
             "operation_id": operation.id,
-            "product_qty": line.product_uom_qty,
+            "product_qty": product_qty,
             "delivery_address_id": self.sale_id.partner_id.id,
             "invoice_address_id": self.sale_id.partner_id.id,
             "price_unit": line.currency_id._convert(
@@ -118,10 +163,20 @@ class RmaAddSale(models.TransientModel):
         rma_line_obj = self.env["rma.order.line"]
         existing_sale_lines = self._get_existing_sale_lines()
         for line in self.sale_line_ids:
+            tracking_move = line.product_id.tracking in ("serial", "lot")
             # Load a PO line only once
-            if line not in existing_sale_lines:
-                data = self._prepare_rma_line_from_sale_order_line(line)
-                rma_line_obj.create(data)
+            if line not in existing_sale_lines or tracking_move:
+                if not tracking_move:
+                    data = self._prepare_rma_line_from_sale_order_line(line)
+                    rma_line_obj.create(data)
+                else:
+                    for lot in line.mapped("move_ids.move_line_ids.lot_id").filtered(
+                        lambda x: x.id in self.lot_ids.ids
+                    ):
+                        if lot.id in self.rma_id.rma_line_ids.mapped("lot_id").ids:
+                            continue
+                        data = self._prepare_rma_line_from_sale_order_line(line, lot)
+                        rma_line_obj.create(data)
         rma = self.rma_id
         data_rma = self._get_rma_data()
         rma.write(data_rma)
diff --git a/rma_sale/wizards/rma_add_sale.xml b/rma_sale/wizards/rma_add_sale.xml
index 10774c37..427e87a7 100644
--- a/rma_sale/wizards/rma_add_sale.xml
+++ b/rma_sale/wizards/rma_add_sale.xml
@@ -46,6 +46,35 @@
                     </tree>
 
                 </field>
+                <field name="show_lot_filter" invisible="1" />
+                <field name="lot_domain_ids" widget="many2many_tags" invisible="1" />
+                <div
+                    class="oe_grey"
+                    attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                >
+                    The creation of the RMA Lines will be separated according to the lots or serials selected
+                </div>
+                <div class="o_row">
+                    <label
+                        for="lot_ids"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                        string="Selected Lot/Serial Numbers"
+                    />
+                    <field
+                        name="lot_ids"
+                        widget="many2many_tags"
+                        domain="[('id', 'in', lot_domain_ids)]"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                        options="{'no_create': True}"
+                    />
+                    <button
+                        name="select_all"
+                        type="object"
+                        string="Select all"
+                        class="oe_inline"
+                        attrs="{'invisible': [('show_lot_filter', '=', False)]}"
+                    />
+                </div>
                 <footer>
                     <button
                         string="Confirm"