From 350e26566f2cb2e41e659104fedc69888a97f749 Mon Sep 17 00:00:00 2001
From: enlineawork <enlinea.work@gmail.com>
Date: Sat, 12 Sep 2026 11:33:45 -0300
Subject: [PATCH] =?UTF-8?q?fix(web):=20no=20bloquear=20Actividad=20por=20e?=
 =?UTF-8?q?stado=20de=20fusi=C3=B3n?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web-v2/src/features/assets/AssetDossierPanel.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/web-v2/src/features/assets/AssetDossierPanel.tsx b/web-v2/src/features/assets/AssetDossierPanel.tsx
index 2ed5409..e907562 100644
--- a/web-v2/src/features/assets/AssetDossierPanel.tsx
+++ b/web-v2/src/features/assets/AssetDossierPanel.tsx
@@ -81,10 +81,12 @@ export function AssetDossierPanel({ assetId }: { assetId: string }) {
   const load = () => {
     setLoading(true);
     setError('');
+    setMergeStatus(null);
     Promise.all([
       getAssetDossier(assetId),
       getAsset(assetId),
-      getInventoryMergeStatus(assetId),
+      // La conciliación es auxiliar: nunca debe bloquear la Actividad del Inventario.
+      getInventoryMergeStatus(assetId).catch(() => null),
     ])
       .then(([loadedDossier, loadedAsset, loadedMerge]) => {
         setDossier(loadedDossier as ExtendedDossier);