diff --git a/rma_scrap/wizards/rma_make_scrap.py b/rma_scrap/wizards/rma_make_scrap.py
index 1c393ace..a9bb89fa 100644
--- a/rma_scrap/wizards/rma_make_scrap.py
+++ b/rma_scrap/wizards/rma_make_scrap.py
@@ -28,6 +28,8 @@ class RmaMakeScrap(models.TransientModel):
             "line_id": line.id,
             "rma_id": line.rma_id and line.rma_id.id or False,
         }
+        if line.lot_id:
+            values["lot_id"] = line.lot_id.id
         return values
 
     @api.model
@@ -73,6 +75,7 @@ class RmaMakeScrap(models.TransientModel):
                 "name": line.rma_id.id and line.rma_id.name or line.name,
                 "origin": line.name,
                 "product_id": item.line_id.product_id.id,
+                "lot_id": item.lot_id.id or False,
                 "scrap_qty": item.qty_to_scrap,
                 "product_uom_id": item.line_id.product_id.product_tmpl_id.uom_id.id,
                 "location_id": item.location_id.id,
@@ -96,6 +99,7 @@ class RmaMakeScrapItem(models.TransientModel):
     )
     rma_id = fields.Many2one("rma.order", related="line_id.rma_id", string="RMA Group")
     product_id = fields.Many2one("product.product", string="Product", required=True)
+    lot_id = fields.Many2one("stock.production.lot", string="Lot/Serial Number")
     product_qty = fields.Float(
         related="line_id.product_qty",
         string="Quantity Ordered",
diff --git a/rma_scrap/wizards/rma_scrap_view.xml b/rma_scrap/wizards/rma_scrap_view.xml
index 03bedb49..dc2a9088 100644
--- a/rma_scrap/wizards/rma_scrap_view.xml
+++ b/rma_scrap/wizards/rma_scrap_view.xml
@@ -10,6 +10,10 @@
                     <tree string="RMA Lines" editable="bottom" create="false">
                         <field name="rma_id" groups="rma.group_rma_groups" />
                         <field name="product_id" />
+                        <field
+                            name="lot_id"
+                            attrs="{'invisible':[('lot_id', '=', False)]}"
+                        />
                         <field name="product_qty" />
                         <field name="qty_to_scrap" />
                         <field name="location_id" />