diff --git a/rma_sale/wizards/rma_add_sale.py b/rma_sale/wizards/rma_add_sale.py
index c2b7fc14..c2a4ecc3 100644
--- a/rma_sale/wizards/rma_add_sale.py
+++ b/rma_sale/wizards/rma_add_sale.py
@@ -68,6 +68,22 @@ class RmaAddSale(models.TransientModel):
         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:
diff --git a/rma_sale/wizards/rma_add_sale.xml b/rma_sale/wizards/rma_add_sale.xml
index 474a765b..75fbe70c 100644
--- a/rma_sale/wizards/rma_add_sale.xml
+++ b/rma_sale/wizards/rma_add_sale.xml
@@ -44,18 +44,33 @@
                 </field>
                 <field name="show_lot_filter" invisible="1" />
                 <field name="lot_domain_ids" widget="many2many_tags" invisible="1" />
-                <label
-                    for="lot_ids"
+                <div
+                    class="oe_grey"
                     attrs="{'invisible': [('show_lot_filter', '=', False)]}"
-                    string="Create rma with lot/serials selected"
-                />
-                <field
-                    name="lot_ids"
-                    widget="many2many_tags"
-                    domain="[('id', 'in', lot_domain_ids)]"
-                    attrs="{'invisible': [('show_lot_filter', '=', False)], 'required': [('show_lot_filter', '=', True)]}"
-                    options="{'no_create': True}"
-                />
+                >
+                    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"