diff --git a/frontend/src/lib/api/dashboard/a76/invoices.ts b/frontend/src/lib/api/dashboard/a76/invoices.ts
index 91cc735e..b2a855c0 100644
--- a/frontend/src/lib/api/dashboard/a76/invoices.ts
+++ b/frontend/src/lib/api/dashboard/a76/invoices.ts
@@ -103,6 +103,7 @@ export interface InvoiceFinancials {
 	insurance_value?: number | null;
 	packaging?: number | null;
 	other_increments?: number | null;
+	other_deductibles?: number | null;
 	total_increments_mn?: number | null;
 	total_increments_me?: number | null;
 	iva_mn?: number | null;
@@ -158,6 +159,8 @@ export interface InvoiceLogistics {
 	payment_date?: string | null;
 	payment_receipt_num?: string | null;
 	is_ctm_process?: string | null;
+	is_subdivision?: boolean | null;
+	acts_as_cd?: boolean | null;
 }
 
 export interface InvoiceSalesDetails {
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/general-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/general-tab-form.svelte
index ba02ac9a..0b8ff489 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/general-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/general-tab-form.svelte
@@ -1,4 +1,4 @@
-<script lang="ts">	
+<script lang="ts">
 	import { Input } from '$lib/components/ui/input';
 	import { Label } from '$lib/components/ui/label';
 	import * as Select from '$lib/components/ui/select';
@@ -14,7 +14,7 @@
 		[key: string]: any;
 	}
 
-	let { 
+	let {
 		invoice,
 		formData = $bindable(),
 		customsBrokers = [],
@@ -29,8 +29,8 @@
 		codePedimentoRegimens = [],
 		operationType = undefined,
 		defaultOperationType = undefined,
-		exchangeRate = undefined 
-	}: { 
+		exchangeRate = undefined
+	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		invoiceTypes?: InvoiceType[];
@@ -51,12 +51,12 @@
 		exchangeRate?: number | null;
 	} = $props();
 
-    // Sync exchangeRate prop to formData
-    $effect(() => {
-        if (exchangeRate !== undefined && formData) {
-            formData.exchange_rate = exchangeRate;        
-        }
-    });
+	// Sync exchangeRate prop to formData
+	$effect(() => {
+		if (exchangeRate !== undefined && formData) {
+			formData.exchange_rate = exchangeRate;
+		}
+	});
 
 	if (!formData) {
 		if (invoice) {
@@ -69,14 +69,16 @@
 				sold_to_id: invoice.compliance_mx?.sold_to_id || null,
 				shipped_to_header: invoice.compliance_mx?.shipped_to_header || 'enviado_a',
 				shipped_to_id: invoice.compliance_mx?.shipped_to_id || null,
+				shipped_by_header: invoice.compliance_mx?.shipped_by_header || 'enviado_por',
+				shipped_by_id: invoice.compliance_mx?.shipped_by_id || null,
 				customs_broker_id: invoice.compliance_mx?.customs_broker_id || null,
 				customs_broker_us_id: invoice.compliance_mx?.customs_broker_us_id || null,
-				
+
 				// RIGHT fields
 				currency_type: invoice.financials?.currency_type || '',
-		        currency: invoice.financials?.currency || 'foreign', // foreign, local, manual
-                exchange_rate: invoice.financials?.exchange_rate || null, // Added exchange_rate				
-                weight_type: 'kgs',
+				currency: invoice.financials?.currency || 'foreign', // foreign, local, manual
+				exchange_rate: invoice.financials?.exchange_rate || null, // Added exchange_rate
+				weight_type: 'kgs',
 				iva_factor: invoice.financials?.iva_factor || null,
 				carrier_id: invoice.logistics?.carrier_id || null,
 				transport_id: invoice.logistics?.transport_id || '',
@@ -85,7 +87,8 @@
 				transport_num: invoice.logistics?.vehicle_num || '',
 				aduana: invoice.compliance_mx?.aduana || '',
 				document_type: invoice.document_type || '',
-			};            
+				manifest_number: invoice.compliance_mx?.manifest_number || ''
+			};
 		} else {
 			// Creando una nueva factura
 			formData = {
@@ -96,9 +99,11 @@
 				sold_to_id: null,
 				shipped_to_header: 'enviado_a',
 				shipped_to_id: null,
+				shipped_by_header: 'enviado_por',
+				shipped_by_id: null,
 				customs_broker_id: null,
 				customs_broker_us_id: null,
-				
+
 				// RIGHT fields
 				currency_type: '',
 				currency: 'foreign', // foreign, local, manual
@@ -112,6 +117,7 @@
 				transport_num: '',
 				aduana: '',
 				document_type: '',
+				manifest_number: ''
 			};
 		}
 	} else {
@@ -128,6 +134,9 @@
 		if (!formData.shipped_to_header) {
 			formData.shipped_to_header = 'enviado_a';
 		}
+		if (!formData.shipped_by_header) {
+			formData.shipped_by_header = 'enviado_por';
+		}
 	}
 
 	// Opciones de tipo de peso
@@ -157,62 +166,92 @@
 		{ value: 'exportador', label: 'Exportador' }
 	];
 
