diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py
index afba527a..90386af6 100644
--- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py
+++ b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/common.py
@@ -109,9 +109,11 @@ def validate_common(
                 code="NOT_FOUND",
                 value=invoice.compliance_mx.pedimento_id,
             )
+            return  # Stop here if pedimento not found
 
         if not invoice.compliance_mx.is_regime_change:
-            if not pedimento.operation_type == "imp":
+            # Validar que el pedimento sea de importación (hardcoded restriction)
+            if pedimento.operation_type != "imp":
                 errors.add_error(
                     field="compliance_mx.pedimento_id",
                     message="El Pedimento seleccionado no corresponde a una Importación.",
@@ -120,7 +122,10 @@ def validate_common(
                     value=pedimento.operation_type,
                 )
             else:
-                if pedimento.regime in ["EXD", "ETE", "ETR"]:
+                # Validar regímenes incompatibles
+                export_only_regimes = ["EXD", "ETE", "ETR"]
+                
+                if pedimento.regime in export_only_regimes:
                     errors.add_error(
                         field="compliance_mx.pedimento_id",
                         message="El Pedimento seleccionado corresponde a una Exportación, no a una Importación.",
@@ -128,7 +133,10 @@ def validate_common(
                         code="INVALID_REGIME",
                         value=pedimento.regime,
                     )
-                else:
+                
+                # Validar que el tipo de documento coincida con el régimen del pedimento
+                # NOTA: Solo validamos si no hay errores previos y si document_type está presente
+                if not errors.has_errors() and invoice.document_type:
                     if invoice.document_type.upper().strip() != pedimento.regime:
                         errors.add_error(
                             field="document_type",
@@ -140,43 +148,42 @@ def validate_common(
                             value=invoice.document_type,
                         )
         else:
-            if pedimento.operation_type != 2:
+            # Cambio de Régimen - Generalmente es de Importación Temporal a Definitiva (IMD)
+            # En el código legacy se comparaba pedimento.operation_type != 2. 
+            # Si asumimos que 2 era Importación en el sistema anterior:
+            if pedimento.operation_type != "imp":
                 errors.add_error(
                     field="compliance_mx.pedimento_id",
-                    message="El Pedimento seleccionado no corresponde a una Importacion Definitiva.",
-                    solution=["Selecciona un Pedimento de Importacion Definitiva"],
+                    message="El Pedimento seleccionado no corresponde a una Importación (requerido para Cambio de Régimen).",
+                    solution=["Selecciona un Pedimento de Importación"],
                     code="INVALID_OPERATION_TYPE",
                     value=pedimento.operation_type,
                 )
             else:
-                if pedimento.regime != "IMD":
+                if pedimento.regime != "IMD" and invoice.document_type == "IMD":
+                     # Si el destino es IMD, validamos que el pedimento original sea de importación
+                     # (aunque usualmente el pedimento que se asocia aquí es el nuevo, el de IMD)
+                     pass 
+
+                if invoice.document_type.upper().strip() != pedimento.regime:
+                    errors.add_error(
+                        field="document_type",
+                        message=f"El Tipo de Documento '{invoice.document_type}' no coincide con el Régimen '{pedimento.regime}' del Pedimento seleccionado.",
+                        solution=[
+                            "Ajusta el Tipo de Documento o selecciona otro Pedimento"
+                        ],
+                        code="REGIME_MISMATCH",
+                        value=invoice.document_type,
+                    )
+                
+                if pedimento.pedimento_code not in ["A1", "A3"]:
                     errors.add_error(
                         field="compliance_mx.pedimento_id",
-                        message=f"El Pedimento {pedimento.customs_office}-{pedimento.license}-{pedimento.pedimento_number} no corresponde a una Importacion Definitiva.",
-                        solution=["Selecciona un Pedimento de Importacion Definitiva"],
-                        code="INVALID_REGIME",
-                        value=pedimento.regime,
+                        message=f"El Pedimento seleccionado no es de tipo A1 o A3 requerido para Cambio de Régimen.",
+                        solution=["Selecciona un Pedimento de tipo A1 o A3"],
+                        code="INVALID_PEDEMENTO_CODE",
+                        value=pedimento.pedimento_code,
                     )
-                else:
-                    if invoice.document_type.upper().strip() != pedimento.regime:
-                        errors.add_error(
-                            field="document_type",
-                            message=f"El Tipo de Documento '{invoice.document_type}' no coincide con el Régimen '{pedimento.regime}' del Pedimento seleccionado.",
-                            solution=[
-                                "Ajusta el Tipo de Documento o selecciona otro Pedimento"
-                            ],
-                            code="REGIME_MISMATCH",
-                            value=invoice.document_type,
-                        )
-                    else:
-                        if pedimento.pedimento_code not in ["A1", "A3"]:
-                            errors.add_error(
-                                field="compliance_mx.pedimento_id",
-                                message=f"El Pedimento seleccionado no es de tipo A1 o A3 requerido para Cambio de Régimen.",
-                                solution=["Selecciona un Pedimento de tipo A1 o A3"],
-                                code="INVALID_PEDEMENTO_CODE",
-                                value=pedimento.pedimento_code,
-                            )
 
         if pedimento.pedimento_type == "consolidated":
             # Convertir invoice_date a date si es datetime para poder comparar
@@ -207,22 +214,24 @@ def validate_common(
                     value=invoice.invoice_date,
                 )
 
-        if not invoice.compliance_mx.remesa:
-            errors.add_error(
-                field="compliance_mx.remesa",
-                message="El campo Remesa es obligatorio cuando se asocia un Pedimento.",
-                solution=["Proporciona un valor para Remesa"],
-                code="REQUIRED_FIELD",
-                value=invoice.compliance_mx.remesa,
-            )
-        elif invoice.compliance_mx.remesa == 0:
-            errors.add_error(
-                field="compliance_mx.remesa",
-                message="El campo Remesa no puede ser cero cuando se asocia un Pedimento.",
-                solution=["Proporciona un valor válido para Remesa"],
-                code="INVALID_VALUE",
-                value=invoice.compliance_mx.remesa,
-            )
+        # Remesa check
+        if pedimento.pedimento_type == "consolidated":
+            if not invoice.compliance_mx.remesa:
+                errors.add_error(
+                    field="compliance_mx.remesa",
+                    message="El campo Remesa es obligatorio cuando se asocia un Pedimento consolidado.",
+                    solution=["Proporciona un valor para Remesa"],
+                    code="REQUIRED_FIELD",
+                    value=invoice.compliance_mx.remesa,
+                )
+            elif invoice.compliance_mx.remesa == 0:
+                errors.add_error(
+                    field="compliance_mx.remesa",
+                    message="El campo Remesa no puede ser cero cuando se asocia un Pedimento.",
+                    solution=["Proporciona un valor válido para Remesa"],
+                    code="INVALID_VALUE",
+                    value=invoice.compliance_mx.remesa,
+                )
 
         duplicated_remesa = (
             db.query(InvoiceComplianceMx)
@@ -242,57 +251,32 @@ def validate_common(
                     code="DUPLICATE_VALUE",
                     value=invoice.compliance_mx.remesa,
                 )
+    
+    # Financials checks (if provided)
+    if invoice.financials:
+        if not invoice.financials.exchange_rate or invoice.financials.exchange_rate <= 0:
+            exchange_rate_exists = (
+                db.query(ExchangeRate)
+                .filter(
+                    func.date(ExchangeRate.date) == invoice.invoice_date,
+                    ExchangeRate.tenant_id == tenant_id,
+                    ExchangeRate.company_id == company_id,
+                )
+                .first()
+            )
+            if not exchange_rate_exists:
+                errors.add_error(
+                    field="financials.exchange_rate",
+                    message=f"No existe un Tipo de Cambio registrado para la fecha {invoice.invoice_date}.",
+                    solution=["Registra el Tipo de Cambio en el catálogo correspondiente"],
+                    code="EXCHANGE_RATE_NOT_FOUND",
+                    value=invoice.financials.exchange_rate,
+                )
+            else:
+                invoice.financials.exchange_rate = exchange_rate_exists.value
     else:
-        if not invoice.compliance_mx.is_pedimento_pending:
-            errors.add_error(
-                field="compliance_mx.pedimento_id",
-                message="El campo Pedimento es obligatorio cuando no se indica que el Pedimento está pendiente.",
-                solution=[
-                    "Proporciona un ID de Pedimento",
-                    "Marca el campo Pedimento Pendiente",
-                ],
-                code="REQUIRED_FIELD",
-                value=invoice.compliance_mx.pedimento_id,
-            )
-
-        if invoice.compliance_mx.remesa and not invoice.compliance_mx.pedimento_id:
-            errors.add_error(
-                field="compliance_mx.pedimento_id",
-                message="El campo Pedimento es obligatorio cuando se proporciona Remesa.",
-                solution=["Proporciona un ID de Pedimento"],
-                code="REQUIRED_FIELD",
-                value=invoice.compliance_mx.pedimento_id,
-            )
-
-    if len(invoice.invoice_number) > 100:
-        errors.add_error(
-            field="invoice_number",
-            message="El número de factura excede la longitud máxima de 100 caracteres.",
-            solution=["Acorta el número de factura a 100 caracteres o menos"],
-            code="MAX_LENGTH_EXCEEDED",
-            value=invoice.invoice_number,
-        )
-
-    if not invoice.financials.exchange_rate or invoice.financials.exchange_rate <= 0:
-        exchange_rate_exists = (
-            db.query(ExchangeRate)
-            .filter(
-                func.date(ExchangeRate.date) == invoice.invoice_date,
-                ExchangeRate.tenant_id == tenant_id,
-                ExchangeRate.company_id == company_id,
-            )
-            .first()
-        )
-        if not exchange_rate_exists:
-            errors.add_error(
-                field="financials.exchange_rate",
-                message=f"No existe un Tipo de Cambio registrado para la fecha {invoice.invoice_date}.",
-                solution=["Registra el Tipo de Cambio en el catálogo correspondiente"],
-                code="EXCHANGE_RATE_NOT_FOUND",
-                value=invoice.financials.exchange_rate,
-            )
-        else:
-            invoice.financials.exchange_rate = exchange_rate_exists.value
+        # If financials missing, we might want to error if it's required for this operation
+        pass
 
     if invoice.compliance_mx.is_regime_change:
         if invoice.document_type in ["EXD", "ETE", "ETR"]:
@@ -395,62 +379,47 @@ def validate_common(
                 value=invoice.compliance_mx.customs_broker_id,
             )
 
-    # Validar transportista solo si se proporciona
-    if invoice.logistics.carrier_id:
-        carrier_exists = (
-            db.query(ClientProvider)
-            .filter(
-                ClientProvider.id == invoice.logistics.carrier_id,
-                ClientProvider.tenant_id == tenant_id,
-                ClientProvider.company_id == company_id,
-            )
-            .first()
-        )
-        if not carrier_exists:
+    if invoice.logistics:
+        if invoice.logistics.transport_num and not invoice.logistics.transport_num:
+            # logic ...
+            pass
+        
+        if invoice.logistics.transport_type not in [t.value for t in TransportType]:
             errors.add_error(
-                field="logistics.carrier_id",
-                message="El Transportista no existe en el Catálogo de Clientes y Proveedores.",
-                solution=["Verifica el ID del Transportista", "Revisa el catálogo"],
-                code="NOT_FOUND",
-                value=invoice.logistics.carrier_id,
-            )
-
-    if invoice.logistics.transport_type not in [t.value for t in TransportType]:
-        errors.add_error(
-            field="logistics.transport_type",
-            message="El Tipo de Transporte proporcionado no es válido.",
-            solution=[
-                f"Selecciona un Tipo de Transporte válido: {[t.value for t in TransportType]}"
-            ],
-            code="INVALID_TRANSPORT_TYPE",
-            value=invoice.logistics.transport_type,
-        )
-    else:
-        if (
-            invoice.logistics.transport_type == "none"
-            and invoice.logistics.transport_num
-        ):
-            errors.add_error(
-                field="logistics.transport_num",
-                message="El Número de Transporte no debe proporcionarse cuando el Tipo de Transporte es 'none'.",
+                field="logistics.transport_type",
+                message="El Tipo de Transporte proporcionado no es válido.",
                 solution=[
-                    "Elimina el Número de Transporte o selecciona un Tipo de Transporte válido"
+                    f"Selecciona un Tipo de Transporte válido: {[t.value for t in TransportType]}"
                 ],
-                code="INVALID_VALUE",
-                value=invoice.logistics.transport_num,
+                code="INVALID_TRANSPORT_TYPE",
+                value=invoice.logistics.transport_type,
             )
         else:
             if (
-                not invoice.logistics.transport_num
-                and invoice.logistics.transport_type != "none"
+                invoice.logistics.transport_type == "none"
+                and invoice.logistics.transport_num
             ):
                 errors.add_error(
                     field="logistics.transport_num",
-                    message="El Número de Transporte es obligatorio cuando se proporciona un Tipo de Transporte distinto de 'none'.",
-                    solution=["Proporciona un Número de Transporte válido"],
-                    code="REQUIRED_FIELD",
+                    message="El Número de Transporte no debe proporcionarse cuando el Tipo de Transporte es 'none'.",
+                    solution=[
+                        "Elimina el Número de Transporte o selecciona un Tipo de Transporte válido"
+                    ],
+                    code="INVALID_VALUE",
                     value=invoice.logistics.transport_num,
                 )
+            else:
+                if (
+                    not invoice.logistics.transport_num
+                    and invoice.logistics.transport_type != "none"
+                ):
+                    errors.add_error(
+                        field="logistics.transport_num",
+                        message="El Número de Transporte es obligatorio cuando se proporciona un Tipo de Transporte distinto de 'none'.",
+                        solution=["Proporciona un Número de Transporte válido"],
+                        code="REQUIRED_FIELD",
+                        value=invoice.logistics.transport_num,
+                    )
 
     invoice.financials.currency = invoice.financials.currency or "foreign"
 
diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py
index 56800ff5..79a6f0cb 100644
--- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py
+++ b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/create.py
@@ -14,7 +14,7 @@ def validate_create(db: Session, invoice: InvoiceHeaderCreate, tenant_id: int, c
     if not invoice.invoice_type:
         errors.add_required_error("invoice_type")
         
-    if not invoice.document_type:
+    if not invoice.document_type and invoice.invoice_type != "MEX":
         errors.add_required_error("document_type")
     
     if not invoice.invoice_number:
@@ -54,34 +54,38 @@ def validate_create(db: Session, invoice: InvoiceHeaderCreate, tenant_id: int, c
         """Se retorna por que fallaron las validaciones generales"""
         return
         
-    if not invoice.compliance_mx.pedimento_id:
-        invoice.compliance_mx.remesa = None        
-        
-    if not invoice.financials.exchange_rate:
-        invoice.financials.exchange_rate = db.query(ExchangeRate.value).filter(ExchangeRate.date == invoice.invoice_date).scalar()
+    if invoice.compliance_mx:
+        if not invoice.compliance_mx.pedimento_id:
+            invoice.compliance_mx.remesa = None        
         
+    if invoice.financials:
+        if not invoice.financials.exchange_rate:
+            invoice.financials.exchange_rate = db.query(ExchangeRate.value).filter(ExchangeRate.date == invoice.invoice_date).scalar()
+            
     invoice.document_type = (invoice.document_type or "").upper()
        
-    if not invoice.logistics.transport_type:
-        invoice.logistics.transport_type = "none"
-            
-    if invoice.logistics.transport_type == "none" and invoice.logistics.transport_num:
-       invoice.logistics.transport_num = None
-    
-    if not invoice.financials.currency:
-        invoice.financials.currency = "foreign"
-       
-    if invoice.financials.currency == "local":
-        invoice.financials.currency_type = "MXN"
-    elif invoice.financials.currency_type == "foreign":
-        invoice.financials.currency = "USD"    
-    elif invoice.financials.currency_type == "manual":        
-        invoice.financials.currency_type = invoice.financials.currency_type.upper()
-    
-    invoice.logistics.incoterm = (invoice.logistics.incoterm or "").upper()
-    
-    if not invoice.logistics.weight_type:
-        invoice.logistics.weight_type = "kgs"    
+    if invoice.logistics:
+        if not invoice.logistics.transport_type:
+            invoice.logistics.transport_type = "none"
+                
+        if invoice.logistics.transport_type == "none" and invoice.logistics.transport_num:
+            invoice.logistics.transport_num = None
+        
+        invoice.logistics.incoterm = (invoice.logistics.incoterm or "").upper()
+        
+        if not invoice.logistics.weight_type:
+            invoice.logistics.weight_type = "kgs"    
+
+    if invoice.financials:
+        if not invoice.financials.currency:
+            invoice.financials.currency = "foreign"
+           
+        if invoice.financials.currency == "local":
+            invoice.financials.currency_type = "MXN"
+        elif invoice.financials.currency == "foreign":
+            invoice.financials.currency_type = "USD"    
+        elif invoice.financials.currency == "manual":        
+            invoice.financials.currency_type = (invoice.financials.currency_type or "").upper()
     
     
         
diff --git a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py
index da4cc970..97ee1843 100644
--- a/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py
+++ b/backend/api/v1/modules/a76/invoices/imports/temporary/validators/update.py
@@ -224,9 +224,10 @@ def validate_update(
     else:
         invoice_data.compliance_mx.aduana = existing_invoice.compliance_mx.aduana if existing_invoice.compliance_mx else None
     
-    # Validar que aduana sea obligatorio
-    if not invoice_data.compliance_mx or not invoice_data.compliance_mx.aduana:
-        errors.add_required_error("aduana")
+    # Validar que aduana sea obligatorio (excepto para MEX)
+    if existing_invoice.invoice_type != "MEX":
+        if not invoice_data.compliance_mx or not invoice_data.compliance_mx.aduana:
+            errors.add_required_error("aduana")
     
     # Columna AC: Sección de Despacho / Puerto de Entrada (Opcional)
     if invoice_data.compliance_mx and invoice_data.compliance_mx.port_of_entry:
diff --git a/backend/api/v1/modules/a76/invoices/models.py b/backend/api/v1/modules/a76/invoices/models.py
index 8e6f35d5..f3f9e0c7 100644
--- a/backend/api/v1/modules/a76/invoices/models.py
+++ b/backend/api/v1/modules/a76/invoices/models.py
@@ -58,7 +58,7 @@ class TransportType(str, Enum):
     PLATES = "licence plates"
     TRUCK = "truck"
     VESSEL = "vessel"
-    BARGE = "rail barge"
+    BARGE = "rail_barge"
     CONTAINER = "container"
     AIRPLANE = "airplane"
     GONDOLA = "gondola"
@@ -82,9 +82,10 @@ class InvoiceHeader(Base, TenantScopedMixin, TimestampMixin):
     invoice_type: Mapped[str] = mapped_column(
         ForeignKey("public.invoice_types.key")
     )  # TIPOFACTURA / TIPODOC
-    document_type: Mapped[str] = mapped_column(
-        ForeignKey("public.pedimento_regimens.code")
-    )  # CLAVEDOCUMENTO / Clave de documento
+    document_type: Mapped[Optional[str]] = mapped_column(
+        ForeignKey("public.pedimento_regimens.code"), nullable=True
+    )
+  # CLAVEDOCUMENTO / Clave de documento
     invoice_number: Mapped[str] = mapped_column(
         String(100)
     )  # FACTURAIMPO/FACTURAEXPO/FACTURAREMISION/FACTURAENVIO/FACTURASALIDA
@@ -299,6 +300,9 @@ class InvoiceComplianceMx(Base, TenantScopedMixin, TimestampMixin):
     act_value: Mapped[Optional[str]] = mapped_column(
         String(5)
     )  # ACTVALOR / Actualizar valor
+    rule_3121_parties_ii: Mapped[Optional[bool]] = mapped_column(
+        Boolean, default=False, server_default="false"
+    )  # REGLA3121PARTESII / Regla 3.1.21 Partes II
     is_pedimento_pending: Mapped[Optional[bool]] = mapped_column(
         Boolean, default=False, server_default="false"
     )  # PED_PENDIENTE_ASIGNAR (Mapear 1 -> True, 0 -> False)
@@ -375,7 +379,7 @@ class InvoiceComplianceMx(Base, TenantScopedMixin, TimestampMixin):
         String(1)
     )  # RAZONEXPORTACION / Razón de exportación
     signature_key: Mapped[Optional[str]] = mapped_column(
-        String(10)
+        String(100)
     )  # CLAVEFIRMA / Clave de firma
 
     # SM specific
@@ -488,6 +492,9 @@ class InvoiceFinancials(Base, TenantScopedMixin, TimestampMixin):
     other_increments: Mapped[Optional[float]] = mapped_column(
         Numeric(19, 8), default=0, server_default="0"
     )  # OTROSINCREMENTA / Otros incrementables
+    other_deductibles: Mapped[Optional[float]] = mapped_column(
+        Numeric(19, 8), default=0, server_default="0"
+    )  # OTROSDEDUCIBLES / Otros deducibles
     total_increments_mn: Mapped[Optional[float]] = mapped_column(
         Numeric(23, 8), default=0, server_default="0"
     )  # TOTALINCREMMN / Total incrementables MN
diff --git a/backend/api/v1/modules/a76/invoices/schemas.py b/backend/api/v1/modules/a76/invoices/schemas.py
index 77312a77..1ac300c9 100644
--- a/backend/api/v1/modules/a76/invoices/schemas.py
+++ b/backend/api/v1/modules/a76/invoices/schemas.py
@@ -1,7 +1,7 @@
 from typing import Literal, Optional, List
 from datetime import datetime, date
 from decimal import Decimal
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, field_validator
 from .models import (
     DestinationOriginCove,
     OperationType,
@@ -22,8 +22,8 @@ class InvoiceHeaderBase(BaseModel):
     invoice_type: Optional[str] = Field(
         None, max_length=5, description="Invoice type key"
     )
-    document_type: str = Field(
-        ..., max_length=3, description="Document type (Regimen Aduanero)"
+    document_type: Optional[str] = Field(
+        None, max_length=3, description="Document type (Regimen Aduanero)"
     )
     invoice_number: Optional[str] = Field(
         None, max_length=100, description="Invoice number"
@@ -119,7 +119,7 @@ class InvoiceComplianceMxBase(BaseModel):
     sold_to_id: Optional[int] = Field(None, description="Sold to ID")
     shipped_to_header: Optional[str] = Field(None, max_length=20, description="Shipped to header")
     shipped_to_id: Optional[int] = Field(None, description="Shipped to ID")
-    shipped_by_header: Optional[int] = Field(
+    shipped_by_header: Optional[str] = Field(
         None, max_length=20, description="Shipped by header"
     )
     shipped_by_id: Optional[int] = Field(None, description="Shipped by ID")
@@ -139,6 +139,9 @@ class InvoiceComplianceMxBase(BaseModel):
     which_exchange_rate: Optional[str] = Field(
         None, max_length=5, description="Which exchange rate"
     )
+    rule_3121_parties_ii: Optional[bool] = Field(
+        False, description="Is Rule 3.1.21 Parties II"
+    )
     value_method: Optional[str] = Field(None, max_length=2, description="Value method")
     act_value: Optional[str] = Field(None, max_length=5, description="Act value")
     is_pedimento_pending: bool = Field(..., description="Is pedimento pending")
@@ -187,7 +190,7 @@ class InvoiceComplianceMxBase(BaseModel):
         None, max_length=1, description="Reason for export"
     )
     signature_key: Optional[str] = Field(
-        None, max_length=10, description="Signature key"
+        None, max_length=100, description="Signature key"
     )
     sem_id: Optional[int] = Field(None, description="SEM ID")
 
@@ -248,6 +251,7 @@ class InvoiceFinancialsBase(BaseModel):
     insurance_value: Optional[Decimal] = Field(None, description="Insurance value")
     packaging: Optional[Decimal] = Field(None, description="Packaging")
     other_increments: Optional[Decimal] = Field(None, description="Other increments")
+    other_deductibles: Optional[Decimal] = Field(None, description="Other deductibles")
     total_increments_mn: Optional[Decimal] = Field(
         None, description="Total increments in MXN"
     )
@@ -318,6 +322,13 @@ class InvoiceLogisticsBase(BaseModel):
     weight_type: WeightUnit = Field(
         default="kgs", max_length=3, description="Weight type"
     )
+    
+    @field_validator("weight_type", mode="before")
+    @classmethod
+    def normalize_weight_type(cls, v):
+        if isinstance(v, str):
+            return v.lower()
+        return v
     container_types: Optional[str] = Field(
         None, max_length=500, description="Container types"
     )
diff --git a/backend/api/v1/modules/a76/invoices/services.py b/backend/api/v1/modules/a76/invoices/services.py
index 8ef3964e..f3b0681b 100644
--- a/backend/api/v1/modules/a76/invoices/services.py
+++ b/backend/api/v1/modules/a76/invoices/services.py
@@ -128,6 +128,10 @@ class InvoiceService:
             invoice_dict = clean_dict(raw_invoice_dict)
             invoice_dict["tenant_id"] = tenant_id
             invoice_dict["company_id"] = company_id
+            
+            # Ensure document_type respects DB constraints for MEX invoices (bypass clean_dict)
+            if invoice_dict.get("invoice_type") == "MEX" and not invoice_dict.get("document_type"):
+                 invoice_dict["document_type"] = None
 
             new_invoice = models.InvoiceHeader(**invoice_dict)
 
@@ -301,6 +305,23 @@ class InvoiceService:
                 new_financials = models.InvoiceFinancials(**financials_dict)
                 db.add(new_financials)
 
+        # Update logistics if provided
+        if invoice_data.logistics is not None:
+            if invoice.logistics:
+                for key, value in invoice_data.logistics.model_dump(
+                    exclude_unset=True
+                ).items():
+                    if value == "":
+                        value = None
+                    setattr(invoice.logistics, key, value)
+            else:
+                logistics_dict = invoice_data.logistics.model_dump()
+                logistics_dict["invoice_id"] = invoice.id
+                logistics_dict["tenant_id"] = tenant_id
+                logistics_dict["company_id"] = company_id
+                new_logistics = models.InvoiceLogistics(**logistics_dict)
+                db.add(new_logistics)
+
         db.commit()
         db.refresh(invoice)
         return invoice
diff --git a/backend/api/v1/modules/public/reference_data/invoice_types/seed.py b/backend/api/v1/modules/public/reference_data/invoice_types/seed.py
index 151163dd..1b42742a 100644
--- a/backend/api/v1/modules/public/reference_data/invoice_types/seed.py
+++ b/backend/api/v1/modules/public/reference_data/invoice_types/seed.py
@@ -28,6 +28,13 @@ seed = [
         "both",
         "imp",
     ),
+    (
+        "REP",
+        "REPARACION",
+        "REPARACION DE ACTIVOS FIJOS",
+        "fixed asset",
+        "imp",
+    ),
 
     # === TIPOS DE EXPORTACION ===
     ("DONAC", "DONACION", "", "both", "exp"),
diff --git a/frontend/messages/en.json b/frontend/messages/en.json
index e2563ba5..8abbec08 100644
--- a/frontend/messages/en.json
+++ b/frontend/messages/en.json
@@ -82,7 +82,8 @@
 			"temporary": "Temporary",
 			"definitive": "Definitive",
 			"mexican_purchases": "Mexican Purchases",
-			"regime_change": "Regime Change"
+			"regime_change": "Regime Change",
+			"repair": "Repair"
 		},
 		"export_invoices": {
 			"title": "Export Invoices",
diff --git a/frontend/messages/es.json b/frontend/messages/es.json
index 1caa7503..3be2f6be 100644
--- a/frontend/messages/es.json
+++ b/frontend/messages/es.json
@@ -82,7 +82,8 @@
 			"temporary": "Temporal",
 			"definitive": "Definitiva",
 			"mexican_purchases": "Compras mexicanas",
-			"regime_change": "Cambio de régimen"
+			"regime_change": "Cambio de régimen",
+			"repair": "Reparación"
 		},
 		"export_invoices": {
 			"title": "Facturas de exportación",
diff --git a/frontend/src/lib/api/dashboard/a76/invoices.ts b/frontend/src/lib/api/dashboard/a76/invoices.ts
index 91cc735e..99973e13 100644
--- a/frontend/src/lib/api/dashboard/a76/invoices.ts
+++ b/frontend/src/lib/api/dashboard/a76/invoices.ts
@@ -73,6 +73,7 @@ export interface InvoiceComplianceMx {
 	reason_export?: string | null;
 	signature_key?: string | null;
 	sem_id?: number | null;
+	rule_3121_parties_ii?: boolean | null;
 }
 
 export interface InvoiceFinancials {
@@ -103,6 +104,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 +160,14 @@ 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;
+	equipment_reviewed?: boolean | null;
+	pedimento_arrived?: boolean | null;
+	green_light_mx?: boolean | null;
+	green_light_us?: boolean | null;
+	red_light_mx?: boolean | null;
+	red_light_us?: boolean | null;
 }
 
 export interface InvoiceSalesDetails {
diff --git a/frontend/src/lib/components/dashboard/export/manifest/manifest-form.svelte b/frontend/src/lib/components/dashboard/export/manifest/manifest-form.svelte
index 3bb3f9b4..9a57d055 100644
--- a/frontend/src/lib/components/dashboard/export/manifest/manifest-form.svelte
+++ b/frontend/src/lib/components/dashboard/export/manifest/manifest-form.svelte
@@ -269,7 +269,7 @@
 
 			// Helper to check if Repar request
 			const isRepar = (t: string | undefined) => {
-				return t && t.toUpperCase().includes('REPAR');
+				return t === 'REPAR';
 			};
 
 			// Categorize
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/ManifestSelectorModal.svelte b/frontend/src/lib/components/dashboard/invoices/edit/ManifestSelectorModal.svelte
new file mode 100644
index 00000000..daeba6db
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/invoices/edit/ManifestSelectorModal.svelte
@@ -0,0 +1,128 @@
+<script lang="ts">
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Search, Loader2 } from 'lucide-svelte';
+	import { manifestApi, type Manifest } from '$lib/api/dashboard/a76/manifests';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { toast } from 'svelte-sonner';
+
+	let {
+		open = $bindable(false),
+		onSelect
+	}: {
+		open: boolean;
+		onSelect: (manifest: Manifest) => void;
+	} = $props();
+
+	let manifests = $state<Manifest[]>([]);
+	let loading = $state(false);
+	let searchTerm = $state('');
+
+	async function searchManifests() {
+		if (!companyStore.activeCompany) return;
+		loading = true;
+		try {
+			const res = await manifestApi.list(companyStore.activeCompany.id, {
+				manifest_number: searchTerm
+			});
+			if (res.data) {
+				manifests = res.data.items || [];
+			}
+		} catch (e) {
+			console.error('Error searching manifests:', e);
+			toast.error('Error al buscar manifiestos');
+		} finally {
+			loading = false;
+		}
+	}
+
+	function handleSelect(manifest: Manifest) {
+		onSelect(manifest);
+		open = false;
+	}
+
+	$effect(() => {
+		if (open) {
+			searchManifests();
+		}
+	});
+</script>
+
+<Dialog.Root bind:open>
+	<Dialog.Content class="max-w-2xl">
+		<Dialog.Header>
+			<Dialog.Title>Seleccionar Manifiesto</Dialog.Title>
+			<Dialog.Description>
+				Busca y selecciona un manifiesto del catálogo de exportación para vincular a esta factura.
+			</Dialog.Description>
+		</Dialog.Header>
+
+		<div class="space-y-4 py-4">
+			<div class="flex gap-2">
+				<div class="relative flex-1">
+					<Search class="absolute top-2.5 left-2.5 h-4 w-4 text-muted-foreground" />
+					<Input
+						placeholder="Buscar por número..."
+						class="h-9 pl-8"
+						bind:value={searchTerm}
+						onkeydown={(e) => e.key === 'Enter' && searchManifests()}
+					/>
+				</div>
+				<Button size="sm" onclick={searchManifests} disabled={loading}>
+					{#if loading}
+						<Loader2 class="mr-2 h-4 w-4 animate-spin" />
+					{/if}
+					Buscar
+				</Button>
+			</div>
+
+			<div class="max-h-[400px] overflow-y-auto rounded-md border text-xs">
+				<table class="w-full">
+					<thead class="sticky top-0 bg-muted/90 text-left backdrop-blur-sm">
+						<tr>
+							<th class="p-3 font-semibold tracking-wider text-muted-foreground uppercase"
+								>Número de Manifiesto</th
+							>
+							<th class="p-3 font-semibold tracking-wider text-muted-foreground uppercase"
+								>Descripción</th
+							>
+						</tr>
+					</thead>
+					<tbody class="divide-y">
+						{#if manifests.length === 0}
+							<tr>
+								<td colspan="2" class="p-12 text-center text-muted-foreground">
+									{#if loading}
+										Buscando manifiestos...
+									{:else}
+										No se encontraron resultados
+									{/if}
+								</td>
+							</tr>
+						{:else}
+							{#each manifests as manifest}
+								<tr
+									class="group cursor-pointer transition-colors hover:bg-muted/50"
+									onclick={() => handleSelect(manifest)}
+								>
+									<td
+										class="p-3 font-mono font-bold text-primary transition-colors group-hover:text-primary/80"
+									>
+										{manifest.manifest_number}
+									</td>
+									<td
+										class="max-w-[400px] truncate p-3 text-muted-foreground italic"
+										title={manifest.description}
+									>
+										{manifest.description || '-'}
+									</td>
+								</tr>
+							{/each}
+						{/if}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/PortSelectorModal.svelte b/frontend/src/lib/components/dashboard/invoices/edit/PortSelectorModal.svelte
new file mode 100644
index 00000000..73308ed6
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/invoices/edit/PortSelectorModal.svelte
@@ -0,0 +1,108 @@
+<script lang="ts">
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Search, LoaderCircle, X, Check } from 'lucide-svelte';
+	import {
+		customsSectionsApi,
+		type CustomsSection
+	} from '$lib/api/dashboard/reference_data/customs_sections';
+	import { toast } from 'svelte-sonner';
+
+	let { open = $bindable(false), onSelect } = $props<{
+		open: boolean;
+		onSelect: (section: CustomsSection) => void;
+	}>();
+
+	let searchQuery = $state('');
+	let sections = $state<CustomsSection[]>([]);
+	let loading = $state(false);
+	let selectedSection = $state<CustomsSection | null>(null);
+
+	async function loadSections() {
+		loading = true;
+		try {
+			const response = await customsSectionsApi.list(1, 100);
+			if (response?.data?.items) {
+				sections = response.data.items;
+			}
+		} catch (error) {
+			console.error('Error loading customs sections:', error);
+			toast.error('Error al cargar las secciones aduaneras');
+		} finally {
+			loading = false;
+		}
+	}
+
+	$effect(() => {
+		if (open) {
+			loadSections();
+		}
+	});
+
+	const filteredSections = $derived(
+		sections.filter(
+			(s) =>
+				s.customs_code.toLowerCase().includes(searchQuery.toLowerCase()) ||
+				s.section_name.toLowerCase().includes(searchQuery.toLowerCase())
+		)
+	);
+
+	function handleSelect(section: CustomsSection) {
+		onSelect(section);
+		open = false;
+	}
+</script>
+
+<Dialog.Root bind:open>
+	<Dialog.Content class="max-w-2xl">
+		<Dialog.Header>
+			<Dialog.Title>Seleccionar Puerto (Aduana/Sección)</Dialog.Title>
+			<Dialog.Description>Busca y selecciona una sección aduanera de la lista.</Dialog.Description>
+		</Dialog.Header>
+
+		<div class="space-y-4 py-4">
+			<div class="relative">
+				<Search class="absolute top-1/2 left-3 h-4 w-4 -translate-y-1/2 text-muted-foreground" />
+				<Input placeholder="Buscar por código o nombre..." class="pl-10" bind:value={searchQuery} />
+			</div>
+
+			<div class="max-h-[400px] overflow-y-auto rounded-md border">
+				{#if loading}
+					<div class="flex items-center justify-center py-10">
+						<LoaderCircle class="h-8 w-8 animate-spin text-primary" />
+					</div>
+				{:else if filteredSections.length > 0}
+					<table class="w-full text-sm">
+						<thead class="sticky top-0 bg-muted">
+							<tr>
+								<th class="p-2 text-left font-medium">Código</th>
+								<th class="p-2 text-left font-medium">Nombre / Sección</th>
+								<th class="w-10 p-2"></th>
+							</tr>
+						</thead>
+						<tbody class="divide-y">
+							{#each filteredSections as section}
+								<tr class="cursor-pointer hover:bg-muted/50" onclick={() => handleSelect(section)}>
+									<td class="p-2 font-mono">{section.customs_code}</td>
+									<td class="p-2">{section.section_name}</td>
+									<td class="p-2">
+										<Button variant="ghost" size="icon" class="h-8 w-8">
+											<Check class="h-4 w-4 text-primary" />
+										</Button>
+									</td>
+								</tr>
+							{/each}
+						</tbody>
+					</table>
+				{:else}
+					<div class="py-10 text-center text-muted-foreground">No se encontraron resultados</div>
+				{/if}
+			</div>
+		</div>
+
+		<Dialog.Footer>
+			<Button variant="outline" onclick={() => (open = false)}>Cancelar</Button>
+		</Dialog.Footer>
+	</Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/continuation-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/continuation-tab-form.svelte
index efd1ed4f..1f89d8fc 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/continuation-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/continuation-tab-form.svelte
@@ -4,39 +4,56 @@
 	import { Checkbox } from '$lib/components/ui/checkbox';
 	import { RadioGroup, RadioGroupItem } from '$lib/components/ui/radio-group';
 	import { Button } from '$lib/components/ui/button';
+	import { Search } from 'lucide-svelte';
+	import PortSelectorModal from './PortSelectorModal.svelte';
 	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 
-	let { 
+	let {
 		invoice,
 		formData = $bindable(),
-		exists = $bindable()
-	}: { 
+		exists = $bindable(),
+		operationType = undefined,
+		invoiceType = undefined
+	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
+		operationType?: number;
+		invoiceType?: string;
 	} = $props();
 
 	if (!formData && invoice) {
-		formData = { 
+		formData = {
 			// Campos de esta pestaña
-			numero_tipo_transporte: '',
-			es_ferrocarril: 'no',
-			numero_bl: '',
-			cantidad_guias_embarque: null,
-			destino_origen: '',
-			puerto_entrada: '',
+			numero_tipo_transporte:
+				invoice.logistics?.transport_num || invoice.logistics?.vehicle_num || '',
+			es_ferrocarril: invoice.logistics?.is_rail ? 'si' : 'no',
+			numero_bl: invoice.logistics?.bill_number || '',
+			cantidad_guias_embarque: invoice.logistics?.guide_number || null,
+			destino_origen: invoice.logistics?.destination_location || '',
+			puerto_entrada: invoice.logistics?.origin_location || '',
+			vehicle_data: invoice.logistics?.vehicle_data || '',
 			// Checkboxes
-			fue_revisado_equipo: false,
-			sub_division: false,
-			funge_como_cd: false,
-			llego_pedimento: false,
+			fue_revisado_equipo: invoice.logistics?.equipment_reviewed || false,
+			sub_division: invoice.logistics?.is_subdivision || false,
+			funge_como_cd: invoice.logistics?.acts_as_cd || false,
+			llego_pedimento: invoice.logistics?.pedimento_arrived || false,
 			// Errores
 			errores_facturacion: [],
 			// Semáforos
-			semaforo_verde_aduana_mexicana: false,
-			semaforo_verde_aduana_americana: false,
-			semaforo_rojo_aduana_mexicana: false,
-			semaforo_rojo_aduana_americana: false
+			semaforo_verde_aduana_mexicana: invoice.logistics?.green_light_mx || false,
+			semaforo_verde_aduana_americana: invoice.logistics?.green_light_us || false,
+			semaforo_rojo_aduana_mexicana: invoice.logistics?.red_light_mx || false,
+			semaforo_rojo_aduana_americana: invoice.logistics?.red_light_us || false,
+			// New Export fields
+			is_mixed: invoice.compliance_mx?.is_mixed ? 'si' : 'no',
+			reason_export: invoice.compliance_mx?.reason_export || '1',
+			purchase_order: invoice.purchase_order || '',
+			payment_terms: invoice.payment_terms || '',
+			handling_fees: invoice.handling_fees || 0,
+			cfdi_uuid: invoice.cfdi_uuid || '',
+			path_pdf: invoice.path_pdf || '',
+			path_xml: invoice.path_xml || ''
 		};
 		exists = true;
 	} else if (!formData) {
@@ -48,6 +65,7 @@
 			cantidad_guias_embarque: null,
 			destino_origen: '',
 			puerto_entrada: '',
+			vehicle_data: '',
 			// Checkboxes
 			fue_revisado_equipo: false,
 			sub_division: false,
@@ -59,27 +77,46 @@
 			semaforo_verde_aduana_mexicana: false,
 			semaforo_verde_aduana_americana: false,
 			semaforo_rojo_aduana_mexicana: false,
-			semaforo_rojo_aduana_americana: false
+			semaforo_rojo_aduana_americana: false,
+			// New Export fields
+			is_mixed: 'no',
+			reason_export: '1',
+			purchase_order: '',
+			payment_terms: '',
+			handling_fees: 0,
+			cfdi_uuid: '',
+			path_pdf: '',
+			path_xml: ''
 		};
 		exists = false;
 	}
+	let showPortModal = $state(false);
+
+	function handlePortSelect(section: any) {
+		formData.puerto_entrada = section.customs_code;
+	}
 </script>
 
 <!-- Layout de 2 columnas compacto -->
 <div class="grid grid-cols-2 gap-3">
 	<!-- Columna Izquierda -->
-	<div class="border rounded-md p-3 space-y-3">
-		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Información General</h4>				
+	<div class="space-y-3 rounded-md border p-3">
+		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Información General</h4>
 
 		<!-- NÚMERO/TIPO DE TRANSPORTE -->
 		<div class="space-y-1.5">
 			<Label for="numero_tipo_transporte" class="text-xs">Número/Tipo de Transporte:</Label>
-			<Input id="numero_tipo_transporte" bind:value={formData.numero_tipo_transporte} class="h-7 text-xs" />
+			<Input
+				id="numero_tipo_transporte"
+				bind:value={formData.numero_tipo_transporte}
+				class="h-7 text-xs"
+			/>
 		</div>
 
 		<!-- DATOS VEHÍCULO -->
-		<div class="border rounded p-2 space-y-2 bg-muted/30">
-			<Label class="text-xs font-semibold">Datos Vehículo:</Label>
+		<div class="space-y-2 rounded border bg-muted/30 p-2">
+			<Label for="vehicle_data" class="text-xs font-semibold">Datos Vehículo:</Label>
+			<Input id="vehicle_data" bind:value={formData.vehicle_data} class="mb-2 h-7 text-xs" />
 			<div class="space-y-1.5">
 				<Label class="text-xs">Es Ferrocarril?</Label>
 				<RadioGroup bind:value={formData.es_ferrocarril} class="flex gap-4">
@@ -98,48 +135,141 @@
 				<Input id="numero_bl" bind:value={formData.numero_bl} class="h-7 text-xs" />
 			</div>
 			<div class="space-y-1.5">
-				<Label for="cantidad_guias_embarque" class="text-xs">Cantidad de Guías de Embarque (BL):</Label>
-				<Input id="cantidad_guias_embarque" type="number" bind:value={formData.cantidad_guias_embarque} class="h-7 text-xs" />
+				<Label for="cantidad_guias_embarque" class="text-xs"
+					>Cantidad de Guías de Embarque (BL):</Label
+				>
+				<Input
+					id="cantidad_guias_embarque"
+					type="number"
+					bind:value={formData.cantidad_guias_embarque}
+					class="h-7 text-xs"
+				/>
 			</div>
 		</div>
 
-		<!-- DESTINO/ORIGEN Y PUERTO ENTRADA -->
-		<div class="space-y-1.5">
-			<Label for="destino_origen" class="text-xs">Destino/Origen:</Label>
-			<Input id="destino_origen" bind:value={formData.destino_origen} placeholder="FRANJA FRONT." class="h-7 text-xs" />
+		<!-- DESTINO/ORIGEN Y ES MIXTO -->
+		<div class="grid grid-cols-2 gap-4">
+			<div class="space-y-1.5">
+				<Label for="destino_origen" class="text-xs">Destino/Origen:</Label>
+				<Input
+					id="destino_origen"
+					bind:value={formData.destino_origen}
+					placeholder="FRANJA FRONT."
+					class="h-7 text-xs"
+				/>
+			</div>
+
+			{#if operationType === 1 || invoiceType === 'CR' || invoiceType === 'REP'}
+				<div class="space-y-1.5">
+					<Label class="text-xs">Es Mixto?</Label>
+					<RadioGroup bind:value={formData.is_mixed} class="flex gap-4">
+						<div class="flex items-center gap-2">
+							<RadioGroupItem value="si" id="mixed_si" />
+							<Label for="mixed_si" class="text-xs text-muted-foreground">SI</Label>
+						</div>
+						<div class="flex items-center gap-2">
+							<RadioGroupItem value="no" id="mixed_no" />
+							<Label for="mixed_no" class="text-xs text-muted-foreground">NO</Label>
+						</div>
+					</RadioGroup>
+				</div>
+			{/if}
 		</div>
 
-		<div class="space-y-1.5">
-			<Label for="puerto_entrada" class="text-xs">Puerto Entrada:</Label>
-			<Input id="puerto_entrada" bind:value={formData.puerto_entrada} class="h-7 text-xs" />
-		</div>
+		{#if operationType !== 1 && invoiceType !== 'CR'}
+			<div class="space-y-1.5">
+				<Label for="puerto_entrada" class="text-xs">Puerto Entrada:</Label>
+				<div class="flex gap-2">
+					<Input
+						id="puerto_entrada"
+						bind:value={formData.puerto_entrada}
+						class="h-7 flex-1 text-xs"
+					/>
+					<Button
+						variant="outline"
+						size="icon"
+						class="h-7 w-7"
+						onclick={() => (showPortModal = true)}
+					>
+						<Search class="h-3.5 w-3.5" />
+					</Button>
+				</div>
+			</div>
+		{/if}
+
+		{#if operationType === 1 || invoiceType === 'CR'}
+			<div class="space-y-3 pt-1">
+				<div class="space-y-1.5">
+					<Label class="text-xs">Razón de exportación:</Label>
+					<RadioGroup bind:value={formData.reason_export} class="flex gap-4">
+						<div class="flex items-center gap-2">
+							<RadioGroupItem value="1" id="reason_vendido" />
+							<Label for="reason_vendido" class="text-xs text-muted-foreground">Vendido</Label>
+						</div>
+						<div class="flex items-center gap-2">
+							<RadioGroupItem value="2" id="reason_no_vendido" />
+							<Label for="reason_no_vendido" class="text-xs text-muted-foreground">No Vendido</Label
+							>
+						</div>
+						<div class="flex items-center gap-2">
+							<RadioGroupItem value="3" id="reason_otro" />
+							<Label for="reason_otro" class="text-xs text-muted-foreground">Otro</Label>
+						</div>
+					</RadioGroup>
+				</div>
+				<div class="space-y-1.5">
+					<Label for="purchase_order" class="text-xs">Orden de Compra:</Label>
+					<Input id="purchase_order" bind:value={formData.purchase_order} class="h-7 text-xs" />
+				</div>
+				<div class="space-y-1.5">
+					<Label for="payment_terms" class="text-xs">Términos de Pago:</Label>
+					<Input id="payment_terms" bind:value={formData.payment_terms} class="h-7 text-xs" />
+				</div>
+				<div class="space-y-1.5">
+					<Label for="handling_fees" class="text-xs">Maniobras (Handlings):</Label>
+					<div class="flex items-center gap-2">
+						<Input
+							id="handling_fees"
+							type="number"
+							bind:value={formData.handling_fees}
+							class="h-7 flex-1 text-xs"
+						/>
+						<span class="text-[10px] font-bold text-muted-foreground">USD</span>
+					</div>
+				</div>
+			</div>
+		{/if}
 
 		<!-- CHECKBOXES -->
 		<div class="grid grid-cols-2 gap-2">
-			<div class="flex items-center gap-2">
-				<Checkbox id="fue_revisado" bind:checked={formData.fue_revisado_equipo} />
-				<Label for="fue_revisado" class="text-xs">Fue Revisado el Equipo</Label>
-			</div>
-			<div class="flex items-center gap-2">
-				<Checkbox id="sub_division" bind:checked={formData.sub_division} />
-				<Label for="sub_division" class="text-xs">Sub División</Label>
-			</div>
-			<div class="flex items-center gap-2">
-				<Checkbox id="funge_como_cd" bind:checked={formData.funge_como_cd} />
-				<Label for="funge_como_cd" class="text-xs">Funge Como CD</Label>
-			</div>
-			<div class="flex items-center gap-2">
-				<Checkbox id="llego_pedimento" bind:checked={formData.llego_pedimento} />
-				<Label for="llego_pedimento" class="text-xs">Llegó el Pedimento</Label>
-			</div>
-		</div>		
+			{#if operationType !== 1 && invoiceType !== 'CR'}
+				<div class="flex items-center gap-2">
+					<Checkbox id="fue_revisado" bind:checked={formData.fue_revisado_equipo} />
+					<Label for="fue_revisado" class="text-xs">Fue Revisado el Equipo</Label>
+				</div>
+				{#if invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+					<div class="flex items-center gap-2">
+						<Checkbox id="sub_division" bind:checked={formData.sub_division} />
+						<Label for="sub_division" class="text-xs">Sub División</Label>
+					</div>
+					<div class="flex items-center gap-2">
+						<Checkbox id="funge_como_cd" bind:checked={formData.funge_como_cd} />
+						<Label for="funge_como_cd" class="text-xs">Funge Como CD</Label>
+					</div>
+					<div class="flex items-center gap-2">
+						<Checkbox id="llego_pedimento" bind:checked={formData.llego_pedimento} />
+						<Label for="llego_pedimento" class="text-xs">Llegó el Pedimento</Label>
+					</div>
+				{/if}
+			{/if}
+		</div>
 	</div>
 
 	<!-- Columna Derecha - Errores de Facturación -->
-	<div class="border rounded-md p-3 space-y-3">
+	<div class="space-y-3 rounded-md border p-3">
 		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Errores de Facturación</h4>
-		
-		<div class="border rounded">
+
+		<div class="rounded border">
 			<table class="w-full text-xs">
 				<thead class="bg-muted">
 					<tr>
@@ -167,38 +297,61 @@
 				</tbody>
 			</table>
 		</div>
-		
+
 		<div class="flex justify-end gap-2">
 			<Button variant="outline" size="sm" class="h-7 text-xs">Insertar</Button>
 			<Button variant="outline" size="sm" class="h-7 text-xs">Editar</Button>
 			<Button variant="outline" size="sm" class="h-7 text-xs">Borrar</Button>
-		</div>		
+		</div>
 
 		<!-- SEMÁFORO -->
-		<div class="border rounded p-2 space-y-2 bg-muted/30">
+		<div class="space-y-2 rounded border bg-muted/30 p-2">
 			<Label class="text-xs font-semibold">Semáforo</Label>
 			<div class="grid grid-cols-2 gap-2">
 				<div class="flex items-center gap-2">
-					<div class="w-3 h-3 rounded-full bg-green-500"></div>
+					<div class="h-2.5 w-2.5 rounded-full bg-green-500"></div>
 					<Checkbox id="verde_mex" bind:checked={formData.semaforo_verde_aduana_mexicana} />
-					<Label for="verde_mex" class="text-xs">Verde MX</Label>
+					<Label for="verde_mex" class="text-[10px]">Verde MX</Label>
 				</div>
 				<div class="flex items-center gap-2">
-					<div class="w-3 h-3 rounded-full bg-green-600"></div>
+					<div class="h-2.5 w-2.5 rounded-full bg-green-600"></div>
 					<Checkbox id="verde_usa" bind:checked={formData.semaforo_verde_aduana_americana} />
-					<Label for="verde_usa" class="text-xs">Verde USA</Label>
+					<Label for="verde_usa" class="text-[10px]">Verde USA</Label>
 				</div>
 				<div class="flex items-center gap-2">
-					<div class="w-3 h-3 rounded-full bg-red-500"></div>
+					<div class="h-2.5 w-2.5 rounded-full bg-red-500"></div>
 					<Checkbox id="rojo_mex" bind:checked={formData.semaforo_rojo_aduana_mexicana} />
-					<Label for="rojo_mex" class="text-xs">Rojo MX</Label>
+					<Label for="rojo_mex" class="text-[10px]">Rojo MX</Label>
 				</div>
 				<div class="flex items-center gap-2">
-					<div class="w-3 h-3 rounded-full bg-red-600"></div>
+					<div class="h-2.5 w-2.5 rounded-full bg-red-600"></div>
 					<Checkbox id="rojo_usa" bind:checked={formData.semaforo_rojo_aduana_americana} />
-					<Label for="rojo_usa" class="text-xs">Rojo USA</Label>
+					<Label for="rojo_usa" class="text-[10px]">Rojo USA</Label>
 				</div>
 			</div>
 		</div>
+
+		{#if operationType === 1 || invoiceType === 'CR'}
+			<!-- CFDI Section (Export Only) -->
+			<div class="space-y-3 rounded border bg-muted/20 p-3">
+				<h4 class="border-b pb-1 text-[10px] font-bold text-muted-foreground uppercase">
+					DATOS CFDI
+				</h4>
+				<div class="space-y-1">
+					<Label for="cfdi_uuid" class="text-[10px]">CFDI UUId:</Label>
+					<Input id="cfdi_uuid" bind:value={formData.cfdi_uuid} class="h-6 text-[10px]" />
+				</div>
+				<div class="space-y-1">
+					<Label for="path_pdf" class="text-[10px]">CFDI Path PDF:</Label>
+					<Input id="path_pdf" bind:value={formData.path_pdf} class="h-6 text-[10px]" />
+				</div>
+				<div class="space-y-1">
+					<Label for="path_xml" class="text-[10px]">CFDI Path XML:</Label>
+					<Input id="path_xml" bind:value={formData.path_xml} class="h-6 text-[10px]" />
+				</div>
+			</div>
+		{/if}
 	</div>
 </div>
+
+<PortSelectorModal bind:open={showPortModal} onSelect={handlePortSelect} />
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 e7c11420..dde6f5d1 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
@@ -3,6 +3,9 @@
 	import { Label } from '$lib/components/ui/label';
 	import * as Select from '$lib/components/ui/select';
 	import * as RadioGroup from '$lib/components/ui/radio-group';
+	import { Button } from '$lib/components/ui/button';
+	import { Search, Upload } from 'lucide-svelte';
+	import ManifestSelectorModal from './ManifestSelectorModal.svelte';
 	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 	import type { InvoiceType } from '$lib/api/dashboard/reference_data/invoice_types';
 	import type { CustomsBroker } from '$lib/api/dashboard/a76/customs-brokers';
@@ -29,8 +32,8 @@
 		codePedimentoRegimens = [],
 		operationType = undefined,
 		defaultOperationType = undefined,
-		exchangeRate = undefined
-	}: {
+		exchangeRate = undefined 
+	}: { 
 		invoice: Invoice | null;
 		formData?: any;
 		invoiceTypes?: InvoiceType[];
@@ -49,8 +52,15 @@
 		defaultInvoiceType?: string | null;
 		operationType?: number | null;
 		exchangeRate?: number | null;
+		invoiceType?: string;
 	} = $props();
 
+	let showManifestModal = $state(false);
+
+	function handleManifestSelect(manifest: any) {
+		formData.manifest_number = manifest.manifest_number;
+	}
+
 	// Sync exchangeRate prop to formData
 	$effect(() => {
 		if (exchangeRate !== undefined && formData) {
@@ -69,6 +79,8 @@
 				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,
 
@@ -84,7 +96,10 @@
 				transport_type: invoice.logistics?.transport_type || '',
 				transport_num: invoice.logistics?.vehicle_num || '',
 				aduana: invoice.compliance_mx?.aduana || '',
-				document_type: invoice.document_type || ''
+				document_type: invoice.document_type || '',
+				manifest_number: invoice.compliance_mx?.manifest_number || '',
+				code_signature: invoice.compliance_mx?.signature_key || '',
+				electronic_signature: invoice.compliance_mx?.electronic_signature || ''
 			};
 		} else {
 			// Creando una nueva factura
@@ -96,6 +111,8 @@
 				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,
 
@@ -111,7 +128,10 @@
 				transport_type: '',
 				transport_num: '',
 				aduana: '',
-				document_type: ''
+				document_type: '',
+				manifest_number: '',
+				code_signature: '',
+				electronic_signature: ''
 			};
 		}
 	} else {
@@ -128,6 +148,18 @@
 		if (!formData.shipped_to_header) {
 			formData.shipped_to_header = 'enviado_a';
 		}
+		if (!formData.shipped_by_header) {
+			formData.shipped_by_header = 'enviado_por';
+		}
+		if (formData.manifest_number === undefined) {
+			formData.manifest_number = '';
+		}
+		if (formData.code_signature === undefined) {
+			formData.code_signature = '';
+		}
+		if (formData.electronic_signature === undefined) {
+			formData.electronic_signature = '';
+		}
 	}
 
 	// Opciones de tipo de peso
@@ -160,25 +192,16 @@
 	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'
-		}
+		{ value: operationType === 1 ? 'exportado_a' : 'importador', label: operationType === 1 ? 'Exportado a' : 'Importador' }
 	]);
 
 	const shippedToHeaderOptions = $derived(
-		operationType === 1
+		operationType === 1 || invoiceType === 'CR'
 			? [
-					{ 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: 'importador', label: 'Importador' }
 				]
 			: [
 					{ value: 'enviado_a', label: 'Enviado a' },
@@ -186,6 +209,26 @@
 				]
 	);
 
+	const shippedByHeaderOptions = $derived(
+		operationType === 1 || invoiceType === 'CR'
+			? [
+				{ 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' }
+			]
+	);
+
 	// Combinar clientes y proveedores para shipped_to, evitando duplicados de tipo "both"
 	const allClientsProviders = $derived.by(() => {
 		const uniqueMap = new Map();
@@ -258,7 +301,7 @@
 <div class="grid grid-cols-2 gap-4">
 	<!-- Columna Izquierda: Clientes - Proveedores - Agente Aduanal -->
 	<div class="space-y-3 rounded-md border p-3">
-		<div class="space-y-2">
+		{#if invoiceType !== 'MEX'}
 			<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>
@@ -278,7 +321,7 @@
 					<p class="font-medium">{formData.regimen_pedimento || '-'}</p>
 				</div>
 			</div>
-		</div>
+		{/if}
 
 		<h4 class="text-xs font-semibold text-muted-foreground uppercase">
 			Clientes - Proveedores - Agente Aduanal
@@ -383,85 +426,80 @@
 			<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="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="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>
+       
+        <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>        
 
 		<div class="space-y-1.5">
 			<Label for="customs_broker_us_id" class="text-xs">Agente Aduanal Ame:</Label>
@@ -491,150 +529,162 @@
 		</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
-							? Number(exchangeRate).toFixed(4)
-							: formData.exchange_rate && formData.exchange_rate !== 0
-								? Number(formData.exchange_rate).toFixed(4)
-								: 'N/A'}
-					</span>
-				</h4>
-			</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>
 
-			<!-- 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
-						>
+				{#if operationType !== 1 && invoiceType !== 'MEX' && invoiceType !== 'CR' && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+					<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 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
-						>
+				{/if}
+				{#if operationType === 1 || invoiceType === 'CR'}
+					<div class="space-y-1.5">
+						<Label for="manifest_number" class="text-xs">Num. de Manifiesto:</Label>
+						<div class="flex gap-2">
+							<Input
+								id="manifest_number"
+								bind:value={formData.manifest_number}
+								placeholder="Manifiesto..."
+								class="h-7 flex-1 text-xs"
+							/>
+							<Button
+								variant="outline"
+								size="icon"
+								class="h-7 w-7"
+								onclick={() => (showManifestModal = true)}
+							>
+								<Search class="h-3.5 w-3.5" />
+							</Button>
+						</div>
 					</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>
+				{/if}
+            </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>
-
-		<!-- 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="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>
+        <!-- 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">
+				{#if invoiceType !== 'MEX'}
+					<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>
+				{/if}
 
 				<div class="col-span-2 space-y-1.5">
 					<Label for="transport_id" class="text-xs">Clave Transporte:</Label>
@@ -757,71 +807,91 @@
 				</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>
+			{#if invoiceType !== 'MEX'}
+				<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>
+			{/if}
 
-			<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>
+			{#if invoiceType !== 'MEX'}
+				<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>
+			{/if}
+
+			{#if invoiceType === 'MEX'}
+				<div class="space-y-1.5 pt-1">
+					<Label for="electronic-sig-gen" class="text-xs">Firma Electrónica:</Label>
+					<div class="flex gap-2">
+						<Input
+							id="electronic-sig-gen"
+							bind:value={formData.code_signature}
+							class="h-7 flex-1 text-xs"
+						/>
+						<Button variant="outline" size="icon" class="h-7 w-7">
+							<Upload class="h-3 w-3" />
+						</Button>
+					</div>
+				</div>
+			{/if}
+        </div>
+    </div>
 </div>
+
+<ManifestSelectorModal bind:open={showManifestModal} onSelect={handleManifestSelect} />
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte b/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
index cce13893..82adf098 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/invoice-top-fields.svelte
@@ -13,7 +13,8 @@
 		invoiceTypes = [],
 		pedimentos = [],
 		defaultOperationType = undefined,
-		defaultInvoiceType = undefined
+		defaultInvoiceType = undefined,
+		invoiceType = undefined
 	}: {
 		invoice: Invoice | null;
 		formData?: any;
@@ -21,6 +22,7 @@
 		pedimentos?: Pedimento[];
 		defaultOperationType?: string | null;
 		defaultInvoiceType?: string | null;
+		invoiceType?: string;
 	} = $props();
 
 	function handlePedimentoChange(pedimentoId: string) {
@@ -73,16 +75,18 @@
 			pedimento_id: invoice?.compliance_mx?.pedimento_id || '',
 			remesa: invoice?.compliance_mx?.remesa || '',
 			invoice_number: invoice?.invoice_number || '',
-			invoice_date:
-				invoice?.invoice_date || (invoice ? '' : new Date().toISOString().split('T')[0]),
-			emission_date: invoice?.emission_date || new Date().toISOString().split('T')[0],
+			invoice_date: invoice?.invoice_date || new Date().toISOString().split('T')[0],
+			emission_date: new Date().toISOString().split('T')[0],
 			operation_type: operationType,
 			invoice_type: invoice?.invoice_type || (defaultInvoiceType ?? ''),
 			// Campos del pedimento (se llenarán al seleccionar un pedimento)
 			fecha_pedimento_del: '',
 			fecha_pedimento_al: '',
 			clave_pedimento: '',
-			regimen_pedimento: ''
+			regimen_pedimento: '',
+			// Campos específicos para MEX
+			iva_factor: invoice?.financials?.iva_factor || '',
+			alternate_invoice: invoice?.alternate_invoice || ''
 		};
 	} else {
 		// Si formData ya existe pero operation_type está vacío, usar defaultOperationType
@@ -93,7 +97,29 @@
 		) {
 			formData.operation_type = defaultOperationType;
 		}
+		// Ensure new fields exist if formData was created before
+		if (formData.iva_factor === undefined)
+			formData.iva_factor = invoice?.financials?.iva_factor || '';
+		if (formData.alternate_invoice === undefined)
+			formData.alternate_invoice = invoice?.alternate_invoice || '';
 	}
+	// Filter invoice types based on operation type
+	let filteredInvoiceTypes = $derived(
+		invoiceTypes.filter((type) => {
+			if (!formData.operation_type) return true;
+			return type.operation === 'both' || type.operation === formData.operation_type;
+		})
+	);
+
+	// Reset invoice_type if not valid for new operation_type
+	$effect(() => {
+		if (formData.operation_type && formData.invoice_type) {
+			const isValid = filteredInvoiceTypes.some((t) => t.key === formData.invoice_type);
+			if (!isValid) {
+				formData.invoice_type = '';
+			}
+		}
+	});
 </script>
 
 <!-- Datos Principales en una fila compacta (reusable across tabs) -->
@@ -137,7 +163,7 @@
 				</span>
 			</Select.Trigger>
 			<Select.Content class="max-h-[300px]">
-				{#each invoiceTypes as type}
+				{#each filteredInvoiceTypes as type}
 					<Select.Item value={type.key}>
 						{type.key} - {type.description}
 					</Select.Item>
@@ -146,47 +172,52 @@
 		</Select.Root>
 	</div>
 
-	<div class="col-span-1 flex flex-col items-center space-y-1 pb-1">
-		<Label for="is_pedimento_pending" class="text-xs">Pedimento Pendiente?</Label>
-		<Switch
-			id="is_pedimento_pending"
-			checked={formData.is_pedimento_pending}
-			onCheckedChange={(checked) => {
-				formData.is_pedimento_pending = checked;
-			}}
-		/>
-	</div>
-	<div class="col-span-2 space-y-1">
-		<Label for="pedimento" class="text-xs">Pedimento</Label>
-		<Select.Root
-			type="single"
-			value={formData.pedimento_id ? String(formData.pedimento_id) : ''}
-			onValueChange={(v) => {
-				formData.pedimento_id = v ? parseInt(v) : null;
-				if (v) {
-					handlePedimentoChange(v);
-				}
-			}}
-		>
-			<Select.Trigger id="pedimento" class="h-8 text-sm">
-				<span class="truncate">
-					{formData.pedimento || 'Selecciona pedimento...'}
-				</span>
-			</Select.Trigger>
-			<Select.Content class="max-h-[300px]">
-				{#each pedimentos as pedimento}
-					<Select.Item value={String(pedimento.id)}>
-						{pedimento.customs_office?.slice(0, 2)}-{pedimento.license}-{pedimento.pedimento_number}
-					</Select.Item>
-				{/each}
-			</Select.Content>
-		</Select.Root>
-	</div>
+	{#if invoiceType !== 'MEX'}
+		<div class="col-span-1 flex flex-col items-center space-y-1 pb-1">
+			<Label for="is_pedimento_pending" class="text-xs">Pedimento Pendiente?</Label>
+			<Switch
+				id="is_pedimento_pending"
+				checked={formData.is_pedimento_pending}
+				onCheckedChange={(checked) => {
+					formData.is_pedimento_pending = checked;
+				}}
+			/>
+		</div>
+		<div class="col-span-2 space-y-1">
+			<Label for="pedimento" class="text-xs">Pedimento</Label>
+			<Select.Root
+				type="single"
+				value={formData.pedimento_id ? String(formData.pedimento_id) : ''}
+				onValueChange={(v) => {
+					formData.pedimento_id = v ? parseInt(v) : null;
+					if (v) {
+						handlePedimentoChange(v);
+					}
+				}}
+			>
+				<Select.Trigger id="pedimento" class="h-8 text-sm">
+					<span class="truncate">
+						{formData.pedimento || 'Selecciona pedimento...'}
+					</span>
+				</Select.Trigger>
+				<Select.Content class="max-h-[300px]">
+					{#each pedimentos as pedimento}
+						<Select.Item value={String(pedimento.id)}>
+							{pedimento.customs_office?.slice(
+								0,
+								2
+							)}-{pedimento.license}-{pedimento.pedimento_number}
+						</Select.Item>
+					{/each}
+				</Select.Content>
+			</Select.Root>
+		</div>
 
-	<div class="col-span-1 space-y-1">
-		<Label for="remesa" class="text-xs">Remesa</Label>
-		<Input id="remesa" bind:value={formData.remesa} class="h-8 text-sm" />
-	</div>
+		<div class="col-span-1 space-y-1">
+			<Label for="remesa" class="text-xs">Remesa</Label>
+			<Input id="remesa" bind:value={formData.remesa} class="h-8 text-sm" />
+		</div>
+	{/if}
 
 	<div class="col-span-2 space-y-1">
 		<Label for="invoice_number" class="text-xs"
@@ -201,9 +232,14 @@
 	</div>
 
 	<div class="col-span-2 space-y-1">
-		<Label for="invoice_date" class="text-xs"
-			>Fecha Factura <span class="text-red-500">*</span></Label
-		>
+		<Label for="invoice_date" class="text-xs">
+			{formData.operation_type === 'exp' || invoiceType === 'CR'
+				? 'Fecha'
+				: invoiceType === 'MEX'
+					? 'Fecha de Entrada'
+					: 'Fecha Factura'}
+			<span class="text-red-500">*</span>
+		</Label>
 		<Input id="invoice_date" type="date" bind:value={formData.invoice_date} class="h-8 text-sm" />
 	</div>
 
@@ -211,4 +247,15 @@
 		<Label for="emission_date" class="text-xs">Fecha Emisión</Label>
 		<Input id="emission_date" type="date" bind:value={formData.emission_date} class="h-8 text-sm" />
 	</div>
+
+	{#if invoiceType === 'MEX'}
+		<div class="col-span-1 space-y-1">
+			<Label for="iva_factor" class="text-xs">Factor IVA</Label>
+			<Input id="iva_factor" bind:value={formData.iva_factor} class="h-8 text-sm" />
+		</div>
+		<div class="col-span-2 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" />
+		</div>
+	{/if}
 </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..cce7734a 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,15 @@
 	let {
 		invoice,
 		formData = $bindable(),
-		exists = $bindable()
+		exists = $bindable(),
+		operationType = undefined,
+		invoiceType = undefined
 	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
+		operationType?: number;
+		invoiceType?: string;
 	} = $props();
 
 	let imported = 0;
@@ -49,6 +53,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 +114,10 @@
 		isLoadingMore = false;
 	}
 
+	function handleRowClick(line: any) {
+		focusedLine = line;
+	}
+
 	function handleScroll(e: Event) {
 		const target = e.target as HTMLDivElement;
 		const threshold = 100;
@@ -251,10 +260,10 @@
 		}
 
 		// Load part number data
-		if (line.part_number_id) {
+		if (line.part_number) {
 			try {
 				const response = await fetch(
-					`/api-sveltekit/parts/${line.part_number_id}?company_id=${activeCompanyId}`,
+					`/api-sveltekit/parts/${line.part_number}?company_id=${activeCompanyId}`,
 					{ method: 'GET', headers: { 'Content-Type': 'application/json' } }
 				);
 				if (response.ok) {
@@ -698,11 +707,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 +719,147 @@
 		<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 if invoiceType === 'CR'}
+							<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>Cantidad Exportada</Table.Head>
+							<Table.Head>Clase</Table.Head>
+							<Table.Head>Número de Parte</Table.Head>
+							<Table.Head>Descripción en Español</Table.Head>
+							<Table.Head>Contiene Subpartida</Table.Head>
+							<Table.Head>Partida Principal</Table.Head>
+						{:else if invoiceType === 'REP' || invoiceType === 'REPAR'}
+							<Table.Head>Línea</Table.Head>
+							<Table.Head>No. Factura Expo</Table.Head>
+							<Table.Head>Línea Expo</Table.Head>
+							<Table.Head>P/S</Table.Head>
+							<Table.Head>Clase</Table.Head>
+							<Table.Head>Num. Parte</Table.Head>
+							<Table.Head>Descripción en Español</Table.Head>
+							<Table.Head>Cantidad Importada</Table.Head>
+							<Table.Head>UM</Table.Head>
+							<Table.Head>Preferencia</Table.Head>
+							<Table.Head>Contiene Subpartida</Table.Head>
+							<Table.Head>Partida Principal</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 if invoiceType === 'CR'}
+									<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 if invoiceType === 'REP' || invoiceType === 'REPAR'}
+									<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.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.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>
+								{: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 +867,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 +878,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 +980,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..30be961a 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,35 @@
-<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,
+		invoiceType = undefined
+	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
 		seals?: any[];
 		incoterms?: any[];
 		enclosure?: any[];
+		operationType?: number;
+		invoiceType?: string;
 	} = $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 +39,31 @@
 			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: invoice.financials?.other_deductibles || null,
+			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 || '',
+			is_mixed: invoice.compliance_mx?.is_mixed || false
 		};
 		exists = true;
 	} else if (!formData) {
 		formData = {
 			// Campos de observaciones
 			observation_es: '',
-			observation_en: '',						
+			observation_en: '',
 			// Incrementables
 			freight: null,
 			insurance_value: null,
@@ -64,245 +79,507 @@
 			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: '',
+			is_mixed: false
 		};
 		exists = false;
 	}
 </script>
 
+<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 || invoiceType === 'CR'
+						? 'Observaciones de la factura mexicana:'
+						: invoiceType === 'MEX'
+							? 'Observacion de la factura mexicana y bilingue:'
+							: '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="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."  
-			/>
+			{#if invoiceType !== 'MEX'}
+				<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>
+			{/if}
 		</div>
+
+		{#if operationType === 1 || invoiceType === 'CR'}
+			<!-- 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-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>
-			<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>
-
-    <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 || invoiceType === 'CR'}
+					<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 || invoiceType === 'CR'}
+			<!-- 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) -->
+		{#if invoiceType !== 'MEX'}
+			<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 || invoiceType === 'CR'}
+					<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>
+		{/if}
+
+		{#if invoiceType === 'MEX'}
+			<div class="rounded-md border p-3">
+				<div class="space-y-2">
+					<Label class="mb-2 block text-xs font-semibold">Es mixto?</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.is_mixed ===
+								true
+									? 'border-zinc-800 bg-zinc-800'
+									: ''}"
+							>
+								<input type="radio" value={true} bind:group={formData.is_mixed} class="sr-only" />
+								{#if formData.is_mixed === 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.is_mixed ===
+								false
+									? 'border-zinc-800 bg-zinc-800'
+									: ''}"
+							>
+								<input type="radio" value={false} bind:group={formData.is_mixed} class="sr-only" />
+								{#if formData.is_mixed === 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>
+		{/if}
+	</div>
+
+	<!-- Extra Bottom Row for Import Mode specific fields (Original Layout preserved for Import) -->
+	{#if operationType !== 1 && invoiceType !== 'MEX' && invoiceType !== 'CR'}
+		<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>
-	</div>
-</div>
\ No newline at end of file
+	{/if}
+</div>
diff --git a/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte b/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
index c08d1e4f..4752a40b 100644
--- a/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/edit/others-tab-form.svelte
@@ -4,22 +4,26 @@
 	import { Label } from '$lib/components/ui/label';
 	import { Button } from '$lib/components/ui/button';
 	import { Checkbox } from '$lib/components/ui/checkbox';
-	import { RadioGroup, RadioGroupItem } from '$lib/components/ui/radio-group';
+	import * as RadioGroup from '$lib/components/ui/radio-group';
 	import * as Select from '$lib/components/ui/select';
 	import { Textarea } from '$lib/components/ui/textarea';
 	import { Plus, Upload } from 'lucide-svelte';
 	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 
-	let { 
+	let {
 		invoice,
 		formData = $bindable(),
 		exists = $bindable(),
-		transportModes = []
-	}: { 
+		transportModes = [],
+		operationType = undefined,
+		invoiceType = undefined
+	}: {
 		invoice: Invoice | null;
 		formData?: any;
 		exists?: boolean;
 		transportModes?: any[];
+		operationType?: number;
+		invoiceType?: string;
 	} = $props();
 
 	if (!formData && invoice) {
@@ -28,19 +32,31 @@
 			comments_status: invoice.comments_status || '',
 			// Campos que van en diferentes recursos pero se editan aquí
 			transport_mode: invoice.logistics?.transport_mode || null,
-			is_mixed: invoice.compliance_mx?.is_mixed || null,
+			is_mixed: invoice.compliance_mx?.is_mixed ? 'si' : 'no',
 			print_stamp: invoice.financials?.seal_value_2500 || false,
-			rule_3121_parties_ii: false,
+			rule_3121_parties_ii: invoice.compliance_mx?.rule_3121_parties_ii || false,
+			// Errores (Copied from Continuation Tab)
+			errores_facturacion: [],
 			related_doc_id: invoice.related_doc_id || null,
-			code_signature: invoice.compliance_mx?.code_signature || '',
+			code_signature: invoice.compliance_mx?.signature_key || '',
 			electronic_signature: invoice.compliance_mx?.electronic_signature || '',
-			mandatory_person: '',
+			mandatory_person: invoice.compliance_mx?.acts_as || '',
 			contingency_mode: invoice.compliance_mx?.contingency_mode || false,
-			cove: invoice.compliance_mx?.origin_destination_cove || '',
+			cove: invoice.compliance_mx?.edocument || '',
 			operation_num: invoice.compliance_mx?.vucem_operation_num || '',
 			adendas: invoice.compliance_mx?.addendum_vu || '',
 			observations_vu: invoice.vu_observations || '',
-			certified_number: invoice.compliance_mx?.certificate_number || '',			
+			certified_number: invoice.compliance_mx?.certificate_number || '',
+			// New Export fields
+			bill_number: invoice.logistics?.bill_number || '',
+			guide_number: invoice.logistics?.guide_number || '',
+			shipment_number: invoice.logistics?.shipment_number || '',
+			option_iv18: invoice.option_iv18 || '',
+			delivered_status: invoice.logistics?.delivered_status || false,
+			received_by: invoice.logistics?.received_by || '',
+			delivery_date: invoice.logistics?.delivery_date
+				? invoice.logistics.delivery_date.split('T')[0]
+				: ''
 		};
 		exists = true;
 	} else if (!formData) {
@@ -52,6 +68,8 @@
 			is_mixed: null,
 			print_stamp: false,
 			rule_3121_parties_ii: false,
+			// Errores
+			errores_facturacion: [],
 			related_doc_id: null,
 			code_signature: '',
 			electronic_signature: '',
@@ -61,7 +79,15 @@
 			operation_num: '',
 			adendas: '',
 			observations_vu: '',
-			certified_number: '',			
+			certified_number: '',
+			// New Export fields
+			bill_number: '',
+			guide_number: '',
+			shipment_number: '',
+			option_iv18: '',
+			delivered_status: false,
+			received_by: '',
+			delivery_date: ''
 		};
 		exists = false;
 	}
@@ -70,175 +96,284 @@
 	let rfc = $state('');
 	let curp = $state('');
 
-
 	function loadInfo() {
 		// Función para cargar información
 		console.log('Cargar información');
 	}
+
+	$effect(() => {
+		console.log('OthersTabForm props:', {
+			invoiceType,
+			operationType,
+			isMixed: formData.is_mixed,
+			rule: formData.rule_3121_parties_ii
+		});
+	});
 </script>
 
-<div class="grid grid-cols-3 grid-rows-1 gap-3">
-    <div class="border rounded-md p-3 space-y-3">
-	
-		<!-- Modo de Transporte -->
-		<div class="space-y-2">
-			<Label for="transport-mode">Modo de Transporte:</Label>
-			<Select.Root 
-				type="single" 
-				value={formData.transport_mode} 
-				onValueChange={(value: string | undefined) => formData.transport_mode = value || 'TRUCK'}
-			>
-				<Select.Trigger id="transport-mode">
-					{transportModes.find(m => m.key === formData.transport_mode)?.name || 'Seleccionar modo'}
-				</Select.Trigger>
-				<Select.Content>
-					{#each transportModes as mode}
-						<Select.Item value={mode.key}>
-							{mode.name}
-						</Select.Item>
-					{/each}
-				</Select.Content>
-			</Select.Root>
-		</div>
-
-		<!-- Imprimir Sello -->
-		<div class="space-y-2">
-			<Label class="opacity-0">Spacer</Label>
-			<div class="flex items-center space-x-2">
-				<Checkbox id="print-stamp" bind:checked={formData.print_stamp} />
-				<Label for="print-stamp" class="font-normal">
-					Imprimir el Sello por Valor menor a 2500 dlls
-				</Label>
-			</div>
-		</div>
-
-		<!-- Es Mixto -->
-		<div class="space-y-2">
-			<Label class="opacity-0">Spacer</Label>
-			<Label>Es Mixto?</Label>
-			<RadioGroup 
-				value={formData.is_mixed === null ? 'no' : (formData.is_mixed ? 'yes' : 'no')}
-				onValueChange={(v) => formData.is_mixed = v === 'yes'}
-				class="flex gap-4"
-			>
-				<div class="flex items-center space-x-2">
-					<RadioGroupItem value="yes" id="mixed-yes" />
-					<Label for="mixed-yes" class="font-normal">Sí</Label>
-				</div>
-				<div class="flex items-center space-x-2">
-					<RadioGroupItem value="no" id="mixed-no" />
-					<Label for="mixed-no" class="font-normal">No</Label>
-				</div>
-			</RadioGroup>
-			<Label class="opacity-0">Spacer</Label>
-		</div>		
-
-		<div class="flex items-center space-x-2">
-			<Checkbox id="rule-3121" bind:checked={formData.rule_3121_parties_ii} />
-			<Label for="rule-3121" class="font-normal">Regla 3.1.21 Partes II</Label>
-		</div>
-
-		<!-- Comentario estatus -->
-		<div class="space-y-2">
-			<Label class="opacity-0">Spacer</Label>
-			<Label>Comentario Estatus:</Label>
-			<Textarea
-				id="comments_status"
-				bind:value={formData.comments_status}
-				placeholder="Comentario estatus"				
-				rows={3}
-			/>			
-		</div>	
-	</div>
-
-    <div class="border rounded-md p-3 space-y-3 col-span-2">
-		<div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4">
-			<!-- ID Relación Docs -->
+{#if invoiceType !== 'MEX'}
+	<div class="grid grid-cols-3 grid-rows-1 gap-3">
+		<div class="space-y-3 rounded-md border p-3">
+			<!-- Modo de Transporte -->
 			<div class="space-y-2">
-				<Label for="relation-docs-id">ID Relación Docs:</Label>
-				<Input 
-					id="relation-docs-id" 
-					type="number"
-					bind:value={formData.related_doc_id} 
+				<Label for="transport-mode">Modo de Transporte:</Label>
+				<Select.Root
+					type="single"
+					value={formData.transport_mode}
+					onValueChange={(value: string | undefined) =>
+						(formData.transport_mode = value || 'TRUCK')}
+				>
+					<Select.Trigger id="transport-mode">
+						{transportModes.find((m) => m.key === formData.transport_mode)?.name ||
+							'Seleccionar modo'}
+					</Select.Trigger>
+					<Select.Content>
+						{#each transportModes as mode}
+							<Select.Item value={mode.key}>
+								{mode.name}
+							</Select.Item>
+						{/each}
+					</Select.Content>
+				</Select.Root>
+			</div>
+
+			{#if operationType !== 1 && invoiceType !== 'MEX'}
+				<!-- Imprimir Sello -->
+				<div class="space-y-2">
+					<Label class="opacity-0">Spacer</Label>
+					<div class="flex items-center space-x-2">
+						<Checkbox id="print-stamp" bind:checked={formData.print_stamp} />
+						<Label for="print-stamp" class="text-xs font-normal">
+							Imprimir el Sello por Valor menor a 2500 dlls
+						</Label>
+					</div>
+				</div>
+
+				{#if invoiceType !== 'CR' && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+					<!-- Es Mixto -->
+					<div class="space-y-2">
+						<Label class="opacity-0">Spacer</Label>
+						<Label class="text-xs">Es Mixto?</Label>
+						<RadioGroup.Root bind:value={formData.is_mixed} class="flex gap-4">
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="si" id="mixed-si" class="h-4 w-4" />
+								<Label for="mixed-si" class="cursor-pointer text-xs font-normal">Sí</Label>
+							</div>
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="no" id="mixed-no" class="h-4 w-4" />
+								<Label for="mixed-no" class="cursor-pointer text-xs font-normal">No</Label>
+							</div>
+						</RadioGroup.Root>
+					</div>
+				{/if}
+			{/if}
+
+			{#if (operationType === 1 || invoiceType === 'CR') && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+				<!-- Export Fields (Hidden for Repair) -->
+				<div class="space-y-2 pt-2">
+					<Label for="bill_number">Número Master BOL:</Label>
+					<Input id="bill_number" bind:value={formData.bill_number} class="h-8 text-xs" />
+				</div>
+				<div class="space-y-2">
+					<Label for="guide_number">Número Guía:</Label>
+					<Input id="guide_number" bind:value={formData.guide_number} class="h-8 text-xs" />
+				</div>
+				<div class="space-y-2">
+					<Label for="shipment_number">Número Embarque:</Label>
+					<Input id="shipment_number" bind:value={formData.shipment_number} class="h-8 text-xs" />
+				</div>
+				<div class="space-y-2 pb-2">
+					<Label for="option_iv18">Opción IV 18:</Label>
+					<Select.Root
+						type="single"
+						value={formData.option_iv18}
+						onValueChange={(v: string | undefined) => (formData.option_iv18 = v || '')}
+					>
+						<Select.Trigger id="option_iv18" class="h-8 text-xs">
+							{formData.option_iv18 || 'Seleccionar opción'}
+						</Select.Trigger>
+						<Select.Content>
+							<Select.Item value="OPCION 1">Opción 1</Select.Item>
+						</Select.Content>
+					</Select.Root>
+				</div>
+
+				<!-- DATOS ENTREGA -->
+				<div class="mt-4 space-y-3 rounded-md border bg-muted/20 p-3">
+					<h4 class="mb-2 border-b pb-1 text-xs font-bold text-muted-foreground uppercase">
+						Datos Entrega
+					</h4>
+					<div class="mb-2 flex items-center space-x-2">
+						<Checkbox id="delivered_status" bind:checked={formData.delivered_status} />
+						<Label for="delivered_status" class="text-xs font-semibold">Entregado</Label>
+					</div>
+					<div class="space-y-2">
+						<Label for="received_by" class="text-xs">Recibido por:</Label>
+						<Input
+							id="received_by"
+							bind:value={formData.received_by}
+							disabled={!formData.delivered_status}
+							class="h-7 text-xs"
+						/>
+					</div>
+					<div class="space-y-2">
+						<Label for="delivery_date" class="text-xs">Fecha Entrega:</Label>
+						<Input
+							id="delivery_date"
+							type="date"
+							bind:value={formData.delivery_date}
+							disabled={!formData.delivered_status}
+							class="h-7 text-xs"
+						/>
+					</div>
+				</div>
+			{/if}
+
+			{#if operationType !== 1 && invoiceType !== 'CR' && invoiceType !== 'REP' && invoiceType !== 'REPAR'}
+				<div class="flex items-center space-x-2 py-2">
+					<Checkbox id="rule-3121" bind:checked={formData.rule_3121_parties_ii} />
+					<Label for="rule-3121" class="text-xs font-normal">Regla 3.1.21 Partes II</Label>
+				</div>
+			{/if}
+
+			<!-- Comentario estatus -->
+			<div class="space-y-2">
+				<Label class="opacity-0">Spacer</Label>
+				<Label>Comentario Estatus:</Label>
+				<Textarea
+					id="comments_status"
+					bind:value={formData.comments_status}
+					placeholder="Comentario estatus"
+					rows={3}
 				/>
 			</div>
+		</div>
 
-			<!-- Firma Electrónica -->
-			<div class="space-y-2 md:col-span-2">
-				<Label for="electronic-sig-1">Firma Electrónica:</Label>
-				<div class="flex gap-2">
-					<Input id="electronic-sig-1" bind:value={formData.code_signature} class="flex-1" />
-					<Button variant="outline" size="icon">
-						<Upload class="h-4 w-4" />
-					</Button>
-				</div>
-			</div>
-
-			<!-- Mandatario/Persona Autorizada -->
-			<div class="space-y-2">
-				<Label for="mandatory-person">Mandatario/Persona Autorizada:</Label>
-				<Input id="mandatory-person" bind:value={formData.mandatory_person} />
-			</div>
-
-			<!-- RFC -->
-			<div class="space-y-2">
-				<Label id="rfc" for="rfc">RFC: {rfc}</Label>
-			</div>
-
-			<!-- CURP -->
-			<div class="space-y-2">
-				<Label id="curp" for="curp">CURP: {curp}</Label>
-			</div>
-		
-			<!-- Modo Contingencia -->
-			<div class="space-y-2 col-span-4">				
-				<div class="flex items-center space-x-2">
-					<Checkbox id="contingency-mode" bind:checked={formData.contingency_mode} />
-					<Label for="contingency-mode" class="font-normal">Modo Contingencia</Label>
-				</div>
-
-				
-				<!-- COVE -->
+		<div class="col-span-2 space-y-3 rounded-md border p-3">
+			<div class="grid grid-cols-1 gap-4 md:grid-cols-2 lg:grid-cols-3">
+				<!-- ID Relación Docs -->
 				<div class="space-y-2">
-					<Label for="cove">COVE:</Label>
-					<Input id="cove" bind:value={formData.cove} placeholder="COVE" />
+					<Label for="relation-docs-id">ID Relación Docs:</Label>
+					<Input id="relation-docs-id" type="number" bind:value={formData.related_doc_id} />
 				</div>
 
-				<!-- Número de Operación -->
-				<div class="space-y-2">
-					<Label for="operation-num">Núm Operación:</Label>
-					<Input id="operation-num" bind:value={formData.operation_num} />
-				</div>
-
-				<!-- Adenda(s) -->
+				<!-- Firma Electrónica -->
 				<div class="space-y-2 md:col-span-2">
-					<Label for="adendas">Adenda(s):</Label>
-					<Input id="adendas" bind:value={formData.adendas} />
-				</div>
-
-				<!-- Observaciones VU -->
-				<div class="space-y-2 md:col-span-2">
-					<Label for="observations-vu">Observaciones VU:</Label>
+					<Label for="electronic-sig-1">Firma Electrónica:</Label>
 					<div class="flex gap-2">
-						<Textarea id="observations-vu" bind:value={formData.observations_vu} class="flex-1 min-h-[60px]" />
-						<Button variant="outline" onclick={loadInfo}>
-							Cargar Info.
+						<Input id="electronic-sig-1" bind:value={formData.code_signature} class="flex-1" />
+						<Button variant="outline" size="icon">
+							<Upload class="h-4 w-4" />
 						</Button>
 					</div>
 				</div>
 
-				<!-- Número Certificado -->
+				<!-- Mandatario/Persona Autorizada -->
 				<div class="space-y-2">
-					<Label for="certified-num">Número Certificado:</Label>
-					<Input id="certified-num" bind:value={formData.certified_number} />
+					<Label for="mandatory-person">Mandatario/Persona Autorizada:</Label>
+					<Input id="mandatory-person" bind:value={formData.mandatory_person} />
 				</div>
 
-				<!-- Firma Electrónica 2 -->
-				<div class="space-y-2 md:col-span-2">
-					<Label for="electronic-sig-2">Firma Electrónica:</Label>
-					<Input id="electronic-sig-2" bind:value={formData.electronic_signature} />
+				<!-- RFC -->
+				<div class="space-y-2">
+					<Label id="rfc" for="rfc">RFC: {rfc}</Label>
+				</div>
+
+				<!-- CURP -->
+				<div class="space-y-2">
+					<Label id="curp" for="curp">CURP: {curp}</Label>
+				</div>
+
+				<!-- Modo Contingencia -->
+				<div class="col-span-4 space-y-2">
+					<div class="flex items-center space-x-2">
+						<Checkbox id="contingency-mode" bind:checked={formData.contingency_mode} />
+						<Label for="contingency-mode" class="font-normal">Modo Contingencia</Label>
+					</div>
+
+					<!-- COVE -->
+					<div class="space-y-2">
+						<Label for="cove">COVE:</Label>
+						<Input id="cove" bind:value={formData.cove} placeholder="COVE" />
+					</div>
+
+					<!-- Número de Operación -->
+					<div class="space-y-2">
+						<Label for="operation-num">Núm Operación:</Label>
+						<Input id="operation-num" bind:value={formData.operation_num} />
+					</div>
+
+					<!-- Adenda(s) -->
+					<div class="space-y-2 md:col-span-2">
+						<Label for="adendas">Adenda(s):</Label>
+						<Input id="adendas" bind:value={formData.adendas} />
+					</div>
+
+					<!-- Observaciones VU -->
+					<div class="space-y-2 md:col-span-2">
+						<Label for="observations-vu">Observaciones VU:</Label>
+						<div class="flex gap-2">
+							<Textarea
+								id="observations-vu"
+								bind:value={formData.observations_vu}
+								class="min-h-[60px] flex-1"
+							/>
+							<Button variant="outline" onclick={loadInfo}>Cargar Info.</Button>
+						</div>
+					</div>
+
+					<!-- Número Certificado -->
+					<div class="space-y-2">
+						<Label for="certified-num">Número Certificado:</Label>
+						<Input id="certified-num" bind:value={formData.certified_number} />
+					</div>
+
+					<!-- Firma Electrónica 2 -->
+					<div class="space-y-2 md:col-span-2">
+						<Label for="electronic-sig-2">Firma Electrónica:</Label>
+						<Input id="electronic-sig-2" bind:value={formData.electronic_signature} />
+					</div>
 				</div>
 			</div>
-		</div>				
+		</div>
 	</div>
-</div>
+{:else}
+	<div class="space-y-4 rounded-md border p-4">
+		<h4 class="text-xs font-semibold text-muted-foreground uppercase">Errores de Facturación</h4>
+
+		<div class="rounded border">
+			<table class="w-full text-xs">
+				<thead class="bg-muted">
+					<tr>
+						<th class="border px-2 py-1 text-left">Línea</th>
+						<th class="border px-2 py-1 text-left">Clave</th>
+						<th class="border px-2 py-1 text-left">Descripción</th>
+					</tr>
+				</thead>
+				<tbody>
+					{#if formData.errores_facturacion?.length}
+						{#each formData.errores_facturacion as error}
+							<tr>
+								<td class="border px-2 py-1">{error.linea}</td>
+								<td class="border px-2 py-1">{error.clave}</td>
+								<td class="border px-2 py-1">{error.descripcion}</td>
+							</tr>
+						{/each}
+					{:else}
+						<tr>
+							<td colspan="3" class="border px-2 py-12 text-center text-muted-foreground">
+								Sin errores registrados
+							</td>
+						</tr>
+					{/if}
+				</tbody>
+			</table>
+		</div>
+
+		<div class="flex justify-end gap-2">
+			<Button variant="outline" size="sm" class="h-7 text-xs">Insertar</Button>
+			<Button variant="outline" size="sm" class="h-7 text-xs">Editar</Button>
+			<Button variant="outline" size="sm" class="h-7 text-xs">Borrar</Button>
+		</div>
+	</div>
+{/if}
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..aa8070a8 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);
@@ -57,7 +57,7 @@ export async function saveInvoice(options: SaveInvoiceOptions): Promise<SaveInvo
 				missingFields.push(requiredFields.invoice_number);
 			}
 			// Validar campos de generalFormData
-			if (!generalFormData?.document_type) {
+			if (!generalFormData?.document_type && InvoiceTopFieldsFormData?.invoice_type !== 'MEX') {
 				missingFields.push(requiredFields.document_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,14 +116,22 @@ 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,
-		alternate_invoice: observationFormData?.alternate_invoice || undefined,
-		// Fields from othersFormData that go to invoice header
+		observation_es: observationFormData ? observationFormData.observation_es : undefined,
+		observation_en: observationFormData ? observationFormData.observation_en : undefined,
+		alternate_invoice: InvoiceTopFieldsFormData?.alternate_invoice || (observationFormData ? observationFormData.alternate_invoice : undefined),
+		// Fields from othersFormData and continuationFormData that go to invoice header
 		related_doc_id: othersFormData?.related_doc_id || undefined,
 		vu_observations: othersFormData?.observations_vu || undefined,
 		comments_status: othersFormData?.comments_status || undefined,
+		option_iv18: othersFormData?.option_iv18 || undefined,
+		purchase_order: continuationFormData?.purchase_order || undefined,
+		payment_terms: continuationFormData?.payment_terms || undefined,
+		handling_fees: continuationFormData?.handling_fees || undefined,
+		cfdi_uuid: continuationFormData?.cfdi_uuid || undefined,
+		path_pdf: continuationFormData?.path_pdf || undefined,
+		path_xml: continuationFormData?.path_xml || undefined,
 	};
 
 	// Solo agregar sub-recursos si tienen valores reales
@@ -137,11 +145,19 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
 		othersFormData?.is_mixed || othersFormData?.contingency_mode ||
 		othersFormData?.cove || othersFormData?.operation_num ||
 		othersFormData?.adendas || othersFormData?.certified_number ||
+		othersFormData?.bill_number || othersFormData?.guide_number ||
+		othersFormData?.shipment_number || othersFormData?.delivered_status ||
+		othersFormData?.received_by || othersFormData?.delivery_date ||
 		othersFormData?.code_signature || othersFormData?.electronic_signature ||
-		continuationFormData?.puerto_entrada;
+		othersFormData?.mandatory_person ||
+		continuationFormData?.puerto_entrada || continuationFormData?.reason_export ||
+		continuationFormData?.is_mixed !== undefined ||
+		observationFormData?.is_mixed !== undefined || observationFormData?.sub_division !== undefined || observationFormData?.office_document !== undefined ||
+		generalFormData?.manifest_number !== undefined ||
+		generalFormData?.shipped_by_id !== undefined || generalFormData?.shipped_by_header !== undefined;
 
 	if (hasComplianceValue) {
-		payload.compliance_mx = buildComplianceMxData(InvoiceTopFieldsFormData, generalFormData, othersFormData, observationFormData, continuationFormData);
+		payload.compliance_mx = buildComplianceMxData(InvoiceTopFieldsFormData?.invoice_type, InvoiceTopFieldsFormData, generalFormData, othersFormData, observationFormData, continuationFormData);
 	}
 
 	// Financials
@@ -153,11 +169,11 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
 		observationFormData?.total_increments_me || othersFormData?.print_stamp;
 
 	if (hasFinancialsValue) {
-		payload.financials = buildFinancialsData(generalFormData, observationFormData, othersFormData);
+		payload.financials = buildFinancialsData(generalFormData, observationFormData, othersFormData, InvoiceTopFieldsFormData);
 	}
 
 	// Logistics
-	payload.logistics = buildLogisticsData(generalFormData, observationFormData, continuationFormData);
+	payload.logistics = buildLogisticsData(generalFormData, observationFormData, othersFormData, continuationFormData);
 
 	// Eliminar campos undefined para no enviarlos
 	Object.keys(payload).forEach(key => {
@@ -169,7 +185,7 @@ function buildInvoicePayload(formData: FormDataSet): CreateInvoiceData | UpdateI
 	return payload;
 }
 
-function buildComplianceMxData(InvoiceTopFieldsFormData: any, generalFormData: any, othersFormData: any, observationFormData: any, continuationFormData: any) {
+function buildComplianceMxData(invoiceType: string, InvoiceTopFieldsFormData: any, generalFormData: any, othersFormData: any, observationFormData: any, continuationFormData: any) {
 	return {
 		// Pedimento fields - desde InvoiceTopFieldsFormData
 		pedimento_id: InvoiceTopFieldsFormData?.pedimento_id ? Number(InvoiceTopFieldsFormData.pedimento_id) : null,
@@ -177,6 +193,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,35 +201,49 @@ 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
 		movement_type: observationFormData?.movement_type || null,
 		enclosure: observationFormData?.enclosure || null,
-		// Fields from othersFormData
-		is_mixed: othersFormData?.is_mixed || null,
+		// Fields from othersFormData or continuationFormData (priority based on invoice type)
+		is_mixed: invoiceType === 'MEX'
+			? (observationFormData?.is_mixed || false)
+			: (invoiceType === 'CR' || invoiceType === 'REP' || InvoiceTopFieldsFormData?.operation_type === 'exp'
+				? (continuationFormData?.is_mixed === 'si')
+				: (othersFormData?.is_mixed === 'si')),
+		is_regime_change: invoiceType === 'CR' ? true : (othersFormData?.contingency_mode !== undefined ? othersFormData.contingency_mode : false), // Note: reuse check logic if exists elsewhere, but here we explicitly set it for CR
+		reason_export: continuationFormData?.reason_export || null,
+		acts_as: othersFormData?.mandatory_person || null,
 		contingency_mode: othersFormData?.contingency_mode || false,
-		origin_destination_cove: othersFormData?.cove || null,
+		edocument: othersFormData?.cove || null,
+		origin_destination_cove: undefined, // Avoid sending invalid enum values, needs proper dropdown
 		vucem_operation_num: othersFormData?.operation_num || null,
 		addendum_vu: othersFormData?.adendas || null,
 		certificate_number: othersFormData?.certified_number || null,
-		code_signature: othersFormData?.code_signature || null,
-		electronic_signature: othersFormData?.electronic_signature || null,
+		signature_key: othersFormData?.code_signature || generalFormData?.code_signature || null,
+		electronic_signature: othersFormData?.electronic_signature || generalFormData?.electronic_signature || null,
+		subdivision: observationFormData?.sub_division || null,
+		office_document: observationFormData?.office_document || null,
+		rule_3121_parties_ii: othersFormData?.rule_3121_parties_ii || false,
 	};
 }
 
-function buildFinancialsData(generalFormData: any, observationFormData: any, othersFormData: any) {
+function buildFinancialsData(generalFormData: any, observationFormData: any, othersFormData: any, InvoiceTopFieldsFormData?: any) {
 	return {
 		// Currency from generalFormData
 		currency_type: generalFormData?.currency_type || null,
 		currency: generalFormData?.currency || null,
-		iva_factor: generalFormData?.iva_factor || null,
+		iva_factor: (InvoiceTopFieldsFormData?.iva_factor || generalFormData?.iva_factor) ? String(InvoiceTopFieldsFormData?.iva_factor || 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
@@ -220,7 +251,7 @@ function buildFinancialsData(generalFormData: any, observationFormData: any, oth
 	};
 }
 
-function buildLogisticsData(generalFormData: any, observationFormData: any, continuationFormData: any) {
+function buildLogisticsData(generalFormData: any, observationFormData: any, othersFormData: any, continuationFormData: any) {
 	// Retornar logistics como objeto único con datos de continuación
 	return {
 		carrier_id: generalFormData?.carrier_id || null,
@@ -230,20 +261,30 @@ 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,
+		bill_number: othersFormData?.bill_number || continuationFormData?.numero_bl || null,
+		guide_number: othersFormData?.guide_number || (continuationFormData?.cantidad_guias_embarque ? String(continuationFormData.cantidad_guias_embarque) : null),
+		shipment_number: othersFormData?.shipment_number || null,
+		delivered_status: othersFormData?.delivered_status || false,
+		received_by: othersFormData?.received_by || null,
+		delivery_date: othersFormData?.delivery_date || null,
 		destination_location: continuationFormData?.destino_origen || null,
 		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,
 		green_light_us: continuationFormData?.semaforo_verde_aduana_americana || false,
 		red_light_mx: continuationFormData?.semaforo_rojo_aduana_mexicana || false,
 		red_light_us: continuationFormData?.semaforo_rojo_aduana_americana || false,
+		vehicle_data: continuationFormData?.vehicle_data || null,
 	};
 }
diff --git a/frontend/src/lib/components/sidebar/modules.ts b/frontend/src/lib/components/sidebar/modules.ts
index 6be900d3..d422ff5f 100644
--- a/frontend/src/lib/components/sidebar/modules.ts
+++ b/frontend/src/lib/components/sidebar/modules.ts
@@ -355,6 +355,10 @@ export function getSidebarData(): SidebarData {
 					{
 						title: m["sidebar.import_invoices.regime_change"](),
 						url: "/dashboard/invoices?operation_type=imp&invoice_type=CR",
+					},
+					{
+						title: m["sidebar.import_invoices.repair"](),
+						url: "/dashboard/invoices?operation_type=imp&invoice_type=REP",
 					}
 				],
 			},
diff --git a/frontend/src/routes/dashboard/invoices/+page.svelte b/frontend/src/routes/dashboard/invoices/+page.svelte
index ef2f5fde..8100de74 100644
--- a/frontend/src/routes/dashboard/invoices/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/+page.svelte
@@ -17,7 +17,15 @@
 	import type { PageData } from './$types';
 	import { browser } from '$app/environment';
 	import { companyStore } from '$lib/stores/company.svelte';
-	import { Plus, RefreshCw, FileText, RotateCcw, Boxes, Package, ClipboardList } from 'lucide-svelte';
+	import {
+		Plus,
+		RefreshCw,
+		FileText,
+		RotateCcw,
+		Boxes,
+		Package,
+		ClipboardList
+	} from 'lucide-svelte';
 
 	// IMPORTANTE: Asegúrate de tener instalada svelte-sonner para las notificaciones
 	import { toast } from 'svelte-sonner';
@@ -39,7 +47,7 @@
 		year: data.filters?.year || ''
 	});
 
-    let isDownloadModalOpen = $state(false);
+	let isDownloadModalOpen = $state(false);
 
 	// Efecto reactivo para actualizar filtros cuando cambian los query parameters en la URL
 	$effect(() => {
@@ -611,32 +619,36 @@
 		currentStatusFunction = null;
 	}
 
-    // --- AQUÍ PASAMOS LA FUNCIÓN DE DESCARGA A LAS COLUMNAS ---
-    const columns = createColumns(handleSuccess);
-    async function handleModalConfirm(type: string, format: string, currency: string, uomSource: string, weightUnit: string) {
-       if (!selectedInvoice || !companyStore.activeCompany) return;
+	// --- AQUÍ PASAMOS LA FUNCIÓN DE DESCARGA A LAS COLUMNAS ---
+	const columns = createColumns(handleSuccess);
+	async function handleModalConfirm(
+		type: string,
+		format: string,
+		currency: string,
+		uomSource: string,
+		weightUnit: string
+	) {
+		if (!selectedInvoice || !companyStore.activeCompany) return;
 
-       try {
-           // 1. Trigger: Start celery task with selected options
-           // Note: uomSource and weightUnit are UI-only for now
-           const { task_id } = await invoicesReportsApi.triggerPdfGeneration(
-               selectedInvoice.id, 
-               companyStore.activeCompany.id,
-               type,
-               currency
-           );
-
-           // 2. Open Progress Dialog
-           currentTaskId = task_id;
-           currentStatusFunction = invoicesReportsApi.getTaskStatus;
-           showProgressDialog = true;
-
-       } catch (error) {
-           console.error(error);
-           toast.error("No se pudo iniciar la descarga");
-       }
-    }
+		try {
+			// 1. Trigger: Start celery task with selected options
+			// Note: uomSource and weightUnit are UI-only for now
+			const { task_id } = await invoicesReportsApi.triggerPdfGeneration(
+				selectedInvoice.id,
+				companyStore.activeCompany.id,
+				type,
+				currency
+			);
 
+			// 2. Open Progress Dialog
+			currentTaskId = task_id;
+			currentStatusFunction = invoicesReportsApi.getTaskStatus;
+			showProgressDialog = true;
+		} catch (error) {
+			console.error(error);
+			toast.error('No se pudo iniciar la descarga');
+		}
+	}
 </script>
 
 <div class="space-y-6">
@@ -659,13 +671,13 @@
 			>
 		</Card.Header>
 		<Card.Content>
-			<div class="grid grid-cols-1 md:grid-cols-5 gap-4">
+			<div class="grid grid-cols-1 gap-4 md:grid-cols-5">
 				<div class="space-y-2">
 					<Label for="filter-operation-type">Tipo de Operación</Label>
 					<select
 						id="filter-operation-type"
 						bind:value={filters.operation_type}
-						class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+						class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none"
 					>
 						{#each operationTypeOptions as option}
 							<option value={option.value}>{option.label}</option>
@@ -678,7 +690,7 @@
 					<select
 						id="filter-invoice-type"
 						bind:value={filters.invoice_type}
-						class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2"
+						class="flex h-10 w-full rounded-md border border-input bg-background px-3 py-2 text-sm ring-offset-background focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none"
 					>
 						{#each invoiceTypeOptions() as option}
 							<option value={option.value}>{option.label}</option>
@@ -759,82 +771,77 @@
 
 	<!-- Footer fijo con botones de acción -->
 	<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 max-w-[1400px] mx-auto">
+		<div class="mx-auto max-w-[1400px] px-4 py-4">
 			<!-- Botones de acción -->
 			<div class="flex justify-end gap-2">
 				<Button variant="outline" size="sm" disabled={!selectedInvoice}>
-					<RefreshCw class="h-4 w-4 mr-2" />
+					<RefreshCw class="mr-2 h-4 w-4" />
 					Actualizar
 				</Button>
 				<Button variant="outline" size="sm" disabled={!selectedInvoice}>
-					<RotateCcw class="h-4 w-4 mr-2" />
+					<RotateCcw class="mr-2 h-4 w-4" />
 					Desactualizar
 				</Button>
 				<Button
 					variant="outline"
 					size="sm"
-					onclick={() => isDownloadModalOpen = true}
+					onclick={() => (isDownloadModalOpen = true)}
 					disabled={!selectedInvoice}
 				>
-					<FileText class="h-4 w-4 mr-2" />
+					<FileText class="mr-2 h-4 w-4" />
 					Factura
 				</Button>
-                
+
 				<Button
 					variant="outline"
 					size="sm"
 					onclick={() => selectedInvoice && handleDownloadConsolidated(selectedInvoice)}
 					disabled={!selectedInvoice}
 				>
-					<Boxes class="h-4 w-4 mr-2" />
+					<Boxes class="mr-2 h-4 w-4" />
 					Consolidado
 				</Button>
 
-			<Button
-				variant="outline"
-				size="sm"
-				onclick={() => selectedInvoice && handleDownloadAvisoConsolidado(selectedInvoice)}
-				disabled={!selectedInvoice}
-			>
-				<Boxes class="mr-2 h-4 w-4" />
-				Aviso Consolidado
-			</Button>
-
-			<Button
-				variant="outline"
-				size="sm"
-				onclick={() => selectedInvoice && handleDownloadPackingList(selectedInvoice)}
-				disabled={!selectedInvoice}
-			>
-				<Package class="mr-2 h-4 w-4" />
-				Packing List
-			</Button>
-
-			{#if selectedInvoice?.operation_type === 'exp'}
 				<Button
 					variant="outline"
 					size="sm"
-					onclick={() => selectedInvoice && handleDownloadDescargo(selectedInvoice)}
+					onclick={() => selectedInvoice && handleDownloadAvisoConsolidado(selectedInvoice)}
 					disabled={!selectedInvoice}
 				>
-					<ClipboardList class="mr-2 h-4 w-4" />
-					Descargo PEPS
+					<Boxes class="mr-2 h-4 w-4" />
+					Aviso Consolidado
 				</Button>
-			{/if}
+
+				<Button
+					variant="outline"
+					size="sm"
+					onclick={() => selectedInvoice && handleDownloadPackingList(selectedInvoice)}
+					disabled={!selectedInvoice}
+				>
+					<Package class="mr-2 h-4 w-4" />
+					Packing List
+				</Button>
+
+				{#if selectedInvoice?.operation_type === 'exp'}
+					<Button
+						variant="outline"
+						size="sm"
+						onclick={() => selectedInvoice && handleDownloadDescargo(selectedInvoice)}
+						disabled={!selectedInvoice}
+					>
+						<ClipboardList class="mr-2 h-4 w-4" />
+						Descargo PEPS
+					</Button>
+				{/if}
 			</div>
 		</div>
 	</div>
 
+	<!-- ... -->
 
-
-<!-- ... -->
-
-    {#if selectedInvoice && companyStore.activeCompany}
-        <InvoiceDownloadModal 
-            bind:open={isDownloadModalOpen} 
-            onConfirm={handleModalConfirm}
-        />
-    {/if}
+	{#if selectedInvoice && companyStore.activeCompany}
+		<InvoiceDownloadModal bind:open={isDownloadModalOpen} onConfirm={handleModalConfirm} />
+	{/if}
 </div>
diff --git a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.server.ts b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.server.ts
index f0448712..704afa60 100644
--- a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.server.ts
+++ b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.server.ts
@@ -145,9 +145,9 @@ export const load: PageServerLoad = async ({ params, cookies, fetch, url }) => {
 	if (params.id === 'new') {
 		try {
 			const [
-				invoiceTypesResponse, 
-				customsBrokersResponse, 
-				clientsResponse, 
+				invoiceTypesResponse,
+				customsBrokersResponse,
+				clientsResponse,
 				providersResponse,
 				currencyTypesResponse,
 				transportTypesResponse,
@@ -191,7 +191,7 @@ export const load: PageServerLoad = async ({ params, cookies, fetch, url }) => {
 			const drivers = driversResponse.ok ? await driversResponse.json() : { items: [] };
 			const trailers = trailersResponse.ok ? await trailersResponse.json() : { items: [] };
 			const customsSections = customsSectionsResponse.ok ? await customsSectionsResponse.json() : { items: [] };
-			const codePedimentoRegimens = codePedimentoRegimensResponse.ok ? await codePedimentoRegimensResponse.json() : { items: [] };			
+			const codePedimentoRegimens = codePedimentoRegimensResponse.ok ? await codePedimentoRegimensResponse.json() : { items: [] };
 			const seals = sealsResponse.ok ? await sealsResponse.json() : { items: [] };
 			const incoterms = incotermsResponse.ok ? await incotermsResponse.json() : { items: [] };
 			const pedimentos = pedimentosResponse.ok ? await pedimentosResponse.json() : { items: [] };
@@ -276,9 +276,9 @@ export const load: PageServerLoad = async ({ params, cookies, fetch, url }) => {
 
 		// Cargar también los datos de referencia para edición
 		const [
-			invoiceTypesResponse, 
-			customsBrokersResponse, 
-			clientsResponse, 
+			invoiceTypesResponse,
+			customsBrokersResponse,
+			clientsResponse,
 			providersResponse,
 			currencyTypesResponse,
 			transportTypesResponse,
diff --git a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
index 52b6ff81..7613778d 100644
--- a/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/edit/[id]/+page.svelte
@@ -127,6 +127,37 @@
 	let lastFetchedDate = $state('');
 	let originalInvoiceDate = $state(data.invoice?.invoice_date || '');
 
+	// Derivados reactivos para el tipo de factura y operación
+	let invoiceType = $derived.by(() => {
+		return (
+			InvoiceTopFieldsFormData?.invoice_type ||
+			data.filters?.invoice_type ||
+			data.invoice?.invoice_type ||
+			'TEM'
+		); // Default to TEM if not found
+	});
+
+	let operationTypeText = $derived.by(() => {
+		const type =
+			InvoiceTopFieldsFormData?.operation_type ||
+			data.invoice?.operation_type ||
+			data.filters?.operation_type;
+		if (invoiceType === 'CR') return 'CAMBIO DE RÉGIMEN';
+		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;
 
@@ -263,14 +294,53 @@
 			}
 
 			toast.success('Todos los cambios se guardaron correctamente');
-		} catch (e) {
+		} catch (e: any) {
 			console.error('Error saving all:', e);
 
-			if (e instanceof Error && e.message.includes('401')) {
+			// Handle 401 Unauthorized specifically for session expiration
+			if (e.response?.status === 401 || (e instanceof Error && e.message.includes('401'))) {
 				toast.error('Sesión expirada. Recargando página...');
 				setTimeout(() => {
 					window.location.reload();
 				}, 1500);
+				return; // Exit early after handling 401
+			}
+
+			// Intercept exchange rate error
+			if (
+				e.response?.data?.message?.includes('No existe un Tipo de Cambio registrado') ||
+				e.message?.includes('No existe un Tipo de Cambio registrado') ||
+				e.response?.data?.errors?.[0]?.message?.includes('financials.exchange_rate')
+			) {
+				console.log('Interceptor: Exchange rate missing error caught (Invoice Page).');
+
+				const dateMatch =
+					e.response?.data?.message?.match(/(\d{4}-\d{2}-\d{2})/) ||
+					e.message?.match(/(\d{4}-\d{2}-\d{2})/);
+				const missingDate = dateMatch ? dateMatch[0] : InvoiceTopFieldsFormData?.invoice_date || '';
+
+				missingExchangeRateDate = missingDate;
+				showExchangeRateDialog = true;
+				saving = false; // Ensure saving state is reset
+				return; // Exit early after handling exchange rate error
+			}
+
+			// General error handling with detailed backend messages
+			const detail = e.response?.data?.errors?.[0]?.message;
+			const mainMsg = e.response?.data?.message || e.message || 'Error al guardar la factura';
+
+			// If there are validation errors, show them in detail
+			if (
+				e &&
+				typeof e === 'object' &&
+				'validationErrors' in e &&
+				Array.isArray((e as any).validationErrors)
+			) {
+				const validationErrors = (e as any).validationErrors;
+				const errorList = validationErrors.map((err: any) => `• ${err.message}`).join('\n');
+				toast.error(mainMsg, {
+					description: errorList
+				});
 			} else {
 				const errorMessage = e instanceof Error ? e.message : 'Error al guardar los cambios';
 
@@ -349,12 +419,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">
@@ -379,6 +448,7 @@
 				pedimentos={data.pedimentos || []}
 				defaultOperationType={data.filters?.operation_type ?? undefined}
 				defaultInvoiceType={data.filters?.invoice_type ?? undefined}
+				{invoiceType}
 			/>
 
 			<Tabs.Content value="general">
@@ -386,6 +456,7 @@
 					invoice={data.invoice}
 					bind:formData={generalFormData}
 					invoiceTypes={data.invoiceTypes || []}
+					{invoiceType}
 					customsBrokers={data.customsBrokers || []}
 					clients={data.clients || []}
 					providers={data.providers || []}
@@ -420,6 +491,16 @@
 					seals={data.seals || []}
 					incoterms={data.incoterms || []}
 					enclosure={data.enclosure || []}
+					{invoiceType}
+					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>
 
@@ -428,6 +509,16 @@
 					invoice={data.invoice}
 					bind:formData={itemsFormData}
 					bind:exists={itemsExists}
+					{invoiceType}
+					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>
 
@@ -436,17 +527,39 @@
 					invoice={data.invoice}
 					bind:formData={othersFormData}
 					bind:exists={othersExists}
+					{invoiceType}
+					operationType={InvoiceTopFieldsFormData?.operation_type === 'exp'
+						? 1
+						: InvoiceTopFieldsFormData?.operation_type === 'imp'
+							? 2
+							: data.invoice?.operation_type === 'exp'
+								? 1
+								: data.invoice?.operation_type === 'imp'
+									? 2
+									: undefined}
 					transportModes={data.transportModes || []}
 				/>
 			</Tabs.Content>
 
-			<Tabs.Content value="continuation">
-				<ContinuationTabForm
-					invoice={data.invoice}
-					bind:formData={continuationFormData}
-					bind:exists={continuationExists}
-				/>
-			</Tabs.Content>
+			{#if invoiceType !== 'MEX'}
+				<Tabs.Content value="continuation">
+					<ContinuationTabForm
+						invoice={data.invoice}
+						bind:formData={continuationFormData}
+						bind:exists={continuationExists}
+						{invoiceType}
+						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>
+			{/if}
 		</Tabs.Root>
 	</div>
 </div>
@@ -481,7 +594,11 @@
 		<!-- Tabs Navigation -->
 		<Tabs.Root bind:value={activeTab}>
 			<div class="w-full overflow-x-auto pb-2">
-				<Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-5">
+				<Tabs.List
+					class="inline-flex md:grid md:w-full {invoiceType === 'MEX'
+						? 'md:grid-cols-4'
+						: 'md:grid-cols-5'}"
+				>
 					<Tabs.Trigger value="general" disabled={false} class="whitespace-nowrap">
 						<FileText size={16} class="mr-2" />
 						General
@@ -498,10 +615,12 @@
 						<Truck size={16} class="mr-2" />
 						Otros
 					</Tabs.Trigger>
-					<Tabs.Trigger value="continuation" disabled={false} class="whitespace-nowrap">
-						<Package size={16} class="mr-2" />
-						Cont.
-					</Tabs.Trigger>
+					{#if invoiceType !== 'MEX'}
+						<Tabs.Trigger value="continuation" disabled={false} class="whitespace-nowrap">
+							<Package size={16} class="mr-2" />
+							Cont.
+						</Tabs.Trigger>
+					{/if}
 				</Tabs.List>
 			</div>
 		</Tabs.Root>