diff --git a/ddmrp_warning/models/ddmrp_warning_item.py b/ddmrp_warning/models/ddmrp_warning_item.py
index 497509c07..1cf708804 100644
--- a/ddmrp_warning/models/ddmrp_warning_item.py
+++ b/ddmrp_warning/models/ddmrp_warning_item.py
@@ -16,6 +16,10 @@ class DdmrpWarningItem(models.Model):
     name = fields.Char(
         compute="_compute_name",
     )
+    product_id = fields.Many2one(related="buffer_id.product_id")
+    location_id = fields.Many2one(
+        related="buffer_id.location_id", groups="stock.group_stock_multi_locations"
+    )
     severity = fields.Selection(
         related="warning_definition_id.severity",
         store=True,
diff --git a/ddmrp_warning/views/ddmrp_warning_item_views.xml b/ddmrp_warning/views/ddmrp_warning_item_views.xml
index 60f4a3e1b..4bf6c12e3 100644
--- a/ddmrp_warning/views/ddmrp_warning_item_views.xml
+++ b/ddmrp_warning/views/ddmrp_warning_item_views.xml
@@ -13,7 +13,9 @@
                 decoration-danger="severity == '3_high'"
             >
                 <field name="name" />
+                <field name="product_id" />
                 <field name="severity" />
+                <field name="location_id" groups="stock.group_stock_multi_locations" />
                 <field name="company_id" groups="base.group_multi_company" />
             </tree>
         </field>
@@ -25,10 +27,22 @@
             <form>
                 <sheet>
                     <group>
-                        <field name="warning_definition_id" />
-                        <field name="buffer_id" />
-                        <field name="severity" />
-                        <field name="company_id" groups="base.group_multi_company" />
+                        <group>
+                            <field name="warning_definition_id" />
+                            <field name="buffer_id" />
+                            <field name="severity" />
+                        </group>
+                        <group>
+                            <field name="product_id" />
+                            <field
+                                name="location_id"
+                                groups="stock.group_stock_multi_locations"
+                            />
+                            <field
+                                name="company_id"
+                                groups="base.group_multi_company"
+                            />
+                        </group>
                     </group>
                 </sheet>
             </form>
@@ -40,6 +54,8 @@
         <field name="arch" type="xml">
             <search>
                 <field name="buffer_id" />
+                <field name="product_id" />
+                <field name="location_id" groups="stock.group_stock_multi_locations" />
                 <field name="severity" />
                 <separator />
                 <group expand="0" string="Group By">