diff --git a/rma/wizards/rma_add_stock_move_view.xml b/rma/wizards/rma_add_stock_move_view.xml
index bd9d1270..7c91d080 100644
--- a/rma/wizards/rma_add_stock_move_view.xml
+++ b/rma/wizards/rma_add_stock_move_view.xml
@@ -116,7 +116,33 @@
                     <field name="partner_id" string="Supplier" />
                 </group>
                 <separator string="Select Stock Moves to add" />
-                <field name="move_ids" />
+                <field
+                    name="move_ids"
+                    domain="[('picking_id.partner_id', '=', partner_id), ('location_id.usage', '=', 'supplier')]"
+                />
+                <field name="show_lot_filter" invisible="1" />
+                <field name="lot_domain_ids" widget="many2many_tags" invisible="1" />
+                <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"