-	const soldToHeaderOptions = $derived([
-		{ value: 'consignado_a', label: 'Consignado a' },
-		{ value: 'vendido_a', label: 'Vendido a' },
-		{ value: operationType === 1 ? 'exportado_a' : 'importador', label: operationType === 1 ? 'Exportado a' : 'Importador' }
-	]);
+	const soldToHeaderOptions = $derived(
+		operationType === 1
+			? [
+					{ value: 'consignado_a', label: 'Consignado a' },
+					{ value: 'vendido_a', label: 'Vendido a' },
+					{ value: 'exportado_a', label: 'Exportado a' }
+				]
+			: [
+					{ value: 'consignado_a', label: 'Consignado a' },
+					{ value: 'vendido_a', label: 'Vendido a' },
+					{ value: 'importador', label: 'Importador' }
+				]
+	);
 
 	const shippedToHeaderOptions = $derived(
 		operationType === 1
 			? [
-				{ value: 'enviado_por', label: 'Enviado Por' },
-				{ value: 'destinatario', label: 'Destinatario' },
-				{ value: 'vendido_por', label: 'Vendido Por' },
-				{ value: 'consignado_a', label: 'Consignado a' },
-				{ value: 'vendido_a', label: 'Vendido a' },
-				{ value: 'exportado_a', label: 'Exportado a' },
-				{ value: 'enviado_a', label: 'Enviado a' },
-				{ value: 'transferido_a', label: 'Transferido a' },
-				{ value: 'donado_a', label: 'Donado a' },
-				{ value: 'notificar_a', label: 'Notificar a' }
-			]
+					{ value: 'enviado_a', label: 'Enviado a' },
+					{ value: 'transferido_a', label: 'Transferido a' },
+					{ value: 'donado_a', label: 'Donado a' },
+					{ value: 'importador', label: 'Importador' }
+				]
 			: [
-				{ value: 'enviado_a', label: 'Enviado a' },
-				{ value: 'transferido_a', label: 'Transferido a' }
-			]
+					{ value: 'enviado_a', label: 'Enviado a' },
+					{ value: 'transferido_a', label: 'Transferido a' }
+				]
+	);
+
+	const shippedByHeaderOptions = $derived(
+		operationType === 1
+			? [
+					{ value: 'enviado_por', label: 'Enviado Por' },
+					{ value: 'vendido_por', label: 'Vendido Por' },
+					{ value: 'consignado_a', label: 'Consignado a' },
+					{ value: 'vendido_a', label: 'Vendido a' },
+					{ value: 'exportado_a', label: 'Exportado a' },
+					{ value: 'enviado_a', label: 'Enviado a' },
+					{ value: 'transferido_a', label: 'Transferido a' },
+					{ value: 'donado_a', label: 'Donado a' },
+					{ value: 'notificar_a', label: 'Notificar a' },
+					{ value: 'importador', label: 'Importador' }
+				]
+			: [
+					{ value: 'enviado_por', label: 'Enviado Por' },
+					{ value: 'notificar_a', label: 'Notificar a' }
+				]
 	);
 
 	// Combinar clientes y proveedores para shipped_to, evitando duplicados de tipo "both"
 	const allClientsProviders = $derived.by(() => {
 		const uniqueMap = new Map();
-		
+
 		// Agregar todos los clientes
-		clients.forEach(c => {
+		clients.forEach((c) => {
 			uniqueMap.set(c.id, { ...c, type: c.client_or_provider });
 		});
-		
+
 		// Agregar proveedores solo si no existen (evita duplicados de "both")
-		providers.forEach(p => {
+		providers.forEach((p) => {
 			if (!uniqueMap.has(p.id)) {
 				uniqueMap.set(p.id, { ...p, type: p.client_or_provider });
 			}
 		});
-		
+
 		return Array.from(uniqueMap.values());
 	});
 
 	// Determinar tipo de código basado en operationType prop, defaultOperationType o invoice.operation_type
 	const typeCode = $derived(
-		operationType === 1 ? 'E' 
-		: operationType === 2 ? 'I'
-		: defaultOperationType === 1 ? 'E'
-		: defaultOperationType === 2 ? 'I'
-		: defaultOperationType === 'exp' ? 'E'
-		: defaultOperationType === 'imp' ? 'I'
-		: invoice?.operation_type === 'exp' ? 'E'
-		: invoice?.operation_type === 'imp' ? 'I'
-		: null
+		operationType === 1
+			? 'E'
+			: operationType === 2
+				? 'I'
+				: defaultOperationType === 1
+					? 'E'
+					: defaultOperationType === 2
+						? 'I'
+						: defaultOperationType === 'exp'
+							? 'E'
+							: defaultOperationType === 'imp'
+								? 'I'
+								: invoice?.operation_type === 'exp'
+									? 'E'
+									: invoice?.operation_type === 'imp'
+										? 'I'
+										: null
 	);
 
 	// Filtrar regímenes por tipo de operación (1='E' exp, 2='I' imp) y obtener valores únicos
@@ -220,22 +259,22 @@
 		!codePedimentoRegimens || codePedimentoRegimens.length === 0 || !typeCode
 			? []
 			: Array.from(
-				codePedimentoRegimens
-					.filter(r => r.type_code === typeCode)
-					.reduce((map, r) => {
-						if (r.regimen_code && !map.has(r.regimen_code)) {
-							map.set(r.regimen_code, r);
-						}
-						return map;
-					}, new Map<string, CodePedimentoRegimen>())
-					.values()
-			)
+					codePedimentoRegimens
+						.filter((r) => r.type_code === typeCode)
+						.reduce((map, r) => {
+							if (r.regimen_code && !map.has(r.regimen_code)) {
+								map.set(r.regimen_code, r);
+							}
+							return map;
+						}, new Map<string, CodePedimentoRegimen>())
+						.values()
+				)
 	);
 
 	// Efecto: Limpiar régimen si no existe en los regímenes filtrados al cambiar operation_type
 	$effect(() => {
 		if (formData.document_type && filteredRegimens.length > 0) {
-			const regimenExists = filteredRegimens.some(r => r.regimen_code === formData.document_type);
+			const regimenExists = filteredRegimens.some((r) => r.regimen_code === formData.document_type);
 			if (!regimenExists) {
 				formData.document_type = '';
 			}
@@ -245,532 +284,642 @@
 
 <!-- Layout de 2 columnas compacto -->
 <div class="grid grid-cols-2 gap-4">
-    <!-- Columna Izquierda: Clientes - Proveedores - Agente Aduanal -->
-    <div class="border rounded-md p-3 space-y-3">
-        <div class="space-y-2">
-            <h4 class="text-xs font-semibold text-muted-foreground uppercase">Datos del pedimento</h4>
-            <div class="grid grid-cols-4 gap-3 text-xs">
-                <div>
-                    <span class="text-muted-foreground">Fecha del:</span>
-                    <p class="font-medium">{formData.fecha_pedimento_del || '-'}</p>
-                </div>
-                <div>
-                    <span class="text-muted-foreground">Fecha al:</span>
-                    <p class="font-medium">{formData.fecha_pedimento_al || '-'}</p>
-                </div>
-                <div>
-                    <span class="text-muted-foreground">Clave:</span>
-                    <p class="font-medium">{formData.clave_pedimento || '-'}</p>
-                </div>
-                <div>
-                    <span class="text-muted-foreground">Régimen:</span>
-                    <p class="font-medium">{formData.regimen_pedimento || '-'}</p>
-                </div>
-            </div>
-        </div>
+	<!-- Columna Izquierda: Clientes - Proveedores - Agente Aduanal -->
+	<div class="space-y-3 rounded-md border p-3">
+		<div class="space-y-2">
+			<h4 class="text-xs font-semibold text-muted-foreground uppercase">Datos del pedimento</h4>
+			<div class="grid grid-cols-4 gap-3 text-xs">
+				<div>
+					<span class="text-muted-foreground">Fecha del:</span>
+					<p class="font-medium">{formData.fecha_pedimento_del || '-'}</p>
+				</div>
+				<div>
+					<span class="text-muted-foreground">Fecha al:</span>
+					<p class="font-medium">{formData.fecha_pedimento_al || '-'}</p>
+				</div>
+				<div>
+					<span class="text-muted-foreground">Clave:</span>
+					<p class="font-medium">{formData.clave_pedimento || '-'}</p>
+				</div>
+				<div>
+					<span class="text-muted-foreground">Régimen:</span>
+					<p class="font-medium">{formData.regimen_pedimento || '-'}</p>
+				</div>
+			</div>
+		</div>
 
-        <h4 class="text-xs font-semibold text-muted-foreground uppercase">Clientes - Proveedores - Agente Aduanal</h4>
-        <div class="grid grid-cols-4 gap-3 space-y-1.5">            
-            <Select.Root
-                type="single"
-                value={formData.provider_header || providerHeaderOptions[0]?.value || ''}
-                onValueChange={(v) => {
-                    formData.provider_header = v ?? '';
-                }}
-            >
-                <Select.Trigger id="provider_header" class="h-7 text-xs min-w-[125px] max-w-[250px]">
-                    <span class="truncate">
-                        {providerHeaderOptions.find(o => o.value === (formData.provider_header || providerHeaderOptions[0]?.value))?.label || 'Selecciona encabezado...'}
-                    </span>
-                </Select.Trigger>
-                <Select.Content>
-                    {#each providerHeaderOptions as option}
-                        <Select.Item value={option.value}>
-                            {option.label}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>
-            <Select.Root
-                type="single"
-                value={formData.provider_id ? String(formData.provider_id) : ''}
-                onValueChange={(v) => {
-                    formData.provider_id = v ? parseInt(v) : null;
-                }}
-            >
-                <Select.Trigger id="provider_id" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                    <span class="truncate">
-                        {#if formData.provider_id}
-                            {providers.find(p => p.id === formData.provider_id)?.name || 'Selecciona...'}
-                        {:else}
-                            Selecciona...
-                        {/if}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each providers as provider}
-                        <Select.Item value={String(provider.id)}>
-                            {provider.name}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>			
-            <span class="text-red-500">*</span>            
-        </div>
+		<h4 class="text-xs font-semibold text-muted-foreground uppercase">
+			Clientes - Proveedores - Agente Aduanal
+		</h4>
+		<div class="grid grid-cols-4 gap-3 space-y-1.5">
+			<Select.Root
+				type="single"
+				value={formData.provider_header || providerHeaderOptions[0]?.value || ''}
+				onValueChange={(v) => {
+					formData.provider_header = v ?? '';
+				}}
+			>
+				<Select.Trigger id="provider_header" class="h-7 max-w-[250px] min-w-[125px] text-xs">
+					<span class="truncate">
+						{providerHeaderOptions.find(
+							(o) => o.value === (formData.provider_header || providerHeaderOptions[0]?.value)
+						)?.label || 'Selecciona encabezado...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content>
+					{#each providerHeaderOptions as option}
+						<Select.Item value={option.value}>
+							{option.label}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<Select.Root
+				type="single"
+				value={formData.provider_id ? String(formData.provider_id) : ''}
+				onValueChange={(v) => {
+					formData.provider_id = v ? parseInt(v) : null;
+				}}
+			>
+				<Select.Trigger id="provider_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+					<span class="truncate">
+						{#if formData.provider_id}
+							{providers.find((p) => p.id === formData.provider_id)?.name || 'Selecciona...'}
+						{:else}
+							Selecciona...
+						{/if}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each providers as provider}
+						<Select.Item value={String(provider.id)}>
+							{provider.name}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<span class="text-red-500">*</span>
+		</div>
 
-        <div class="grid grid-cols-4 gap-3 space-y-1.5">            
-            <Select.Root
-                type="single"
-                value={formData.sold_to_header || soldToHeaderOptions[0]?.value || ''}
-                onValueChange={(v) => {
-                    formData.sold_to_header = v ?? '';
-                }}
-            >
-                <Select.Trigger id="sold_to_header" class="h-7 text-xs min-w-[125px] max-w-[250px]">
-                    <span class="truncate">
-                        {soldToHeaderOptions.find(o => o.value === (formData.sold_to_header || soldToHeaderOptions[0]?.value))?.label || 'Selecciona encabezado...'}
-                    </span>
-                </Select.Trigger>
-                <Select.Content>
-                    {#each soldToHeaderOptions as option}
-                        <Select.Item value={option.value}>
-                            {option.label}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>
-            <Select.Root
-                type="single"
-                value={formData.sold_to_id ? String(formData.sold_to_id) : ''}
-                onValueChange={(v) => {
-                    formData.sold_to_id = v ? parseInt(v) : null;
-                }}
-            >
-                <Select.Trigger id="sold_to_id" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                    <span class="truncate">
-                        {#if formData.sold_to_id}
-                            {clients.find(c => c.id === formData.sold_to_id)?.name || 'Selecciona...'}
-                        {:else}
-                            Selecciona...
-                        {/if}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each clients as client}
-                        <Select.Item value={String(client.id)}>
-                            {client.name}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>		
-            <span class="text-red-500">*</span>			
-        </div>
+		<div class="grid grid-cols-4 gap-3 space-y-1.5">
+			<Select.Root
+				type="single"
+				value={formData.sold_to_header || soldToHeaderOptions[0]?.value || ''}
+				onValueChange={(v) => {
+					formData.sold_to_header = v ?? '';
+				}}
+			>
+				<Select.Trigger id="sold_to_header" class="h-7 max-w-[250px] min-w-[125px] text-xs">
+					<span class="truncate">
+						{soldToHeaderOptions.find(
+							(o) => o.value === (formData.sold_to_header || soldToHeaderOptions[0]?.value)
+						)?.label || 'Selecciona encabezado...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content>
+					{#each soldToHeaderOptions as option}
+						<Select.Item value={option.value}>
+							{option.label}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<Select.Root
+				type="single"
+				value={formData.sold_to_id ? String(formData.sold_to_id) : ''}
+				onValueChange={(v) => {
+					formData.sold_to_id = v ? parseInt(v) : null;
+				}}
+			>
+				<Select.Trigger id="sold_to_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+					<span class="truncate">
+						{#if formData.sold_to_id}
+							{clients.find((c) => c.id === formData.sold_to_id)?.name || 'Selecciona...'}
+						{:else}
+							Selecciona...
+						{/if}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each clients as client}
+						<Select.Item value={String(client.id)}>
+							{client.name}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<span class="text-red-500">*</span>
+		</div>
 
-        <div class="grid grid-cols-4 gap-3 space-y-1.5">        
-            <Select.Root
-                type="single"
-                value={formData.shipped_to_header || shippedToHeaderOptions[0]?.value || ''}
-                onValueChange={(v) => {
-                    formData.shipped_to_header = v ?? '';
-                }}
-            >
-                <Select.Trigger id="shipped_to_header" class="h-7 text-xs min-w-[125px] max-w-[250px]">
-                    <span class="truncate">
-                        {shippedToHeaderOptions.find(o => o.value === (formData.shipped_to_header || shippedToHeaderOptions[0]?.value))?.label || 'Selecciona encabezado...'}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each shippedToHeaderOptions as option}
-                        <Select.Item value={option.value}>
-                            {option.label}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>
-            <Select.Root
-                type="single"
-                value={formData.shipped_to_id ? String(formData.shipped_to_id) : ''}
-                onValueChange={(v) => {
-                    formData.shipped_to_id = v ? parseInt(v) : null;
-                }}
-            >
-                <Select.Trigger id="shipped_to_id" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                    <span class="truncate">
-                        {#if formData.shipped_to_id}
-                            {allClientsProviders.find(cp => cp.id === formData.shipped_to_id)?.name || 'Selecciona...'}
-                        {:else}
-                            Selecciona...
-                        {/if}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each allClientsProviders as cp}
-                        <Select.Item value={String(cp.id)}>
-                            {cp.name}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>
-            <span class="text-red-500">*</span>
-        </div>
+		<div class="grid grid-cols-4 gap-3 space-y-1.5">
+			<Select.Root
+				type="single"
+				value={formData.shipped_to_header || shippedToHeaderOptions[0]?.value || ''}
+				onValueChange={(v) => {
+					formData.shipped_to_header = v ?? '';
+				}}
+			>
+				<Select.Trigger id="shipped_to_header" class="h-7 max-w-[250px] min-w-[125px] text-xs">
+					<span class="truncate">
+						{shippedToHeaderOptions.find(
+							(o) => o.value === (formData.shipped_to_header || shippedToHeaderOptions[0]?.value)
+						)?.label || 'Selecciona encabezado...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each shippedToHeaderOptions as option}
+						<Select.Item value={option.value}>
+							{option.label}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<Select.Root
+				type="single"
+				value={formData.shipped_to_id ? String(formData.shipped_to_id) : ''}
+				onValueChange={(v) => {
+					formData.shipped_to_id = v ? parseInt(v) : null;
+				}}
+			>
+				<Select.Trigger id="shipped_to_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+					<span class="truncate">
+						{#if formData.shipped_to_id}
+							{allClientsProviders.find((cp) => cp.id === formData.shipped_to_id)?.name ||
+								'Selecciona...'}
+						{:else}
+							Selecciona...
+						{/if}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each allClientsProviders as cp}
+						<Select.Item value={String(cp.id)}>
+							{cp.name}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+			<span class="text-red-500">*</span>
+		</div>
 
-       
-        <div class="space-y-1.5">
-            <Label for="customs_broker_id" class="text-xs">Agente Aduanal Mex: <span class="text-red-500">*</span></Label>
-            <Select.Root
-                type="single"
-                value={formData.customs_broker_id ? String(formData.customs_broker_id) : ''}
-                onValueChange={(v) => {
-                    formData.customs_broker_id = v ? parseInt(v) : null;
-                }}
-            >
-                <Select.Trigger id="customs_broker_id" class="h-7 text-xs min-w-[150px] max-w-[300px]">
-                    <span class="truncate">
-                        {formData.customs_broker_id
-                            ? customsBrokers.find(cb => cb.id === formData.customs_broker_id)?.name || 'Selecciona...'
-                            : 'Selecciona...'}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each customsBrokers as broker}
-                        <Select.Item value={broker.id.toString()}>
-                            {broker.name}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>            
-        </div>        
+		{#if operationType === 1}
+			<div class="grid grid-cols-4 gap-3 space-y-1.5">
+				<Select.Root
+					type="single"
+					value={formData.shipped_by_header || shippedByHeaderOptions[0]?.value || ''}
+					onValueChange={(v) => {
+						formData.shipped_by_header = v ?? '';
+					}}
+				>
+					<Select.Trigger id="shipped_by_header" class="h-7 max-w-[250px] min-w-[125px] text-xs">
+						<span class="truncate">
+							{shippedByHeaderOptions.find(
+								(o) => o.value === (formData.shipped_by_header || shippedByHeaderOptions[0]?.value)
+							)?.label || 'Selecciona encabezado...'}
+						</span>
+					</Select.Trigger>
+					<Select.Content class="max-h-[300px]">
+						{#each shippedByHeaderOptions as option}
+							<Select.Item value={option.value}>
+								{option.label}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+				<Select.Root
+					type="single"
+					value={formData.shipped_by_id ? String(formData.shipped_by_id) : ''}
+					onValueChange={(v) => {
+						formData.shipped_by_id = v ? parseInt(v) : null;
+					}}
+				>
+					<Select.Trigger id="shipped_by_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+						<span class="truncate">
+							{#if formData.shipped_by_id}
+								{allClientsProviders.find((cp) => cp.id === formData.shipped_by_id)?.name ||
+									'Selecciona...'}
+							{:else}
+								Selecciona...
+							{/if}
+						</span>
+					</Select.Trigger>
+					<Select.Content class="max-h-[300px]">
+						{#each allClientsProviders as cp}
+							<Select.Item value={String(cp.id)}>
+								{cp.name}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+				<span class="text-red-500">*</span>
+			</div>
+		{/if}
 
-        <div class="space-y-1.5">
-            <Label for="customs_broker_us_id" class="text-xs">Agente Aduanal Ame:</Label>
-            <Select.Root
-                type="single"
-                value={formData.customs_broker_us_id ? String(formData.customs_broker_us_id) : ''}
-                onValueChange={(v) => {
-                    formData.customs_broker_us_id = v ? parseInt(v) : null;
-                }}
-            >
-                <Select.Trigger id="customs_broker_us_id" class=" min-w-[150px] h-7 text-xs">
-                    <span class="truncate">
-                        {formData.customs_broker_us_id 
-                            ? customsBrokers.find(cb => cb.id === formData.customs_broker_us_id)?.name || 'Selecciona...'
-                            : 'Selecciona...'}
-                    </span>
-                </Select.Trigger>
-                <Select.Content class="max-h-[300px]">
-                    {#each customsBrokers as broker}
-                        <Select.Item value={broker.id.toString()}>
-                            {broker.name}
-                        </Select.Item>
-                    {/each}
-                </Select.Content>
-            </Select.Root>
-        </div>        
-    </div>
+		<div class="space-y-1.5">
+			<Label for="customs_broker_id" class="text-xs"
+				>Agente Aduanal Mex: <span class="text-red-500">*</span></Label
+			>
+			<Select.Root
+				type="single"
+				value={formData.customs_broker_id ? String(formData.customs_broker_id) : ''}
+				onValueChange={(v) => {
+					formData.customs_broker_id = v ? parseInt(v) : null;
+				}}
+			>
+				<Select.Trigger id="customs_broker_id" class="h-7 max-w-[300px] min-w-[150px] text-xs">
+					<span class="truncate">
+						{formData.customs_broker_id
+							? customsBrokers.find((cb) => cb.id === formData.customs_broker_id)?.name ||
+								'Selecciona...'
+							: 'Selecciona...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each customsBrokers as broker}
+						<Select.Item value={broker.id.toString()}>
+							{broker.name}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+		</div>
 
-    <!-- Columna Derecha: Tipo de Moneda y Transportista -->
-    <div class="space-y-3">
-        <!-- Tipo de Moneda - Pesos Netos y Brutos -->
-        <div class="border rounded-md p-3 space-y-2">
-            <div class="flex justify-between">
-                <h4 class="text-xs font-semibold text-muted-foreground uppercase">Tipo de Moneda - Pesos Netos y Brutos</h4>
-                <h4 class="text-xs font-semibold text-muted-foreground uppercase">
-                    Tipo de cambio: 
-                    <span class="text-primary ml-1">
-                        {(exchangeRate !== undefined && exchangeRate !== null)
-                            ? (exchangeRate === 0 ? 'N/A' : Number(exchangeRate).toFixed(4))
-                            : (formData.exchange_rate ? Number(formData.exchange_rate).toFixed(4) : 'N/A')}
-                    </span>
-                </h4>
-            </div>
-            
-            <!-- Radio buttons para tipo de moneda -->
-            <div class="space-y-1.5">
-                <RadioGroup.Root bind:value={formData.currency} class="flex gap-4">
-                    <div class="flex items-center space-x-2">
-                        <RadioGroup.Item value="foreign" id="currency-foreign" class="h-4 w-4" />
-                        <Label for="currency-foreign" class="text-xs font-normal cursor-pointer">Extranjera (Dlls)</Label>
-                    </div>
-                    <div class="flex items-center space-x-2">
-                        <RadioGroup.Item value="local" id="currency-local" class="h-4 w-4" />
-                        <Label for="currency-local" class="text-xs font-normal cursor-pointer">Nacional (Pesos)</Label>
-                    </div>
-                    <div class="flex items-center space-x-2">
-                        <RadioGroup.Item value="manual" id="currency-manual" class="h-4 w-4" />
-                        <Label for="currency-manual" class="text-xs font-normal cursor-pointer">De Captura</Label>
-                    </div>
-                </RadioGroup.Root>
-            </div>
-            {#if formData.currency === 'manual'}
-                <div class="space-y-1.5">
-                    <Label for="currency_type" class="text-xs">Moneda:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.currency_type || ''}
-                        onValueChange={(v) => {
-                            formData.currency_type = v ?? '';
-                        }}
-                    >
-                        <Select.Trigger id="currency_type" class="h-7 text-xs min-w-[80px]">
-                            <span class="truncate">
-                                {formData.currency_type || '...'}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content class="min-w-[80px] max-h-[300px]">
-                            {#each currencyTypes as currencyType}
-                                <Select.Item value={currencyType.code}>
-                                    {currencyType.code}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
-            {/if}
-            <div class="grid grid-cols-3 gap-2">                
-                <div class="space-y-1.5">
-                    <Label for="weight_type" class="text-xs">Tipo Peso:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.weight_type || 'kgs'}
-                        onValueChange={(v) => {
-                            formData.weight_type = v ?? 'kgs';
-                        }}
-                    >
-                        <Select.Trigger id="weight_type" class="min-w-[150px] h-7 text-xs">
-                            <span class="truncate">
-                                {weightTypeOptions.find(w => w.value === formData.weight_type)?.label || 'Kilogramos (kg)'}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content>
-                            {#each weightTypeOptions as weightType}
-                                <Select.Item value={weightType.value}>
-                                    {weightType.label}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
+		<div class="space-y-1.5">
+			<Label for="customs_broker_us_id" class="text-xs">Agente Aduanal Ame:</Label>
+			<Select.Root
+				type="single"
+				value={formData.customs_broker_us_id ? String(formData.customs_broker_us_id) : ''}
+				onValueChange={(v) => {
+					formData.customs_broker_us_id = v ? parseInt(v) : null;
+				}}
+			>
+				<Select.Trigger id="customs_broker_us_id" class=" h-7 min-w-[150px] text-xs">
+					<span class="truncate">
+						{formData.customs_broker_us_id
+							? customsBrokers.find((cb) => cb.id === formData.customs_broker_us_id)?.name ||
+								'Selecciona...'
+							: 'Selecciona...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each customsBrokers as broker}
+						<Select.Item value={broker.id.toString()}>
+							{broker.name}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+		</div>
+	</div>
 
-                <div class="space-y-1.5">
-                    <Label for="iva_factor" class="text-xs">IVA:</Label>
-                    <Input id="iva_factor" type="number" step="0.0001" bind:value={formData.iva_factor} placeholder="0.16" class="h-7 text-xs" />
-                </div>
-            </div>
-        </div>
+	<!-- Columna Derecha: Tipo de Moneda y Transportista -->
+	<div class="space-y-3">
+		<!-- Tipo de Moneda - Pesos Netos y Brutos -->
+		<div class="space-y-2 rounded-md border p-3">
+			<div class="flex justify-between">
+				<h4 class="text-xs font-semibold text-muted-foreground uppercase">
+					Tipo de Moneda - Pesos Netos y Brutos
+				</h4>
+				<h4 class="text-xs font-semibold text-muted-foreground uppercase">
+					Tipo de cambio:
+					<span class="ml-1 text-primary">
+						{exchangeRate !== undefined && exchangeRate !== null
+							? exchangeRate === 0
+								? 'N/A'
+								: Number(exchangeRate).toFixed(4)
+							: formData.exchange_rate
+								? Number(formData.exchange_rate).toFixed(4)
+								: 'N/A'}
+					</span>
+				</h4>
+			</div>
 
-        <!-- Transportista -->
-        <div class="border rounded-md p-3 space-y-2">
-            <h4 class="text-xs font-semibold text-muted-foreground uppercase">Transportista</h4>
-            
-            <div class="grid grid-cols-3 gap-2">
-                <div class="space-y-1.5">
-                    <Label for="carrier_id" class="text-xs">Transportista:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.carrier_id ? String(formData.carrier_id) : ''}
-                        onValueChange={(v) => {
-                            formData.carrier_id = v || null;
-                        }}
-                    >
-                        <Select.Trigger id="carrier_id" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                            <span class="truncate">
-                                {#if formData.carrier_id}
-                                    {transporters.find(t => String(t.transporter_key) === String(formData.carrier_id))?.name || formData.carrier_id}
-                                {:else if transporters.length > 0}
-                                    Selecciona transportista...
-                                {:else}
-                                    Sin datos
-                                {/if}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content class="max-h-[300px]">
-                            {#each transporters as transporter}
-                                <Select.Item value={String(transporter.transporter_key)}>
-                                    {transporter.transporter_key}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
+			<!-- Radio buttons para tipo de moneda -->
+			<div class="space-y-1.5">
+				<RadioGroup.Root bind:value={formData.currency} class="flex gap-4">
+					<div class="flex items-center space-x-2">
+						<RadioGroup.Item value="foreign" id="currency-foreign" class="h-4 w-4" />
+						<Label for="currency-foreign" class="cursor-pointer text-xs font-normal"
+							>Extranjera (Dlls)</Label
+						>
+					</div>
+					<div class="flex items-center space-x-2">
+						<RadioGroup.Item value="local" id="currency-local" class="h-4 w-4" />
+						<Label for="currency-local" class="cursor-pointer text-xs font-normal"
+							>Nacional (Pesos)</Label
+						>
+					</div>
+					<div class="flex items-center space-x-2">
+						<RadioGroup.Item value="manual" id="currency-manual" class="h-4 w-4" />
+						<Label for="currency-manual" class="cursor-pointer text-xs font-normal"
+							>De Captura</Label
+						>
+					</div>
+				</RadioGroup.Root>
+			</div>
+			{#if formData.currency === 'manual'}
+				<div class="space-y-1.5">
+					<Label for="currency_type" class="text-xs">Moneda:</Label>
+					<Select.Root
+						type="single"
+						value={formData.currency_type || ''}
+						onValueChange={(v) => {
+							formData.currency_type = v ?? '';
+						}}
+					>
+						<Select.Trigger id="currency_type" class="h-7 min-w-[80px] text-xs">
+							<span class="truncate">
+								{formData.currency_type || '...'}
+							</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px] min-w-[80px]">
+							{#each currencyTypes as currencyType}
+								<Select.Item value={currencyType.code}>
+									{currencyType.code}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			{/if}
+			<div class="grid grid-cols-3 gap-2">
+				<div class="space-y-1.5">
+					<Label for="weight_type" class="text-xs">Tipo Peso:</Label>
+					<Select.Root
+						type="single"
+						value={formData.weight_type || 'kgs'}
+						onValueChange={(v) => {
+							formData.weight_type = v ?? 'kgs';
+						}}
+					>
+						<Select.Trigger id="weight_type" class="h-7 min-w-[150px] text-xs">
+							<span class="truncate">
+								{weightTypeOptions.find((w) => w.value === formData.weight_type)?.label ||
+									'Kilogramos (kg)'}
+							</span>
+						</Select.Trigger>
+						<Select.Content>
+							{#each weightTypeOptions as weightType}
+								<Select.Item value={weightType.value}>
+									{weightType.label}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
 
-                <div class="col-span-2 space-y-1.5">
-                    <Label for="transport_id" class="text-xs">Clave Transporte:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.transport_id || ''}
-                        onValueChange={(v) => {
-                            formData.transport_id = v ?? '';
-                        }}
-                    >
-                        <Select.Trigger id="transport_id" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                            <span class="truncate">
-                                {#if formData.transport_id}
-                                    {vehicles.find(v => v.vehicle_key === formData.transport_id)?.vehicle_key || formData.transport_id}
-                                {:else if vehicles.length > 0}
-                                    Selecciona vehículo...
-                                {:else}
-                                    Sin datos
-                                {/if}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content class="max-h-[300px]">
-                            {#each vehicles as vehicle}
-                                <Select.Item value={vehicle.vehicle_key}>
-                                    {vehicle.vehicle_key} {vehicle.plate_number ? `- ${vehicle.plate_number}` : ''}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
-            </div>
-            
-            <div class="space-y-1.5">             
-                <Label for="driver_name" class="text-xs">Conductor:</Label>
-                <Select.Root
-                    type="single"
-                    value={formData.driver_name || ''}
-                    onValueChange={(v) => {
-                        formData.driver_name = v ?? '';
-                    }}
-                >
-                    <Select.Trigger id="driver_name" class="h-7 text-xs w-full">
-                        <span class="truncate">
-                            {#if formData.driver_name}
-                                {formData.driver_name}
-                            {:else if drivers.length > 0}
-                                Selecciona conductor...
-                            {:else}
-                                Sin datos
-                            {/if}
-                        </span>
-                    </Select.Trigger>
-                    <Select.Content class="max-h-[300px]">
-                        {#each drivers as driver}
-                            <Select.Item value={driver.driver_name}>
-                                {driver.driver_name}
-                            </Select.Item>
-                        {/each}
-                    </Select.Content>
-                </Select.Root>                
-            </div>
+				{#if operationType !== 1}
+					<div class="space-y-1.5">
+						<Label for="iva_factor" class="text-xs">IVA:</Label>
+						<Input
+							id="iva_factor"
+							type="number"
+							step="0.0001"
+							bind:value={formData.iva_factor}
+							placeholder="0.16"
+							class="h-7 text-xs"
+						/>
+					</div>
+				{/if}
+				{#if operationType === 1}
+					<div class="space-y-1.5">
+						<Label for="manifest_number" class="text-xs font-bold text-primary"
+							>Num. de Manifiesto:</Label
+						>
+						<Input
+							id="manifest_number"
+							bind:value={formData.manifest_number}
+							placeholder="Manifiesto..."
+							class="h-7 border-primary/50 text-xs"
+						/>
+					</div>
+				{/if}
+			</div>
+		</div>
 
-            <div class="grid grid-cols-4 gap-2">
-                <div class="space-y-1.5">
-                    <Label for="transport_type" class="text-xs">Tipo Transporte:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.transport_type || 'none'}
-                        onValueChange={(v) => {
-                            formData.transport_type = v ?? 'none';
-                        }}
-                    >
-                        <Select.Trigger id="transport_type" class="h-7 text-xs min-w-[120px] max-w-[250px]">
-                            <span class="truncate">
-                                {transportTypeOptions.find(t => t.value === formData.transport_type)?.label || 'Ninguno'}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content>
-                            {#each transportTypeOptions as option}
-                                <Select.Item value={option.value}>
-                                    {option.label}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
+		<!-- Transportista -->
+		<div class="space-y-2 rounded-md border p-3">
+			<h4 class="text-xs font-semibold text-muted-foreground uppercase">Transportista</h4>
 
-                <div class="space-y-1.5 col-span-3">
-                    <Label for="transport_num" class="text-xs">Placas:</Label>
-                    <Select.Root
-                        type="single"
-                        value={formData.transport_num || ''}
-                        onValueChange={(v) => {
-                            formData.transport_num = v ?? '';
-                        }}
-                    >
-                        <Select.Trigger id="transport_num" class="h-7 text-xs w-full">
-                            <span class="truncate">
-                                {#if formData.transport_num}
-                                    {trailers.find(t => t.trailer_number === formData.transport_num)?.plate_number || formData.transport_num}
-                                {:else if trailers.length > 0}
-                                    Selecciona remolque...
-                                {:else}
-                                    Sin datos
-                                {/if}
-                            </span>
-                        </Select.Trigger>
-                        <Select.Content class="max-h-[300px]">
-                            {#each trailers as trailer}
-                                <Select.Item value={trailer.trailer_number}>
-                                    {trailer.plate_number || trailer.trailer_number}
-                                </Select.Item>
-                            {/each}
-                        </Select.Content>
-                    </Select.Root>
-                </div>
-            </div>
+			<div class="grid grid-cols-3 gap-2">
+				<div class="space-y-1.5">
+					<Label for="carrier_id" class="text-xs">Transportista:</Label>
+					<Select.Root
+						type="single"
+						value={formData.carrier_id ? String(formData.carrier_id) : ''}
+						onValueChange={(v) => {
+							formData.carrier_id = v || null;
+						}}
+					>
+						<Select.Trigger id="carrier_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+							<span class="truncate">
+								{#if formData.carrier_id}
+									{transporters.find(
+										(t) => String(t.transporter_key) === String(formData.carrier_id)
+									)?.name || formData.carrier_id}
+								{:else if transporters.length > 0}
+									Selecciona transportista...
+								{:else}
+									Sin datos
+								{/if}
+							</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each transporters as transporter}
+								<Select.Item value={String(transporter.transporter_key)}>
+									{transporter.transporter_key}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
 
-            <div class="space-y-1.5">
-                <Label for="aduana" class="text-xs">Aduana y Sección de Despacho:</Label>
-                <Select.Root
-                    type="single"
-                    value={formData.aduana || ''}
-                    onValueChange={(v) => {
-                        formData.aduana = v ?? '';
-                    }}
-                >
-                    <Select.Trigger id="aduana" class="h-7 text-xs w-full">
-                        <span class="truncate">
-                            {#if formData.aduana}
-                                {customsSections.find(cs => cs.customs_code === formData.aduana)?.section_name || formData.aduana}
-                            {:else if customsSections.length > 0}
-                                Selecciona aduana...
-                            {:else}
-                                Sin datos
-                            {/if}
-                        </span>
-                    </Select.Trigger>
-                    <Select.Content class="max-h-[300px]">
-                        {#each customsSections as section}
-                            <Select.Item value={section.customs_code}>
-                                {section.customs_code} - {section.section_name}
-                            </Select.Item>
-                        {/each}
-                    </Select.Content>
-                </Select.Root>
-            </div>
+				<div class="col-span-2 space-y-1.5">
+					<Label for="transport_id" class="text-xs">Clave Transporte:</Label>
+					<Select.Root
+						type="single"
+						value={formData.transport_id || ''}
+						onValueChange={(v) => {
+							formData.transport_id = v ?? '';
+						}}
+					>
+						<Select.Trigger id="transport_id" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+							<span class="truncate">
+								{#if formData.transport_id}
+									{vehicles.find((v) => v.vehicle_key === formData.transport_id)?.vehicle_key ||
+										formData.transport_id}
+								{:else if vehicles.length > 0}
+									Selecciona vehículo...
+								{:else}
+									Sin datos
+								{/if}
+							</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each vehicles as vehicle}
+								<Select.Item value={vehicle.vehicle_key}>
+									{vehicle.vehicle_key}
+									{vehicle.plate_number ? `- ${vehicle.plate_number}` : ''}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			</div>
 
-            <div class="space-y-1.5">
-                <Label for="document_type" class="text-xs">Clave de Régimen Aduanero: <span class="text-red-500">*</span></Label>
-                <Select.Root
-                    type="single"
-                    value={formData.document_type || ''}
-                    onValueChange={(v) => {
-                        formData.document_type = v ?? '';
-                    }}
-                >
-                    <Select.Trigger id="document_type" class="h-7 text-xs w-full">
-                        <span class="truncate">
-                            {#if formData.document_type}
-                                {codePedimentoRegimens.find(r => r.regimen_code === formData.document_type)?.regimen_code || formData.document_type}
-                            {:else if filteredRegimens.length > 0}
-                                Selecciona régimen...
-                            {:else if operationType}
-                                Sin regímenes para tipo {operationType}
-                            {:else}
-                                Selecciona tipo de operación primero
-                            {/if}
-                        </span>
-                    </Select.Trigger>
-                    <Select.Content class="max-h-[300px]">
-                        {#each filteredRegimens as regimen}
-                            <Select.Item value={regimen.regimen_code}>
-                                {regimen.regimen_code}
-                            </Select.Item>
-                        {/each}
-                    </Select.Content>
-                </Select.Root>
-            </div>
-        </div>
-    </div>
+			<div class="space-y-1.5">
+				<Label for="driver_name" class="text-xs">Conductor:</Label>
+				<Select.Root
+					type="single"
+					value={formData.driver_name || ''}
+					onValueChange={(v) => {
+						formData.driver_name = v ?? '';
+					}}
+				>
+					<Select.Trigger id="driver_name" class="h-7 w-full text-xs">
+						<span class="truncate">
+							{#if formData.driver_name}
+								{formData.driver_name}
+							{:else if drivers.length > 0}
+								Selecciona conductor...
+							{:else}
+								Sin datos
+							{/if}
+						</span>
+					</Select.Trigger>
+					<Select.Content class="max-h-[300px]">
+						{#each drivers as driver}
+							<Select.Item value={driver.driver_name}>
+								{driver.driver_name}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+
+			<div class="grid grid-cols-4 gap-2">
+				<div class="space-y-1.5">
+					<Label for="transport_type" class="text-xs">Tipo Transporte:</Label>
+					<Select.Root
+						type="single"
+						value={formData.transport_type || 'none'}
+						onValueChange={(v) => {
+							formData.transport_type = v ?? 'none';
+						}}
+					>
+						<Select.Trigger id="transport_type" class="h-7 max-w-[250px] min-w-[120px] text-xs">
+							<span class="truncate">
+								{transportTypeOptions.find((t) => t.value === formData.transport_type)?.label ||
+									'Ninguno'}
+							</span>
+						</Select.Trigger>
+						<Select.Content>
+							{#each transportTypeOptions as option}
+								<Select.Item value={option.value}>
+									{option.label}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+
+				<div class="col-span-3 space-y-1.5">
+					<Label for="transport_num" class="text-xs">Placas:</Label>
+					<Select.Root
+						type="single"
+						value={formData.transport_num || ''}
+						onValueChange={(v) => {
+							formData.transport_num = v ?? '';
+						}}
+					>
+						<Select.Trigger id="transport_num" class="h-7 w-full text-xs">
+							<span class="truncate">
+								{#if formData.transport_num}
+									{trailers.find((t) => t.trailer_number === formData.transport_num)
+										?.plate_number || formData.transport_num}
+								{:else if trailers.length > 0}
+									Selecciona remolque...
+								{:else}
+									Sin datos
+								{/if}
+							</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each trailers as trailer}
+								<Select.Item value={trailer.trailer_number}>
+									{trailer.plate_number || trailer.trailer_number}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			</div>
+
+			<div class="space-y-1.5">
+				<Label for="aduana" class="text-xs">Aduana y Sección de Despacho:</Label>
+				<Select.Root
+					type="single"
+					value={formData.aduana || ''}
+					onValueChange={(v) => {
+						formData.aduana = v ?? '';
+					}}
+				>
+					<Select.Trigger id="aduana" class="h-7 w-full text-xs">
+						<span class="truncate">
+							{#if formData.aduana}
+								{customsSections.find((cs) => cs.customs_code === formData.aduana)?.section_name ||
+									formData.aduana}
+							{:else if customsSections.length > 0}
+								Selecciona aduana...
+							{:else}
+								Sin datos
+							{/if}
+						</span>
+					</Select.Trigger>
+					<Select.Content class="max-h-[300px]">
+						{#each customsSections as section}
+							<Select.Item value={section.customs_code}>
+								{section.customs_code} - {section.section_name}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+
+			<div class="space-y-1.5">
+				<Label for="document_type" class="text-xs"
+					>Clave de Régimen Aduanero: <span class="text-red-500">*</span></Label
+				>
+				<Select.Root
+					type="single"
+					value={formData.document_type || ''}
+					onValueChange={(v) => {
+						formData.document_type = v ?? '';
+					}}
+				>
+					<Select.Trigger id="document_type" class="h-7 w-full text-xs">
+						<span class="truncate">
+							{#if formData.document_type}
+								{codePedimentoRegimens.find((r) => r.regimen_code === formData.document_type)
+									?.regimen_code || formData.document_type}
+							{:else if filteredRegimens.length > 0}
+								Selecciona régimen...
+							{:else if operationType}
+								Sin regímenes para tipo {operationType}
+							{:else}
+								Selecciona tipo de operación primero
+							{/if}
+						</span>
+					</Select.Trigger>
+					<Select.Content class="max-h-[300px]">
+						{#each filteredRegimens as regimen}
+							<Select.Item value={regimen.regimen_code}>
+								{regimen.regimen_code}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+		</div>
+	</div>
 </div>
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
index 785a6bb3..37815876 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/items/items-tab-form.svelte
@@ -15,11 +15,13 @@
 	let {
 		invoice,
 		formData = $bindable(),
-		exists = $bindable()
+		exists = $bindable(),
+		operationType = undefined
 	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
+		operationType?: number;
 	} = $props();
 
 	let imported = 0;
@@ -49,6 +51,7 @@
 	let isLoadingMore = $state(false);
 	let isLoadingItems = $state(false);
 	let isSaving = $state(false);
+	let focusedLine = $state<any>(null);
 
 	// Sheet states
 	let showItemSheet = $state(false);
@@ -109,6 +112,10 @@
 		isLoadingMore = false;
 	}
 
+	function handleRowClick(line: any) {
+		focusedLine = line;
+	}
+
 	function handleScroll(e: Event) {
 		const target = e.target as HTMLDivElement;
 		const threshold = 100;
@@ -698,11 +705,11 @@
 </script>
 
 <div class="grid grid-cols-4 grid-rows-1 gap-3">
-	<div class="border rounded-md p-3 space-y-3 col-span-3">
-		<div class="flex justify-between items-center mb-3">
+	<div class="col-span-3 space-y-3 rounded-md border p-3">
+		<div class="mb-3 flex items-center justify-between">
 			<h3 class="text-sm font-semibold">Items de la Factura</h3>
 			<Button size="sm" onclick={handleAdd}>
-				<Plus class="w-4 h-4 mr-1" />
+				<Plus class="mr-1 h-4 w-4" />
 				Agregar Item
 			</Button>
 		</div>
@@ -710,49 +717,89 @@
 		<div
 			bind:this={tableContainer}
 			onscroll={handleScroll}
-			class="max-h-[500px] overflow-auto border rounded-md"
+			class="max-h-[500px] overflow-auto rounded-md border"
 		>
 			<Table.Root>
 				<Table.Header class="bg-background">
 					<Table.Row>
-						<Table.Head>Línea</Table.Head>
-						<Table.Head>P/S</Table.Head>
-						<Table.Head>Clase</Table.Head>
-						<Table.Head>Descripcion Clase</Table.Head>
-						<Table.Head>Cant. Importada</Table.Head>
-						<Table.Head>U.M.</Table.Head>
-						<Table.Head>Preferencia</Table.Head>
-						<Table.Head>Contiene Subpartida</Table.Head>
-						<Table.Head>Partida Principal</Table.Head>
-						<Table.Head class="text-right w-[120px]">Acciones</Table.Head>
+						{#if operationType === 1}
+							<Table.Head>Línea</Table.Head>
+							<Table.Head>Factura Impo</Table.Head>
+							<Table.Head>Lin Impo</Table.Head>
+							<Table.Head>P/S</Table.Head>
+							<Table.Head>Cant. Exportada</Table.Head>
+							<Table.Head>Clase</Table.Head>
+							<Table.Head>Num Parte</Table.Head>
+							<Table.Head>Descripción Esp.</Table.Head>
+							<Table.Head>Subpartidas</Table.Head>
+							<Table.Head>Partida Princ.</Table.Head>
+						{:else}
+							<Table.Head>Línea</Table.Head>
+							<Table.Head>P/S</Table.Head>
+							<Table.Head>Clase</Table.Head>
+							<Table.Head>Descripcion Clase</Table.Head>
+							<Table.Head>Cant. Importada</Table.Head>
+							<Table.Head>U.M.</Table.Head>
+							<Table.Head>Preferencia</Table.Head>
+							<Table.Head>Contiene Subpartida</Table.Head>
+							<Table.Head>Partida Principal</Table.Head>
+						{/if}
+						<Table.Head class="w-[120px] text-right">Acciones</Table.Head>
 					</Table.Row>
 				</Table.Header>
 				<Table.Body>
 					{#if displayedItems.length === 0}
 						<Table.Row>
-							<Table.Cell colspan={7} class="text-center text-muted-foreground py-8">
+							<Table.Cell
+								colspan={operationType === 1 ? 11 : 10}
+								class="py-8 text-center text-muted-foreground"
+							>
 								No hay items disponibles
 							</Table.Cell>
 						</Table.Row>
 					{:else}
 						{#each displayedItems as item (item.id)}
-							<Table.Row>
-								<Table.Cell>{item.line_number}</Table.Cell>
-								<Table.Cell>{item.is_subitem ? 'S' : 'P'}</Table.Cell>
-								<Table.Cell>{item.class_code || '-'}</Table.Cell>
-								<Table.Cell>{item.class_description || '-'}</Table.Cell>
-								<Table.Cell>{item.quantity?.quantity || '0'}</Table.Cell>
-								<Table.Cell>{item.unit_of_measure_code || '-'}</Table.Cell>
-								<Table.Cell>{item.reference_number || '-'}</Table.Cell>
-								<Table.Cell>{item.fa_data?.contains_subitems ? 'Sí' : 'No'}</Table.Cell>
-								<Table.Cell>{item.warehouse || '-'}</Table.Cell>
+							<Table.Row
+								onclick={() => handleRowClick(item)}
+								class="cursor-pointer transition-colors hover:bg-muted/50 {focusedLine?.id ===
+								item.id
+									? 'bg-muted ring-1 ring-primary/20 ring-inset'
+									: ''}"
+							>
+								{#if operationType === 1}
+									<Table.Cell>{item.line_number}</Table.Cell>
+									<Table.Cell>{item.fa_data?.search_invoice || '-'}</Table.Cell>
+									<Table.Cell>{item.fa_data?.search_line || '-'}</Table.Cell>
+									<Table.Cell>{item.is_subitem ? 'S' : 'P'}</Table.Cell>
+									<Table.Cell>{item.quantity?.quantity || '0'}</Table.Cell>
+									<Table.Cell>{item.class_code || '-'}</Table.Cell>
+									<Table.Cell>{item.part_number || '-'}</Table.Cell>
+									<Table.Cell
+										class="max-w-[200px] truncate"
+										title={item.description?.description_spanish}
+									>
+										{item.description?.description_spanish || '-'}
+									</Table.Cell>
+									<Table.Cell>{item.fa_data?.contains_subitems ? 'Sí' : 'No'}</Table.Cell>
+									<Table.Cell>{item.warehouse || '-'}</Table.Cell>
+								{:else}
+									<Table.Cell>{item.line_number}</Table.Cell>
+									<Table.Cell>{item.is_subitem ? 'S' : 'P'}</Table.Cell>
+									<Table.Cell>{item.class_code || '-'}</Table.Cell>
+									<Table.Cell>{item.class_description || '-'}</Table.Cell>
+									<Table.Cell>{item.quantity?.quantity || '0'}</Table.Cell>
+									<Table.Cell>{item.unit_of_measure_code || '-'}</Table.Cell>
+									<Table.Cell>{item.reference_number || '-'}</Table.Cell>
+									<Table.Cell>{item.fa_data?.contains_subitems ? 'Sí' : 'No'}</Table.Cell>
+									<Table.Cell>{item.warehouse || '-'}</Table.Cell>
+								{/if}
 								<Table.Cell class="text-right">
 									<div class="flex justify-end gap-2">
 										<Button size="icon" variant="ghost" onclick={() => handleEdit(item)}>
-											<Pencil class="w-4 h-4" />
+											<Pencil class="h-4 w-4" />
 										</Button>
 										<Button size="icon" variant="ghost" onclick={() => handleDelete(item)}>
-											<Trash2 class="w-4 h-4 text-destructive" />
+											<Trash2 class="h-4 w-4 text-destructive" />
 										</Button>
 									</div>
 								</Table.Cell>
@@ -760,7 +807,7 @@
 						{/each}
 						{#if isLoadingMore}
 							<Table.Row>
-								<Table.Cell colspan={7} class="text-center py-4">
+								<Table.Cell colspan={operationType === 1 ? 11 : 10} class="py-4 text-center">
 									<span class="text-sm text-muted-foreground">Cargando más items...</span>
 								</Table.Cell>
 							</Table.Row>
@@ -771,43 +818,66 @@
 		</div>
 
 		{#if flattenedLines.length > 0}
-			<div class="text-xs text-muted-foreground text-right">
+			<div class="text-right text-xs text-muted-foreground">
 				Mostrando {displayedItems.length} de {flattenedLines.length} líneas
 			</div>
 		{/if}
 	</div>
 
-	<div class="border rounded-md p-3 space-y-3 col-start-4">
-		<div>
-			<h4 class="text-xs font-semibold text-muted-foreground uppercase">Cantidades:</h4>
-			<div>
-				<div class="grid grid-cols-2 gap-3">
-					<div>
-						Partidas: <span class="text-blue-400">{items.length || 0}</span>
-					</div>
-					<div>
-						Bultos: <span class="text-blue-400">0</span>
-					</div>
+	<div class="col-start-4 space-y-4">
+		{#if operationType === 1}
+			<!-- Top Box: Descripción en español -->
+			<div class="flex h-[200px] flex-col rounded-md border p-3">
+				<h4 class="mb-2 text-xs font-semibold text-muted-foreground uppercase">
+					Descripción en español:
+				</h4>
+				<div class="flex-1 overflow-auto rounded border bg-muted/30 p-2">
+					{#if focusedLine}
+						<p class="text-xs leading-relaxed font-medium">
+							{focusedLine.description?.description_spanish || 'Sin descripción disponible.'}
+						</p>
+					{:else}
+						<p class="flex h-full items-center justify-center text-xs text-muted-foreground italic">
+							Selecciona una fila para ver la descripción.
+						</p>
+					{/if}
 				</div>
 			</div>
-			Importada:<span class="text-blue-400">{imported || 0}</span> <br />
-			Peso neto: <span class="text-blue-400">{net_weight || 0}</span><br />
-			Peso bruto: <span class="text-blue-400">{gross_weight || 0}</span> <br />
+		{/if}
+
+		<!-- Bottom Box (or only box in Import): Quantities and Values -->
+		<div class="space-y-3 rounded-md border p-3">
+			<div>
+				<h4 class="text-xs font-semibold text-muted-foreground uppercase">Cantidades:</h4>
+				<div>
+					<div class="grid grid-cols-2 gap-3">
+						<div>
+							Partidas: <span class="text-blue-400">{items.length || 0}</span>
+						</div>
+						<div>
+							Bultos: <span class="text-blue-400">0</span>
+						</div>
+					</div>
+				</div>
+				Importada:<span class="text-blue-400">{imported || 0}</span> <br />
+				Peso neto: <span class="text-blue-400">{net_weight || 0}</span><br />
+				Peso bruto: <span class="text-blue-400">{gross_weight || 0}</span> <br />
+			</div>
+
+			<h4 class="col-span-2 text-xs font-semibold text-muted-foreground uppercase">
+				Valores de importacion:
+			</h4>
+			Dolares:<span class="text-blue-400">0</span> <span class="text-red-400">USD</span> <br />
+			Pesos: <span class="text-blue-400">0</span> <span class="text-red-400">MXN</span><br />
+			De Captura: <span class="text-blue-400">0</span> <span class="text-red-400">USD</span>
+
+			<h4 class="col-span-2 text-xs font-semibold text-muted-foreground uppercase opacity-0">
+				spacer
+			</h4>
+
+			Aduana:<span class="text-blue-400">0</span> <span class="text-red-400">USD</span><br />
+			Aduana: <span class="text-blue-400">0</span> <span class="text-red-400">MXN</span><br />
 		</div>
-
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase col-span-2">
-			Valores de importacion:
-		</h4>
-		Dolares:<span class="text-blue-400">0</span> <span class="text-red-400">USD</span> <br />
-		Pesos: <span class="text-blue-400">0</span> <span class="text-red-400">MXN</span><br />
-		De Captura: <span class="text-blue-400">0</span> <span class="text-red-400">USD</span>
-
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase col-span-2 opacity-0">
-			spacer
-		</h4>
-
-		Aduana:<span class="text-blue-400">0</span> <span class="text-red-400">USD</span><br />
-		Aduana: <span class="text-blue-400">0</span> <span class="text-red-400">MXN</span><br />
 	</div>
 </div>
 
@@ -850,7 +920,7 @@
 			</Button>
 			<Button variant="destructive" onclick={confirmDelete} disabled={isSaving}>
 				{#if isSaving}
-					<Loader2 class="w-4 h-4 mr-2 animate-spin" />
+					<Loader2 class="mr-2 h-4 w-4 animate-spin" />
 					Eliminando...
 				{:else}
 					Eliminar
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/observations-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/observations-tab-form.svelte
index 91b069f9..722afc8b 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/observations-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/observations-tab-form.svelte
@@ -1,31 +1,33 @@
-<script lang="ts">	
+<script lang="ts">
 	import * as Select from '$lib/components/ui/select';
 	import { Input } from '$lib/components/ui/input';
 	import { Label } from '$lib/components/ui/label';
-	import { Textarea } from "$lib/components/ui/textarea/index.js";
-	import type { Invoice } from '$lib/api/dashboard/a76/invoices';	
+	import { Textarea } from '$lib/components/ui/textarea/index.js';
+	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 
-	let { 
+	let {
 		invoice,
 		formData = $bindable(),
 		exists = $bindable(),
 		seals = [],
 		incoterms = [],
 		enclosure = [],
-	}: { 
+		operationType = undefined
+	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
 		seals?: any[];
 		incoterms?: any[];
 		enclosure?: any[];
+		operationType?: number;
 	} = $props();
 
 	if (!formData && invoice) {
 		formData = {
 			// Campos de observaciones
 			observation_es: invoice.observation_es || '',
-			observation_en: invoice.observation_en || '',						
+			observation_en: invoice.observation_en || '',
 			// Incrementables
 			freight: invoice.financials?.freight || null,
 			insurance_value: invoice.financials?.insurance_value || null,
@@ -35,20 +37,30 @@
 			total_increments_mn: invoice.financials?.total_increments_mn || null,
 			total_increments_me: invoice.financials?.total_increments_me || null,
 			// Incoterm y recinto
-			incoterm: invoice.logistics?.[0]?.incoterm || null,
+			incoterm: invoice.logistics?.incoterm || null,
 			enclosure: invoice.compliance_mx?.enclosure || null,
 			// Campos de esta pestaña
 			num_seals: null,
 			movement_type: invoice.compliance_mx?.movement_type || '',
 			alternate_invoice: invoice.alternate_invoice || '',
-			valuation_method: null
+			valuation_method: invoice.compliance_mx?.value_method || null,
+			// New fields for Export
+			other_deductibles: null, // Need to confirm where this maps
+			proforma_number: invoice.proforma_number || '',
+			sub_division: invoice.compliance_mx?.subdivision || '',
+			acts_as_cd: invoice.logistics?.acts_as_cd || false,
+			identifier_1: invoice.logistics?.identifier_1 || '',
+			complement_1: invoice.logistics?.complement_1 || '',
+			identifier_2: invoice.logistics?.identifier_2 || '',
+			complement_2: invoice.logistics?.complement_2 || '',
+			office_document: invoice.compliance_mx?.office_document || ''
 		};
 		exists = true;
 	} else if (!formData) {
 		formData = {
 			// Campos de observaciones
 			observation_es: '',
-			observation_en: '',						
+			observation_en: '',
 			// Incrementables
 			freight: null,
 			insurance_value: null,
@@ -64,245 +76,462 @@
 			num_seals: null,
 			movement_type: '',
 			alternate_invoice: '',
-			valuation_method: null
+			valuation_method: null,
+			// New fields for Export
+			other_deductibles: null,
+			proforma_number: '',
+			sub_division: '',
+			acts_as_cd: false,
+			identifier_1: '',
+			complement_1: '',
+			identifier_2: '',
+			complement_2: '',
+			office_document: ''
 		};
 		exists = false;
 	}
 </script>
 
-
-
-<div class="grid grid-cols-2 grid-rows-5 gap-4">
-    <div class="border rounded-md p-3 space-y-3 row-span-2">
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Observacion de la factura mexicana y bilingue:</h4>      
-		<div class="space-y-1">			
-			<Textarea 
-				id="observation_es" 
-				bind:value={formData.observation_es} 
-				class="min-h-[150px] max-h-[150px] text-sm font-medium" 
-				placeholder="Escribe tus observaciones aqui."  
-			/>
-		</div>
-	</div>
-
-    <div class="border rounded-md p-3 space-y-3 row-span-2 col-start-1 row-start-3">
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Observacion de la factura americana:</h4>   
-		<Textarea 
-			id="observation_en" 
-			bind:value={formData.observation_en} 
-			class="min-h-[150px] max-h-[150px] text-sm font-medium" 
-			placeholder="Escribe tus observaciones aqui."  
-		/>   
-	</div>
-
-    <div class="border rounded-md p-3 space-y-3 col-span-2 col-start-1 row-start-5">
-		<div class="grid grid-cols-4 gap-3">
-			<div class="space-y-1">
-				<Label for="num_seals" class="text-xs">Num Precintos:</Label>
-				<Select.Root
-					type="single"
-					value={formData.num_seals ? String(formData.num_seals) : ''}
-					onValueChange={(v) => {
-						formData.num_seals = v ? parseInt(v) : null;
-					}}
-				>
-					<Select.Trigger id="num_seals" class="h-7 text-xs">
-						<span class="truncate">
-							{formData.num_seals 
-								? seals.find(p => p.id === formData.num_seals)?.name || 'Selecciona...'
-								: 'Selecciona...'}
-						</span>
-					</Select.Trigger>
-					<Select.Content class="max-h-[300px]">
-						{#each seals as seal}
-							<Select.Item value={String(seal.id)}>
-								{seal.name}
-							</Select.Item>
-						{/each}
-					</Select.Content>
-				</Select.Root>
-			</div>
-			<div class="space-y-1">
-				<Label for="movement_type" class="text-xs">Tipo Movimiento:</Label>
-				<Input 
-					id="movement_type" 
-					bind:value={formData.movement_type} 
-					class="h-8 text-sm font-medium" 
+<div class="grid grid-cols-2 gap-4">
+	<!-- Left Column: Observations and Catalog Info -->
+	<div class="space-y-4">
+		<!-- Observations Section -->
+		<div class="space-y-4 rounded-md border p-3">
+			<div class="space-y-2">
+				<h4 class="text-xs font-semibold text-muted-foreground uppercase">
+					{operationType === 1
+						? 'Observaciones de la factura mexicana:'
+						: 'Observacion de la factura mexicana y bilingue:'}
+				</h4>
+				<Textarea
+					id="observation_es"
+					bind:value={formData.observation_es}
+					class="max-h-[150px] min-h-[150px] text-sm font-medium"
+					placeholder="Escribe tus observaciones aqui."
 				/>
 			</div>
-			<div class="space-y-1">
-				<Label for="alternate_invoice" class="text-xs">Factura Alterna:</Label>
-				<Input 
-					id="alternate_invoice" 
-					bind:value={formData.alternate_invoice} 
-					class="h-8 text-sm font-medium" 
+
+			<div class="space-y-2">
+				<h4 class="text-xs font-semibold text-muted-foreground uppercase">
+					Observaciones de la factura americana:
+				</h4>
+				<Textarea
+					id="observation_en"
+					bind:value={formData.observation_en}
+					class="max-h-[150px] min-h-[150px] text-sm font-medium"
+					placeholder="Escribe tus observaciones aqui."
 				/>
 			</div>
-			<div class="space-y-1">
-				<Label for="valuation_method" class="text-xs">Met. Valoracion:</Label>
-				<Select.Root
-					type="single"
-					value={formData.valuation_method ? String(formData.valuation_method) : ''}
-					onValueChange={(v) => {
-						formData.valuation_method = v;
-					}}
-				>
-					<Select.Trigger id="valuation_method" class="h-7 text-xs">
-						<span class="truncate">
-							{formData.valuation_method || 'Selecciona...'}
-						</span>
-					</Select.Trigger>
-					<Select.Content class="max-h-[300px]">
-						<Select.Item value="general">General</Select.Item>
-						<Select.Item value="devalued">Devaluado</Select.Item>
-						<Select.Item value="special">Especial</Select.Item>
-					</Select.Content>
-				</Select.Root>
-			</div>
 		</div>
+
+		{#if operationType === 1}
+			<!-- Identificadores (Export Only) -->
+			<div class="space-y-4 rounded-md border bg-muted/20 p-4">
+				<h4 class="mb-1 border-b pb-2 text-xs font-bold text-muted-foreground uppercase">
+					Identificadores
+				</h4>
+				<div class="grid grid-cols-2 gap-4">
+					<div class="space-y-1.5">
+						<Label for="identifier_1" class="text-xs font-semibold">Primero:</Label>
+						<Input
+							id="identifier_1"
+							bind:value={formData.identifier_1}
+							class="h-8 text-xs"
+							placeholder="Clave..."
+						/>
+					</div>
+					<div class="space-y-1.5">
+						<Label for="identifier_2" class="text-xs font-semibold">Segundo:</Label>
+						<Input
+							id="identifier_2"
+							bind:value={formData.identifier_2}
+							class="h-8 text-xs"
+							placeholder="Clave..."
+						/>
+					</div>
+				</div>
+			</div>
+
+			<!-- Complementos (Export Only) -->
+			<div class="space-y-4 rounded-md border bg-muted/20 p-4">
+				<h4 class="mb-1 border-b pb-2 text-xs font-bold text-muted-foreground uppercase">
+					Complementos
+				</h4>
+				<div class="grid grid-cols-2 gap-4">
+					<div class="space-y-1.5">
+						<Label for="complement_1" class="text-xs font-semibold">1:</Label>
+						<Input id="complement_1" bind:value={formData.complement_1} class="h-8 text-xs" />
+					</div>
+					<div class="space-y-1.5">
+						<Label for="complement_2" class="text-xs font-semibold">2:</Label>
+						<Input id="complement_2" bind:value={formData.complement_2} class="h-8 text-xs" />
+					</div>
+				</div>
+			</div>
+
+			<!-- Oficio (Export Only) -->
+			<div class="rounded-md border bg-muted/20 p-3">
+				<div class="space-y-1.5">
+					<Label for="office_document" class="text-xs font-semibold">Oficio:</Label>
+					<Input id="office_document" bind:value={formData.office_document} class="h-8 text-xs" />
+				</div>
+			</div>
+		{/if}
 	</div>
 
-    <div class="border rounded-md p-3 space-y-3 row-span-3 col-start-2 row-start-1">
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Incrementables:</h4>      
-		<div class="grid grid-cols-2 gap-2">
-			<div class="space-y-1">	
-				<Label for="freight" class="text-xs">Flete:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="freight" 
+	<!-- Right Column: Values, Flags and Logistics -->
+	<div class="space-y-4">
+		<!-- Incrementables Section -->
+		<div class="space-y-3 rounded-md border p-3">
+			<h4 class="text-xs font-semibold text-muted-foreground uppercase">Incrementables:</h4>
+			<div class="grid grid-cols-2 gap-x-4 gap-y-2">
+				<div class="flex items-center">
+					<Label for="freight" class="text-xs">Flete:</Label>
+				</div>
+				<Input
+					id="freight"
 					type="number"
-					bind:value={formData.freight} 
-					class="h-8 text-sm font-medium" 
-				/>
-			</div>
-
-			<div class="space-y-1">	
-				<Label for="insurance_value" class="text-xs">Val. Seguros:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="insurance_value" 
-					type="number"
-					bind:value={formData.insurance_value} 
-					class="h-8 text-sm font-medium" 
-				/>
-			</div>
-
-			<div class="space-y-1">	
-				<Label for="insurance" class="text-xs">Seguros:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="insurance" 
-					type="number"
-					bind:value={formData.insurance} 
-					class="h-8 text-sm font-medium" 
-				/>
-			</div>
-
-			<div class="space-y-1">	
-				<Label for="packaging" class="text-xs">Embalajes:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="packaging" 
-					type="number"
-					bind:value={formData.packaging} 
-					class="h-8 text-sm font-medium" 
-				/>
-			</div>
-
-			<div class="space-y-1">	
-				<Label for="other_increments" class="text-xs">Otros incrementables:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="other_increments" 
-					type="number"
-					bind:value={formData.other_increments} 
-					class="h-8 text-sm font-medium" 
-				/>
-			</div>
-
-			<div class="space-y-1">	
-				<Label for="total_increments_mn" class="text-xs">Total Incrementables:</Label>
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="total_increments_mn" 
-					type="number"
-					bind:value={formData.total_increments_mn} 
+					bind:value={formData.freight}
 					class="h-8 text-sm font-medium"
-					disabled
 				/>
-			</div>
-			<div class="space-y-1">							
-			</div>
-			<div class="space-y-1">				
-				<Input 
-					id="total_increments_me" 
+
+				<div class="flex items-center">
+					<Label for="insurance" class="text-xs">Seguros:</Label>
+				</div>
+				<Input
+					id="insurance"
 					type="number"
-					bind:value={formData.total_increments_me} 
+					bind:value={formData.insurance}
 					class="h-8 text-sm font-medium"
-					disabled
 				/>
+
+				<div class="flex items-center">
+					<Label for="packaging" class="text-xs">Embalajes:</Label>
+				</div>
+				<Input
+					id="packaging"
+					type="number"
+					bind:value={formData.packaging}
+					class="h-8 text-sm font-medium"
+				/>
+
+				<div class="flex items-center">
+					<Label for="other_increments" class="text-xs leading-none">Otros increm.:</Label>
+				</div>
+				<Input
+					id="other_increments"
+					type="number"
+					bind:value={formData.other_increments}
+					class="h-8 text-sm font-medium"
+				/>
+
+				{#if operationType === 1}
+					<div class="flex items-center">
+						<Label for="other_deductibles" class="text-xs leading-none">Otros deduc.:</Label>
+					</div>
+					<Input
+						id="other_deductibles"
+						type="number"
+						bind:value={formData.other_deductibles}
+						class="h-8 border-orange-200 text-sm font-medium focus-visible:ring-orange-200"
+					/>
+				{/if}
 			</div>
 		</div>
-	</div>
-	
-    <div class="border rounded-md p-3 space-y-3 col-start-2 row-start-4">
-		<div class="grid grid-cols-2 gap-3">
-			<div class="space-y-1">
-				<Label for="incoterm" class="text-xs">Incoterm:</Label>
-				<Select.Root
-					type="single"
-					value={formData.incoterm ? String(formData.incoterm) : ''}
-					onValueChange={(v) => {
-						formData.incoterm = v ? parseInt(v) : null;
-					}}
-				>
-					<Select.Trigger id="incoterm" class="h-7 text-xs">
-						<span class="truncate">
-							{formData.incoterm 
-								? incoterms.find(p => p.id === formData.incoterm)?.name || 'Selecciona...'
-								: 'Selecciona...'}
-						</span>
-					</Select.Trigger>
-					<Select.Content class="max-h-[300px]">
-						{#each incoterms as inco}
-							<Select.Item value={String(inco.id)}>
-								{inco.name}
-							</Select.Item>
-						{/each}
-					</Select.Content>
-				</Select.Root>
+
+		{#if operationType === 1}
+			<!-- Precintos & Tipo Mov Group (No Title) -->
+			<div class="grid grid-cols-2 gap-4 rounded-md border bg-muted/20 p-3">
+				<div class="space-y-1">
+					<Label for="num_seals_exp" class="text-xs font-semibold">Número de Precinto:</Label>
+					<Select.Root
+						type="single"
+						value={formData.num_seals ? String(formData.num_seals) : ''}
+						onValueChange={(v) => {
+							formData.num_seals = v ? parseInt(v) : null;
+						}}
+					>
+						<Select.Trigger id="num_seals_exp" class="h-8 text-xs">
+							<span class="truncate">
+								{formData.num_seals
+									? seals.find((p) => p.id === formData.num_seals)?.name || 'Selecciona...'
+									: 'Selecciona...'}
+							</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each seals as seal}
+								<Select.Item value={String(seal.id)}>
+									{seal.name}
+								</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+				<div class="space-y-1">
+					<Label for="movement_type_exp" class="text-xs font-semibold">Tipo Movimiento:</Label>
+					<Input
+						id="movement_type_exp"
+						bind:value={formData.movement_type}
+						class="h-8 text-xs font-medium"
+					/>
+				</div>
 			</div>
-			<div class="space-y-1">
-				<Label for="enclosure" class="text-xs">Recinto:</Label>
-				<Select.Root
-					type="single"
-					value={formData.enclosure ? String(formData.enclosure) : ''}
-					onValueChange={(v) => {
-						formData.enclosure = v ? parseInt(v) : null;
-					}}
-				>
-					<Select.Trigger id="enclosure" class="h-7 text-xs">
-						<span class="truncate">
-							{formData.enclosure 
-								? enclosure.find(p => p.id === formData.enclosure)?.name || 'Selecciona...'
-								: 'Selecciona...'}
-						</span>
-					</Select.Trigger>
-					<Select.Content class="max-h-[300px]">
-						{#each enclosure as rec}
-							<Select.Item value={String(rec.id)}>
-								{rec.name}
-							</Select.Item>
-						{/each}
-					</Select.Content>
-				</Select.Root>
+
+			<!-- Factura Alterna & Flags Section -->
+			<div class="space-y-4 rounded-md border bg-muted/20 p-4">
+				<h4 class="mb-1 border-b pb-2 text-xs font-bold text-muted-foreground uppercase">
+					Factura Alterna & Flags
+				</h4>
+				<div class="grid grid-cols-2 gap-x-6 gap-y-4">
+					<div class="space-y-1.5">
+						<Label for="alternate_invoice_exp" class="text-xs font-semibold">Factura Alterna:</Label
+						>
+						<Input
+							id="alternate_invoice_exp"
+							bind:value={formData.alternate_invoice}
+							class="h-8 text-xs"
+						/>
+					</div>
+					<div class="space-y-1.5">
+						<Label for="proforma_number" class="text-xs font-semibold">Número de Proforma:</Label>
+						<Input id="proforma_number" bind:value={formData.proforma_number} class="h-8 text-xs" />
+					</div>
+
+					<div class="space-y-2 pt-1">
+						<Label class="mb-2 block text-xs font-semibold">Sub División:</Label>
+						<div class="flex items-center gap-4">
+							<label class="group flex cursor-pointer items-center gap-2">
+								<div
+									class="relative flex h-4 w-4 items-center justify-center rounded-full border-2 border-zinc-400 transition-all {formData.sub_division ===
+									'si'
+										? 'border-zinc-800 bg-zinc-800'
+										: ''}"
+								>
+									<input
+										type="radio"
+										value="si"
+										bind:group={formData.sub_division}
+										class="sr-only"
+									/>
+									{#if formData.sub_division === 'si'}<div
+											class="h-1.5 w-1.5 rounded-full bg-white"
+										></div>{/if}
+								</div>
+								<span class="text-xs font-medium transition-colors group-hover:text-zinc-800"
+									>Si</span
+								>
+							</label>
+							<label class="group flex cursor-pointer items-center gap-2">
+								<div
+									class="relative flex h-4 w-4 items-center justify-center rounded-full border-2 border-zinc-400 transition-all {formData.sub_division ===
+									'no'
+										? 'border-zinc-800 bg-zinc-800'
+										: ''}"
+								>
+									<input
+										type="radio"
+										value="no"
+										bind:group={formData.sub_division}
+										class="sr-only"
+									/>
+									{#if formData.sub_division === 'no'}<div
+											class="h-1.5 w-1.5 rounded-full bg-white"
+										></div>{/if}
+								</div>
+								<span class="text-xs font-medium transition-colors group-hover:text-zinc-800"
+									>No</span
+								>
+							</label>
+						</div>
+					</div>
+
+					<div class="space-y-2 pt-1">
+						<Label class="mb-2 block text-xs font-semibold">Funge como CD:</Label>
+						<div class="flex items-center gap-4">
+							<label class="group flex cursor-pointer items-center gap-2">
+								<div
+									class="relative flex h-4 w-4 items-center justify-center rounded-full border-2 border-zinc-400 transition-all {formData.acts_as_cd ===
+									true
+										? 'border-zinc-800 bg-zinc-800'
+										: ''}"
+								>
+									<input
+										type="radio"
+										value={true}
+										bind:group={formData.acts_as_cd}
+										class="sr-only"
+									/>
+									{#if formData.acts_as_cd === true}
+										<div class="h-1.5 w-1.5 rounded-full bg-white"></div>{/if}
+								</div>
+								<span class="text-xs font-medium transition-colors group-hover:text-zinc-800"
+									>Si</span
+								>
+							</label>
+							<label class="group flex cursor-pointer items-center gap-2">
+								<div
+									class="relative flex h-4 w-4 items-center justify-center rounded-full border-2 border-zinc-400 transition-all {formData.acts_as_cd ===
+									false
+										? 'border-zinc-800 bg-zinc-800'
+										: ''}"
+								>
+									<input
+										type="radio"
+										value={false}
+										bind:group={formData.acts_as_cd}
+										class="sr-only"
+									/>
+									{#if formData.acts_as_cd === false}
+										<div class="h-1.5 w-1.5 rounded-full bg-white"></div>{/if}
+								</div>
+								<span class="text-xs font-medium transition-colors group-hover:text-zinc-800"
+									>No</span
+								>
+							</label>
+						</div>
+					</div>
+				</div>
 			</div>
+		{/if}
+
+		<!-- Incoterm & Recinto (Show for all, layout adjusted) -->
+		<div class="space-y-3 rounded-md border p-3">
+			<div class="grid grid-cols-2 gap-4">
+				<div class="space-y-1">
+					<Label for="incoterm" class="text-xs">Incoterm:</Label>
+					<Select.Root
+						type="single"
+						value={formData.incoterm ? String(formData.incoterm) : ''}
+						onValueChange={(v) => {
+							formData.incoterm = v ? parseInt(v) : null;
+						}}
+					>
+						<Select.Trigger id="incoterm" class="h-7 text-xs">
+							<span class="truncate"
+								>{formData.incoterm
+									? incoterms.find((p) => p.id === formData.incoterm)?.name || 'Selecciona...'
+									: 'Selecciona...'}</span
+							>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each incoterms as inco}
+								<Select.Item value={String(inco.id)}>{inco.name}</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+				<div class="space-y-1">
+					<Label for="enclosure" class="text-xs">Recinto:</Label>
+					<Select.Root
+						type="single"
+						value={formData.enclosure ? String(formData.enclosure) : ''}
+						onValueChange={(v) => {
+							formData.enclosure = v ? parseInt(v) : null;
+						}}
+					>
+						<Select.Trigger id="enclosure" class="h-7 text-xs">
+							<span class="truncate"
+								>{formData.enclosure
+									? enclosure.find((p) => p.id === formData.enclosure)?.name || 'Selecciona...'
+									: 'Selecciona...'}</span
+							>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each enclosure as rec}
+								<Select.Item value={String(rec.id)}>{rec.name}</Select.Item>
+							{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+			</div>
+			{#if operationType === 1}
+				<div class="space-y-1 pt-1">
+					<Label for="valuation_method_exp" class="text-xs font-semibold"
+						>Método de Valoración:</Label
+					>
+					<Select.Root
+						type="single"
+						value={formData.valuation_method ? String(formData.valuation_method) : ''}
+						onValueChange={(v) => {
+							formData.valuation_method = v;
+						}}
+					>
+						<Select.Trigger id="valuation_method_exp" class="h-8 text-xs">
+							<span class="truncate">{formData.valuation_method || 'Selecciona...'}</span>
+						</Select.Trigger>
+						<Select.Content>
+							<Select.Item value="general">General</Select.Item>
+							<Select.Item value="devalued">Devaluado</Select.Item>
+							<Select.Item value="special">Especial</Select.Item>
+						</Select.Content>
+					</Select.Root>
+				</div>
+			{/if}
 		</div>
 	</div>
-</div>
\ No newline at end of file
+
+	<!-- Extra Bottom Row for Import Mode specific fields (Original Layout preserved for Import) -->
+	{#if operationType !== 1}
+		<div class="col-span-2 space-y-3 rounded-md border p-3">
+			<div class="grid grid-cols-4 gap-3">
+				<div class="space-y-1">
+					<Label for="num_seals" class="text-xs">Num Precintos:</Label>
+					<Select.Root
+						type="single"
+						value={formData.num_seals ? String(formData.num_seals) : ''}
+						onValueChange={(v) => {
+							formData.num_seals = v ? parseInt(v) : null;
+						}}
+					>
+						<Select.Trigger id="num_seals" class="h-7 text-xs">
+							<span class="truncate"
+								>{formData.num_seals
+									? seals.find((p) => p.id === formData.num_seals)?.name || 'Selecciona...'
+									: 'Selecciona...'}</span
+							>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							{#each seals as seal}<Select.Item value={String(seal.id)}>{seal.name}</Select.Item
+								>{/each}
+						</Select.Content>
+					</Select.Root>
+				</div>
+				<div class="space-y-1">
+					<Label for="movement_type" class="text-xs">Tipo Movimiento:</Label>
+					<Input
+						id="movement_type"
+						bind:value={formData.movement_type}
+						class="h-8 text-sm font-medium"
+					/>
+				</div>
+				<div class="space-y-1">
+					<Label for="alternate_invoice" class="text-xs">Factura Alterna:</Label>
+					<Input
+						id="alternate_invoice"
+						bind:value={formData.alternate_invoice}
+						class="h-8 text-sm font-medium"
+					/>
+				</div>
+				<div class="space-y-1">
+					<Label for="valuation_method" class="text-xs">Met. Valoracion:</Label>
+					<Select.Root
+						type="single"
+						value={formData.valuation_method ? String(formData.valuation_method) : ''}
+						onValueChange={(v) => {
+							formData.valuation_method = v;
+						}}
+					>
+						<Select.Trigger id="valuation_method" class="h-7 text-xs">
+							<span class="truncate">{formData.valuation_method || 'Selecciona...'}</span>
+						</Select.Trigger>
+						<Select.Content class="max-h-[300px]">
+							<Select.Item value="general">General</Select.Item>
+							<Select.Item value="devalued">Devaluado</Select.Item>
+							<Select.Item value="special">Especial</Select.Item>
+						</Select.Content>
+					</Select.Root>
+				</div>
+			</div>
+		</div>
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
index e6f6b550..04121f86 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
+++ b/frontend/src/lib/components/dashboard/invoices/edit/save-invoice.ts
@@ -45,7 +45,7 @@ export async function saveInvoice(options: SaveInvoiceOptions): Promise<SaveInvo
 			};
 
 			const missingFields: string[] = [];
-			
+
 			// Validar campos de InvoiceTopFieldsFormData
 			if (!InvoiceTopFieldsFormData?.operation_type) {
 				missingFields.push(requiredFields.operation_type);
@@ -73,11 +73,11 @@ export async function saveInvoice(options: SaveInvoiceOptions): Promise<SaveInvo
 
 		if (isCreate) {
 			// Crear nueva factura con todos sus sub-recursos
-			const response = await invoicesApi.create(companyId, payload as CreateInvoiceData);			
+			const response = await invoicesApi.create(companyId, payload as CreateInvoiceData);
 			if (response.error) {
 				const errorMsg = typeof response.error === 'string' ? response.error : 'Error al crear la factura';
 				const error: any = new Error(errorMsg);
-				error.validationErrors = response.validationErrors;				
+				error.validationErrors = response.validationErrors;
 				throw error;
 			}
 			if (!response.data?.id) throw new Error('No se recibió el ID de la factura creada');
@@ -88,10 +88,10 @@ export async function saveInvoice(options: SaveInvoiceOptions): Promise<SaveInvo
 		} else {
 			// Actualizar factura existente con todos sus sub-recursos
 			const updatePayload = { ...payload, id: invoiceId } as UpdateInvoiceData;
-			const response = await invoicesApi.update(invoiceId!, companyId, updatePayload);			
+			const response = await invoicesApi.update(invoiceId!, companyId, updatePayload);
 			if (response.error) {
 				const error: any = new Error(response.error);
-				error.validationErrors = response.validationErrors;				
+				error.validationErrors = response.validationErrors;
 				throw error;
 			}
 		}
@@ -116,6 +116,7 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
 		invoice_number: InvoiceTopFieldsFormData?.invoice_number || undefined,
 		invoice_date: InvoiceTopFieldsFormData?.invoice_date || undefined,
 		emission_date: InvoiceTopFieldsFormData?.emission_date || undefined,
+		proforma_number: observationFormData?.proforma_number || undefined,
 		// Observation fields from observationFormData
 		observation_es: observationFormData?.observation_es || undefined,
 		observation_en: observationFormData?.observation_en || undefined,
@@ -138,7 +139,8 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
 		othersFormData?.cove || othersFormData?.operation_num ||
 		othersFormData?.adendas || othersFormData?.certified_number ||
 		othersFormData?.code_signature || othersFormData?.electronic_signature ||
-		continuationFormData?.puerto_entrada;
+		continuationFormData?.puerto_entrada || generalFormData?.manifest_number ||
+		generalFormData?.shipped_by_id || generalFormData?.shipped_by_header;
 
 	if (hasComplianceValue) {
 		payload.compliance_mx = buildComplianceMxData(InvoiceTopFieldsFormData, generalFormData, othersFormData, observationFormData, continuationFormData);
@@ -177,6 +179,7 @@ function buildComplianceMxData(InvoiceTopFieldsFormData: any, generalFormData: a
 		is_pedimento_pending: Boolean(InvoiceTopFieldsFormData?.is_pedimento_pending || false),
 		// Fields from generalFormData
 		aduana: generalFormData?.aduana || null,
+		manifest_number: generalFormData?.manifest_number || null,
 		port_of_entry: continuationFormData?.puerto_entrada || null,
 		provider_header: generalFormData?.provider_header || null,
 		provider_id: generalFormData?.provider_id || null,
@@ -184,6 +187,8 @@ function buildComplianceMxData(InvoiceTopFieldsFormData: any, generalFormData: a
 		sold_to_id: generalFormData?.sold_to_id || null,
 		shipped_to_header: generalFormData?.shipped_to_header || null,
 		shipped_to_id: generalFormData?.shipped_to_id || null,
+		shipped_by_header: generalFormData?.shipped_by_header || null,
+		shipped_by_id: generalFormData?.shipped_by_id || null,
 		customs_broker_id: generalFormData?.customs_broker_id ? Number(generalFormData.customs_broker_id) : null,
 		customs_broker_us_id: generalFormData?.customs_broker_us_id ? Number(generalFormData.customs_broker_us_id) : null,
 		// Fields from observationFormData
@@ -198,6 +203,8 @@ function buildComplianceMxData(InvoiceTopFieldsFormData: any, generalFormData: a
 		certificate_number: othersFormData?.certified_number || null,
 		code_signature: othersFormData?.code_signature || null,
 		electronic_signature: othersFormData?.electronic_signature || null,
+		subdivision: observationFormData?.sub_division || null,
+		office_document: observationFormData?.office_document || null,
 	};
 }
 
@@ -206,13 +213,14 @@ function buildFinancialsData(generalFormData: any, observationFormData: any, oth
 		// Currency from generalFormData
 		currency_type: generalFormData?.currency_type || null,
 		currency: generalFormData?.currency || null,
-		iva_factor: generalFormData?.iva_factor || null,
+		iva_factor: generalFormData?.iva_factor !== null && generalFormData?.iva_factor !== undefined ? String(generalFormData.iva_factor) : null,
 		// Costs & increments from observationFormData
 		freight: observationFormData?.freight || null,
 		insurance: observationFormData?.insurance || null,
 		insurance_value: observationFormData?.insurance_value || null,
 		packaging: observationFormData?.packaging || null,
 		other_increments: observationFormData?.other_increments || null,
+		other_deductibles: observationFormData?.other_deductibles || null,
 		total_increments_mn: observationFormData?.total_increments_mn || null,
 		total_increments_me: observationFormData?.total_increments_me || null,
 		// Seal value from othersFormData
@@ -230,6 +238,13 @@ function buildLogisticsData(generalFormData: any, observationFormData: any, cont
 		incoterm: observationFormData?.incoterm || null,
 		// Campos de continuación mapeados a logistics
 		transport_num: continuationFormData?.numero_tipo_transporte || null,
+		// Identificadores y Complementos
+		identifier_1: observationFormData?.identifier_1 || null,
+		complement_1: observationFormData?.complement_1 || null,
+		identifier_2: observationFormData?.identifier_2 || null,
+		complement_2: observationFormData?.complement_2 || null,
+		acts_as_cd: observationFormData?.acts_as_cd || continuationFormData?.funge_como_cd || false,
+		is_subdivision: (observationFormData?.sub_division === 'si') || continuationFormData?.sub_division || false,
 		is_rail: continuationFormData?.es_ferrocarril === 'si' ? true : false,
 		bill_number: continuationFormData?.numero_bl || null,
 		guide_number: continuationFormData?.cantidad_guias_embarque ? String(continuationFormData.cantidad_guias_embarque) : null,
@@ -237,8 +252,6 @@ function buildLogisticsData(generalFormData: any, observationFormData: any, cont
 		origin_location: continuationFormData?.puerto_entrada || null,
 		// Checkboxes de continuación
 		equipment_reviewed: continuationFormData?.fue_revisado_equipo || false,
-		is_subdivision: continuationFormData?.sub_division || false,
-		acts_as_cd: continuationFormData?.funge_como_cd || false,
 		pedimento_arrived: continuationFormData?.llego_pedimento || false,
 		// Semáforos de continuación
 		green_light_mx: continuationFormData?.semaforo_verde_aduana_mexicana || false,
diff --git a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
index 290aa6ad..a876fe5d 100644
--- a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
@@ -112,6 +112,27 @@
 	let showExchangeRateDialog = $state(false);
 	let missingExchangeRateDate = $state('');
 
+	// Derivados reactivos para el tipo de operación
+	let operationTypeText = $derived.by(() => {
+		const type =
+			InvoiceTopFieldsFormData?.operation_type ||
+			data.invoice?.operation_type ||
+			data.filters?.operation_type;
+		if (type === 'exp') return 'EXPORTACIÓN';
+		if (type === 'imp') return 'IMPORTACIÓN';
+		return 'TIPO NO DEFINIDO';
+	});
+
+	let operationColorClass = $derived.by(() => {
+		const type =
+			InvoiceTopFieldsFormData?.operation_type ||
+			data.invoice?.operation_type ||
+			data.filters?.operation_type;
+		if (type === 'exp') return 'bg-blue-500/10 text-blue-600 border-blue-500/20';
+		if (type === 'imp') return 'bg-emerald-500/10 text-emerald-600 border-emerald-500/20';
+		return 'bg-muted text-muted-foreground border-border';
+	});
+
 	async function checkExchangeRate(date: string): Promise<boolean> {
 		if (!date || !companyStore?.activeCompany?.id) return true;
 
@@ -293,7 +314,7 @@
 							: null}
 						Nueva Factura
 						{#if invoiceTypeInfo}
-							<span class="text-muted-foreground font-normal text-2xl">
+							<span class="text-2xl font-normal text-muted-foreground">
 								- {invoiceTypeInfo.description}
 							</span>
 						{/if}
@@ -301,12 +322,11 @@
 						Factura #{data.invoice.id}
 					{/if}
 				</h1>
+				<Badge variant="outline" class="px-3 py-1 text-sm font-bold {operationColorClass}">
+					{operationTypeText}
+				</Badge>
 				{#if data.isCreate}
-					<Badge variant="default">Nueva</Badge>
-				{:else if data.invoice.operation_type}
-					<Badge variant={getOperationColor(data.invoice.operation_type)}>
-						{data.invoice.operation_type === 'imp' ? 'Importación' : 'Exportación'}
-					</Badge>
+					<Badge variant="secondary">Borrador</Badge>
 				{/if}
 			</div>
 			<p class="text-muted-foreground">
@@ -324,6 +344,37 @@
 	<!-- Contenido de las tabs con padding inferior para el footer flotante -->
 	<div class="pb-48">
 		<Tabs.Root bind:value={activeTab}>
+			<div class="mb-4 rounded-lg border p-4 shadow-sm transition-colors {operationColorClass}">
+				<div class="flex items-center justify-between">
+					<div class="flex items-center gap-3">
+						<div class="flex h-10 w-10 items-center justify-center rounded-full bg-background/50">
+							{#if InvoiceTopFieldsFormData?.operation_type === 'exp'}
+								<Package size={20} />
+							{:else}
+								<Truck size={20} />
+							{/if}
+						</div>
+						<div>
+							<h3 class="text-sm font-semibold tracking-wider uppercase">
+								Operación de {operationTypeText}
+							</h3>
+							<p class="text-xs opacity-80">
+								{#if InvoiceTopFieldsFormData?.operation_type === 'exp'}
+									Factura para salida de mercancías del territorio nacional.
+								{:else if InvoiceTopFieldsFormData?.operation_type === 'imp'}
+									Factura para entrada de mercancías al territorio nacional.
+								{:else}
+									Por favor, seleccione el tipo de operación para continuar.
+								{/if}
+							</p>
+						</div>
+					</div>
+					<Badge variant="outline" class="bg-background/20 font-mono">
+						{InvoiceTopFieldsFormData?.operation_type?.toUpperCase() || '---'}
+					</Badge>
+				</div>
+			</div>
+
 			<InvoiceTopFields
 				invoice={data.invoice}
 				bind:formData={InvoiceTopFieldsFormData}
@@ -372,6 +423,15 @@
 					seals={data.seals || []}
 					incoterms={data.incoterms || []}
 					enclosure={data.enclosure || []}
+					operationType={InvoiceTopFieldsFormData?.operation_type === 'exp'
+						? 1
+						: InvoiceTopFieldsFormData?.operation_type === 'imp'
+							? 2
+							: data.invoice?.operation_type === 'exp'
+								? 1
+								: data.invoice?.operation_type === 'imp'
+									? 2
+									: undefined}
 				/>
 			</Tabs.Content>
 
@@ -380,6 +440,15 @@
 					invoice={data.invoice}
 					bind:formData={itemsFormData}
 					bind:exists={itemsExists}
+					operationType={InvoiceTopFieldsFormData?.operation_type === 'exp'
+						? 1
+						: InvoiceTopFieldsFormData?.operation_type === 'imp'
+							? 2
+							: data.invoice?.operation_type === 'exp'
+								? 1
+								: data.invoice?.operation_type === 'imp'
+									? 2
+									: undefined}
 				/>
 			</Tabs.Content>
 
@@ -420,9 +489,9 @@
 	}}
 />
 <div
-	class="fixed bottom-0 left-0 right-0 bg-background/95 backdrop-blur supports-[backdrop-filter]:bg-background/80 border-t shadow-lg z-[5] group-has-data-[state=collapsed]/sidebar-wrapper:ml-[calc(var(--sidebar-width-icon))] ml-[calc(var(--sidebar-width))]"
+	class="fixed right-0 bottom-0 left-0 z-[5] 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="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
+	<div class="mx-auto max-w-[1400px] space-y-4 px-4 py-4">
 		<!-- Tabs Navigation -->
 		<Tabs.Root bind:value={activeTab}>
 			<div class="w-full overflow-x-auto pb-2">