From 97251f7ab8316ea0eedc098c6b9da58a3917836b Mon Sep 17 00:00:00 2001
From: Joan Sisquella <joan.sisquella@forgeflow.com>
Date: Mon, 22 Jul 2024 10:02:06 +0200
Subject: [PATCH] [IMP] stock_inventory: improve errors information when
 inventory is blocked

---
 stock_inventory/models/stock_inventory.py | 18 ++++++++++++++----
 stock_inventory/views/stock_inventory.xml |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/stock_inventory/models/stock_inventory.py b/stock_inventory/models/stock_inventory.py
index f46f3c29d..cf27f3736 100644
--- a/stock_inventory/models/stock_inventory.py
+++ b/stock_inventory/models/stock_inventory.py
@@ -273,18 +273,28 @@ class InventoryAdjustmentsGroup(models.Model):
             search_filter.append(("product_id", "in", self.product_ids.ids))
             error_field = "product_id"
             error_message = _(
-                "There are active adjustments for the requested products: %s"
+                "There are active adjustments for the requested products: %(names)s. "
+                "Blocking adjustments: %(blocking_names)s"
             )
         else:
             error_field = "location_id"
             error_message = _(
-                "There's already an Adjustment in Process using one requested Location: %s"
+                "There's already an Adjustment in Process "
+                "using one requested Location: %(names)s. "
+                "Blocking adjustments: %(blocking_names)s"
             )
 
         quants = self.env["stock.quant"].search(search_filter)
         if quants:
-            names = self._get_quant_joined_names(quants, error_field)
-            raise ValidationError(error_message % names)
+            inventory_ids = self.env["stock.inventory"].search(
+                [("stock_quant_ids", "in", quants.ids), ("state", "=", "in_progress")]
+            )
+            if inventory_ids:
+                blocking_names = ", ".join(inventory_ids.mapped("name"))
+                names = self._get_quant_joined_names(quants, error_field)
+                raise ValidationError(
+                    error_message % {"names": names, "blocking_names": blocking_names}
+                )
 
         quants = self._get_quants(self.location_ids)
         self.write(
diff --git a/stock_inventory/views/stock_inventory.xml b/stock_inventory/views/stock_inventory.xml
index a4394b587..fe0f4c85b 100644
--- a/stock_inventory/views/stock_inventory.xml
+++ b/stock_inventory/views/stock_inventory.xml
@@ -161,6 +161,7 @@
                 <field name="location_ids" />
                 <field name="date" />
                 <field name="state" />
+                <field name="product_ids" string="Product" />
             </search>
         </field>
     </record>