diff --git a/frontend/src/routes/dashboard/export/manifest/+page.svelte b/frontend/src/routes/dashboard/export/manifest/+page.svelte
index 06c7f2f3..32afa19f 100644
--- a/frontend/src/routes/dashboard/export/manifest/+page.svelte
+++ b/frontend/src/routes/dashboard/export/manifest/+page.svelte
@@ -47,10 +47,8 @@
 	let showDetails = $state(false);
 
 
-	const isError = $derived(!canView || status >= 400 || error);
-
 	// Pasamos canEdit y canDelete a las columnas por si tu DataTable tiene acciones por fila
-	const columns = createColumns({ canEdit, canDelete });
+	const columns = createColumns();
 
 	// --- Lifecycle ---
 	onMount(() => {
diff --git a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
index f514e93d..fbb8734d 100644
--- a/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/concepts/+page.svelte
@@ -1,238 +1,285 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/general_catalogs/concepts/columns';
-import CreateEditDialog from '$lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaConceptos } from '$lib/config/shortcuts/dashboard/general_catalogs/concepts/list';
-import { getConcepts, deleteConcept, type Concept } from '$lib/api/dashboard/a76/general_catalogs/concepts';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/concepts/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/concepts/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaConceptos } from '$lib/config/shortcuts/dashboard/general_catalogs/concepts/list';
+	import {
+		getConcepts,
+		deleteConcept,
+		type Concept
+	} from '$lib/api/dashboard/a76/general_catalogs/concepts';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let dialogOpen = $state(false);
-let editingItem = $state<Concept | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let dialogOpen = $state(false);
+	let editingItem = $state<Concept | null>(null);
+	let error = $state<string | null>(data.error || null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_concepts.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_concepts.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_concepts.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_concepts.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_concepts.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_concepts.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_concepts.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_concepts.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista Conceptos',
-obtenerAtajosListaConceptos({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-dialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista Conceptos',
+		obtenerAtajosListaConceptos({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				dialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchKey = $state($page.url.searchParams.get('code') || '');
-let searchDesc = $state($page.url.searchParams.get('description') || '');
-let timeout: ReturnType<typeof setTimeout>;
+	// Filtros
+	let searchKey = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Concept[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<Concept[]>(data.concepts?.items || data.concepts || []);
+	let currentPage = $state(data.concepts?.page || 1);
+	let pageSize = $state(data.concepts?.page_size || 50);
+	let totalItems = $state(data.concepts?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.concepts) {
+			allItems = data.concepts.items || data.concepts || [];
+			currentPage = data.concepts.page || 1;
+			totalItems = data.concepts.total || 0;
+			pageSize = data.concepts.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await getConcepts(1, pageSize, companyStore.activeCompany.id, {
-code: searchKey || undefined,
-description: searchDesc || undefined
-});
-const payload = (response as any).items ? response : (response as any).data;
-if (payload?.items) {
-allItems = payload.items;
-currentPage = payload.page || 1;
-totalItems = payload.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await getConcepts(1, pageSize, companyStore.activeCompany.id, {
+					code: searchKey || undefined,
+					description: searchDesc || undefined
+				});
+				const payload = (response as any).items ? response : (response as any).data;
+				if (payload?.items) {
+					allItems = payload.items;
+					currentPage = payload.page || 1;
+					totalItems = payload.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchKey) url.searchParams.set('code', searchKey);
-else url.searchParams.delete('code');
-if (searchDesc) url.searchParams.set('description', searchDesc);
-else url.searchParams.delete('description');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchKey) url.searchParams.set('code', searchKey);
+			else url.searchParams.delete('code');
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await getConcepts(currentPage + 1, pageSize, companyStore.activeCompany.id, {
-code: searchKey || undefined,
-description: searchDesc || undefined
-});
-const payload = (response as any).items ? response : (response as any).data;
-if (payload?.items) {
-allItems = [...allItems, ...payload.items];
-currentPage = payload.page || (currentPage + 1);
-totalItems = payload.total;
-}
-} catch (err) {
-error = 'Error cargando mas datos';
-} finally {
-loading = false;
-}
-}
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await getConcepts(currentPage + 1, pageSize, companyStore.activeCompany.id, {
+				code: searchKey || undefined,
+				description: searchDesc || undefined
+			});
+			const payload = (response as any).items ? response : (response as any).data;
+			if (payload?.items) {
+				allItems = [...allItems, ...payload.items];
+				currentPage = payload.page || currentPage + 1;
+				totalItems = payload.total;
+			}
+		} catch (err) {
+			error = 'Error cargando mas datos';
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await getConcepts(1, pageSize, companyStore.activeCompany.id, {
-code: searchKey || undefined,
-description: searchDesc || undefined
-});
-const payload = (response as any).items ? response : (response as any).data;
-if (payload?.items) {
-allItems = payload.items;
-currentPage = payload.page || 1;
-totalItems = payload.total;
-}
-} catch (err) {
-error = 'Error al recargar datos';
-} finally {
-loading = false;
-}
-}
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await getConcepts(1, pageSize, companyStore.activeCompany.id, {
+				code: searchKey || undefined,
+				description: searchDesc || undefined
+			});
+			const payload = (response as any).items ? response : (response as any).data;
+			if (payload?.items) {
+				allItems = payload.items;
+				currentPage = payload.page || 1;
+				totalItems = payload.total;
+			}
+		} catch (err) {
+			error = 'Error al recargar datos';
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-dialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		dialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">Conceptos</h1>
-<p class="text-muted-foreground">Catálogo de Conceptos</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; dialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Conceptos</h1>
+			<p class="text-muted-foreground">Catálogo de Conceptos</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						dialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_concepts.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Código" bind:value={searchKey} oninput={handleSearch} class="h-9 w-40 bg-card lg:w-52" />
-<Input placeholder="Descripción" bind:value={searchDesc} oninput={handleSearch} class="h-9 w-44 bg-card lg:w-64" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; dialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_concepts.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Código"
+							bind:value={searchKey}
+							oninput={handleSearch}
+							class="h-9 w-40 bg-card lg:w-52"
+						/>
+						<Input
+							placeholder="Descripción"
+							bind:value={searchDesc}
+							oninput={handleSearch}
+							class="h-9 w-44 bg-card lg:w-64"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								dialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								dialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await deleteConcept(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; dialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await deleteConcept(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={dialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={dialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
index b6e61749..ba3792e9 100644
--- a/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/exchange-rate/+page.svelte
@@ -37,7 +37,7 @@
 
 	let selectedIds = $state<(string | number)[]>([]);
 	const selectedItem = $derived(
-		selectedIds.length === 1 ? allItems.find((item) => item.id === selectedIds[0]) ?? null : null
+		selectedIds.length === 1 ? allItems.find((item: ExchangeRate) => item.id === selectedIds[0]) ?? null : null
 	);
 
 	// Permisos
diff --git a/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
index 93b9e501..dd28a1b7 100644
--- a/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/identifiers/+page.svelte
@@ -1,237 +1,283 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/general_catalogs/identifiers/columns';
-import CreateEditDialog from '$lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaIdentificadores } from '$lib/config/shortcuts/dashboard/general_catalogs/identifiers/list';
-import { identifiersApi, type Identifier } from '$lib/api/dashboard/a76/general_catalogs/identifiers';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/identifiers/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/identifiers/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaIdentificadores } from '$lib/config/shortcuts/dashboard/general_catalogs/identifiers/list';
+	import {
+		identifiersApi,
+		type Identifier
+	} from '$lib/api/dashboard/a76/general_catalogs/identifiers';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let createDialogOpen = $state(false);
-let editingItem = $state<Identifier | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let createDialogOpen = $state(false);
+	let editingItem = $state<Identifier | null>(null);
+	let error = $state<string | null>(data.error || null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_identifiers.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_identifiers.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_identifiers.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_identifiers.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_identifiers.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_identifiers.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_identifiers.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_identifiers.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista Identificadores',
-obtenerAtajosListaIdentificadores({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-createDialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista Identificadores',
+		obtenerAtajosListaIdentificadores({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				createDialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchCode = $state($page.url.searchParams.get('code') || '');
-let searchDesc = $state($page.url.searchParams.get('description') || '');
-let timeout: ReturnType<typeof setTimeout>;
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Identifier[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<Identifier[]>(data.identifiers?.items || data.identifiers || []);
+	let currentPage = $state(data.identifiers?.page || 1);
+	let pageSize = $state(data.identifiers?.page_size || 50);
+	let totalItems = $state(data.identifiers?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.identifiers) {
+			allItems = data.identifiers.items || data.identifiers || [];
+			currentPage = data.identifiers.page || 1;
+			totalItems = data.identifiers.total || 0;
+			pageSize = data.identifiers.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await identifiersApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await identifiersApi.list(companyStore.activeCompany.id, {
+					code: searchCode || undefined,
+					description: searchDesc || undefined,
+					page: '1',
+					page_size: pageSize.toString()
+				});
+				if (response.data) {
+					allItems = response.data.items;
+					currentPage = 1;
+					totalItems = response.data.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchCode) url.searchParams.set('code', searchCode);
-else url.searchParams.delete('code');
-if (searchDesc) url.searchParams.set('description', searchDesc);
-else url.searchParams.delete('description');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await identifiersApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: (currentPage + 1).toString(),
-page_size: pageSize.toString()
-});
-if (response.data?.items) {
-allItems = [...allItems, ...response.data.items];
-currentPage += 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await identifiersApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: (currentPage + 1).toString(),
+				page_size: pageSize.toString()
+			});
+			if (response.data?.items) {
+				allItems = [...allItems, ...response.data.items];
+				currentPage += 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await identifiersApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await identifiersApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: '1',
+				page_size: pageSize.toString()
+			});
+			if (response.data) {
+				allItems = response.data.items;
+				currentPage = 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-createDialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		createDialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">Identificadores</h1>
-<p class="text-muted-foreground">Catálogo de Identificadores del sistema</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; createDialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Identificadores</h1>
+			<p class="text-muted-foreground">Catálogo de Identificadores del sistema</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						createDialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_identifiers.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado de Identificadores</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Código" bind:value={searchCode} oninput={handleSearch} class="h-9 w-36 bg-card lg:w-44" />
-<Input placeholder="Descripción" bind:value={searchDesc} oninput={handleSearch} class="h-9 w-44 bg-card lg:w-64" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; createDialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_identifiers.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado de Identificadores</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Código"
+							bind:value={searchCode}
+							oninput={handleSearch}
+							class="h-9 w-36 bg-card lg:w-44"
+						/>
+						<Input
+							placeholder="Descripción"
+							bind:value={searchDesc}
+							oninput={handleSearch}
+							class="h-9 w-44 bg-card lg:w-64"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								createDialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								createDialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await identifiersApi.delete(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; createDialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await identifiersApi.delete(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
index cc083c22..f81996e7 100644
--- a/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/inpc/+page.svelte
@@ -1,237 +1,280 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/general_catalogs/inpc/columns';
-import CreateEditDialog from '$lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaINPC } from '$lib/config/shortcuts/dashboard/general_catalogs/inpc/list';
-import { inpcApi, type INPC } from '$lib/api/dashboard/a76/general_catalogs/inpc';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/inpc/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/inpc/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaINPC } from '$lib/config/shortcuts/dashboard/general_catalogs/inpc/list';
+	import { inpcApi, type INPC } from '$lib/api/dashboard/a76/general_catalogs/inpc';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let createDialogOpen = $state(false);
-let editingItem = $state<INPC | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let createDialogOpen = $state(false);
+	let editingItem = $state<INPC | null>(null);
+	let error = $state<string | null>(data.error || null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_inpc.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_inpc.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_inpc.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_inpc.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_inpc.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_inpc.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_inpc.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_inpc.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista INPC',
-obtenerAtajosListaINPC({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-createDialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista INPC',
+		obtenerAtajosListaINPC({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				createDialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchYear = $state($page.url.searchParams.get('year') || '');
-let searchMonth = $state($page.url.searchParams.get('month') || '');
-let timeout: ReturnType<typeof setTimeout>;
+	// Filtros
+	let searchYear = $state($page.url.searchParams.get('year') || '');
+	let searchMonth = $state($page.url.searchParams.get('month') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<INPC[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<INPC[]>(data.inpc?.items || data.inpc || []);
+	let currentPage = $state(data.inpc?.page || 1);
+	let pageSize = $state(data.inpc?.page_size || 50);
+	let totalItems = $state(data.inpc?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.inpc) {
+			allItems = data.inpc.items || data.inpc || [];
+			currentPage = data.inpc.page || 1;
+			totalItems = data.inpc.total || 0;
+			pageSize = data.inpc.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await inpcApi.list(companyStore.activeCompany.id, {
-year: searchYear || undefined,
-month: searchMonth || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await inpcApi.list(companyStore.activeCompany.id, {
+					year: searchYear || undefined,
+					month: searchMonth || undefined,
+					page: '1',
+					page_size: pageSize.toString()
+				});
+				if (response.data) {
+					allItems = response.data.items;
+					currentPage = 1;
+					totalItems = response.data.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchYear) url.searchParams.set('year', searchYear);
-else url.searchParams.delete('year');
-if (searchMonth) url.searchParams.set('month', searchMonth);
-else url.searchParams.delete('month');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchYear) url.searchParams.set('year', searchYear);
+			else url.searchParams.delete('year');
+			if (searchMonth) url.searchParams.set('month', searchMonth);
+			else url.searchParams.delete('month');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await inpcApi.list(companyStore.activeCompany.id, {
-year: searchYear || undefined,
-month: searchMonth || undefined,
-page: (currentPage + 1).toString(),
-page_size: pageSize.toString()
-});
-if (response.data?.items) {
-allItems = [...allItems, ...response.data.items];
-currentPage += 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await inpcApi.list(companyStore.activeCompany.id, {
+				year: searchYear || undefined,
+				month: searchMonth || undefined,
+				page: (currentPage + 1).toString(),
+				page_size: pageSize.toString()
+			});
+			if (response.data?.items) {
+				allItems = [...allItems, ...response.data.items];
+				currentPage += 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await inpcApi.list(companyStore.activeCompany.id, {
-year: searchYear || undefined,
-month: searchMonth || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await inpcApi.list(companyStore.activeCompany.id, {
+				year: searchYear || undefined,
+				month: searchMonth || undefined,
+				page: '1',
+				page_size: pageSize.toString()
+			});
+			if (response.data) {
+				allItems = response.data.items;
+				currentPage = 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-createDialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		createDialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">INPC</h1>
-<p class="text-muted-foreground">Catálogo de INPC del sistema</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; createDialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">INPC</h1>
+			<p class="text-muted-foreground">Catálogo de INPC del sistema</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						createDialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_inpc.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado de INPC</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Año" bind:value={searchYear} oninput={handleSearch} class="h-9 w-28 bg-card lg:w-36" />
-<Input placeholder="Mes" bind:value={searchMonth} oninput={handleSearch} class="h-9 w-28 bg-card lg:w-36" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; createDialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_inpc.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado de INPC</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Año"
+							bind:value={searchYear}
+							oninput={handleSearch}
+							class="h-9 w-28 bg-card lg:w-36"
+						/>
+						<Input
+							placeholder="Mes"
+							bind:value={searchMonth}
+							oninput={handleSearch}
+							class="h-9 w-28 bg-card lg:w-36"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								createDialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								createDialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await inpcApi.delete(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; createDialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await inpcApi.delete(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
index 80662218..4518b68f 100644
--- a/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/legends/+page.svelte
@@ -1,237 +1,280 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/general_catalogs/legends/columns';
-import CreateEditDialog from '$lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaLeyendas } from '$lib/config/shortcuts/dashboard/general_catalogs/legends/list';
-import { legendsApi, type Legend } from '$lib/api/dashboard/a76/general_catalogs/legends';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/legends/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/legends/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaLeyendas } from '$lib/config/shortcuts/dashboard/general_catalogs/legends/list';
+	import { legendsApi, type Legend } from '$lib/api/dashboard/a76/general_catalogs/legends';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let createDialogOpen = $state(false);
-let editingItem = $state<Legend | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let createDialogOpen = $state(false);
+	let editingItem = $state<Legend | null>(null);
+	let error = $state<string | null>(data.error || null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_legends.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_legends.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_legends.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_legends.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_legends.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_legends.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_legends.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_legends.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista Leyendas',
-obtenerAtajosListaLeyendas({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-createDialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista Leyendas',
+		obtenerAtajosListaLeyendas({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				createDialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchCode = $state($page.url.searchParams.get('code') || '');
-let searchDesc = $state($page.url.searchParams.get('description') || '');
-let timeout: ReturnType<typeof setTimeout>;
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Legend[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<Legend[]>(data.legends?.items || data.legends || []);
+	let currentPage = $state(data.legends?.page || 1);
+	let pageSize = $state(data.legends?.page_size || 50);
+	let totalItems = $state(data.legends?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.legends) {
+			allItems = data.legends.items || data.legends || [];
+			currentPage = data.legends.page || 1;
+			totalItems = data.legends.total || 0;
+			pageSize = data.legends.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await legendsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await legendsApi.list(companyStore.activeCompany.id, {
+					code: searchCode || undefined,
+					description: searchDesc || undefined,
+					page: '1',
+					page_size: pageSize.toString()
+				});
+				if (response.data) {
+					allItems = response.data.items;
+					currentPage = 1;
+					totalItems = response.data.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchCode) url.searchParams.set('code', searchCode);
-else url.searchParams.delete('code');
-if (searchDesc) url.searchParams.set('description', searchDesc);
-else url.searchParams.delete('description');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await legendsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: (currentPage + 1).toString(),
-page_size: pageSize.toString()
-});
-if (response.data?.items) {
-allItems = [...allItems, ...response.data.items];
-currentPage += 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await legendsApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: (currentPage + 1).toString(),
+				page_size: pageSize.toString()
+			});
+			if (response.data?.items) {
+				allItems = [...allItems, ...response.data.items];
+				currentPage += 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await legendsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await legendsApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: '1',
+				page_size: pageSize.toString()
+			});
+			if (response.data) {
+				allItems = response.data.items;
+				currentPage = 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-createDialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		createDialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">Leyendas</h1>
-<p class="text-muted-foreground">Catálogo de Leyendas del sistema</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; createDialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Leyendas</h1>
+			<p class="text-muted-foreground">Catálogo de Leyendas del sistema</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						createDialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_legends.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado de Leyendas</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Código" bind:value={searchCode} oninput={handleSearch} class="h-9 w-36 bg-card lg:w-44" />
-<Input placeholder="Descripción" bind:value={searchDesc} oninput={handleSearch} class="h-9 w-44 bg-card lg:w-64" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; createDialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_legends.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado de Leyendas</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Código"
+							bind:value={searchCode}
+							oninput={handleSearch}
+							class="h-9 w-36 bg-card lg:w-44"
+						/>
+						<Input
+							placeholder="Descripción"
+							bind:value={searchDesc}
+							oninput={handleSearch}
+							class="h-9 w-44 bg-card lg:w-64"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								createDialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								createDialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await legendsApi.delete(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; createDialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await legendsApi.delete(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
index a5a85ed8..c59074c4 100644
--- a/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/ports/+page.svelte
@@ -1,237 +1,280 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/ports/columns';
-import CreateEditDialog from '$lib/components/dashboard/ports/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaPuertos } from '$lib/config/shortcuts/dashboard/general_catalogs/ports/list';
-import { portsApi, type Port } from '$lib/api/dashboard/a76/general_catalogs/ports';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/ports/columns';
+	import CreateEditDialog from '$lib/components/dashboard/ports/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaPuertos } from '$lib/config/shortcuts/dashboard/general_catalogs/ports/list';
+	import { portsApi, type Port } from '$lib/api/dashboard/a76/general_catalogs/ports';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let createDialogOpen = $state(false);
-let editingItem = $state<Port | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let createDialogOpen = $state(false);
+	let editingItem = $state<Port | null>(null);
+	let error = $state<string | null>(data.error || null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_ports.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_ports.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_ports.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_ports.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_ports.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_ports.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_ports.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_ports.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista Puertos',
-obtenerAtajosListaPuertos({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-createDialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista Puertos',
+		obtenerAtajosListaPuertos({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				createDialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchCode = $state($page.url.searchParams.get('code') || '');
-let searchDesc = $state($page.url.searchParams.get('description') || '');
-let timeout: ReturnType<typeof setTimeout>;
+	// Filtros
+	let searchCode = $state($page.url.searchParams.get('code') || '');
+	let searchDesc = $state($page.url.searchParams.get('description') || '');
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Port[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<Port[]>(data.ports?.items || data.ports || []);
+	let currentPage = $state(data.ports?.page || 1);
+	let pageSize = $state(data.ports?.page_size || 50);
+	let totalItems = $state(data.ports?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.ports) {
+			allItems = data.ports.items || data.ports || [];
+			currentPage = data.ports.page || 1;
+			totalItems = data.ports.total || 0;
+			pageSize = data.ports.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await portsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await portsApi.list(companyStore.activeCompany.id, {
+					code: searchCode || undefined,
+					description: searchDesc || undefined,
+					page: '1',
+					page_size: pageSize.toString()
+				});
+				if (response.data) {
+					allItems = response.data.items;
+					currentPage = 1;
+					totalItems = response.data.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchCode) url.searchParams.set('code', searchCode);
-else url.searchParams.delete('code');
-if (searchDesc) url.searchParams.set('description', searchDesc);
-else url.searchParams.delete('description');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchCode) url.searchParams.set('code', searchCode);
+			else url.searchParams.delete('code');
+			if (searchDesc) url.searchParams.set('description', searchDesc);
+			else url.searchParams.delete('description');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await portsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: (currentPage + 1).toString(),
-page_size: pageSize.toString()
-});
-if (response.data?.items) {
-allItems = [...allItems, ...response.data.items];
-currentPage += 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await portsApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: (currentPage + 1).toString(),
+				page_size: pageSize.toString()
+			});
+			if (response.data?.items) {
+				allItems = [...allItems, ...response.data.items];
+				currentPage += 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await portsApi.list(companyStore.activeCompany.id, {
-code: searchCode || undefined,
-description: searchDesc || undefined,
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await portsApi.list(companyStore.activeCompany.id, {
+				code: searchCode || undefined,
+				description: searchDesc || undefined,
+				page: '1',
+				page_size: pageSize.toString()
+			});
+			if (response.data) {
+				allItems = response.data.items;
+				currentPage = 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-createDialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		createDialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">Puertos</h1>
-<p class="text-muted-foreground">Catálogo de Puertos del sistema</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; createDialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Puertos</h1>
+			<p class="text-muted-foreground">Catálogo de Puertos del sistema</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						createDialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_ports.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado de Puertos</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Código" bind:value={searchCode} oninput={handleSearch} class="h-9 w-36 bg-card lg:w-44" />
-<Input placeholder="Descripción" bind:value={searchDesc} oninput={handleSearch} class="h-9 w-44 bg-card lg:w-64" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; createDialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_ports.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado de Puertos</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Código"
+							bind:value={searchCode}
+							oninput={handleSearch}
+							class="h-9 w-36 bg-card lg:w-44"
+						/>
+						<Input
+							placeholder="Descripción"
+							bind:value={searchDesc}
+							oninput={handleSearch}
+							class="h-9 w-44 bg-card lg:w-64"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								createDialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								createDialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await portsApi.delete(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; createDialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await portsApi.delete(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/seal/+page.server.ts b/frontend/src/routes/dashboard/general_catalogs/seal/+page.server.ts
new file mode 100644
index 00000000..f0341324
--- /dev/null
+++ b/frontend/src/routes/dashboard/general_catalogs/seal/+page.server.ts
@@ -0,0 +1,83 @@
+import { getServerApiUrl, getAuthTokens } from '$lib/server/api';
+import type { PageServerLoad } from './$types';
+import { redirect } from '@sveltejs/kit';
+
+export const load: PageServerLoad = async ({ cookies, fetch, url, parent }) => {
+	const parentData = await parent();
+	const { accessToken } = getAuthTokens(cookies);
+	if (!accessToken) {
+		throw redirect(302, '/login');
+	}
+
+	const page = Number(url.searchParams.get('page')) || 1;
+	const pageSize = Number(url.searchParams.get('page_size')) || 50;
+	const sealFilter = url.searchParams.get('seal')?.trim() || '';
+
+	const cookieCompanyId = cookies.get('active_company_id');
+	const companyId = cookieCompanyId
+		? parseInt(cookieCompanyId)
+		: parentData.companies?.[0]?.id;
+
+	if (!companyId) {
+		return {
+			seals: { items: [], total: 0, page, page_size: pageSize, pages: 0 },
+			error: 'Selecciona una compañía para ver los sellos',
+			status: 400
+		};
+	}
+
+	const apiUrl = getServerApiUrl();
+	const query = new URLSearchParams({
+		page: page.toString(),
+		page_size: pageSize.toString(),
+		company_id: companyId.toString()
+	});
+	if (sealFilter) {
+		query.set('seal', sealFilter);
+	}
+
+	const endpoint = `${apiUrl}v1/a76/seals/?${query.toString()}`;
+
+	try {
+		const response = await fetch(endpoint, {
+			headers: {
+				Authorization: `Bearer ${accessToken}`
+			}
+		});
+
+		if (!response.ok) {
+			let errorMessage = `Error: ${response.status} ${response.statusText}`;
+			try {
+				const errorData = await response.json();
+				errorMessage = errorData.detail || errorData.message || errorMessage;
+			} catch {
+				// not JSON
+			}
+			return {
+				seals: { items: [], total: 0, page, page_size: pageSize, pages: 0 },
+				error: errorMessage,
+				status: response.status
+			};
+		}
+
+		const data = await response.json();
+		return {
+			seals: {
+				items: data.items,
+				total: data.total,
+				page: data.page,
+				page_size: data.page_size,
+				pages: data.pages
+			},
+			status: 200
+		};
+	} catch (error: unknown) {
+		console.error('Error fetching seals:', error);
+		const message = error instanceof Error ? error.message : 'Failed to connect to server';
+		return {
+			seals: { items: [], total: 0, page, page_size: pageSize, pages: 0 },
+			error: message,
+			status: 500
+		};
+	}
+};
diff --git a/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
index 67b7a2ab..724e64c9 100644
--- a/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/seal/+page.svelte
@@ -1,234 +1,272 @@
 <script lang="ts">
-import { page } from '$app/stores';
-import { goto } from '$app/navigation';
-import { browser } from '$app/environment';
-import { createColumns } from '$lib/components/dashboard/general_catalogs/seals/columns';
-import CreateEditDialog from '$lib/components/dashboard/general_catalogs/seals/create-edit-dialog.svelte';
-import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
-import * as Card from '$lib/components/ui/card';
-import { Button } from '$lib/components/ui/button';
-import { Input } from '$lib/components/ui/input';
-import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
-import { useShortcuts } from '$lib/hooks/use-shortcuts';
-import { obtenerAtajosListaSellos } from '$lib/config/shortcuts/dashboard/general_catalogs/seal/list';
-import { sealsApi, type Seal } from '$lib/api/dashboard/a76/general_catalogs/seals';
-import { companyStore } from '$lib/stores/company.svelte';
-import { currentUser, userHasPermission } from '$lib/auth';
-import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
+	import { page } from '$app/stores';
+	import { goto } from '$app/navigation';
+	import { browser } from '$app/environment';
+	import { createColumns } from '$lib/components/dashboard/general_catalogs/seals/columns';
+	import CreateEditDialog from '$lib/components/dashboard/general_catalogs/seals/create-edit-dialog.svelte';
+	import InfiniteDataTable from '$lib/components/dashboard/common/infinite-data-table.svelte';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Pencil, Plus, Trash2, RefreshCw } from 'lucide-svelte';
+	import { useShortcuts } from '$lib/hooks/use-shortcuts';
+	import { obtenerAtajosListaSellos } from '$lib/config/shortcuts/dashboard/general_catalogs/seal/list';
+	import { sealsApi, type Seal } from '$lib/api/dashboard/a76/general_catalogs/seals';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { currentUser, userHasPermission } from '$lib/auth';
+	import ErrorState from '$lib/components/dashboard/common/error-state.svelte';
 
-let { data } = $props();
+	let { data } = $props();
 
-let createDialogOpen = $state(false);
-let editingItem = $state<Seal | null>(null);
-let error = $state<string | null>(data.error || null);
-let status = $state<number>(data.status || 200);
+	let createDialogOpen = $state(false);
+	let editingItem = $state<Seal | null>(null);
+	let error = $state<string | null>(data.error ?? null);
+	let status = $state<number>(data.status || 200);
 
-// Permisos
-const canView = $derived(userHasPermission($currentUser, 'cat_seals.view'));
-const canCreate = $derived(userHasPermission($currentUser, 'cat_seals.create'));
-const canEdit = $derived(userHasPermission($currentUser, 'cat_seals.edit'));
-const canDelete = $derived(userHasPermission($currentUser, 'cat_seals.delete'));
+	// Permisos
+	const canView = $derived(userHasPermission($currentUser, 'cat_seals.view'));
+	const canCreate = $derived(userHasPermission($currentUser, 'cat_seals.create'));
+	const canEdit = $derived(userHasPermission($currentUser, 'cat_seals.edit'));
+	const canDelete = $derived(userHasPermission($currentUser, 'cat_seals.delete'));
 
-const isError = $derived(!canView || status >= 400 || error);
+	const isError = $derived(!canView || status >= 400 || error);
 
-// Atajos
-useShortcuts(
-'Lista Sellos',
-obtenerAtajosListaSellos({
-manejarNuevo: () => {
-if (!canCreate) return;
-editingItem = null;
-createDialogOpen = true;
-},
-manejarActualizar: () => reloadData()
-})
-);
+	// Atajos
+	useShortcuts(
+		'Lista Sellos',
+		obtenerAtajosListaSellos({
+			manejarNuevo: () => {
+				if (!canCreate) return;
+				editingItem = null;
+				createDialogOpen = true;
+			},
+			manejarActualizar: () => reloadData()
+		})
+	);
 
-// Filtros
-let searchSeal = $state($page.url.searchParams.get('seal') || '');
+	// Filtros
+	let searchSeal = $state($page.url.searchParams.get('seal') || '');
 
-let timeout: ReturnType<typeof setTimeout>;
+	let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Seal[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
-let loading = $state(false);
-let hasMore = $derived(allItems.length < totalItems);
-let selectedIds = $state<(string | number)[]>([]);
-const selectedItem = $derived(
-selectedIds.length === 1
-? allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null
-: null
-);
+	let allItems = $state<Seal[]>(data.seals?.items || data.seals || []);
+	let currentPage = $state(data.seals?.page || 1);
+	let pageSize = $state(data.seals?.page_size || 50);
+	let totalItems = $state(data.seals?.total || 0);
+	let loading = $state(false);
+	let hasMore = $derived(allItems.length < totalItems);
+	let selectedIds = $state<(string | number)[]>([]);
+	const selectedItem = $derived(
+		selectedIds.length === 1
+			? (allItems.find((item) => String(item.id) === String(selectedIds[0])) ?? null)
+			: null
+	);
 
-$effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
-}
-});
+	$effect(() => {
+		if (data.seals) {
+			allItems = data.seals.items || data.seals || [];
+			currentPage = data.seals.page || 1;
+			totalItems = data.seals.total || 0;
+			pageSize = data.seals.page_size || pageSize;
+		}
+	});
 
-async function handleSearch() {
-if (!browser) return;
-clearTimeout(timeout);
-timeout = setTimeout(async () => {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await sealsApi.list(companyStore.activeCompany.id, {
-seal: searchSeal || undefined,
+	async function handleSearch() {
+		if (!browser) return;
+		clearTimeout(timeout);
+		timeout = setTimeout(async () => {
+			if (!companyStore.activeCompany) return;
+			loading = true;
+			error = null;
+			try {
+				const response = await sealsApi.list(companyStore.activeCompany.id, {
+					seal: searchSeal || undefined,
 
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} catch (err) {
-error = 'Error aplicando filtros';
-} finally {
-loading = false;
-}
+					page: '1',
+					page_size: pageSize.toString()
+				});
+				if (response.data) {
+					allItems = response.data.items;
+					currentPage = 1;
+					totalItems = response.data.total;
+				}
+			} catch (err) {
+				error = 'Error aplicando filtros';
+			} finally {
+				loading = false;
+			}
 
-const url = new URL($page.url);
-if (searchSeal) url.searchParams.set('seal', searchSeal);
-else url.searchParams.delete('seal');
-history.replaceState(history.state, '', url);
-}, 500);
-}
+			const url = new URL($page.url);
+			if (searchSeal) url.searchParams.set('seal', searchSeal);
+			else url.searchParams.delete('seal');
+			history.replaceState(history.state, '', url);
+		}, 500);
+	}
 
-async function loadMore() {
-if (loading || !hasMore || !companyStore.activeCompany) return;
-loading = true;
-try {
-const response = await sealsApi.list(companyStore.activeCompany.id, {
-seal: searchSeal || undefined,
+	async function loadMore() {
+		if (loading || !hasMore || !companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const response = await sealsApi.list(companyStore.activeCompany.id, {
+				seal: searchSeal || undefined,
 
-page: (currentPage + 1).toString(),
-page_size: pageSize.toString()
-});
-if (response.data?.items) {
-allItems = [...allItems, ...response.data.items];
-currentPage += 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+				page: (currentPage + 1).toString(),
+				page_size: pageSize.toString()
+			});
+			if (response.data?.items) {
+				allItems = [...allItems, ...response.data.items];
+				currentPage += 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-async function reloadData() {
-if (!companyStore.activeCompany) return;
-loading = true;
-error = null;
-try {
-const response = await sealsApi.list(companyStore.activeCompany.id, {
-seal: searchSeal || undefined,
+	async function reloadData() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		error = null;
+		try {
+			const response = await sealsApi.list(companyStore.activeCompany.id, {
+				seal: searchSeal || undefined,
 
-page: '1',
-page_size: pageSize.toString()
-});
-if (response.data) {
-allItems = response.data.items;
-currentPage = 1;
-totalItems = response.data.total;
-}
-} finally {
-loading = false;
-}
-}
+				page: '1',
+				page_size: pageSize.toString()
+			});
+			if (response.data) {
+				allItems = response.data.items;
+				currentPage = 1;
+				totalItems = response.data.total;
+			}
+		} finally {
+			loading = false;
+		}
+	}
 
-function handleSuccess() {
-createDialogOpen = false;
-editingItem = null;
-selectedIds = [];
-reloadData();
-}
+	function handleSuccess() {
+		createDialogOpen = false;
+		editingItem = null;
+		selectedIds = [];
+		reloadData();
+	}
 
-const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
+	const columns = $derived(createColumns(handleSuccess, { canEdit, canDelete }));
 </script>
 
-<div class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]">
-<div class="flex flex-none items-center justify-between">
-<div>
-<h1 class="text-2xl font-bold tracking-tight">Sellos</h1>
-<p class="text-muted-foreground">Catálogo de Sellos del sistema</p>
-</div>
-<div class="flex items-center gap-3">
-<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
-<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
-</Button>
-{#if !isError && canCreate}
-<Button class="h-9" onclick={() => { editingItem = null; createDialogOpen = true; }}>
-<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
-</Button>
-{/if}
-</div>
-</div>
+<div
+	class="flex h-[calc(100svh-4rem)] flex-col gap-6 overflow-hidden p-6 group-has-data-[collapsible=icon]/sidebar-wrapper:h-[calc(100svh-3rem)]"
+>
+	<div class="flex flex-none items-center justify-between">
+		<div>
+			<h1 class="text-2xl font-bold tracking-tight">Sellos</h1>
+			<p class="text-muted-foreground">Catálogo de Sellos del sistema</p>
+		</div>
+		<div class="flex items-center gap-3">
+			<Button variant="outline" size="sm" class="h-9" onclick={reloadData}>
+				<RefreshCw class="mr-2 h-4 w-4" /> Actualizar
+			</Button>
+			{#if !isError && canCreate}
+				<Button
+					class="h-9"
+					onclick={() => {
+						editingItem = null;
+						createDialogOpen = true;
+					}}
+				>
+					<Plus class="mr-2 h-4 w-4" /> Nuevo Registro
+				</Button>
+			{/if}
+		</div>
+	</div>
 
-{#if isError}
-<ErrorState
-status={!canView ? 403 : status}
-error={!canView ? 'Permission denied: cat_seals.view' : error || ''}
-onRetry={reloadData}
-/>
-{:else}
-<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
-<Card.Header>
-<div class="flex flex-wrap items-center justify-between gap-3">
-<Card.Title>Listado de Sellos</Card.Title>
-<div class="flex flex-wrap items-center gap-2">
-<Input placeholder="Filtrar por sello" bind:value={searchSeal} oninput={handleSearch} class="h-9 w-56 bg-card lg:w-72" />
-</div>
-</div>
-</Card.Header>
-<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
-<div class="h-full overflow-hidden rounded-md border bg-background">
-<InfiniteDataTable 
-data={allItems} {columns} {loading} {hasMore} {loadMore} 
-{selectedIds} onSelectedIdsChange={(ids) => (selectedIds = ids)}
-onRowClick={(row) => selectedIds = selectedIds.includes(row.id) ? [] : [row.id]}
-onRowDoubleClick={(row) => { if(canEdit) { editingItem = row; createDialogOpen = true; } }}
-/>
-</div>
-</Card.Content>
-</Card.Root>
+	{#if isError}
+		<ErrorState
+			status={!canView ? 403 : status}
+			error={!canView ? 'Permission denied: cat_seals.view' : error || ''}
+			onRetry={reloadData}
+		/>
+	{:else}
+		<Card.Root class="flex min-h-0 flex-1 flex-col overflow-hidden border bg-background">
+			<Card.Header>
+				<div class="flex flex-wrap items-center justify-between gap-3">
+					<Card.Title>Listado de Sellos</Card.Title>
+					<div class="flex flex-wrap items-center gap-2">
+						<Input
+							placeholder="Filtrar por sello"
+							bind:value={searchSeal}
+							oninput={handleSearch}
+							class="h-9 w-56 bg-card lg:w-72"
+						/>
+					</div>
+				</div>
+			</Card.Header>
+			<Card.Content class="min-h-0 flex-1 overflow-hidden p-0">
+				<div class="h-full overflow-hidden rounded-md border bg-background">
+					<InfiniteDataTable
+						data={allItems}
+						{columns}
+						{loading}
+						{hasMore}
+						{loadMore}
+						{selectedIds}
+						onSelectedIdsChange={(ids) => (selectedIds = ids)}
+						onRowClick={(row) => (selectedIds = selectedIds.includes(row.id) ? [] : [row.id])}
+						onRowDoubleClick={(row) => {
+							if (canEdit) {
+								editingItem = row;
+								createDialogOpen = true;
+							}
+						}}
+					/>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-<div class="flex-none text-sm text-muted-foreground">
-Mostrando {allItems.length} de {totalItems} registros
-</div>
+		<div class="flex-none text-sm text-muted-foreground">
+			Mostrando {allItems.length} de {totalItems} registros
+		</div>
 
+		<div
+			class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80"
+		>
+			<div class="mx-auto max-w-[1400px] px-4 py-4">
+				<div class="flex justify-end gap-2">
+					{#if canEdit}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={() => {
+								editingItem = selectedItem;
+								createDialogOpen = true;
+							}}
+							disabled={!selectedItem}
+						>
+							<Pencil size={16} class="mr-2" /> Editar
+						</Button>
+					{/if}
+					{#if canDelete}
+						<Button
+							variant="outline"
+							size="sm"
+							onclick={async () => {
+								if (!selectedItem || !companyStore.activeCompany) return;
+								if (confirm('¿Eliminar este registro?')) {
+									await sealsApi.delete(selectedItem.id, companyStore.activeCompany.id);
+									selectedIds = [];
+									reloadData();
+								}
+							}}
+							disabled={!selectedItem}
+							class="text-destructive hover:bg-destructive/10"
+						>
+							<Trash2 size={16} class="mr-2" /> Eliminar
+						</Button>
+					{/if}
+				</div>
+			</div>
+		</div>
+	{/if}
 
-<div class="fixed right-0 bottom-0 left-0 z-50 ml-[calc(var(--sidebar-width))] border-t bg-background/95 shadow-lg backdrop-blur group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] supports-[backdrop-filter]:bg-background/80">
-<div class="mx-auto max-w-[1400px] px-4 py-4">
-<div class="flex justify-end gap-2">
-{#if canEdit}
-<Button variant="outline" size="sm" onclick={() => { editingItem = selectedItem; createDialogOpen = true; }} disabled={!selectedItem}>
-<Pencil size={16} class="mr-2" /> Editar
-</Button>
-{/if}
-{#if canDelete}
-<Button variant="outline" size="sm" onclick={async () => {
-if(!selectedItem || !companyStore.activeCompany) return;
-if(confirm('¿Eliminar este registro?')) {
-await sealsApi.delete(selectedItem.id, companyStore.activeCompany.id);
-selectedIds = [];
-reloadData();
-}
-}} disabled={!selectedItem} class="text-destructive hover:bg-destructive/10">
-<Trash2 size={16} class="mr-2" /> Eliminar
-</Button>
-{/if}
+	<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
 </div>
-</div>
-</div>
-{/if}
-
-<CreateEditDialog bind:open={createDialogOpen} item={editingItem} onSuccess={handleSuccess} />
-</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
index 0b62f0a3..6fcb3cfb 100644
--- a/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/signatures/+page.svelte
@@ -49,10 +49,10 @@ let searchCode = $state($page.url.searchParams.get('code') || '');
 let searchDesc = $state($page.url.searchParams.get('description') || '');
 let timeout: ReturnType<typeof setTimeout>;
 
-let allItems = $state<Signature[]>(data.items?.items || data.items || []);
-let currentPage = $state(data.items?.page || 1);
-let pageSize = $state(data.items?.page_size || 50);
-let totalItems = $state(data.items?.total || 0);
+let allItems = $state<Signature[]>(data.signatures?.items || data.signatures || []);
+let currentPage = $state(data.signatures?.page || 1);
+let pageSize = $state(data.signatures?.page_size || 50);
+let totalItems = $state(data.signatures?.total || 0);
 let loading = $state(false);
 let hasMore = $derived(allItems.length < totalItems);
 let selectedIds = $state<(string | number)[]>([]);
@@ -63,11 +63,11 @@ selectedIds.length === 1
 );
 
 $effect(() => {
-if (data.items) {
-allItems = data.items.items || data.items || [];
-currentPage = data.items.page || 1;
-totalItems = data.items.total || 0;
-pageSize = data.items.page_size || pageSize;
+if (data.signatures) {
+allItems = data.signatures.items || data.signatures || [];
+currentPage = data.signatures.page || 1;
+totalItems = data.signatures.total || 0;
+pageSize = data.signatures.page_size || pageSize;
 }
 });
 
diff --git a/frontend/src/routes/dashboard/goods/fda-codes/+page.svelte b/frontend/src/routes/dashboard/goods/fda-codes/+page.svelte
index fb967805..93f51275 100644
--- a/frontend/src/routes/dashboard/goods/fda-codes/+page.svelte
+++ b/frontend/src/routes/dashboard/goods/fda-codes/+page.svelte
@@ -409,7 +409,6 @@
 					</div>
 				{/if}
 			</Card.Root>
-		{/if}
 	</div>
 
 
diff --git a/frontend/src/routes/dashboard/reference_data/countries/+page.svelte b/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
index 5ff81be4..4a515aff 100644
--- a/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
+++ b/frontend/src/routes/dashboard/reference_data/countries/+page.svelte
@@ -81,7 +81,7 @@
 			loading = true;
 			error = null;
 			try {
-				const response = await countriesApi.list(1, pageSize, searchQuery);
+				const response = await countriesApi.list(1, pageSize, searchQuery as any);
 				if (!response.error && response.data) {
 					allItems = response.data.items;
 					currentPage = 1;
@@ -108,7 +108,7 @@
 		error = null;
 
 		try {			
-			const response = await countriesApi.list(currentPage + 1, pageSize, searchQuery);
+			const response = await countriesApi.list(currentPage + 1, pageSize, searchQuery as any);
 			if (response.error) {
 				console.error('📊 [Page] Error en loadMore:', response.error, 'Status:', response.status);
 				if (response.status === 401 || response.status === 403) {