diff --git a/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts b/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
index ee507945..16cd3b02 100644
--- a/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
+++ b/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
@@ -1,6 +1,91 @@
 import { api } from '$lib/api';
 import type { ApiResponse } from '$lib/api';
 
+export interface CompanyAddress {
+    id?: number;
+    address_type: string;
+    street?: string | null;
+    exterior_number?: string | null;
+    interior_number?: string | null;
+    postal_code?: string | null;
+    neighborhood?: string | null;
+    city?: string | null;
+    municipality?: string | null;
+    state?: string | null;
+    country?: string | null;
+    phone?: string | null;
+    fax?: string | null;
+    email?: string | null;
+}
+
+export interface CompanyCertification {
+    id?: number;
+    is_certified_company?: string | null;
+    certified_company_registration?: string | null;
+    certified_company_start_date?: number | null;
+    certified_company_end_date?: number | null;
+    annex31_certification_date?: number | null;
+    annex31_certification_number?: string | null;
+    annex31_modality?: string | null;
+    annex31_company_type?: string | null;
+    annex31_renewal_date?: number | null;
+    annex31_final_certification_date?: number | null;
+    is_oea_company?: number | null;
+    neec_company?: number | null;
+}
+
+export interface CompanyDigitalCertificate {
+    id?: number;
+    certificate_type: string;
+    cer_file_path?: string | null;
+    key_file_path?: string | null;
+    password?: string | null;
+    access_key?: string | null;
+    cer_expiration_date?: number | null;
+    key_expiration_date?: number | null;
+}
+
+export interface CompanyVU {
+    id?: number;
+    webservice_user?: string | null;
+    webservice_password?: string | null;
+    email?: string | null;
+    figure_type?: string | null;
+    central_path?: string | null;
+    xml_files_path?: string | null;
+    query_rfc?: string | null;
+    validation_rfc?: string | null;
+    configuration_source?: string | null;
+    measurement_units?: string | null;
+}
+
+export interface CompanyElectronicAgent {
+    id?: number;
+    input_folder?: string | null;
+    output_folder?: string | null;
+    send_mask?: string | null;
+    response_mask?: string | null;
+    response_extension?: string | null;
+    counter_start?: number | null;
+    counter_end?: number | null;
+    counter_next?: number | null;
+}
+
+export interface CompanyPrevalidator {
+    id?: number;
+    customs?: string | null;
+    key?: string | null;
+    patent?: string | null;
+    description?: string | null;
+}
+
+export interface CompanyCFDI {
+    id?: number;
+    xml_save_path?: string | null;
+    cfdi_app_path?: string | null;
+    pac_app_path?: string | null;
+}
+
 export interface Company {
     id: number;
     tenant_id: number;
@@ -32,6 +117,116 @@ export interface Company {
     inter_db_name?: string | null;
     prevalidator_key?: string | null;
     seventh_amendment?: boolean;
+    // Sectores
+    sector1?: string | null;
+    sector2?: string | null;
+    sector3?: string | null;
+    // Flags técnicos
+    active_labels?: number | null;
+    active_fractions?: number | null;
+    activate_caat?: number | null;
+    trans_interface?: number | null;
+    american_costs?: number | null;
+    scaf_readonly?: number | null;
+    parts_replacement?: number | null;
+    activate_facmexame?: number | null;
+    part_reference?: number | null;
+    international_firm?: number | null;
+    // Configuraciones
+    ftp_key?: string | null;
+    sifra_path?: string | null;
+    version_type?: string | null;
+    sql_language?: string | null;
+    balance_operation_mode?: string | null;
+    // Campos de certificación (CompanyCertification aplanado)
+    is_certified_company?: string | null;
+    certified_company_registration?: string | null;
+    certified_company_start_date?: number | null;
+    certified_company_end_date?: number | null;
+    annex31_certification_date?: number | null;
+    annex31_certification_number?: string | null;
+    annex31_modality?: string | null;
+    annex31_company_type?: string | null;
+    annex31_renewal_date?: number | null;
+    annex31_final_certification_date?: number | null;
+    is_oea_company?: number | null;
+    neec_company?: number | null;
+    // Campos de dirección principal (CompanyAddress - main)
+    main_street?: string | null;
+    main_exterior_number?: string | null;
+    main_interior_number?: string | null;
+    main_postal_code?: string | null;
+    main_neighborhood?: string | null;
+    main_city?: string | null;
+    main_municipality?: string | null;
+    main_state?: string | null;
+    main_country?: string | null;
+    main_phone?: string | null;
+    main_fax?: string | null;
+    main_email?: string | null;
+    // Campos de dirección industrial 1 (CompanyAddress - industrial1)
+    ind1_street?: string | null;
+    ind1_exterior_number?: string | null;
+    ind1_interior_number?: string | null;
+    ind1_postal_code?: string | null;
+    ind1_neighborhood?: string | null;
+    ind1_city?: string | null;
+    ind1_municipality?: string | null;
+    ind1_state?: string | null;
+    ind1_country?: string | null;
+    ind1_phone?: string | null;
+    ind1_fax?: string | null;
+    ind1_email?: string | null;
+    // Campos de dirección industrial 2 (CompanyAddress - industrial2)
+    ind2_street?: string | null;
+    ind2_exterior_number?: string | null;
+    ind2_interior_number?: string | null;
+    ind2_postal_code?: string | null;
+    ind2_neighborhood?: string | null;
+    ind2_city?: string | null;
+    ind2_municipality?: string | null;
+    ind2_state?: string | null;
+    ind2_country?: string | null;
+    ind2_phone?: string | null;
+    ind2_fax?: string | null;
+    ind2_email?: string | null;
+    // Campos de prevalidador (CompanyPrevalidator aplanado)
+    prev_customs?: string | null;
+    prev_key?: string | null;
+    prev_patent?: string | null;
+    prev_description?: string | null;
+    // Campos de ventanilla única (CompanyVU aplanado)
+    vu_webservice_user?: string | null;
+    vu_webservice_password?: string | null;
+    vu_email?: string | null;
+    vu_figure_type?: string | null;
+    vu_central_path?: string | null;
+    vu_xml_files_path?: string | null;
+    vu_query_rfc?: string | null;
+    vu_validation_rfc?: string | null;
+    vu_configuration_source?: string | null;
+    vu_measurement_units?: string | null;
+    // Campos de agente aduanal electrónico (CompanyElectronicAgent aplanado)
+    ea_input_folder?: string | null;
+    ea_output_folder?: string | null;
+    ea_send_mask?: string | null;
+    ea_response_mask?: string | null;
+    ea_response_extension?: string | null;
+    ea_counter_start?: number | null;
+    ea_counter_end?: number | null;
+    ea_counter_next?: number | null;
+    // Campos de CFDI (CompanyCFDI aplanado)
+    cfdi_xml_save_path?: string | null;
+    cfdi_app_path?: string | null;
+    cfdi_pac_app_path?: string | null;
+    // Submodelos
+    addresses?: CompanyAddress[];
+    certification?: CompanyCertification | null;
+    digital_certificates?: CompanyDigitalCertificate[];
+    ventanilla_unica?: CompanyVU | null;
+    electronic_agent?: CompanyElectronicAgent | null;
+    prevalidator?: CompanyPrevalidator | null;
+    cfdi?: CompanyCFDI | null;
     created_at: string | null;
     updated_at: string | null;
 }
diff --git a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts
index 4abae76c..775ae7ac 100644
--- a/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts
+++ b/frontend/src/lib/config/shortcuts/dashboard/general_catalogs/company_information/edit.ts
@@ -6,16 +6,15 @@ export const obtenerAtajosFormularioEmpresa = (acciones: {
     manejarCerrar: () => void;
 }): ShortcutDef[] => [
         { key: 'Alt+Digit1', description: 'Pestaña General', action: () => acciones.cambiarPestana('general') },
-        { key: 'Alt+Digit2', description: 'Pestaña Programas', action: () => acciones.cambiarPestana('programas') },
+        { key: 'Alt+Digit2', description: 'Pestaña Programa', action: () => acciones.cambiarPestana('programa') },
         { key: 'Alt+Digit3', description: 'Pestaña Responsable', action: () => acciones.cambiarPestana('responsable') },
-        { key: 'Alt+Digit4', description: 'Pestaña Config', action: () => acciones.cambiarPestana('config') },
+        { key: 'Alt+Digit4', description: 'Pestaña Certificaciones', action: () => acciones.cambiarPestana('certificaciones') },
+        { key: 'Alt+Digit5', description: 'Pestaña Direcciones', action: () => acciones.cambiarPestana('direcciones') },
+        { key: 'Alt+Digit6', description: 'Pestaña Config', action: () => acciones.cambiarPestana('config') },
         {
             key: 'Control+KeyS',
             description: 'Guardar Empresa',
-            action: (e) => {
-                e.preventDefault();
-                acciones.manejarGuardar();
-            }
+            action: () => acciones.manejarGuardar()
         },
         {
             key: 'Escape',
diff --git a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
index d0821f13..ba7e4207 100644
--- a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
@@ -49,7 +49,7 @@
 		name: '',
 		short_name: '',
 		curp: '',
-		client_or_provider: 'client',
+		client_or_provider: 'both',
 		type_nat_foreign: 'N',
 		responsible: '',
 		position: '',
@@ -224,7 +224,7 @@
 		} catch (e: any) {
 			console.error(e);
 			error = e.message || 'Error al guardar';
-			toast.error(error);
+			toast.error(error || 'Error al guardar');
 		} finally {
 			loading = false;
 		}
@@ -314,7 +314,11 @@
 								</div>
 								<div class="grid gap-2">
 									<Label for="type">Tipo de Relación <span class="text-destructive">*</span></Label>
-									<Select.Root type="single" bind:value={formData.client_or_provider}>
+								<Select.Root
+									type="single"
+									value={formData.client_or_provider}
+									onValueChange={(v) => (formData.client_or_provider = v)}
+								>
 										<Select.Trigger id="type">
 											{typeLabels[formData.client_or_provider] || 'Selecciona un tipo'}
 										</Select.Trigger>
@@ -357,7 +361,11 @@
 								</div>
 								<div class="grid gap-2">
 									<Label for="type_nat">Tipo Origen</Label>
-									<Select.Root type="single" bind:value={formData.type_nat_foreign}>
+								<Select.Root
+									type="single"
+									value={formData.type_nat_foreign}
+									onValueChange={(v) => (formData.type_nat_foreign = v)}
+								>
 										<Select.Trigger id="type_nat">
 											{formData.type_nat_foreign === 'N'
 												? 'Nacional'
diff --git a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
index 536f922b..b01393f5 100644
--- a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
@@ -25,7 +25,8 @@
 		Building2,
 		FileText,
 		User,
-		Settings
+		Settings,
+		MapPin
 	} from 'lucide-svelte';
 
 	// 1. Lógica de Navegación y Modo
@@ -80,7 +81,109 @@
 		broker_company: '',
 		inter_db_name: '',
 		prevalidator_key: '',
-		seventh_amendment: false
+		seventh_amendment: false,
+		// Sectores
+		sector1: '',
+		sector2: '',
+		sector3: '',
+		// Certificaciones (CompanyCertification)
+		is_certified_company: '',
+		certified_company_registration: '',
+		certified_company_start_date: 0,
+		certified_company_end_date: 0,
+		annex31_certification_date: 0,
+		annex31_certification_number: '',
+		annex31_modality: '',
+		annex31_company_type: '',
+		annex31_renewal_date: 0,
+		annex31_final_certification_date: 0,
+		is_oea_company: 0,
+		neec_company: 0,
+		// Dirección Principal
+		main_street: '',
+		main_exterior_number: '',
+		main_interior_number: '',
+		main_postal_code: '',
+		main_neighborhood: '',
+		main_city: '',
+		main_municipality: '',
+		main_state: '',
+		main_country: '',
+		main_phone: '',
+		main_fax: '',
+		main_email: '',
+		// Dirección Industrial 1
+		ind1_street: '',
+		ind1_exterior_number: '',
+		ind1_interior_number: '',
+		ind1_postal_code: '',
+		ind1_neighborhood: '',
+		ind1_city: '',
+		ind1_municipality: '',
+		ind1_state: '',
+		ind1_country: '',
+		ind1_phone: '',
+		ind1_fax: '',
+		ind1_email: '',
+		// Dirección Industrial 2
+		ind2_street: '',
+		ind2_exterior_number: '',
+		ind2_interior_number: '',
+		ind2_postal_code: '',
+		ind2_neighborhood: '',
+		ind2_city: '',
+		ind2_municipality: '',
+		ind2_state: '',
+		ind2_country: '',
+		ind2_phone: '',
+		ind2_fax: '',
+		ind2_email: '',
+		// Configuraciones técnicas (flags)
+		active_labels: 0,
+		active_fractions: 0,
+		activate_caat: 0,
+		trans_interface: 0,
+		american_costs: 0,
+		scaf_readonly: 0,
+		parts_replacement: 0,
+		activate_facmexame: 0,
+		part_reference: 0,
+		international_firm: 0,
+		// Configuraciones avanzadas
+		ftp_key: '',
+		sifra_path: '',
+		version_type: '',
+		sql_language: '',
+		balance_operation_mode: '',
+		// Prevalidador (CompanyPrevalidator)
+		prev_customs: '',
+		prev_key: '',
+		prev_patent: '',
+		prev_description: '',
+		// Ventanilla Única (CompanyVU)
+		vu_webservice_user: '',
+		vu_webservice_password: '',
+		vu_email: '',
+		vu_figure_type: '',
+		vu_central_path: '',
+		vu_xml_files_path: '',
+		vu_query_rfc: '',
+		vu_validation_rfc: '',
+		vu_configuration_source: '',
+		vu_measurement_units: '',
+		// Agente Aduanal Electrónico (CompanyElectronicAgent)
+		ea_input_folder: '',
+		ea_output_folder: '',
+		ea_send_mask: '',
+		ea_response_mask: '',
+		ea_response_extension: '',
+		ea_counter_start: 0,
+		ea_counter_end: 0,
+		ea_counter_next: 0,
+		// CFDI (CompanyCFDI)
+		cfdi_xml_save_path: '',
+		cfdi_app_path: '',
+		cfdi_pac_app_path: ''
 	};
 
 	let formData = $state({ ...initialData });
@@ -128,7 +231,109 @@
 					broker_company: item.broker_company || '',
 					inter_db_name: item.inter_db_name || '',
 					prevalidator_key: item.prevalidator_key || '',
-					seventh_amendment: item.seventh_amendment || false
+					seventh_amendment: item.seventh_amendment || false,
+					// Sectores
+					sector1: item.sector1 || '',
+					sector2: item.sector2 || '',
+					sector3: item.sector3 || '',
+					// Configuraciones técnicas (flags)
+					active_labels: item.active_labels || 0,
+					active_fractions: item.active_fractions || 0,
+					activate_caat: item.activate_caat || 0,
+					trans_interface: item.trans_interface || 0,
+					american_costs: item.american_costs || 0,
+					scaf_readonly: item.scaf_readonly || 0,
+					parts_replacement: item.parts_replacement || 0,
+					activate_facmexame: item.activate_facmexame || 0,
+					part_reference: item.part_reference || 0,
+					international_firm: item.international_firm || 0,
+					// Configuraciones avanzadas
+					ftp_key: item.ftp_key || '',
+					sifra_path: item.sifra_path || '',
+					version_type: item.version_type || '',
+					sql_language: item.sql_language || '',
+					balance_operation_mode: item.balance_operation_mode || '',
+					// Certificaciones
+					is_certified_company: item.is_certified_company || '',
+					certified_company_registration: item.certified_company_registration || '',
+					certified_company_start_date: item.certified_company_start_date || 0,
+					certified_company_end_date: item.certified_company_end_date || 0,
+					annex31_certification_date: item.annex31_certification_date || 0,
+					annex31_certification_number: item.annex31_certification_number || '',
+					annex31_modality: item.annex31_modality || '',
+					annex31_company_type: item.annex31_company_type || '',
+					annex31_renewal_date: item.annex31_renewal_date || 0,
+					annex31_final_certification_date: item.annex31_final_certification_date || 0,
+					is_oea_company: item.is_oea_company || 0,
+					neec_company: item.neec_company || 0,
+					// Direcciones - Principal
+					main_street: item.main_street || '',
+					main_exterior_number: item.main_exterior_number || '',
+					main_interior_number: item.main_interior_number || '',
+					main_postal_code: item.main_postal_code || '',
+					main_neighborhood: item.main_neighborhood || '',
+					main_city: item.main_city || '',
+					main_municipality: item.main_municipality || '',
+					main_state: item.main_state || '',
+					main_country: item.main_country || '',
+					main_phone: item.main_phone || '',
+					main_fax: item.main_fax || '',
+					main_email: item.main_email || '',
+					// Direcciones - Industrial 1
+					ind1_street: item.ind1_street || '',
+					ind1_exterior_number: item.ind1_exterior_number || '',
+					ind1_interior_number: item.ind1_interior_number || '',
+					ind1_postal_code: item.ind1_postal_code || '',
+					ind1_neighborhood: item.ind1_neighborhood || '',
+					ind1_city: item.ind1_city || '',
+					ind1_municipality: item.ind1_municipality || '',
+					ind1_state: item.ind1_state || '',
+					ind1_country: item.ind1_country || '',
+					ind1_phone: item.ind1_phone || '',
+					ind1_fax: item.ind1_fax || '',
+					ind1_email: item.ind1_email || '',
+					// Direcciones - Industrial 2
+					ind2_street: item.ind2_street || '',
+					ind2_exterior_number: item.ind2_exterior_number || '',
+					ind2_interior_number: item.ind2_interior_number || '',
+					ind2_postal_code: item.ind2_postal_code || '',
+					ind2_neighborhood: item.ind2_neighborhood || '',
+					ind2_city: item.ind2_city || '',
+					ind2_municipality: item.ind2_municipality || '',
+					ind2_state: item.ind2_state || '',
+					ind2_country: item.ind2_country || '',
+					ind2_phone: item.ind2_phone || '',
+					ind2_fax: item.ind2_fax || '',
+					ind2_email: item.ind2_email || '',
+					// Prevalidador
+					prev_customs: item.prev_customs || '',
+					prev_key: item.prev_key || '',
+					prev_patent: item.prev_patent || '',
+					prev_description: item.prev_description || '',
+					// Ventanilla Única
+					vu_webservice_user: item.vu_webservice_user || '',
+					vu_webservice_password: item.vu_webservice_password || '',
+					vu_email: item.vu_email || '',
+					vu_figure_type: item.vu_figure_type || '',
+					vu_central_path: item.vu_central_path || '',
+					vu_xml_files_path: item.vu_xml_files_path || '',
+					vu_query_rfc: item.vu_query_rfc || '',
+					vu_validation_rfc: item.vu_validation_rfc || '',
+					vu_configuration_source: item.vu_configuration_source || '',
+					vu_measurement_units: item.vu_measurement_units || '',
+					// Agente Aduanal Electrónico
+					ea_input_folder: item.ea_input_folder || '',
+					ea_output_folder: item.ea_output_folder || '',
+					ea_send_mask: item.ea_send_mask || '',
+					ea_response_mask: item.ea_response_mask || '',
+					ea_response_extension: item.ea_response_extension || '',
+					ea_counter_start: item.ea_counter_start || 0,
+					ea_counter_end: item.ea_counter_end || 0,
+					ea_counter_next: item.ea_counter_next || 0,
+					// CFDI
+					cfdi_xml_save_path: item.cfdi_xml_save_path || '',
+					cfdi_app_path: item.cfdi_app_path || '',
+					cfdi_pac_app_path: item.cfdi_pac_app_path || ''
 				};
 				// Guardar la URL del logo actual si existe
 				if (item.logo) {
@@ -247,6 +452,108 @@
 				inter_db_name: clean(formData.inter_db_name),
 				prevalidator_key: clean(formData.prevalidator_key),
 				seventh_amendment: formData.seventh_amendment,
+				// Sectores
+				sector1: clean(formData.sector1),
+				sector2: clean(formData.sector2),
+				sector3: clean(formData.sector3),
+				// Configuraciones técnicas (flags)
+				active_labels: Number(formData.active_labels) || 0,
+				active_fractions: Number(formData.active_fractions) || 0,
+				activate_caat: Number(formData.activate_caat) || 0,
+				trans_interface: Number(formData.trans_interface) || 0,
+				american_costs: Number(formData.american_costs) || 0,
+				scaf_readonly: Number(formData.scaf_readonly) || 0,
+				parts_replacement: Number(formData.parts_replacement) || 0,
+				activate_facmexame: Number(formData.activate_facmexame) || 0,
+				part_reference: Number(formData.part_reference) || 0,
+				international_firm: Number(formData.international_firm) || 0,
+				// Configuraciones avanzadas
+				ftp_key: clean(formData.ftp_key),
+				sifra_path: clean(formData.sifra_path),
+				version_type: clean(formData.version_type),
+				sql_language: clean(formData.sql_language),
+				balance_operation_mode: clean(formData.balance_operation_mode),
+				// Certificaciones
+				is_certified_company: clean(formData.is_certified_company),
+				certified_company_registration: clean(formData.certified_company_registration),
+				certified_company_start_date: Number(formData.certified_company_start_date) || 0,
+				certified_company_end_date: Number(formData.certified_company_end_date) || 0,
+				annex31_certification_date: Number(formData.annex31_certification_date) || 0,
+				annex31_certification_number: clean(formData.annex31_certification_number),
+				annex31_modality: clean(formData.annex31_modality),
+				annex31_company_type: clean(formData.annex31_company_type),
+				annex31_renewal_date: Number(formData.annex31_renewal_date) || 0,
+				annex31_final_certification_date: Number(formData.annex31_final_certification_date) || 0,
+				is_oea_company: Number(formData.is_oea_company) || 0,
+				neec_company: Number(formData.neec_company) || 0,
+				// Direcciones - Principal
+				main_street: clean(formData.main_street),
+				main_exterior_number: clean(formData.main_exterior_number),
+				main_interior_number: clean(formData.main_interior_number),
+				main_postal_code: clean(formData.main_postal_code),
+				main_neighborhood: clean(formData.main_neighborhood),
+				main_city: clean(formData.main_city),
+				main_municipality: clean(formData.main_municipality),
+				main_state: clean(formData.main_state),
+				main_country: clean(formData.main_country),
+				main_phone: clean(formData.main_phone),
+				main_fax: clean(formData.main_fax),
+				main_email: clean(formData.main_email),
+				// Direcciones - Industrial 1
+				ind1_street: clean(formData.ind1_street),
+				ind1_exterior_number: clean(formData.ind1_exterior_number),
+				ind1_interior_number: clean(formData.ind1_interior_number),
+				ind1_postal_code: clean(formData.ind1_postal_code),
+				ind1_neighborhood: clean(formData.ind1_neighborhood),
+				ind1_city: clean(formData.ind1_city),
+				ind1_municipality: clean(formData.ind1_municipality),
+				ind1_state: clean(formData.ind1_state),
+				ind1_country: clean(formData.ind1_country),
+				ind1_phone: clean(formData.ind1_phone),
+				ind1_fax: clean(formData.ind1_fax),
+				ind1_email: clean(formData.ind1_email),
+				// Direcciones - Industrial 2
+				ind2_street: clean(formData.ind2_street),
+				ind2_exterior_number: clean(formData.ind2_exterior_number),
+				ind2_interior_number: clean(formData.ind2_interior_number),
+				ind2_postal_code: clean(formData.ind2_postal_code),
+				ind2_neighborhood: clean(formData.ind2_neighborhood),
+				ind2_city: clean(formData.ind2_city),
+				ind2_municipality: clean(formData.ind2_municipality),
+				ind2_state: clean(formData.ind2_state),
+				ind2_country: clean(formData.ind2_country),
+				ind2_phone: clean(formData.ind2_phone),
+				ind2_fax: clean(formData.ind2_fax),
+				ind2_email: clean(formData.ind2_email),
+				// Prevalidador
+				prev_customs: clean(formData.prev_customs),
+				prev_key: clean(formData.prev_key),
+				prev_patent: clean(formData.prev_patent),
+				prev_description: clean(formData.prev_description),
+				// Ventanilla Única
+				vu_webservice_user: clean(formData.vu_webservice_user),
+				vu_webservice_password: clean(formData.vu_webservice_password),
+				vu_email: clean(formData.vu_email),
+				vu_figure_type: clean(formData.vu_figure_type),
+				vu_central_path: clean(formData.vu_central_path),
+				vu_xml_files_path: clean(formData.vu_xml_files_path),
+				vu_query_rfc: clean(formData.vu_query_rfc),
+				vu_validation_rfc: clean(formData.vu_validation_rfc),
+				vu_configuration_source: clean(formData.vu_configuration_source),
+				vu_measurement_units: clean(formData.vu_measurement_units),
+				// Agente Aduanal Electrónico
+				ea_input_folder: clean(formData.ea_input_folder),
+				ea_output_folder: clean(formData.ea_output_folder),
+				ea_send_mask: clean(formData.ea_send_mask),
+				ea_response_mask: clean(formData.ea_response_mask),
+				ea_response_extension: clean(formData.ea_response_extension),
+				ea_counter_start: Number(formData.ea_counter_start) || 0,
+				ea_counter_end: Number(formData.ea_counter_end) || 0,
+				ea_counter_next: Number(formData.ea_counter_next) || 0,
+				// CFDI
+				cfdi_xml_save_path: clean(formData.cfdi_xml_save_path),
+				cfdi_app_path: clean(formData.cfdi_app_path),
+				cfdi_pac_app_path: clean(formData.cfdi_pac_app_path),
 				// Ensure optional booleans are passed correctly or default to false/null if needed
 				has_express_line: formData.has_express_line,
 				is_service_company: formData.is_service_company
@@ -312,6 +619,7 @@
 			<Card.Content class="p-6">
 				<Tabs.Root bind:value={activeTab} class="w-full">
 					<div class="min-h-[400px]">
+						<!-- TAB 1: GENERAL - Datos Básicos del Modelo Company -->
 						<Tabs.Content value="general" class="space-y-4 pt-4">
 							<!-- Logo Upload Section -->
 							<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
@@ -382,7 +690,8 @@
 							</div>
 						</Tabs.Content>
 
-						<Tabs.Content value="programas" class="space-y-4 pt-4">
+						<!-- TAB 2: PROGRAMA & SECTORES - Modelo Company -->
+						<Tabs.Content value="programa" class="space-y-4 pt-4">
 							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
 								<div class="grid gap-2">
 									<Label for="program">Programa (IMMEX)</Label>
@@ -413,81 +722,811 @@
 									<Input id="subassembly" bind:value={formData.subassembly_mode} />
 								</div>
 							</div>
-						</Tabs.Content>
 
-						<Tabs.Content value="responsable" class="space-y-4 pt-4">
-							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+						<!-- Sectores -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Sectores</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
 								<div class="grid gap-2">
-									<Label for="resp_name">Nombre</Label>
-									<Input id="resp_name" bind:value={formData.responsible_name} />
+									<Label for="sector1">Sector 1</Label>
+									<Input id="sector1" bind:value={formData.sector1} maxlength={150} />
 								</div>
 								<div class="grid gap-2">
-									<Label for="resp_last">Apellido Paterno</Label>
-									<Input id="resp_last" bind:value={formData.responsible_last_name} />
+									<Label for="sector2">Sector 2</Label>
+									<Input id="sector2" bind:value={formData.sector2} maxlength={150} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="sector3">Sector 3</Label>
+									<Input id="sector3" bind:value={formData.sector3} maxlength={5} />
 								</div>
 							</div>
-							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
-								<div class="grid gap-2">
-									<Label for="resp_mother">Apellido Materno</Label>
-									<Input id="resp_mother" bind:value={formData.responsible_mother_last_name} />
-								</div>
-								<div class="grid gap-2">
-									<Label for="resp_rfc">RFC Responsable</Label>
-									<Input id="resp_rfc" bind:value={formData.responsible_rfc} maxlength={13} />
-								</div>
+						</div>
+					</Tabs.Content>
+						<!-- TAB 3: RESPONSABLE - Modelo Company -->					<Tabs.Content value="responsable" class="space-y-4 pt-4">
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="resp_name">Nombre</Label>
+								<Input id="resp_name" bind:value={formData.responsible_name} />
 							</div>
 							<div class="grid gap-2">
-								<Label for="position">Puesto / Cargo</Label>
-								<Input id="position" bind:value={formData.position} />
+								<Label for="resp_last">Apellido Paterno</Label>
+								<Input id="resp_last" bind:value={formData.responsible_last_name} />
 							</div>
-						</Tabs.Content>
-
-						<Tabs.Content value="config" class="space-y-4 pt-4">
-							<div class="grid grid-cols-1 gap-6 md:grid-cols-2">
+						</div>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="resp_mother">Apellido Materno</Label>
+								<Input id="resp_mother" bind:value={formData.responsible_mother_last_name} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="resp_rfc">RFC Responsable</Label>
+								<Input id="resp_rfc" bind:value={formData.responsible_rfc} maxlength={13} />
+							</div>
+						</div>
+						<div class="grid gap-2">
+							<Label for="position">Puesto / Cargo</Label>
+							<Input id="position" bind:value={formData.position} />
+						</div>
+					</Tabs.Content>
+						<!-- TAB 4: CERTIFICACIONES - Submodelo CompanyCertification -->
+						<Tabs.Content value="certificaciones" class="space-y-4 pt-4">
+						<!-- Certificaciones OEA/NEEC -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Certificaciones OEA/NEEC</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="ctpat">C-TPAT / SVI</Label>
+									<Input id="ctpat" bind:value={formData.ctpat_svi} maxlength={100} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="exporter">No. Exportador Confiable</Label>
+									<Input
+										id="exporter"
+										bind:value={formData.trusted_exporter_number}
+										maxlength={50}
+									/>
+								</div>
+							</div>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
 								<div class="flex items-center gap-3 p-4 border rounded-lg">
 									<Switch id="express" bind:checked={formData.has_express_line} />
 									<Label for="express">Carril Exprés (OEA/NEEC)</Label>
 								</div>
 								<div class="flex items-center gap-3 p-4 border rounded-lg">
-									<Switch id="service" bind:checked={formData.is_service_company} />
-									<Label for="service">Es Empresa de Servicios</Label>
+									<Switch
+										id="is_oea"
+										checked={formData.is_oea_company === 1}
+										onCheckedChange={(checked) => (formData.is_oea_company = checked ? 1 : 0)}
+									/>
+									<Label for="is_oea">Empresa OEA</Label>
 								</div>
 								<div class="flex items-center gap-3 p-4 border rounded-lg">
-									<Switch id="seventh" bind:checked={formData.seventh_amendment} />
-									<Label for="seventh">Séptima Enmienda</Label>
+									<Switch
+										id="neec"
+										checked={formData.neec_company === 1}
+										onCheckedChange={(checked) => (formData.neec_company = checked ? 1 : 0)}
+									/>
+									<Label for="neec">Empresa NEEC</Label>
 								</div>
 							</div>
-							<div class="grid grid-cols-1 gap-4 md:grid-cols-2 pt-4">
+						</div>
+
+						<!-- Certificación General -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Certificación General</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
 								<div class="grid gap-2">
-									<Label for="previous_code">Código Anterior</Label>
-									<Input id="previous_code" type="number" bind:value={formData.previous_code} />
+									<Label for="cert_status">¿Es Empresa Certificada?</Label>
+									<Input
+										id="cert_status"
+										bind:value={formData.is_certified_company}
+										maxlength={1}
+										placeholder="S/N"
+									/>
 								</div>
 								<div class="grid gap-2">
-									<Label for="inter_db">Base de Datos Intermedia</Label>
-									<Input id="inter_db" bind:value={formData.inter_db_name} />
+									<Label for="cert_reg">Registro de Empresa Certificada</Label>
+									<Input
+										id="cert_reg"
+										bind:value={formData.certified_company_registration}
+										maxlength={40}
+									/>
 								</div>
 								<div class="grid gap-2">
-									<Label for="prevalidator">Clave Prevalidador</Label>
-									<Input id="prevalidator" bind:value={formData.prevalidator_key} />
+									<Label for="cert_start">Fecha Inicio Certificación</Label>
+									<Input
+										id="cert_start"
+										type="number"
+										bind:value={formData.certified_company_start_date}
+										placeholder="YYYYMMDD"
+									/>
 								</div>
 								<div class="grid gap-2">
-									<Label for="man_id">Manufacturer ID (MID)</Label>
-									<Input id="man_id" bind:value={formData.manufacturer_id} />
-								</div>
-								<div class="grid gap-2">
-									<Label for="order_format">Formato de Pedido</Label>
-									<Input id="order_format" bind:value={formData.order_format_type} />
-								</div>
-								<div class="grid gap-2">
-									<Label for="ctpat">C-TPAT / SVI</Label>
-									<Input id="ctpat" bind:value={formData.ctpat_svi} />
-								</div>
-								<div class="grid gap-2">
-									<Label for="exporter">No. Exportador Confiable</Label>
-									<Input id="exporter" bind:value={formData.trusted_exporter_number} />
+									<Label for="cert_end">Fecha Fin Certificación</Label>
+									<Input
+										id="cert_end"
+										type="number"
+										bind:value={formData.certified_company_end_date}
+										placeholder="YYYYMMDD"
+									/>
 								</div>
 							</div>
-						</Tabs.Content>
+						</div>
+
+						<!-- Anexo 31 -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Anexo 31</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="a31_cert_date">Fecha Certificación Anexo 31</Label>
+									<Input
+										id="a31_cert_date"
+										type="number"
+										bind:value={formData.annex31_certification_date}
+										placeholder="YYYYMMDD"
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="a31_cert_num">Número Certificación Anexo 31</Label>
+									<Input
+										id="a31_cert_num"
+										bind:value={formData.annex31_certification_number}
+										maxlength={50}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="a31_modality">Modalidad Anexo 31</Label>
+									<Input
+										id="a31_modality"
+										bind:value={formData.annex31_modality}
+										maxlength={50}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="a31_type">Tipo de Empresa Anexo 31</Label>
+									<Input
+										id="a31_type"
+										bind:value={formData.annex31_company_type}
+										maxlength={50}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="a31_renewal">Fecha Renovación Anexo 31</Label>
+									<Input
+										id="a31_renewal"
+										type="number"
+										bind:value={formData.annex31_renewal_date}
+										placeholder="YYYYMMDD"
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="a31_final">Fecha Final Certificación Anexo 31</Label>
+									<Input
+										id="a31_final"
+										type="number"
+										bind:value={formData.annex31_final_certification_date}
+										placeholder="YYYYMMDD"
+									/>
+								</div>
+							</div>
+						</div>
+					</Tabs.Content>
+
+					<!-- TAB 5: DIRECCIONES - Submodelo CompanyAddress -->
+					<Tabs.Content value="direcciones" class="space-y-4 pt-4">
+						<!-- Dirección Principal -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Dirección Principal</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="main_street">Calle</Label>
+									<Input id="main_street" bind:value={formData.main_street} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_ext_num">Número Exterior</Label>
+									<Input
+										id="main_ext_num"
+										bind:value={formData.main_exterior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_int_num">Número Interior</Label>
+									<Input
+										id="main_int_num"
+										bind:value={formData.main_interior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_postal">Código Postal</Label>
+									<Input
+										id="main_postal"
+										bind:value={formData.main_postal_code}
+										maxlength={5}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_neighborhood">Colonia</Label>
+									<Input
+										id="main_neighborhood"
+										bind:value={formData.main_neighborhood}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_city">Ciudad</Label>
+									<Input id="main_city" bind:value={formData.main_city} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_municipality">Municipio</Label>
+									<Input
+										id="main_municipality"
+										bind:value={formData.main_municipality}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_state">Estado</Label>
+									<Input id="main_state" bind:value={formData.main_state} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_country">País</Label>
+									<Input id="main_country" bind:value={formData.main_country} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_phone">Teléfono</Label>
+									<Input id="main_phone" bind:value={formData.main_phone} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_fax">Fax</Label>
+									<Input id="main_fax" bind:value={formData.main_fax} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="main_email">Email</Label>
+									<Input
+										id="main_email"
+										type="email"
+										bind:value={formData.main_email}
+										maxlength={255}
+									/>
+								</div>
+							</div>
+						</div>
+
+						<!-- Dirección Industrial 1 -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Dirección Industrial 1</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="ind1_street">Calle</Label>
+									<Input id="ind1_street" bind:value={formData.ind1_street} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_ext_num">Número Exterior</Label>
+									<Input
+										id="ind1_ext_num"
+										bind:value={formData.ind1_exterior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_int_num">Número Interior</Label>
+									<Input
+										id="ind1_int_num"
+										bind:value={formData.ind1_interior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_postal">Código Postal</Label>
+									<Input
+										id="ind1_postal"
+										bind:value={formData.ind1_postal_code}
+										maxlength={5}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_neighborhood">Colonia</Label>
+									<Input
+										id="ind1_neighborhood"
+										bind:value={formData.ind1_neighborhood}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_city">Ciudad</Label>
+									<Input id="ind1_city" bind:value={formData.ind1_city} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_municipality">Municipio</Label>
+									<Input
+										id="ind1_municipality"
+										bind:value={formData.ind1_municipality}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_state">Estado</Label>
+									<Input id="ind1_state" bind:value={formData.ind1_state} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_country">País</Label>
+									<Input id="ind1_country" bind:value={formData.ind1_country} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_phone">Teléfono</Label>
+									<Input id="ind1_phone" bind:value={formData.ind1_phone} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_fax">Fax</Label>
+									<Input id="ind1_fax" bind:value={formData.ind1_fax} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind1_email">Email</Label>
+									<Input
+										id="ind1_email"
+										type="email"
+										bind:value={formData.ind1_email}
+										maxlength={255}
+									/>
+								</div>
+							</div>
+						</div>
+
+						<!-- Dirección Industrial 2 -->
+						<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+							<h3 class="font-semibold">Dirección Industrial 2</h3>
+							<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+								<div class="grid gap-2">
+									<Label for="ind2_street">Calle</Label>
+									<Input id="ind2_street" bind:value={formData.ind2_street} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_ext_num">Número Exterior</Label>
+									<Input
+										id="ind2_ext_num"
+										bind:value={formData.ind2_exterior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_int_num">Número Interior</Label>
+									<Input
+										id="ind2_int_num"
+										bind:value={formData.ind2_interior_number}
+										maxlength={10}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_postal">Código Postal</Label>
+									<Input
+										id="ind2_postal"
+										bind:value={formData.ind2_postal_code}
+										maxlength={5}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_neighborhood">Colonia</Label>
+									<Input
+										id="ind2_neighborhood"
+										bind:value={formData.ind2_neighborhood}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_city">Ciudad</Label>
+									<Input id="ind2_city" bind:value={formData.ind2_city} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_municipality">Municipio</Label>
+									<Input
+										id="ind2_municipality"
+										bind:value={formData.ind2_municipality}
+										maxlength={255}
+									/>
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_state">Estado</Label>
+									<Input id="ind2_state" bind:value={formData.ind2_state} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_country">País</Label>
+									<Input id="ind2_country" bind:value={formData.ind2_country} maxlength={255} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_phone">Teléfono</Label>
+									<Input id="ind2_phone" bind:value={formData.ind2_phone} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_fax">Fax</Label>
+									<Input id="ind2_fax" bind:value={formData.ind2_fax} maxlength={20} />
+								</div>
+								<div class="grid gap-2">
+									<Label for="ind2_email">Email</Label>
+									<Input
+										id="ind2_email"
+										type="email"
+										bind:value={formData.ind2_email}
+										maxlength={255}
+									/>
+								</div>
+							</div>
+						</div>
+					</Tabs.Content>
+
+					<!-- TAB 6: CONFIGURACIÓN - Modelo Company (Flags y Config Avanzada) -->
+						<Tabs.Content value="config" class="space-y-4 pt-4">
+							<!-- Configuración General -->
+							<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+								<h3 class="font-semibold">Configuración General</h3>
+								<div class="grid grid-cols-1 gap-4 md:grid-cols-3">
+									<div class="flex items-center gap-3 p-4 border rounded-lg">
+										<Switch id="service" bind:checked={formData.is_service_company} />
+										<Label for="service">Es Empresa de Servicios</Label>
+									</div>
+									<div class="flex items-center gap-3 p-4 border rounded-lg">
+										<Switch id="seventh" bind:checked={formData.seventh_amendment} />
+										<Label for="seventh">Séptima Enmienda</Label>
+									</div>
+									<div class="grid gap-2">
+										<Label for="previous_code">Código Anterior</Label>
+										<Input id="previous_code" type="number" bind:value={formData.previous_code} />
+									</div>
+								</div>
+							</div>
+
+							<!-- Configuraciones Técnicas (Flags) -->
+							<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Configuraciones Técnicas</h3>
+						<div class="grid grid-cols-2 gap-4 md:grid-cols-5">
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="active_labels"
+									checked={formData.active_labels === 1}
+									onCheckedChange={(checked) => (formData.active_labels = checked ? 1 : 0)}
+								/>
+								<Label for="active_labels" class="text-xs">Etiquetas Activas</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="active_fractions"
+									checked={formData.active_fractions === 1}
+									onCheckedChange={(checked) => (formData.active_fractions = checked ? 1 : 0)}
+								/>
+								<Label for="active_fractions" class="text-xs">Fracciones Activas</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="activate_caat"
+									checked={formData.activate_caat === 1}
+									onCheckedChange={(checked) => (formData.activate_caat = checked ? 1 : 0)}
+								/>
+								<Label for="activate_caat" class="text-xs">Activar CAAT</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="trans_interface"
+									checked={formData.trans_interface === 1}
+									onCheckedChange={(checked) => (formData.trans_interface = checked ? 1 : 0)}
+								/>
+								<Label for="trans_interface" class="text-xs">Interfaz Trans</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="american_costs"
+									checked={formData.american_costs === 1}
+									onCheckedChange={(checked) => (formData.american_costs = checked ? 1 : 0)}
+								/>
+								<Label for="american_costs" class="text-xs">Costos Americanos</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="scaf_readonly"
+									checked={formData.scaf_readonly === 1}
+									onCheckedChange={(checked) => (formData.scaf_readonly = checked ? 1 : 0)}
+								/>
+								<Label for="scaf_readonly" class="text-xs">SCAF Solo Lectura</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="parts_replacement"
+									checked={formData.parts_replacement === 1}
+									onCheckedChange={(checked) => (formData.parts_replacement = checked ? 1 : 0)}
+								/>
+								<Label for="parts_replacement" class="text-xs">Reemplazo Partes</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="activate_facmexame"
+									checked={formData.activate_facmexame === 1}
+									onCheckedChange={(checked) => (formData.activate_facmexame = checked ? 1 : 0)}
+								/>
+								<Label for="activate_facmexame" class="text-xs">Activar FACMEXAME</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="part_reference"
+									checked={formData.part_reference === 1}
+									onCheckedChange={(checked) => (formData.part_reference = checked ? 1 : 0)}
+								/>
+								<Label for="part_reference" class="text-xs">Referencia Partes</Label>
+							</div>
+							<div class="flex items-center gap-3 p-3 border rounded">
+								<Switch
+									id="international_firm"
+									checked={formData.international_firm === 1}
+									onCheckedChange={(checked) => (formData.international_firm = checked ? 1 : 0)}
+								/>
+								<Label for="international_firm" class="text-xs">Firma Internacional</Label>
+							</div>
+						</div>
+					</div>
+
+					<!-- Identificadores y Operación -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Identificadores y Operación</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="man_id">Manufacturer ID (MID)</Label>
+								<Input id="man_id" bind:value={formData.manufacturer_id} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="order_format">Formato de Pedido</Label>
+								<Input id="order_format" bind:value={formData.order_format_type} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="inter_db">Base de Datos Intermedia</Label>
+								<Input id="inter_db" bind:value={formData.inter_db_name} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="prevalidator">Clave Prevalidador</Label>
+								<Input id="prevalidator" bind:value={formData.prevalidator_key} />
+							</div>
+						</div>
+					</div>
+
+					<!-- Configuraciones Avanzadas -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Configuraciones Avanzadas</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="ftp_key">Clave FTP</Label>
+								<Input id="ftp_key" bind:value={formData.ftp_key} maxlength={10} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="sifra_path">Ruta SIFRA</Label>
+								<Input id="sifra_path" bind:value={formData.sifra_path} maxlength={255} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="version_type">Tipo de Versión</Label>
+								<Input id="version_type" bind:value={formData.version_type} maxlength={20} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="sql_language">Lenguaje SQL</Label>
+								<Input id="sql_language" bind:value={formData.sql_language} maxlength={19} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="balance_mode">Modo de Operación de Balance</Label>
+								<Input
+									id="balance_mode"
+									bind:value={formData.balance_operation_mode}
+									maxlength={50}
+								/>
+							</div>
+						</div>
+					</div>
+
+					<!-- Prevalidador Aduanal -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Prevalidador Aduanal</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="prev_customs">Aduana</Label>
+								<Input
+									id="prev_customs"
+									bind:value={formData.prev_customs}
+									maxlength={20}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="prev_key">Clave</Label>
+								<Input id="prev_key" bind:value={formData.prev_key} maxlength={20} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="prev_patent">Patente</Label>
+								<Input
+									id="prev_patent"
+									bind:value={formData.prev_patent}
+									maxlength={4}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="prev_desc">Descripción</Label>
+								<Input
+									id="prev_desc"
+									bind:value={formData.prev_description}
+									maxlength={100}
+								/>
+							</div>
+						</div>
+					</div>
+
+					<!-- Ventanilla Única -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Ventanilla Única</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="vu_user">Usuario Webservice</Label>
+								<Input id="vu_user" bind:value={formData.vu_webservice_user} maxlength={100} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_pass">Contraseña Webservice</Label>
+								<Input
+									id="vu_pass"
+									type="password"
+									bind:value={formData.vu_webservice_password}
+									maxlength={100}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_email">Email</Label>
+								<Input
+									id="vu_email"
+									type="email"
+									bind:value={formData.vu_email}
+									maxlength={800}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_figure">Tipo de Figura</Label>
+								<Input id="vu_figure" bind:value={formData.vu_figure_type} maxlength={29} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_central">Ruta Central</Label>
+								<Input
+									id="vu_central"
+									bind:value={formData.vu_central_path}
+									maxlength={1499}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_xml">Ruta Archivos XML</Label>
+								<Input
+									id="vu_xml"
+									bind:value={formData.vu_xml_files_path}
+									maxlength={1499}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_query_rfc">RFC Consulta</Label>
+								<Input id="vu_query_rfc" bind:value={formData.vu_query_rfc} maxlength={30} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_validation_rfc">RFC Validación</Label>
+								<Input
+									id="vu_validation_rfc"
+									bind:value={formData.vu_validation_rfc}
+									maxlength={30}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_config_source">Fuente de Configuración</Label>
+								<Input
+									id="vu_config_source"
+									bind:value={formData.vu_configuration_source}
+									maxlength={30}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="vu_units">Unidades de Medida</Label>
+								<Input
+									id="vu_units"
+									bind:value={formData.vu_measurement_units}
+									maxlength={3}
+								/>
+							</div>
+						</div>
+					</div>
+
+					<!-- Agente Aduanal Electrónico -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">Agente Aduanal Electrónico</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="ea_input">Carpeta de Entrada</Label>
+								<Input
+									id="ea_input"
+									bind:value={formData.ea_input_folder}
+									maxlength={1000}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_output">Carpeta de Salida</Label>
+								<Input
+									id="ea_output"
+									bind:value={formData.ea_output_folder}
+									maxlength={1000}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_send_mask">Máscara de Envío</Label>
+								<Input id="ea_send_mask" bind:value={formData.ea_send_mask} maxlength={20} />
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_resp_mask">Máscara de Respuesta</Label>
+								<Input
+									id="ea_resp_mask"
+									bind:value={formData.ea_response_mask}
+									maxlength={20}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_resp_ext">Extensión de Respuesta</Label>
+								<Input
+									id="ea_resp_ext"
+									bind:value={formData.ea_response_extension}
+									maxlength={20}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_counter_start">Contador Inicio</Label>
+								<Input
+									id="ea_counter_start"
+									type="number"
+									bind:value={formData.ea_counter_start}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_counter_end">Contador Fin</Label>
+								<Input
+									id="ea_counter_end"
+									type="number"
+									bind:value={formData.ea_counter_end}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="ea_counter_next">Contador Siguiente</Label>
+								<Input
+									id="ea_counter_next"
+									type="number"
+									bind:value={formData.ea_counter_next}
+								/>
+							</div>
+						</div>
+					</div>
+
+					<!-- CFDI - Facturación Electrónica -->
+					<div class="grid gap-4 p-4 border rounded-lg bg-muted/30">
+						<h3 class="font-semibold">CFDI - Facturación Electrónica</h3>
+						<div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+							<div class="grid gap-2">
+								<Label for="cfdi_xml_path">Ruta de Guardado XML</Label>
+								<Input
+									id="cfdi_xml_path"
+									bind:value={formData.cfdi_xml_save_path}
+									maxlength={5000}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="cfdi_app_path">Ruta Aplicación CFDI</Label>
+								<Input
+									id="cfdi_app_path"
+									bind:value={formData.cfdi_app_path}
+									maxlength={5000}
+								/>
+							</div>
+							<div class="grid gap-2">
+								<Label for="cfdi_pac_path">Ruta Aplicación PAC</Label>
+								<Input
+									id="cfdi_pac_path"
+									bind:value={formData.cfdi_pac_app_path}
+									maxlength={5000}
+								/>
+							</div>
+						</div>
+					</div>
+				</Tabs.Content>
 					</div>
 				</Tabs.Root>
 			</Card.Content>
@@ -502,19 +1541,27 @@
 			<!-- Tabs Navigation -->
 			<Tabs.Root bind:value={activeTab} class="w-full">
 				<div class="w-full overflow-x-auto pb-2">
-					<Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
+					<Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-6">
 						<Tabs.Trigger value="general" class="whitespace-nowrap">
 							<Building2 class="mr-2 h-4 w-4" />
 							General
 						</Tabs.Trigger>
-						<Tabs.Trigger value="programas" class="whitespace-nowrap">
+						<Tabs.Trigger value="programa" class="whitespace-nowrap">
 							<FileText class="mr-2 h-4 w-4" />
-							Programas
+							Programa
 						</Tabs.Trigger>
 						<Tabs.Trigger value="responsable" class="whitespace-nowrap">
 							<User class="mr-2 h-4 w-4" />
 							Responsable
 						</Tabs.Trigger>
+						<Tabs.Trigger value="certificaciones" class="whitespace-nowrap">
+							<FileText class="mr-2 h-4 w-4" />
+							Certif.
+						</Tabs.Trigger>
+						<Tabs.Trigger value="direcciones" class="whitespace-nowrap">
+							<MapPin class="mr-2 h-4 w-4" />
+							Direcc.
+						</Tabs.Trigger>
 						<Tabs.Trigger value="config" class="whitespace-nowrap">
 							<Settings class="mr-2 h-4 w-4" />
 							Config
diff --git a/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup b/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup
deleted file mode 100644
index dae74cc6..00000000
--- a/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup
+++ /dev/null
@@ -1,184 +0,0 @@
-<script lang="ts">
-    import { onMount } from 'svelte';
-    import { partsApi, type Part } from '$lib/api/dashboard/a76/parts';
-    import DataTable from '$lib/components/dashboard/goods/parts/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/goods/parts/columns.js';
-    import * as Card from '$lib/components/ui/card';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { companyStore } from '$lib/stores/company.svelte';
-    import { Plus, Search, RefreshCw, Loader2, Trash2 } from 'lucide-svelte';
-
-    // 1. ESTADOS
-    let partsList = $state<Part[]>([]); 
-    let listLoading = $state(false);
-    let listError = $state<string | null>(null);
-
-    // Estado Búsqueda
-    let searchCode = $state(''); 
-    let searchResults = $state<Part[]>([]); // Array para guardar los resultados
-    let searchLoading = $state(false);
-    let isSearching = $state(false); // Para saber si estamos viendo resultados de búsqueda
-
-    // 2. CARGA DE DATOS (Lista Completa)
-    async function loadParts() {
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) return;
-
-        listLoading = true;
-        listError = null;
-        isSearching = false; // Reseteamos modo búsqueda
-        searchResults = [];
-
-        try {
-            const response = await partsApi.list({ 
-                company_id: companyId,
-                page: 1,
-                page_size: 100
-            });
-
-            if (response.data) {
-                partsList = response.data.items || []; 
-            } else if (response.error) {
-                listError = response.error;
-            }
-        } catch (e) {
-            listError = 'Error de conexión con el servidor';
-        } finally {
-            listLoading = false;
-        }
-    }
-
-    // 3. REACTIVIDAD DE COMPAÑÍA
-    $effect(() => {
-        if (companyStore.activeCompany) {
-            loadParts();
-        }
-    });
-
-    // 4. BÚSQUEDA MANUAL
-    async function handleSearch() {
-        if (!searchCode.trim()) return;
-        
-        searchLoading = true;
-        listError = null; // Limpiamos errores previos
-        const companyId = companyStore.activeCompany?.id;
-        
-        if (!companyId) return;
-
-        try {
-            const response = await partsApi.list({
-                company_id: companyId,
-                q: searchCode.trim()
-            });
-            
-            const results = response.data?.items || [];
-            
-            if (results.length > 0) {
-                searchResults = results; // Guardamos TODOS los resultados
-                isSearching = true; // Activamos modo búsqueda
-            } else {
-                listError = "No se encontraron partes con ese criterio";
-                searchResults = [];
-                isSearching = true; // Aún en modo búsqueda, pero vacía
-            }
-        } catch (e) {
-            listError = "Error en la búsqueda";
-        } finally {
-            searchLoading = false;
-        }
-    }
-
-    function clearSearch() {
-        searchCode = '';
-        searchResults = [];
-        isSearching = false;
-        listError = null;
-        loadParts(); // Recargamos la lista completa
-    }
-
-    const columns = createColumns(loadParts);
-    
-    // Si estamos buscando, mostramos searchResults, si no, la lista completa
-    const tableData = $derived(isSearching ? searchResults : partsList);
-</script>
-
-<div class="space-y-6 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-3xl font-bold tracking-tight">Catálogo de Partes</h1>
-            <p class="text-muted-foreground">Gestiona las partes y componentes del sistema.</p>
-        </div>
-        <div class="flex gap-2">
-            <Button variant="outline" onclick={loadParts} disabled={listLoading}>
-                <RefreshCw class="mr-2 h-4 w-4 {listLoading ? 'animate-spin' : ''}" />
-                Actualizar
-            </Button>
-            <Button href="/dashboard/goods/parts/edit">
-                <Plus class="mr-2 h-4 w-4" />
-                Nueva Parte
-            </Button>
-        </div>
-    </div>
-
-    <Card.Root>
-        <Card.Header>
-            <Card.Title>Búsqueda Rápida</Card.Title>
-            <Card.Description>Ingresa el número de parte o descripción para filtrar.</Card.Description>
-        </Card.Header>
-        <Card.Content>
-            <div class="flex gap-4">
-                <div class="flex-1 max-w-xl">
-                    <Input 
-                        bind:value={searchCode} 
-                        placeholder="Buscar por número de parte o descripción..." 
-                        onkeydown={(e) => e.key === 'Enter' && handleSearch()}
-                    />
-                </div>
-                <Button onclick={handleSearch} disabled={searchLoading}>
-                    {#if searchLoading}
-                        <Loader2 class="mr-2 h-4 w-4 animate-spin" />
-                        Buscando...
-                    {:else}
-                        <Search class="mr-2 h-4 w-4" />
-                        Buscar
-                    {/if}
-                </Button>
-                
-                {#if isSearching || searchCode}
-                    <Button variant="ghost" onclick={clearSearch}>
-                        <Trash2 class="mr-2 h-4 w-4" />
-                        Limpiar
-                    </Button>
-                {/if}
-            </div>
-        </Card.Content>
-    </Card.Root>
-
-    <Card.Root>
-        <Card.Header>
-            <Card.Title>
-                {#if isSearching}
-                    Resultados de la búsqueda ({searchResults.length})
-                {:else}
-                    Listado General ({partsList.length} registros)
-                {/if}
-            </Card.Title>
-        </Card.Header>
-        <Card.Content>
-            {#if listError}
-                <div class="bg-destructive/10 text-destructive p-4 rounded-lg border border-destructive/20 mb-4">
-                    {listError}
-                </div>
-            {/if}
-            
-            <DataTable 
-                data={tableData} 
-                {columns} 
-                loading={listLoading || searchLoading}
-                hasMore={false}
-                loadMore={() => {}}
-            />
-        </Card.Content>
-    </Card.Root>
-</div>
\ No newline at end of file