diff --git a/.gitignore b/.gitignore
index 9beb6fa8..1da35013 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,7 @@ logs/
 .pytest_cache/
 .coverage
 htmlcov/
+backend/app_data/
 
 # Node (para frontend)
 node_modules/
diff --git a/backend/Dockerfile b/backend/Dockerfile
index cff9b109..89d5822d 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -9,6 +9,31 @@ RUN apt-get update && apt-get install -y \
     curl \
     && rm -rf /var/lib/apt/lists/*
 
+# Instalar dependencias para wkhtmltopdf y reportes PDF
+RUN apt-get update \
+    && apt-get install -y \
+        xvfb \
+        fontconfig \
+        fonts-dejavu-core \
+        libfontconfig1 \
+        libxrender1 \
+        libxtst6 \
+        libxi6 \
+        libxrandr2 \
+        ca-certificates \
+        libjpeg62-turbo \
+        libpng16-16 \
+    && rm -rf /var/lib/apt/lists/*
+
+# Instalar wkhtmltopdf binario oficial con soporte para footers/headers
+RUN curl -k -L -o /tmp/wkhtmltox.deb https://github.com/wkhtmltopdf/packaging/releases/download/0.12.6.1-3/wkhtmltox_0.12.6.1-3.bookworm_amd64.deb \
+    && apt-get update \
+    && apt-get install -y /tmp/wkhtmltox.deb \
+    && rm /tmp/wkhtmltox.deb \
+    && rm -rf /var/lib/apt/lists/* \
+    && wkhtmltopdf --version
+
+
 # Copiar requirements
 COPY requirements.txt .
 
diff --git a/backend/api/v1/modules/a24/fa/fa_parts/models.py b/backend/api/v1/modules/a24/fa/fa_parts/models.py
index ba5bbe75..ad813d8e 100644
--- a/backend/api/v1/modules/a24/fa/fa_parts/models.py
+++ b/backend/api/v1/modules/a24/fa/fa_parts/models.py
@@ -29,7 +29,7 @@ class FaPart(Base, TenantScopedMixin, TimestampMixin):
         ForeignKeyConstraint(
             ["id"], ["a76.parts.id"], name="fk_fa_partes_master"
         ),
-        {"schema": "a24"},
+        {"schema": "a24", "extend_existing": True},
     )
 
     # El ID hereda el valor de la tabla parts
diff --git a/backend/api/v1/modules/a24/inv/inv_parts/models.py b/backend/api/v1/modules/a24/inv/inv_parts/models.py
index 467bbc2c..5e8c76e2 100644
--- a/backend/api/v1/modules/a24/inv/inv_parts/models.py
+++ b/backend/api/v1/modules/a24/inv/inv_parts/models.py
@@ -32,7 +32,7 @@ class InvPart(Base, TenantScopedMixin, TimestampMixin):
         ForeignKeyConstraint(
             ["id"], ["a76.parts.id"], name="fk_inv_partes_master"
         ),
-        {"schema": "a24"},
+        {"schema": "a24", "extend_existing": True},
     )
 
     # Relación 1:1 - El ID es el mismo de la tabla maestra
diff --git a/backend/api/v1/modules/a76/classes/models.py b/backend/api/v1/modules/a76/classes/models.py
index 58459b11..a5288980 100644
--- a/backend/api/v1/modules/a76/classes/models.py
+++ b/backend/api/v1/modules/a76/classes/models.py
@@ -17,10 +17,11 @@ from sqlalchemy import (
 )
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from api.v1.modules.public.reference_data.material_types.models import MaterialType
+from api.v1.modules.a76.general_catalogs.units_of_measure.models import UnitOfMeasure
+
 if TYPE_CHECKING:
     from api.v1.modules.a76.parts.models import Part
-    from api.v1.modules.public.reference_data.material_types.models import MaterialType
-    from api.v1.modules.a76.general_catalogs.units_of_measure.models import UnitOfMeasure
 
 
 class Class(Base, TenantScopedMixin, TimestampMixin):
@@ -47,7 +48,7 @@ class Class(Base, TenantScopedMixin, TimestampMixin):
             "class_code",
             name="uq_classes_tenant_company_code",
         ),
-        {"schema": "a76"},
+        {"schema": "a76", "extend_existing": True},
     )
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True)
diff --git a/backend/api/v1/modules/a76/general_catalogs/company/routes.py b/backend/api/v1/modules/a76/general_catalogs/company/routes.py
index d62fc99a..cc507462 100644
--- a/backend/api/v1/modules/a76/general_catalogs/company/routes.py
+++ b/backend/api/v1/modules/a76/general_catalogs/company/routes.py
@@ -5,9 +5,13 @@ Rutas para gestión de empresa
 import os
 import shutil
 from typing import List, Optional
+import os
+import shutil
+from pathlib import Path
 from datetime import datetime
 
-from fastapi import APIRouter, Depends, HTTPException, status, UploadFile, File
+from fastapi import APIRouter, Depends, HTTPException, status, File, UploadFile
+from fastapi.responses import FileResponse, UploadFile, File
 from sqlalchemy.orm import Session
 
 from core.database import get_core_db
@@ -305,11 +309,98 @@ async def update_company(
     return CompanyResponseDTO.model_validate(updated_company)
 
 
-@router.delete(
-    "/{company_id}",
-    status_code=status.HTTP_204_NO_CONTENT,
-    summary="Delete company",
+    return CompanyResponseDTO.model_validate(updated_company)
+
+
+@router.post(
+    "/{company_id}/upload-logo",
+    response_model=dict,
+    summary="Upload company logo",
 )
+async def upload_company_logo(
+    company_id: int,
+    file: UploadFile = File(...),
+    db: Session = Depends(get_core_db),
+    current_user: dict = Depends(get_current_user),
+):
+    """Upload logo for a company"""
+    tenant_id = current_user.get("tenant_id")
+    if not tenant_id:
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail="Tenant ID not found in user data",
+        )
+
+    # 1. Verify company exists
+    company = CompanyService.get_by_id(db, company_id, tenant_id, 0)
+    if not company:
+        raise HTTPException(
+            status_code=status.HTTP_404_NOT_FOUND,
+            detail="Company not found",
+        )
+
+    # 2. Define upload path
+    # Use a persistent path: 'app_data/logos/{company_id}'
+    upload_dir = Path(f"app_data/logos/{company_id}")
+    upload_dir.mkdir(parents=True, exist_ok=True)
+
+    # 3. Save file
+    # Preserve original filename
+    filename = file.filename or "logo.png"
+    file_path = upload_dir / filename
+
+    try:
+        # Check if file exists and remove it to avoid accumulation if needed, 
+        # or just overwrite (shutil.copyfileobj overwrites)
+        with open(file_path, "wb") as buffer:
+            shutil.copyfileobj(file.file, buffer)
+    except Exception as e:
+        raise HTTPException(
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+            detail=f"Could not save file: {e}",
+        )
+
+    # 4. Returns the absolute path keys
+    abs_path = str(file_path.absolute())
+
+    return {"path": abs_path}
+
+
+@router.get(
+    "/{company_id}/logo/image",
+    summary="Get company logo image",
+)
+@router.get(
+    "/{company_id}/logo/image",
+    summary="Get company logo image",
+)
+async def get_company_logo_image(
+    company_id: int,
+    db: Session = Depends(get_core_db),
+    # Public endpoint to allow <img> tags to load the image without custom headers
+):
+    """Serve the company logo image file"""
+    # Security: In a stricter environment, we would use a signed short-lived URL 
+    # or cookie-based auth. For now, checking if company exists is sufficient.
+    
+    # We find the company ignoring tenant checks for the image serving
+    # (Logos are generally considered semi-public assets in this context)
+    company = db.query(Company).filter(Company.id == company_id).first()
+    
+    if not company or not company.logo:
+        raise HTTPException(status_code=404, detail="Logo not found")
+
+    file_path = Path(company.logo)
+    if not file_path.exists():
+        # Fallback for old paths or moved files
+        # Check if it exists in the 'standard' location even if DB thinks otherwise
+        standard_path = Path(f"app_data/logos/{company_id}") / file_path.name
+        if standard_path.exists():
+            return FileResponse(standard_path)
+            
+        raise HTTPException(status_code=404, detail="Logo file not found on server")
+
+    return FileResponse(file_path)
 async def delete_company(
     company_id: int,
     db: Session = Depends(get_core_db),
diff --git a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py
index 4564c8d6..eada4a3e 100644
--- a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py
+++ b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/models.py
@@ -12,6 +12,10 @@ from sqlalchemy.orm import Mapped, mapped_column, relationship
 from api.v1.common.base_models import TenantScopedMixin, TimestampMixin
 from core.database import Base
 
+# Import models referenced by TenantScopedMixin (Tenant, Company) to ensure they are loaded
+from api.v1.modules.core.tenants.models import Tenant
+from api.v1.modules.a76.general_catalogs.company.models import Company
+
 # 1. GUniMedACE
 class UnitOfMeasureACE(Base, TimestampMixin):
     __tablename__ = "unit_of_measure_ace"
diff --git a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/service.py b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/service.py
index 19304472..f032f76e 100644
--- a/backend/api/v1/modules/a76/general_catalogs/units_of_measure/service.py
+++ b/backend/api/v1/modules/a76/general_catalogs/units_of_measure/service.py
@@ -34,10 +34,13 @@ class BaseService:
         limit: int = 100,
         filters: Optional[Dict[str, Any]] = None,
     ) -> Tuple[List[Any], int]:
-        query = db.query(cls.model).filter(
-            cls.model.tenant_id == tenant_id,
-            cls.model.company_id == company_id,
-        )
+        query = db.query(cls.model)
+        
+        if hasattr(cls.model, "tenant_id"):
+            query = query.filter(cls.model.tenant_id == tenant_id)
+        
+        if hasattr(cls.model, "company_id"):
+            query = query.filter(cls.model.company_id == company_id)
 
         if filters:
             if filters.get("code"):
@@ -56,11 +59,15 @@ class BaseService:
     def get_by_id(
         cls, db: Session, id: int, tenant_id: int, company_id: int
     ) -> Optional[Any]:
-        return db.query(cls.model).filter(
-            cls.model.id == id,
-            cls.model.tenant_id == tenant_id,
-            cls.model.company_id == company_id,
-        ).first()
+        query = db.query(cls.model).filter(cls.model.id == id)
+        
+        if hasattr(cls.model, "tenant_id"):
+            query = query.filter(cls.model.tenant_id == tenant_id)
+            
+        if hasattr(cls.model, "company_id"):
+            query = query.filter(cls.model.company_id == company_id)
+            
+        return query.first()
 
     @classmethod
     def create(
@@ -70,9 +77,15 @@ class BaseService:
         tenant_id: int,
         company_id: int,
     ) -> Any:
-        db_obj = cls.model(
-            **data.model_dump(), tenant_id=tenant_id, company_id=company_id
-        )
+        create_kwargs = data.model_dump()
+        
+        if hasattr(cls.model, "tenant_id"):
+            create_kwargs["tenant_id"] = tenant_id
+            
+        if hasattr(cls.model, "company_id"):
+            create_kwargs["company_id"] = company_id
+            
+        db_obj = cls.model(**create_kwargs)
         db.add(db_obj)
         db.commit()
         db.refresh(db_obj)
diff --git a/backend/api/v1/modules/a76/items/line_items/models.py b/backend/api/v1/modules/a76/items/line_items/models.py
index 4ed22e07..c3641ee6 100644
--- a/backend/api/v1/modules/a76/items/line_items/models.py
+++ b/backend/api/v1/modules/a76/items/line_items/models.py
@@ -1,10 +1,13 @@
 from decimal import Decimal
 from typing import Optional, TYPE_CHECKING
-from sqlalchemy import Boolean, String, Integer, Numeric, SmallInteger, ForeignKey
+from sqlalchemy import Boolean, String, Integer, Numeric, SmallInteger, ForeignKey, ForeignKeyConstraint
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 from api.v1.common.base_models import TenantScopedMixin, TimestampMixin
 from core.database import Base
 
+from api.v1.modules.a76.classes.models import Class
+from api.v1.modules.a76.general_catalogs.units_of_measure.models import UnitOfMeasure
+
 if TYPE_CHECKING:
     from ..models import Item
     from ..line_financials.models import LineFinancial
@@ -12,10 +15,6 @@ if TYPE_CHECKING:
     from ..line_customs.models import LineCustom
     from ..line_descriptions.models import LineDescription
     from ..line_references.models import LineReference
-    from api.v1.modules.a76.classes.models import Class
-    from api.v1.modules.a76.general_catalogs.units_of_measure.models import (
-        UnitOfMeasure,
-    )
     from api.v1.modules.a24.fa.fa_item_lines.models import FaLineItem
 
 
@@ -26,19 +25,24 @@ class LineItem(Base, TenantScopedMixin, TimestampMixin):
     """
 
     __tablename__ = "item_lines"
-    __table_args__ = {
-        "schema": "a76",
-    }
+    __table_args__ = (
+        ForeignKeyConstraint(
+            ["class_code", "tenant_id", "company_id"],
+            ["a76.classes.class_code", "a76.classes.tenant_id", "a76.classes.company_id"],
+            name="fk_item_lines_class"
+        ),
+        {"schema": "a76"},
+    )
 
     id: Mapped[int] = mapped_column(primary_key=True, autoincrement=True)
     item_id: Mapped[int] = mapped_column(ForeignKey("a76.items.id"))
     line_number: Mapped[int] = mapped_column(Integer)  # LINEAIMPO/LINEAEXPO/LINEA
 
     # Part identification
-    part_number_id: Mapped[Optional[str]] = mapped_column(
+    part_number: Mapped[Optional[str]] = mapped_column(
         ForeignKey("a76.parts.id")
     )  # NUMPARTE
-    component_part_number_id: Mapped[Optional[str]] = mapped_column(
+    component_part_number: Mapped[Optional[str]] = mapped_column(
         ForeignKey("a76.parts.id")
     )  # NUMPARTECOM
     class_id: Mapped[Optional[int]] = mapped_column(
diff --git a/backend/api/v1/modules/a76/parts/models.py b/backend/api/v1/modules/a76/parts/models.py
index b920065a..df231753 100644
--- a/backend/api/v1/modules/a76/parts/models.py
+++ b/backend/api/v1/modules/a76/parts/models.py
@@ -22,14 +22,16 @@ from sqlalchemy import (
 # Importante usar relationship y Mapped
 from sqlalchemy.orm import Mapped, mapped_column, relationship
 
+from api.v1.modules.public.reference_data.currency_types.models import CurrencyType
+from api.v1.modules.a24.fa.fa_parts.models import FaPart
+from api.v1.modules.a24.inv.inv_parts.models import InvPart
+
+
 if TYPE_CHECKING:
     from api.v1.modules.a76.classes.models import Class
-    from api.v1.modules.public.reference_data.currency_types.models import CurrencyType
     from api.v1.modules.a76.general_catalogs.units_of_measure.models import (
         UnitOfMeasure,
     )
-    from api.v1.modules.a24.fa.fa_parts.models import FaPart
-    from api.v1.modules.a24.inv.inv_parts.models import InvPart
 
 
 class Part(Base, TenantScopedMixin, TimestampMixin):
diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/schemas.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/schemas.py
new file mode 100644
index 00000000..d543a5a2
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/schemas.py
@@ -0,0 +1,98 @@
+from decimal import Decimal
+from typing import List, Optional, Union
+from pydantic import BaseModel, field_validator
+
+
+class ClienteSchema(BaseModel):
+    header: str
+    nombre: str
+    # Ponemos valor por defecto "" y permitimos que sea opcional
+    direccion: Optional[str] = "" 
+    num_exterior: Optional[str] = ""
+    num_interior: Optional[str] = ""
+    colonia: Optional[str] = ""
+    codigo_postal: Optional[str] = ""
+    ciudad: Optional[str] = ""
+    estado: Optional[str] = ""
+    pais: Optional[str] = ""
+    tax_id: str
+    programa: Optional[str] = ""
+    autorizacion: Optional[str] = ""
+    prosec: Optional[str] = ""
+    reg_emp: Optional[str] = ""
+    cert: Optional[str] = ""
+
+    # Si llega un None, lo convertimos en "" automáticamente
+    @field_validator('direccion', 'nombre', mode='before')
+    @classmethod
+    def prevent_none(cls, v):
+        return v or ""
+
+class FacturaSchema(BaseModel):
+    numero: str
+    fecha: str
+    tipo_cambio: float
+    moneda: str
+    # Campos de aduanas (Opcionales por si A76 aún no los tiene)
+    pedimento: str = ""
+    clave_pedimento: str = ""
+    remesa: str = ""
+    acuse_electronico: str = ""
+    representante_legal: str = ""
+    nombre_empresa: str = ""
+    agente_aduanal: str = ""
+    patente: str = ""
+    precinto: str = ""
+    regimen: str = ""
+    transportista: str = ""
+    scac: str = ""
+    caat: str = ""
+    incoterm: str = ""
+    transporte: str = ""
+    num_transporte: str = ""
+    placas: str = ""
+    placas_remolque: str = ""
+    licencia_conductor: str = ""
+    caat: str = ""
+    scac: str = ""
+    aduana: str = ""
+    destino: str = ""
+    observaciones: str = ""
+    transportista_info: str = ""
+
+class PartidaSchema(BaseModel):
+    numero_parte: str
+    descripcion: str
+    fraccion: str
+    origen: str
+
+    advalorem:Optional[str] = ""
+    preferencia:Optional[str] = ""
+
+    cantidad_importacion: Union[float, str]
+    unidad_medida: str
+    cantidad_bultos: int
+    clave_bultos: str
+    peso_neto: Union[float, str]
+    peso_bruto: Union[float, str]
+    valor_costo_unitario: Union[float, str]
+    valor_total: Union[float, str]
+    valor_estimado: Union[float, str] = "0.00"
+
+class TotalesSchema(BaseModel):
+    cantidad_total: Union[float, str]
+    bultos_total: int
+    clave_bultos: str = ""
+    peso_neto_total: Union[float, str]
+    peso_bruto_total: Union[float, str]
+    valor_total_total: Union[float, str]
+    valor_total_dolares: Union[float, str]
+    valor_estimado_total: Union[float, str] = "0.00"
+
+class FacturaImportacionCompleta(BaseModel):
+    cliente_proveedor: ClienteSchema
+    cliente_vendido: ClienteSchema
+    cliente_enviado: ClienteSchema
+    factura: FacturaSchema
+    partidas: List[PartidaSchema]
+    totales: TotalesSchema
diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py
new file mode 100644
index 00000000..5cff09b4
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py
@@ -0,0 +1,630 @@
+import shutil
+import base64
+import pdfkit
+from pathlib import Path
+from decimal import Decimal
+from typing import Tuple, List, Callable, Optional
+
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+from fastapi import HTTPException
+from sqlalchemy.orm import Session
+
+# --- MODELOS ---
+from api.v1.modules.a76.invoices.models import InvoiceHeader, InvoiceLogistics, InvoiceComplianceMx 
+from api.v1.modules.a76.items.line_financials.models import LineFinancial
+from api.v1.modules.a76.items.line_quantities.models import LineQuantity
+from api.v1.modules.a76.items.line_items.models import LineItem
+from api.v1.modules.a76.clients_and_providers.models import (
+    ClientProvider, ClientProviderAddress, ClientProviderPrograms
+)
+from api.v1.modules.a76.parts.models import Part
+from api.v1.modules.a76.pedmientos.models import Pedimentos
+from api.v1.modules.a76.general_catalogs.company.models import Company
+from api.v1.modules.a76.customs_brokers.models import CustomsBroker
+from api.v1.modules.a76.items.models import Item 
+
+# --- TRANSPORTATION MODELS ---
+from api.v1.modules.a76.transportation.transporters.models import Transporter
+from api.v1.modules.a76.transportation.vehicles.models import Vehicle
+from api.v1.modules.a76.transportation.trailers.models import Trailer
+from api.v1.modules.a76.transportation.drivers.models import Driver
+
+# --- MODELO DE FRACCIONES ---
+from api.v1.modules.a76.general_catalogs.tariff_fractions.models import TariffFraction
+
+# --- SCHEMAS ---
+from .schemas import (
+    ClienteSchema, PartidaSchema, TotalesSchema, 
+    FacturaSchema, FacturaImportacionCompleta
+)
+
+class ConsolidadoImportacionMexService:
+    def __init__(self):
+        self.template_dir = Path(__file__).parent.parent / "templates"
+        self.jinja_env = Environment(
+            loader=FileSystemLoader(self.template_dir),
+            autoescape=select_autoescape(['html', 'xml'])
+        )
+        self.template = self.jinja_env.get_template('cons_mex_ver.html')
+
+    def _get_wkhtmltopdf_config(self):
+        path = shutil.which("wkhtmltopdf") or "/usr/local/bin/wkhtmltopdf"
+        if not Path(path).exists():
+            raise RuntimeError("wkhtmltopdf no encontrado.")
+        return pdfkit.configuration(wkhtmltopdf=path)
+
+    def formatear_numero(self, valor, decimales: int = 2):
+        if valor is None: return 0.0
+        try:
+            return round(float(valor), decimales)
+        except: return 0.0
+
+    def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
+        if not fraccion_raw or len(fraccion_raw) < 8:
+            return fraccion_raw
+        return f"{fraccion_raw[:4]}.{fraccion_raw[4:6]}.{fraccion_raw[6:]}"
+
+    def _obtener_datos_cliente(self, db: Session, client_id: int, rol: str) -> ClienteSchema:
+        main = db.query(ClientProvider).filter(ClientProvider.id == client_id).first()
+        if not main:
+            return ClienteSchema(header=rol, nombre="Desconocido", direccion="", tax_id="", codigo_postal="", ciudad="", estado="", pais="MEX")
+        
+        addr = db.query(ClientProviderAddress).filter(ClientProviderAddress.client_id == client_id).first()
+        prog = db.query(ClientProviderPrograms).filter(ClientProviderPrograms.client_id == client_id).first()
+
+        return ClienteSchema(
+            header=rol,
+            nombre=(main.name or main.short_name) or "S/N",
+            direccion=(addr.streets or "") if addr else "", 
+            num_exterior=(addr.exterior_number or "") if addr else "",
+            num_interior=(addr.interior_number or "") if addr else "",
+            colonia=(addr.neighborhood or "") if addr else "",
+            codigo_postal=(addr.postal_code or "") if addr else "",
+            ciudad=(addr.city or "") if addr else "",
+            estado=(addr.state or "") if addr else "",
+            pais=(addr.country or "MEX") if addr else "MEX",
+            tax_id=prog.tax_id if (prog and prog.tax_id) else (getattr(main, 'rfc', "") or ""),
+            programa="IMMEX" if (prog and prog.program) else "", 
+            autorizacion=prog.program_number if prog else "",
+            prosec=prog.prosec_authorization if (prog and prog.prosec and prog.prosec_authorization) else "",
+            reg_emp=prog.val_certified_company_registry if (prog and hasattr(prog, 'val_certified_company_registry')) else (
+                prog.certified_company_registry if (prog and prog.certified_company_registry) else ""
+            ),
+            cert=prog.is_certified_company if (prog and prog.is_certified_company) else "" 
+        )
+
+    def obtener_datos(self, db: Session, invoice_id: int, company_id: int, progress_callback: Optional[Callable] = None) -> FacturaImportacionCompleta:
+        try:
+            if progress_callback: progress_callback(10, "Buscando factura...")
+            header = db.query(InvoiceHeader).filter(InvoiceHeader.id == invoice_id, InvoiceHeader.company_id == company_id).first()
+            if not header: raise HTTPException(status_code=404, detail="Factura no encontrada")
+
+            compliance = header.compliance_mx 
+            logistics = header.logistics if header.logistics else None
+            financials = header.financials if header.financials else None
+            if progress_callback: progress_callback(20, "Obteniendo datos de pedimento...")
+            pedimento_id = compliance.pedimento_id if (compliance and compliance.pedimento_id) else header.related_doc_id
+            pedimento = db.query(Pedimentos).filter(Pedimentos.id == pedimento_id).first() if pedimento_id else None
+            
+            if progress_callback: progress_callback(30, "Obteniendo cliente y proveedor...")
+            proveedor_id = compliance.provider_id if compliance else None
+            cliente_proveedor = self._obtener_datos_cliente(db, proveedor_id, "Proveedor / supplier:") if proveedor_id else ClienteSchema(header="Proveedor", nombre="No Asignado", direccion="", tax_id="", codigo_postal="", ciudad="", estado="", pais="")
+
+            nombre_agente = ""
+            if compliance and compliance.customs_broker_id:
+                broker = db.query(CustomsBroker).filter(CustomsBroker.id == compliance.customs_broker_id).first()
+                if broker: nombre_agente = broker.name
+
+            company = db.query(Company).filter(Company.id == header.company_id).first()
+            # Datos Default (Company/Importer) - Used for fallback or Right Side (Enviado A)
+            # Default Header (Company)
+            cliente_default = ClienteSchema(
+                header="Importer / Consignee:",
+                nombre=getattr(company, 'name', "Empresa Local"),
+                direccion="DOMICILIO FISCAL",
+                num_exterior="", colonia="", codigo_postal="", ciudad="", estado="", pais="MEX",
+                tax_id=getattr(company, 'rfc', ""),
+                programa=getattr(company, 'program', "IMMEX"), autorizacion=getattr(company, 'program_number', "")
+            )
+
+            # Left Side Logic (Consignatario / Sold To)
+            cliente_vendido = cliente_default
+            if compliance and compliance.sold_to_id:
+                # Map known headers or default to Sold To / Vendido a
+                raw = (compliance.sold_to_header or "").upper()
+                if "CONSIGN" in raw:
+                    clean_header = "Consignee / Consignatario:"
+                else:
+                    clean_header = "Sold To / Vendido a:"
+                
+                cliente_vendido = self._obtener_datos_cliente(db, compliance.sold_to_id, clean_header)
+            
+            # Right Side Logic (Enviado A / Shipped To)
+            cliente_enviado = cliente_default
+            if compliance and compliance.shipped_to_id:
+                # Map to Shipped To / Enviado a
+                clean_header_shipped = "Shipped To / Enviado a:"
+                
+                # Fetch client data
+                cliente_enviado = self._obtener_datos_cliente(db, compliance.shipped_to_id, clean_header_shipped)
+
+            remesa_valor = str(compliance.remesa) if (compliance and compliance.remesa) else ""
+            acuse_valor = str(compliance.edocument) if (compliance and compliance.edocument) else "N/A"
+
+            patente_val = ""
+            if pedimento and pedimento.license:
+                patente_val = pedimento.license
+            elif 'broker' in locals() and broker and broker.license:
+                patente_val = broker.license
+
+
+            # --- Transport Data Fetching ---
+            transporte_txt = str(logistics.transport_type) if (logistics and logistics.transport_type) else ""
+            num_transporte_val = (logistics.trailer_num or "") if logistics else ""
+            
+            # Init values
+            placas_val = (logistics.license_plate or "") if logistics else "" # Placas Tracto
+            placas_remolque_val = ""
+            transportista_val = (logistics.carrier_id or "") if logistics else ""
+            caat_val = ""
+            scac_val = ""
+            licencia_cond_val = ""
+            conductor_nombre = ""
+
+            # Block Logic (Clarion Style) for transportista_info
+            transport_lines = []
+
+            if logistics:
+                # 1. Transporter (CAAT / SCAC)
+                if logistics.carrier_id:
+                    transporter_obj = db.query(Transporter).filter(Transporter.transporter_key == logistics.carrier_id).first()
+                    if transporter_obj:
+                        caat_val = transporter_obj.caat_code or ""
+                        scac_val = transporter_obj.transport_code or "" # Mapping transport_code to SCAC
+                        transportista_val = transporter_obj.name or logistics.carrier_id
+
+                        # Clarion Logic: Name first
+                        # Line 1: Name
+                        transport_lines.append(transporter_obj.name or "")
+                        
+                        # Line 2: Streets
+                        if transporter_obj.streets:
+                            transport_lines.append(transporter_obj.streets)
+                        
+                        # Line 3: City, State, Country
+                        loc_line = ""
+                        if transporter_obj.city:
+                             loc_line = transporter_obj.city
+                             if transporter_obj.state:
+                                 loc_line += f", {transporter_obj.state}, "
+                             else:
+                                 loc_line += ", "
+                        else:
+                             if transporter_obj.state:
+                                 loc_line = f"{transporter_obj.state},"
+                        
+                        country_desc = transporter_obj.country or "" 
+                        if loc_line:
+                            loc_line += f" {country_desc}"
+                        elif country_desc:
+                            loc_line = country_desc
+                        
+                        if loc_line.strip(", "):
+                            transport_lines.append(loc_line)
+
+                # 2. Vehicle (Placas Tracto) - Try transport_id first
+                if logistics.transport_id:
+                    veh_obj = db.query(Vehicle).filter(Vehicle.vehicle_key == logistics.transport_id).first()
+                    if veh_obj:
+                         placas_val = veh_obj.plate_number or placas_val
+                elif logistics.vehicle_num: # Fallback to vehicle_num if populated and transport_id failed/empty
+                     veh_obj = db.query(Vehicle).filter(Vehicle.vehicle_key == logistics.vehicle_num).first()
+                     if veh_obj:
+                         placas_val = veh_obj.plate_number or placas_val
+
+                # 3. Trailer (Placas Remolque)
+                if logistics.trailer_num:
+                    trl_obj = db.query(Trailer).filter(Trailer.trailer_number == logistics.trailer_num).first()
+                    if trl_obj:
+                        placas_remolque_val = trl_obj.plate_number or ""
+
+                # 4. Driver (License)
+                if logistics.carrier_id and logistics.driver_name:
+                    conductor_nombre = logistics.driver_name
+                    # Attempt to find driver by name + carrier
+                    drv_obj = db.query(Driver).filter(
+                        Driver.transporter_key == logistics.carrier_id,
+                        Driver.driver_name == logistics.driver_name
+                    ).first()
+                    if drv_obj:
+                         licencia_cond_val = drv_obj.license_number or ""
+                
+                # --- Building the rest of the block ---
+                
+                # Line 4: Driver
+                if conductor_nombre:
+                     transport_lines.append(f"Driver/Conductor: {conductor_nombre}")
+                
+                # Line 5: Conveyance / Transporte
+                t_label = "Conveyance / Transporte"
+                t_val = placas_val # Default to Truck Plate
+                
+                if logistics.transport_type:
+                    ttype = str(logistics.transport_type).lower()
+                    if "caja" in ttype or "trailer" in ttype:
+                        t_label = "Trailer / Caja"
+                        t_val = placas_remolque_val or num_transporte_val
+                    elif "placa" in ttype:
+                         t_label = "Plates / Placas"
+                    elif "camion" in ttype or "truck" in ttype:
+                         t_label = "Truck / Camión"
+                
+                if t_val:
+                     transport_lines.append(f"{t_label}: {t_val}")
+                
+                # Line 6: SCAC / CAAT
+                codes_line = ""
+                if scac_val:
+                    codes_line = f"SCAC Code/Clave: {scac_val}"
+                if caat_val:
+                    if codes_line:
+                        codes_line += f", CAAT Code/Clave: {caat_val}"
+                    else:
+                        codes_line = f"CAAT Code/Clave: {caat_val}"
+                
+                if codes_line:
+                     transport_lines.append(codes_line)
+
+            # Join with newlines
+            transport_block_str = "\n".join([l for l in transport_lines if l])
+
+            factura_schema = FacturaSchema(
+                numero=header.invoice_number or "S/N",
+                fecha=str(header.invoice_date) if header.invoice_date else "",
+                tipo_cambio=float(financials.exchange_rate) if (financials and financials.exchange_rate) else (float(pedimento.exchange_rate) if pedimento and pedimento.exchange_rate else 1.0),
+                moneda=getattr(header, 'currency', "USD") or "USD",
+                incoterm=(logistics.incoterm or "") if logistics else "",
+                observaciones=header.observation_es or header.observation_en or "",
+                pedimento=f"{pedimento.year}  {pedimento.customs_office[:2] if pedimento.customs_office else ''}  {pedimento.license}  {pedimento.pedimento_number}" if pedimento else "",
+                clave_pedimento=pedimento.pedimento_code if pedimento else "",
+                regimen=header.document_type or "",
+                patente=patente_val,
+                agente_aduanal=nombre_agente,
+                transporte=transporte_txt,
+                num_transporte=num_transporte_val,
+                placas=placas_val,
+                placas_remolque=placas_remolque_val,
+                transportista=transportista_val,
+                caat=caat_val,
+                scac=scac_val,
+                licencia_conductor=licencia_cond_val,
+                aduana=compliance.aduana if (compliance and compliance.aduana) else (pedimento.customs_office[:2] if (pedimento and pedimento.customs_office) else ""),
+                precinto=(logistics.seal_number or "") if logistics else "",
+                destino=(logistics.destination_goods or "") if logistics else "",
+                remesa=remesa_valor, acuse_electronico=acuse_valor,
+                representante_legal=getattr(company, 'responsible', "") or "",
+                nombre_empresa=getattr(company, 'name', "") or "",
+                transportista_info=transport_block_str
+            )
+            
+            if progress_callback: progress_callback(50, "Procesando partidas...")
+            
+            # --- Fetch Lines from SINGLE Invoice (Requested Scope Change) ---
+            # User requested to ONLY report items from the specific selected invoice,
+            # NOT consolidating all invoices from the same Pedimento.
+            target_invoice_ids = [header.id]
+            
+            lines = db.query(LineItem).join(Item, LineItem.item_id == Item.id).filter(
+                Item.invoice_id.in_(target_invoice_ids)
+            ).all()
+
+            partidas_list = []
+            
+            # --- AGGREGATION LOGIC (Refactoring based on Clarion) ---
+            from collections import defaultdict
+            # Key: (us_fraction_code, origin_country)
+            # Value: Object with accumulated fields
+            aggregated_data = defaultdict(lambda: {
+                "qty": 0.0, 
+                "net_weight_kgs": 0.0, 
+                "gross_weight_kgs": 0.0, 
+                "total_value": 0.0,
+                "est_total_value": 0.0,
+                "description": "",
+                "advalorem_txt": "0%",
+                "unit_measure": "PZA", # Placeholder, takes first one found
+                "hts_code_print": "",
+                "part_number_display": "CONSOLIDADO"
+            })
+
+            # Pre-fetch US Tariff Fractions for efficiency if possible, or query inside loop (caching recommended)
+            # For simplicity in this step, we query inside or rely on Part data. 
+            # Ideally fetch USTariffFraction from DB based on Part.us_fraction
+
+            # --- Optimización: Cargar Facturas en Memoria ---
+            invoices_list = db.query(InvoiceHeader).filter(InvoiceHeader.id.in_(target_invoice_ids)).all()
+            invoice_map = {inv.id: inv for inv in invoices_list}
+
+            from api.v1.modules.a76.general_catalogs.us_tariff_fractions.models import USTariffFraction
+
+            for line in lines:
+                qty = db.query(LineQuantity).filter(LineQuantity.item_line_id == line.id).first()
+                fin = db.query(LineFinancial).filter(LineFinancial.item_line_id == line.id).first()
+                part_master = db.query(Part).filter(Part.id == line.part_number).first()
+                
+                # --- Resolver Identificadores (MOVED INSIDE MAIN LOOP) ---
+                us_fraction_raw = ""
+                origin_final = "MEX"
+                
+                if part_master:
+                    origin_final = part_master.fa_data.origin_country if (part_master.fa_data and part_master.fa_data.origin_country) else "MEX"
+                    us_fraction_raw = part_master.us_fraction if part_master.us_fraction else ""
+                
+                # Key for aggregation
+                us_frac_clean = us_fraction_raw.strip()
+                agg_key = (us_frac_clean, origin_final)
+                # --- Weights & Qty ---
+                q_line = float(qty.quantity) if (qty and qty.quantity) else 0.0
+                nw_line = float(qty.net_weight) if qty else 0.0
+                gw_line = float(qty.gross_weight) if qty else 0.0
+                
+                # --- Multi-Currency Normalization Logic ---
+                # Determine Line Currency context
+                # Use manual lookup instead of specific attribute
+                invoice_id = line.item.invoice_id if line.item else None
+                line_invoice = invoice_map.get(invoice_id) if invoice_id else None
+                
+                line_currency_is_mxn = False
+                line_exchange_rate = 1.0
+
+                if line_invoice and line_invoice.financials:
+                    # Check explicit currency string AND code
+                    curr_desc = str(line_invoice.financials.currency or "").upper()
+                    curr_code = str(line_invoice.financials.currency_type or "").upper()
+                    
+                    # Logic: It is MXN if description says PESO/MX or code is MXN/MN
+                    is_mx_desc = ("MX" in curr_desc or "PESO" in curr_desc)
+                    is_mx_code = ("MXN" in curr_code or "MN" == curr_code)
+                    
+                    # But if code allows clarifying USD, prioritize that
+                    is_usd_code = ("USD" in curr_code)
+                    
+                    if is_usd_code:
+                        line_currency_is_mxn = False
+                    elif is_mx_code or is_mx_desc:
+                        line_currency_is_mxn = True
+                    else:
+                        line_currency_is_mxn = False # Default to Foreign/USD if unsure
+
+                    line_exchange_rate = float(line_invoice.financials.exchange_rate or 1.0)
+                
+                # Target Report Currency
+                report_is_mxn = (factura_schema.moneda == 'MXN')
+
+                # DEBUG LOGGING
+                if line_invoice:
+                     print(f"DEBUG: Line {line.id} - Inv {line_invoice.id} - CurrDesc: '{curr_desc}' Code: '{curr_code}' - Rate: {line_exchange_rate}")
+                     print(f"DEBUG: Is MXN Context? {line_currency_is_mxn}. Report is MXN? {report_is_mxn}")
+
+                # --- Get Financials for Line (Raw) ---
+                v_total_raw = 0.0
+                v_unitario_raw = 0.0
+
+                if fin:
+                    # NEW PRIORITY LOGIC (To avoid Inflation from dirty Customs Unit Cost)
+                    # Priority 1: Use 'fin.value_usd' if it exists and > 0.
+                    # Priority 2: Use 'fin.total_commercial_value' if it exists and > 0.
+                    # Priority 3: Calculate using 'fin.unit_cost_commercial_usd' * 'q_line'.
+                    # Priority 4: Only use 'fin.unit_cost_usd' * 'q_line' if commercial data is also missing.
+
+                    val_usd = float(fin.value_usd or 0.0)
+                    total_comm = float(fin.total_commercial_value or 0.0)
+                    unit_comm_usd = float(fin.unit_cost_commercial_usd or 0.0)
+                    unit_usd = float(fin.unit_cost_usd or 0.0)
+                    
+                    # 1. Direct Total: Custom Value (Best case)
+                    if val_usd > 0:
+                        v_total_raw = val_usd
+                    
+                    # 2. Direct Total: Commercial Total
+                    elif total_comm > 0:
+                        # Convert if invoice currency is MXN
+                        if line_currency_is_mxn and line_exchange_rate > 0:
+                            v_total_raw = total_comm / line_exchange_rate
+                        else:
+                            v_total_raw = total_comm
+                            
+                    # 3. Calc from Commercial Unit Cost (Safe Fallback)
+                    elif unit_comm_usd > 0 and q_line > 0:
+                        v_total_raw = unit_comm_usd * q_line
+                        
+                    # 4. Calc from Customs Unit Cost (Unknown Risk - Last Resort)
+                    elif unit_usd > 0 and q_line > 0:
+                        v_total_raw = unit_usd * q_line
+                    
+                    else:
+                        v_total_raw = 0.0
+                        
+                    # NOTE: v_unitario_raw is left as 0.0 here.
+                    # It will be calculated in the 'Calculation Gap Fill' block below:
+                    # v_unitario_raw = v_total_raw / q_line
+                    # This guarantees consistency and avoids the inflated unit cost record (198.00).
+
+                # --- Calculation Gap Fill (Raw) ---
+                if q_line > 0:
+                    if v_total_raw == 0 and v_unitario_raw > 0:
+                        v_total_raw = v_unitario_raw * q_line
+                    if v_unitario_raw == 0 and v_total_raw > 0:
+                        v_unitario_raw = v_total_raw / q_line
+
+                # --- Conversion to Report Currency (DISABLED TEMPORARILY) ---
+                # User confirms all are USD. Forcing direct sum to avoid logic errors in detection.
+                v_total_line = v_total_raw
+                v_unitario_line = v_unitario_raw
+
+                # if report_is_mxn and not line_currency_is_mxn:
+                #     # USD -> MXN
+                #     v_total_line = v_total_raw * line_exchange_rate
+                #     v_unitario_line = v_unitario_raw * line_exchange_rate
+                # elif not report_is_mxn and line_currency_is_mxn:
+                #     # MXN -> USD
+                #     if line_exchange_rate > 0:
+                #         v_total_line = v_total_raw / line_exchange_rate
+                #         v_unitario_line = v_unitario_raw / line_exchange_rate
+                #     else:
+                #         v_total_line = 0.0
+                #         v_unitario_line = 0.0
+                
+                print(f"DEBUG: ValRaw: {v_total_raw} -> ValFinal: {v_total_line}")
+                
+                # --- Resolve Fraction Details (Description & Rate) ---
+                # Only if this is the first time we see this key (or overwrite, doesn't matter much as they should be same for same HTS)
+                # We check if we already have description set to avoid re-querying if we want optimization, 
+                # but relying on DB query per distinct fraction is safer.
+                
+                current_agg = aggregated_data[agg_key]
+                
+                if not current_agg["description"]:
+                    us_frac_db = db.query(USTariffFraction).filter(USTariffFraction.code == us_frac_clean).first()
+                    if us_frac_db:
+                         current_agg["description"] = us_frac_db.description or "Sin Descripción"
+                         # Parse AdValorem from DB if available, else 0 ?? 
+                         # Creating logical placeholder. The provided Clarion code used `FraAme.Adv`
+                         adv_val = us_frac_db.ad_valorem # Assuming field exists based on viewing file later?
+                         # Wait, in us-tariff-fractions.ts I saw `ad_valorem: number | null`.
+                         current_agg["advalorem_txt"] = f"{adv_val}%" if adv_val is not None else "0%"
+                    else:
+                         current_agg["description"] = part_master.description_spanish if part_master else "S/D"
+
+                    current_agg["hts_code_print"] = us_frac_clean
+                    current_agg["unit_measure"] = qty.weight_unit if qty else "KGS" # Default to first found
+
+                # --- Calculate Estimated Tax for this Line ---
+                rate = 0.0
+                try:
+                    clean_adv = current_agg["advalorem_txt"].replace("%", "").strip()
+                    rate = float(clean_adv) / 100.0
+                except: rate = 0.0
+                
+                v_est_line = v_total_line * rate
+                
+                # --- Accumulate ---
+                current_agg["qty"] += q_line
+                current_agg["net_weight_kgs"] += nw_line
+                current_agg["gross_weight_kgs"] += gw_line
+                current_agg["total_value"] += v_total_line
+                current_agg["est_total_value"] += v_est_line
+
+
+            # --- Convert Aggregated Data to Schema List ---
+            partidas_list = []
+            
+            for (hts, origin), data in aggregated_data.items():
+                
+                # Calculate Unit Price based on Total Value / Total Qty
+                unit_price = 0.0
+                if data["qty"] > 0:
+                    unit_price = data["total_value"] / data["qty"]
+                
+                partidas_list.append(PartidaSchema(
+                    numero_parte="VARIOS", # Or empty
+                    descripcion=data["description"],
+                    fraccion=data["hts_code_print"],
+                    origen=origin,
+                    advalorem=data["advalorem_txt"],
+                    preferencia="General",
+                    cantidad_importacion=self.formatear_numero(data["qty"]),
+                    unidad_medida=data["unit_measure"],
+                    cantidad_bultos=0, # Summing bultos might be tricky if not homogeneous, check logic later
+                    clave_bultos="",
+                    peso_neto=self.formatear_numero(data["net_weight_kgs"]),
+                    peso_bruto=self.formatear_numero(data["gross_weight_kgs"]),
+                    valor_costo_unitario=self.formatear_numero(unit_price),
+                    valor_total=self.formatear_numero(data["total_value"]),
+                    valor_estimado=self.formatear_numero(data["est_total_value"])
+                ))
+            
+            # Sort by Fraction (HTS Code)
+            partidas_list.sort(key=lambda x: x.fraccion)
+
+            totales = self.calcular_totales(partidas_list, Decimal(factura_schema.tipo_cambio))
+
+            return FacturaImportacionCompleta(
+                cliente_proveedor=cliente_proveedor, cliente_vendido=cliente_vendido,
+                cliente_enviado=cliente_enviado, factura=factura_schema,
+                partidas=partidas_list, totales=totales
+            )
+
+        except Exception as e:
+            print(f"Error Service A76: {e}")
+            raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
+
+    def calcular_totales(self, partidas: List[PartidaSchema], tipo_cambio: Decimal) -> TotalesSchema:
+        cant = sum(p.cantidad_importacion for p in partidas)
+        valor = sum(p.valor_total for p in partidas)
+        peso_n = sum(p.peso_neto for p in partidas)
+        peso_b = sum(p.peso_bruto for p in partidas)
+        bultos = sum(p.cantidad_bultos for p in partidas)
+        claves = [p.clave_bultos for p in partidas if p.clave_bultos]
+        clave_comun = max(set(claves), key=claves.count) if claves else ""
+        if bultos > 1 and clave_comun and not clave_comun.endswith("S"): clave_comun += "S"
+        v_est = sum(p.valor_estimado for p in partidas if isinstance(p.valor_estimado, (int, float, Decimal)))
+        
+        tc = float(tipo_cambio) if tipo_cambio else 1.0
+        return TotalesSchema(   
+            cantidad_total=self.formatear_numero(cant), bultos_total=bultos, clave_bultos=clave_comun,
+            peso_neto_total=self.formatear_numero(peso_n), peso_bruto_total=self.formatear_numero(peso_b),
+            valor_total_total=self.formatear_numero(valor), valor_total_dolares=self.formatear_numero(valor / tc if tc > 0 else 0),
+            valor_estimado_total=self.formatear_numero(v_est)
+        )
+
+    def generar_factura_completa(self, db: Session, invoice_id: int, company_id: int, formato: str = "pdf", progress_callback: Optional[Callable] = None) -> Tuple[bytes, str, str]:
+        if progress_callback: progress_callback(5, "Iniciando servicio de reporte...")
+        datos = self.obtener_datos(db, invoice_id, company_id, progress_callback)
+        
+        if progress_callback: progress_callback(80, "Renderizando plantilla...")
+        
+        # LOGO LOGIC
+        logo_b64 = None
+        try:
+            # Fetch company to get logo path
+
+            comp_logo = db.query(Company).filter(Company.id == company_id).first()
+            if comp_logo and comp_logo.logo:
+                p = Path(comp_logo.logo)
+                
+                # Logic robusta de búsqueda (igual que en routes.py)
+                target_path = p
+                if not target_path.exists():
+                    # Intentar en la ruta estándar: app_data/logos/{id}/{nombre}
+                    # Esto cubre el caso donde solo se guardó el nombre del archivo o la ruta absoluta cambió
+                    fallback = Path(f"app_data/logos/{company_id}") / p.name
+                    if fallback.exists():
+                        target_path = fallback
+
+                if target_path.exists():
+                    with open(target_path, "rb") as image_file:
+                        encoded_string = base64.b64encode(image_file.read()).decode('utf-8')
+                        # Detect MIME type loosely
+                        mime = "image/png"
+                        if target_path.suffix.lower() in ['.jpg', '.jpeg']: mime = "image/jpeg"
+                        logo_b64 = f"data:{mime};base64,{encoded_string}"
+        except Exception as e:
+            print(f"Error loading logo: {e}")
+
+        context = {
+            'cliente_proveedor': datos.cliente_proveedor.model_dump(), 'cliente_vendido': datos.cliente_vendido.model_dump(),
+            'cliente_enviado': datos.cliente_enviado.model_dump(), 'factura': datos.factura.model_dump(),
+            'partidas': [p.model_dump() for p in datos.partidas], 'totales': datos.totales.model_dump(),
+            'logo_b64': logo_b64
+        }
+        html_content = self.template.render(**context)
+        nombre = f"Consolidado_{datos.factura.numero}.{formato}"
+        if formato == "html": return html_content.encode('utf-8'), nombre, "text/html"
+        
+        if progress_callback: progress_callback(90, "Generando PDF final...")
+        options = {'page-size': 'Letter', 'margin-top': '0.5in', 'margin-right': '0.5in', 'margin-bottom': '0.5in', 'margin-left': '0.5in', 'encoding': "UTF-8", 'enable-local-file-access': None}
+        pdf = pdfkit.from_string(html_content, False, options=options, configuration=self._get_wkhtmltopdf_config())
+        
+        if progress_callback: progress_callback(100, "Completado")
+        return pdf, nombre, "application/pdf"
diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/routes.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/routes.py
new file mode 100644
index 00000000..5254cfe4
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/routes.py
@@ -0,0 +1,48 @@
+from enum import Enum
+from typing import Dict, Any
+from fastapi import APIRouter, Depends, Query, Response, HTTPException
+from sqlalchemy.orm import Session
+from celery.result import AsyncResult 
+from core.celery_app import celery_app 
+from core.database import get_core_db
+from core.security import get_current_user, validate_access_to_resource
+from .mex.service import ConsolidadoImportacionMexService
+from .task import generar_pdf_consolidado_async
+
+router = APIRouter()
+servicio_mex = ConsolidadoImportacionMexService()
+
+@router.get("/tasks/{task_id}")
+async def get_task_status(
+    task_id: str,
+    current_user: Dict[str, Any] = Depends(get_current_user),
+    db: Session = Depends(get_core_db)
+):
+    task_result = AsyncResult(task_id, app=celery_app)
+
+    response = {
+        "task_id": task_id,
+        "state": task_result.state,
+        "result": None,
+        "info": None
+    }
+
+    if task_result.state == 'FAILURE':
+        response["result"] = str(task_result.result)
+    elif task_result.state == 'SUCCESS':
+        response["result"] = task_result.result
+    elif task_result.state == 'PROCESSING':
+        response["info"] = task_result.info
+
+    return response
+
+@router.post("/{invoice_id}/download-async")
+async def trigger_descarga_consolidado(
+    invoice_id: int,
+    company_id: int = Query(..., description="ID de la empresa"),
+    current_user: Dict[str, Any] = Depends(get_current_user),
+    db: Session = Depends(get_core_db)
+):
+    validate_access_to_resource(db, company_id, current_user)
+    task = generar_pdf_consolidado_async.delay(invoice_id, company_id)
+    return {"task_id": task.id, "message": "Generación iniciada"} 
diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/task.py b/backend/api/v1/modules/a76/reports/importacion/consolidados/task.py
new file mode 100644
index 00000000..23e680c1
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/task.py
@@ -0,0 +1,52 @@
+import base64
+import logging
+from core.celery_app import celery_app
+from celery import current_task, states
+from core.database import CoreSessionLocal 
+
+from .mex.service import ConsolidadoImportacionMexService
+
+logger = logging.getLogger(__name__)
+
+@celery_app.task(name="generar_pdf_consolidado_async", bind=True)
+def generar_pdf_consolidado_async(self, invoice_id: int, company_id: int):
+   
+    # 1. Abrimos conexión a la DB
+    db = CoreSessionLocal()
+    try:
+        logger.info(f"Worker procesando consolidado {invoice_id}...")
+        
+        # 2. Instanciamos el servicio de reportes
+        service = ConsolidadoImportacionMexService()
+
+        # Update state to PROCESSING
+        self.update_state(state='PROCESSING', meta={'current': 5, 'total': 100, 'status': 'Iniciando generación...'})
+        
+        def progress_callback(progress: int, status: str):
+            self.update_state(state='PROCESSING', meta={'current': progress, 'total': 100, 'status': status})
+
+        # 3. Generamos los bytes del PDF
+        pdf_bytes, nombre, media_type = service.generar_factura_completa(
+            db=db, 
+            invoice_id=invoice_id, 
+            company_id=company_id,
+            progress_callback=progress_callback
+        )
+        
+        # 4. Codificamos a base64 para que viaje seguro por Valkey
+        pdf_base64 = base64.b64encode(pdf_bytes).decode('utf-8')
+        
+        return {
+            "status": "success",
+            "file_name": nombre,
+            "content": pdf_base64,
+            "media_type": media_type
+        }
+
+    except Exception as e:
+        logger.error(f"Error en Celery Worker: {str(e)}")
+        return {"status": "error", "message": str(e)}
+    
+    finally:
+        # 5. MUY IMPORTANTE: Cerramos la conexión para no saturar Postgres
+        db.close()
diff --git a/backend/api/v1/modules/a76/reports/importacion/consolidados/templates/cons_mex_ver.html b/backend/api/v1/modules/a76/reports/importacion/consolidados/templates/cons_mex_ver.html
new file mode 100644
index 00000000..2f0d026b
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/templates/cons_mex_ver.html
@@ -0,0 +1,540 @@
+<!DOCTYPE html>
+<html lang="es" xml:lang="es">
+
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+    <title>Consolidado Importacion Mexicana - {{ factura.numero }}</title>
+    <style type="text/css">
+        /* ESTILOS EXACTOS DE SCAPII PARA MANTENER EL FORMATO */
+        * {
+            margin: 0;
+            padding: 0;
+            font-family: Tahoma, sans-serif;
+            color: black;
+        }
+
+        .titulo {
+            font-size: 14pt;
+            padding: 3pt 0 0 6pt;
+        }
+
+        .grande {
+            font-size: 13pt;
+            padding-left: 5pt;
+        }
+
+        .medio-bold {
+            font-size: 9pt;
+            font-weight: bold;
+            padding: 3pt 0 0 3pt;
+        }
+
+        .normal {
+            font-size: 8pt;
+        }
+
+        .small-bold {
+            font-size: 8pt;
+            font-weight: bold;
+        }
+
+        .tiny-bold {
+            font-size: 7pt;
+            font-weight: bold;
+        }
+
+        .tiny {
+            font-size: 7pt;
+        }
+
+        .mini {
+            font-size: 5pt;
+        }
+
+        h1 {
+            font-weight: bold;
+            font-size: 8pt;
+        }
+
+        p {
+            font-size: 7pt;
+        }
+
+        .cliente {
+            border-bottom: 1pt solid black;
+            text-decoration: none;
+            display: block;
+            width: 100%
+        }
+
+        .center {
+            text-align: center;
+        }
+
+        .right {
+            text-align: right;
+        }
+
+        .border {
+            border: 1pt solid #808080;
+        }
+
+        .p-t-1 {
+            padding-top: 1pt;
+        }
+
+        .p-t-2 {
+            padding-top: 2pt;
+        }
+
+        .p-t-3 {
+            padding-top: 3pt;
+        }
+
+        .p-t-4 {
+            padding-top: 4pt;
+        }
+
+        .p-t-5 {
+            padding-top: 5pt;
+        }
+
+        .p-t-8 {
+            padding-top: 8pt;
+        }
+
+        .p-t-9 {
+            padding-top: 9pt;
+        }
+
+        .p-l-2 {
+            padding-left: 2pt;
+        }
+
+        .p-l-3 {
+            padding-left: 3pt;
+        }
+
+        .p-l-5 {
+            padding-left: 5pt;
+        }
+
+        .p-l-6 {
+            padding-left: 6pt;
+        }
+
+        .p-l-7 {
+            padding-left: 7pt;
+        }
+
+        .p-l-8 {
+            padding-left: 8pt;
+        }
+
+        .p-l-9 {
+            padding-left: 9pt;
+        }
+
+        .p-l-10 {
+            padding-left: 10pt;
+        }
+
+        .p-r-1 {
+            padding-right: 1pt;
+        }
+
+        .p-r-2 {
+            padding-right: 2pt;
+        }
+
+        .p-r-4 {
+            padding-right: 4pt;
+        }
+
+        .p-r-5 {
+            padding-right: 5pt;
+        }
+
+        .p-r-9 {
+            padding-right: 9pt;
+        }
+
+        .p-b-1 {
+            padding-bottom: 1pt;
+        }
+
+        .h-10 {
+            height: 10pt;
+        }
+
+        .h-11 {
+            height: 11pt;
+        }
+
+        .h-14 {
+            height: 14pt;
+        }
+
+        .h-15 {
+            height: 15pt;
+        }
+
+        .h-18 {
+            height: 18pt;
+        }
+
+        .h-22 {
+            height: 22pt;
+        }
+
+        .h-82 {
+            height: 82pt;
+        }
+
+        .h-384 {
+            height: 384pt;
+        }
+
+        .line-1 {
+            line-height: 1pt;
+        }
+
+        .line-7 {
+            line-height: 7pt;
+        }
+
+        .line-8 {
+            line-height: 8pt;
+        }
+
+        .line-9 {
+            line-height: 9pt;
+        }
+
+        .line-10 {
+            line-height: 10pt;
+        }
+
+        .m-l-3 {
+            margin-left: 3pt;
+        }
+
+        .m-l-5 {
+            margin-left: 5.74pt;
+        }
+
+        .flex-container {
+            width: 100%;
+            overflow: hidden;
+        }
+
+        .flex-container-end {
+            width: 100%;
+            overflow: hidden;
+        }
+
+        .width-48 {
+            width: 48%;
+            float: left;
+        }
+
+        .width-48-right {
+            width: 48%;
+            float: right;
+            text-align: right;
+        }
+
+        .position-relative-centered {
+            position: relative;
+            width: 48%;
+            float: left;
+        }
+
+        .full-width-block {
+            display: block;
+            width: 100%;
+        }
+
+        .clearfix::after {
+            content: "";
+            display: table;
+            clear: both;
+        }
+
+        table,
+        tbody {
+            vertical-align: top;
+            overflow: visible;
+        }
+    </style>
+</head>
+
+<body>
+    <header>
+        <div class="flex-container clearfix">
+            <div class="width-48" style="position: relative;">
+                <p class="titulo">HTS Code / Fracción Americana <span class="mini">(temporal)</span></p>
+                <div class="cliente" style="height: 1px;"></div>
+                <p class="cliente p-t-1 p-b-1"></p>
+            </div>
+            <div class="width-48-right">
+                <p class="p-l-5 line-1"><span></span></p>
+                <p class="p-t-2"><br></p>
+            </div>
+        </div>
+        <div class="flex-container-end clearfix" style="overflow: visible;">
+            <div class="position-relative-centered">
+                {% if logo_b64 %}
+                <div style="position: absolute; top: 10pt; left: 0;">
+                    <img src="{{ logo_b64 }}" style="max-height: 70pt; max-width: 120pt;" />
+                </div>
+                {% endif %}
+                <div style="margin-left: 130pt; padding-top: 25pt; text-align: left;">
+                    <h1 class="cliente">{{ cliente_proveedor.header }}</h1>
+                    <p>{{ cliente_proveedor.nombre }}</p>
+                    <p>{{ cliente_proveedor.direccion }}
+                        {% if cliente_proveedor.num_exterior %} Ext: {{ cliente_proveedor.num_exterior }}{% endif %}
+                        {% if cliente_proveedor.num_interior %} Int: {{ cliente_proveedor.num_interior }}{% endif %}
+                    </p>
+                    <p>{{ cliente_proveedor.colonia }} {% if cliente_proveedor.codigo_postal %} CP: {{
+                        cliente_proveedor.codigo_postal }}{% endif %}</p>
+                    <p>{{ cliente_proveedor.ciudad }}, {{ cliente_proveedor.estado }}, {{ cliente_proveedor.pais }}</p>
+                    <p>TAX ID: {{ cliente_proveedor.tax_id }}
+                        {% if cliente_proveedor.programa and cliente_proveedor.programa != 'Ninguno' %}
+                        {{ cliente_proveedor.programa }}: {{ cliente_proveedor.autorizacion }}
+                        {% endif %}
+                    </p>
+                    <p><br></p>
+                </div>
+            </div>
+
+            <div style="position: relative;">
+                <table cellspacing="0" class="m-l-3" style="float: right; text-align: left; width: 230pt;">
+                    <tbody>
+                        <tr class="h-18">
+                            <td bgcolor="#E4E4E4" class="border" colspan="2" style="width:90pt">
+                                <p class="medio-bold p-l-3">Invoice No.:</p>
+                            </td>
+                            <td class="border" colspan="2" style="width:140pt">
+                                <p class="grande center">{{ factura.numero }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-18">
+                            <td bgcolor="#E4E4E4" class="border" style="width:35pt">
+                                <p class="medio-bold p-l-2 line-9">Date:</p>
+                            </td>
+                            <td class="border" style="width:65pt">
+                                <p class="normal center line-9">{{ factura.fecha }}</p>
+                            </td>
+                            <td bgcolor="#E4E4E4" class="border" style="width:35pt">
+                                <p class="medio-bold p-l-2 line-9">Rate:</p>
+                            </td>
+                            <td class="border" style="width:65pt">
+                                <p class="normal center line-9">{{ factura.tipo_cambio }}</p>
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+
+                <!-- Transporter Info Block (Clarion Adaptation) -->
+                <div
+                    style="float: right; width: 230pt; margin-top: 5pt; border: 1px solid black; padding: 2pt; margin-left: 10pt;">
+                    <p class="medio-bold">Coveyance Co. / Cia. Transportista:</p>
+                    <p class="normal line-9" style="white-space: pre-line;">{{ factura.transportista_info }}</p>
+                </div>
+            </div>
+        </div>
+
+        <div class="flex-container clearfix">
+            <div class="width-48">
+                <h1 class="p-t-5 p-l-5 line-10 cliente">{{ cliente_vendido.header }}</h1>
+                <p class="p-l-5 line-8">{{ cliente_vendido.nombre }}</p>
+                <p class="p-l-5">{{ cliente_vendido.direccion }}
+                    {% if cliente_vendido.num_exterior %} Ext: {{ cliente_vendido.num_exterior }}{% endif %}
+                    {% if cliente_vendido.num_interior %} Int: {{ cliente_vendido.num_interior }}{% endif %}
+                </p>
+                <p class="p-l-5">{{ cliente_vendido.colonia }} {% if cliente_vendido.codigo_postal %} CP: {{
+                    cliente_vendido.codigo_postal }}{% endif %}</p>
+                <p class="p-l-5">{{ cliente_vendido.ciudad }}, {{ cliente_vendido.estado }}, {{ cliente_vendido.pais }}
+                </p>
+                <p class="p-l-5">RFC: {{ cliente_vendido.tax_id }}
+                    {% if cliente_vendido.programa and cliente_vendido.programa != 'Ninguno' %}
+                    {{ cliente_vendido.programa }}: {{ cliente_vendido.autorizacion }}
+                    {% endif %}
+                </p>
+                <p class="p-l-5">
+                    {% if cliente_vendido.prosec %}PROSEC: {{ cliente_vendido.prosec }} {% endif %}
+                    {% if cliente_vendido.reg_emp %}REG EMP: {{ cliente_vendido.reg_emp }} {% endif %}
+                    {% if cliente_vendido.cert %}CERT: {{ cliente_vendido.cert }}{% endif %}
+                </p>
+            </div>
+
+            <div class="width-48-right" style="text-align: left;">
+                <h1 class="p-t-5 p-l-5 line-10 cliente full-width-block">{{ cliente_enviado.header }}</h1>
+                <p class="p-l-5 line-8">{{ cliente_enviado.nombre }}</p>
+                <p class="p-l-5">{{ cliente_enviado.direccion }}
+                    {% if cliente_enviado.num_exterior %} Ext: {{ cliente_enviado.num_exterior }}{% endif %}
+                    {% if cliente_enviado.num_interior %} Int: {{ cliente_enviado.num_interior }}{% endif %}
+                </p>
+                <p class="p-l-5">{{ cliente_enviado.colonia }} {% if cliente_enviado.codigo_postal %} CP: {{
+                    cliente_enviado.codigo_postal }}{% endif %}</p>
+                <p class="p-l-5">{{ cliente_enviado.ciudad }}, {{ cliente_enviado.estado }}, {{ cliente_enviado.pais }}
+                </p>
+                <p class="p-l-5">RFC: {{ cliente_enviado.tax_id }}
+                    {% if cliente_enviado.programa and cliente_enviado.programa != 'Ninguno' %}
+                    {{ cliente_enviado.programa }}: {{ cliente_enviado.autorizacion }}
+                    {% endif %}
+                </p>
+                <p class="p-l-5">
+                    {% if cliente_enviado.prosec %}PROSEC: {{ cliente_enviado.prosec }} {% endif %}
+                    {% if cliente_enviado.reg_emp %}REG EMP: {{ cliente_enviado.reg_emp }} {% endif %}
+                    {% if cliente_enviado.cert %}CERT: {{ cliente_enviado.cert }}{% endif %}
+                </p>
+            </div>
+        </div>
+        <p class="p-t-8"><br /></p>
+    </header>
+
+    <table cellspacing="0" class="m-l-5" style="width: 99%; max-width: 580pt;">
+        <thead>
+            <tr class="h-10">
+                <td class="border" style="width:15%">
+                    <p class="tiny-bold center p-t-3">HTS Code / Fracción Americana <span class="mini">(temporal)</span>
+                    </p>
+                </td>
+                <td class="border" style="width:10%">
+                    <p class="tiny-bold center p-t-3">Country</p>
+                </td>
+                <td class="border" style="width:10%">
+                    <p class="tiny-bold center p-t-3">Comm. Qty</p>
+                </td>
+                <td class="border" style="width:5%">
+                    <p class="tiny-bold center p-t-3">Unit</p>
+                </td>
+                <td class="border" colspan="2" style="width:15%">
+                    <p class="tiny-bold center line-9">Weight (KGS)</p>
+                    <div class="clearfix">
+                        <div class="width-48" style="width: 50%; text-align: center;">
+                            <p class="mini">Net</p>
+                        </div>
+                        <div class="width-48-right" style="width: 50%; text-align: center;">
+                            <p class="mini">Gross</p>
+                        </div>
+                    </div>
+                </td>
+                <td class="border" colspan="2" style="width:25%">
+                    <p class="tiny-bold center line-9">Dutiable Values</p>
+                    <div class="clearfix">
+                        <div class="width-48" style="width: 50%; text-align: center;">
+                            <p class="mini">Unit</p>
+                        </div>
+                        <div class="width-48-right" style="width: 50%; text-align: center;">
+                            <p class="mini">Totals</p>
+                        </div>
+                    </div>
+                </td>
+                <td class="border" style="width:5%">
+                    <p class="tiny-bold center p-t-3">Rate</p>
+                </td>
+                <td class="border" style="width:15%">
+                    <p class="tiny-bold center p-t-3">Est. Duties</p>
+                </td>
+            </tr>
+        </thead>
+
+        <tbody class="h-384" style="width: 100%;">
+            {% for partida in partidas %}
+            <tr>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.fraccion }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.origen or 'MEX' }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.cantidad_importacion }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.unidad_medida }}</p>
+                </td>
+                <td class="border" style="border-right: 0;">
+                    <p class="mini p-t-2 center">{{ partida.peso_neto }}</p>
+                </td>
+                <td class="border" style="border-left: 0;">
+                    <p class="mini p-t-2 center">{{ partida.peso_bruto }}</p>
+                </td>
+                <td class="border" style="border-right: 0;">
+                    <p class="mini p-t-2 center">${{ partida.valor_costo_unitario }}</p>
+                </td>
+                <td class="border" style="border-left: 0;">
+                    <p class="mini p-t-2 center">${{ partida.valor_total }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.advalorem }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 right p-r-2">${{ partida.valor_estimado }}</p>
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+
+        <tfoot>
+            <tr class="h-14">
+                <td bgcolor="#E4E4E4" class="border" colspan="2" style="width:25%">
+                    <p class="small-bold p-t-2 p-l-3 line-10">
+                        <span>TOTALS</span>
+                    </p>
+                </td>
+                <td class="border" style="width:10%">
+                    <p class="tiny p-t-5 center line-8">{{ totales.cantidad_total }}</p>
+                </td>
+                <td class="border" style="width:5%">
+                    <p class="tiny p-t-4 center line-8">
+                        {% if totales.bultos_total != 0 %}{{ totales.bultos_total }}{% endif %}
+                        <span>{{ totales.clave_bultos or '' }}</span>
+                    </p>
+                </td>
+                <td class="border" style="width:7.5%">
+                    <p class="tiny p-t-5 center line-8">{{ totales.peso_neto_total }}</p>
+                </td>
+                <td class="border" style="width:7.5%">
+                    <p class="tiny p-t-5 center line-8">{{ totales.peso_bruto_total }}</p>
+                </td>
+                <td class="border" style="width:12.5%">
+                    <!-- Unitario Total N/A -->
+                </td>
+                <td class="border" style="width:12.5%">
+                    <p class="tiny p-t-5 right line-8 p-r-2">${{ totales.valor_total_total }}</p>
+                </td>
+                <td class="border" style="width:5%">
+                    <!-- Tasa N/A -->
+                </td>
+                <td class="border" style="width:15%">
+                    <p class="tiny p-t-5 right p-r-2">${{ totales.valor_estimado_total }}</p>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" class="border" style="height: 100pt; text-align:start; vertical-align: top;">
+                    <p class="mini p-l-2 p-t-2">{{ factura.observaciones }}</p>
+                </td>
+                <td colspan="8" style="width:80%; vertical-align: bottom; height: 100%;">
+                    <p style="border-bottom: 1pt solid black; width: 80%; margin: 60pt auto 2pt auto;"></p>
+                    <p class="normal center" style="margin-bottom: 0;">{{ factura.representante_legal }}</p>
+                    <p class="normal center" style="margin-bottom: 0;">{{ factura.nombre_empresa }}</p>
+                    <p style="margin-bottom: 0;"><br /></p>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="10" style="width:100%; vertical-align: top; height: 100%;">
+                    <p class="p-t-8"><br /></p>
+                    <p class="p-l-5 line-8 tiny-bold">Normal Por Parte</p>
+                    <p class="normal p-l-5 line-9">I declare under penalty of perjury that the information contained in
+                        this document is true and I am responsible for proving what is declared here.</p>
+                </td>
+            </tr>
+        </tfoot>
+    </table>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/mex/schemas.py b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/schemas.py
new file mode 100644
index 00000000..9d4455b8
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/schemas.py
@@ -0,0 +1,93 @@
+from decimal import Decimal
+from typing import List, Optional, Union
+from pydantic import BaseModel, field_validator
+
+
+class ClienteSchema(BaseModel):
+    header: str
+    nombre: str
+    # Ponemos valor por defecto "" y permitimos que sea opcional
+    direccion: Optional[str] = "" 
+    num_exterior: Optional[str] = ""
+    num_interior: Optional[str] = ""
+    colonia: Optional[str] = ""
+    codigo_postal: Optional[str] = ""
+    ciudad: Optional[str] = ""
+    estado: Optional[str] = ""
+    pais: Optional[str] = ""
+    tax_id: str
+    programa: Optional[str] = ""
+    autorizacion: Optional[str] = ""
+    prosec: Optional[str] = ""
+    reg_emp: Optional[str] = ""
+    cert: Optional[str] = ""
+
+    # Si llega un None, lo convertimos en "" automáticamente
+    @field_validator('direccion', 'nombre', mode='before')
+    @classmethod
+    def prevent_none(cls, v):
+        return v or ""
+
+class FacturaSchema(BaseModel):
+    numero: str
+    fecha: str
+    tipo_cambio: float
+    moneda: str
+    # Campos de aduanas (Opcionales por si A76 aún no los tiene)
+    pedimento: str = ""
+    clave_pedimento: str = ""
+    remesa: str = ""
+    acuse_electronico: str = ""
+    agente_aduanal: str = ""
+    patente: str = ""
+    precinto: str = ""
+    regimen: str = ""
+    transportista: str = ""
+    scac: str = ""
+    caat: str = ""
+    incoterm: str = ""
+    transporte: str = ""
+    num_transporte: str = ""
+    placas: str = ""
+    placas_remolque: str = ""
+    licencia_conductor: str = ""
+    caat: str = ""
+    scac: str = ""
+    aduana: str = ""
+    destino: str = ""
+    observaciones: str = ""
+
+class PartidaSchema(BaseModel):
+    numero_parte: str
+    descripcion: str
+    fraccion: str
+    origen: str
+
+    advalorem:Optional[str] = ""
+    preferencia:Optional[str] = ""
+
+    cantidad_importacion: Union[float, str]
+    unidad_medida: str
+    cantidad_bultos: int
+    clave_bultos: str
+    peso_neto: Union[float, str]
+    peso_bruto: Union[float, str]
+    valor_costo_unitario: Union[float, str]
+    valor_total: Union[float, str]
+
+class TotalesSchema(BaseModel):
+    cantidad_total: Union[float, str]
+    bultos_total: int
+    clave_bultos: str = ""
+    peso_neto_total: Union[float, str]
+    peso_bruto_total: Union[float, str]
+    valor_total_total: Union[float, str]
+    valor_total_dolares: Union[float, str]
+
+class FacturaImportacionCompleta(BaseModel):
+    cliente_proveedor: ClienteSchema
+    cliente_vendido: ClienteSchema
+    cliente_enviado: ClienteSchema
+    factura: FacturaSchema
+    partidas: List[PartidaSchema]
+    totales: TotalesSchema
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py
new file mode 100644
index 00000000..200a3942
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py
@@ -0,0 +1,403 @@
+import shutil
+import base64
+import pdfkit
+from pathlib import Path
+from decimal import Decimal
+from typing import Tuple, List, Callable, Optional
+
+from jinja2 import Environment, FileSystemLoader, select_autoescape
+from fastapi import HTTPException
+from sqlalchemy.orm import Session
+
+# --- MODELOS ---
+from api.v1.modules.a76.invoices.models import InvoiceHeader, InvoiceLogistics 
+from api.v1.modules.a76.items.line_financials.models import LineFinancial
+from api.v1.modules.a76.items.line_quantities.models import LineQuantity
+from api.v1.modules.a76.items.line_items.models import LineItem
+from api.v1.modules.a76.clients_and_providers.models import (
+    ClientProvider, ClientProviderAddress, ClientProviderPrograms
+)
+from api.v1.modules.a76.parts.models import Part
+from api.v1.modules.a76.pedmientos.models import Pedimentos
+from api.v1.modules.a76.general_catalogs.company.models import Company
+from api.v1.modules.a76.customs_brokers.models import CustomsBroker
+from api.v1.modules.a76.items.models import Item 
+
+# --- TRANSPORTATION MODELS ---
+from api.v1.modules.a76.transportation.transporters.models import Transporter
+from api.v1.modules.a76.transportation.vehicles.models import Vehicle
+from api.v1.modules.a76.transportation.trailers.models import Trailer
+from api.v1.modules.a76.transportation.drivers.models import Driver
+
+# --- MODELO DE FRACCIONES ---
+from api.v1.modules.a76.general_catalogs.tariff_fractions.models import TariffFraction
+
+# --- SCHEMAS ---
+from .schemas import (
+    ClienteSchema, PartidaSchema, TotalesSchema, 
+    FacturaSchema, FacturaImportacionCompleta
+)
+
+class FacturaImportacionMexService:
+    def __init__(self):
+        self.template_dir = Path(__file__).parent.parent / "templates"
+        self.jinja_env = Environment(
+            loader=FileSystemLoader(self.template_dir),
+            autoescape=select_autoescape(['html', 'xml'])
+        )
+        self.template = self.jinja_env.get_template('factura_mex_ver.html')
+
+    def _get_wkhtmltopdf_config(self):
+        path = shutil.which("wkhtmltopdf") or "/usr/local/bin/wkhtmltopdf"
+        if not Path(path).exists():
+            raise RuntimeError("wkhtmltopdf no encontrado.")
+        return pdfkit.configuration(wkhtmltopdf=path)
+
+    def formatear_numero(self, valor, decimales: int = 2):
+        if valor is None: return 0.0
+        try:
+            return round(float(valor), decimales)
+        except: return 0.0
+
+    def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
+        if not fraccion_raw or len(fraccion_raw) < 8:
+            return fraccion_raw
+        return f"{fraccion_raw[:4]}.{fraccion_raw[4:6]}.{fraccion_raw[6:]}"
+
+    def _obtener_datos_cliente(self, db: Session, client_id: int, rol: str) -> ClienteSchema:
+        main = db.query(ClientProvider).filter(ClientProvider.id == client_id).first()
+        if not main:
+            return ClienteSchema(header=rol, nombre="Desconocido", direccion="", tax_id="", codigo_postal="", ciudad="", estado="", pais="MEX")
+        
+        addr = db.query(ClientProviderAddress).filter(ClientProviderAddress.client_id == client_id).first()
+        prog = db.query(ClientProviderPrograms).filter(ClientProviderPrograms.client_id == client_id).first()
+
+        return ClienteSchema(
+            header=rol,
+            nombre=(main.name or main.short_name) or "S/N",
+            direccion=(addr.streets or "") if addr else "", 
+            num_exterior=(addr.exterior_number or "") if addr else "",
+            num_interior=(addr.interior_number or "") if addr else "",
+            colonia=(addr.neighborhood or "") if addr else "",
+            codigo_postal=(addr.postal_code or "") if addr else "",
+            ciudad=(addr.city or "") if addr else "",
+            estado=(addr.state or "") if addr else "",
+            pais=(addr.country or "MEX") if addr else "MEX",
+            tax_id=prog.tax_id if (prog and prog.tax_id) else (getattr(main, 'rfc', "") or ""),
+            programa="IMMEX" if (prog and prog.program) else "", 
+            autorizacion=prog.program_number if prog else "",
+            prosec=prog.prosec_authorization if (prog and prog.prosec and prog.prosec_authorization) else "",
+            reg_emp=prog.val_certified_company_registry if (prog and hasattr(prog, 'val_certified_company_registry')) else (
+                prog.certified_company_registry if (prog and prog.certified_company_registry) else ""
+            ),
+            cert=prog.is_certified_company if (prog and prog.is_certified_company) else "" 
+        )
+
+    def obtener_datos(self, db: Session, invoice_id: int, company_id: int, progress_callback: Optional[Callable] = None) -> FacturaImportacionCompleta:
+        try:
+            if progress_callback: progress_callback(10, "Buscando factura...")
+            header = db.query(InvoiceHeader).filter(InvoiceHeader.id == invoice_id, InvoiceHeader.company_id == company_id).first()
+            if not header: raise HTTPException(status_code=404, detail="Factura no encontrada")
+
+            compliance = header.compliance_mx 
+            logistics = header.logistics if header.logistics else None
+            financials = header.financials if header.financials else None
+            if progress_callback: progress_callback(20, "Obteniendo datos de pedimento...")
+            pedimento_id = compliance.pedimento_id if (compliance and compliance.pedimento_id) else header.related_doc_id
+            pedimento = db.query(Pedimentos).filter(Pedimentos.id == pedimento_id).first() if pedimento_id else None
+            
+            if progress_callback: progress_callback(30, "Obteniendo cliente y proveedor...")
+            proveedor_id = compliance.provider_id if compliance else None
+            cliente_proveedor = self._obtener_datos_cliente(db, proveedor_id, "Proveedor / supplier:") if proveedor_id else ClienteSchema(header="Proveedor", nombre="No Asignado", direccion="", tax_id="", codigo_postal="", ciudad="", estado="", pais="")
+
+            nombre_agente = ""
+            if compliance and compliance.customs_broker_id:
+                broker = db.query(CustomsBroker).filter(CustomsBroker.id == compliance.customs_broker_id).first()
+                if broker: nombre_agente = broker.name
+
+            company = db.query(Company).filter(Company.id == header.company_id).first()
+            # Datos Default (Company/Importer) - Used for fallback or Right Side (Enviado A)
+            cliente_default = ClienteSchema(
+                header="Importador / consignatario:",
+                nombre=getattr(company, 'name', "Empresa Local"),
+                direccion="DOMICILIO FISCAL",
+                num_exterior="", colonia="", codigo_postal="", ciudad="", estado="", pais="MEX",
+                tax_id=getattr(company, 'rfc', ""),
+                programa=getattr(company, 'program', "IMMEX"), autorizacion=getattr(company, 'program_number', "")
+            )
+
+            # Left Side Logic (Consignatario / Sold To)
+            cliente_vendido = cliente_default
+            if compliance and compliance.sold_to_id:
+                raw_header = compliance.sold_to_header or "CONSIGNATARIO"
+                clean_header = raw_header.replace("_", " ").capitalize() + ":"
+                cliente_vendido = self._obtener_datos_cliente(db, compliance.sold_to_id, clean_header)
+            
+            # Right Side Logic (Enviado A / Shipped To)
+            cliente_enviado = cliente_default
+            if compliance and compliance.shipped_to_id:
+                # Clean header: "enviado_a" -> "Enviado a:"
+                raw_header_shipped = compliance.shipped_to_header or "DESTINATARIO"
+                clean_header_shipped = raw_header_shipped.replace("_", " ").capitalize() + ":"
+                
+                # Fetch client data
+                cliente_enviado = self._obtener_datos_cliente(db, compliance.shipped_to_id, clean_header_shipped)
+
+            remesa_valor = str(compliance.remesa) if (compliance and compliance.remesa) else ""
+            acuse_valor = str(compliance.edocument) if (compliance and compliance.edocument) else "N/A"
+
+            patente_val = ""
+            if pedimento and pedimento.license:
+                patente_val = pedimento.license
+            elif 'broker' in locals() and broker and broker.license:
+                patente_val = broker.license
+
+
+            # --- Transport Data Fetching ---
+            transporte_txt = str(logistics.transport_type) if (logistics and logistics.transport_type) else ""
+            num_transporte_val = (logistics.trailer_num or "") if logistics else ""
+            
+            # Init values
+            placas_val = (logistics.license_plate or "") if logistics else "" # Placas Tracto
+            placas_remolque_val = ""
+            transportista_val = (logistics.carrier_id or "") if logistics else ""
+            caat_val = ""
+            scac_val = ""
+            licencia_cond_val = ""
+
+            if logistics:
+                # 1. Transporter (CAAT / SCAC)
+                if logistics.carrier_id:
+                    transporter_obj = db.query(Transporter).filter(Transporter.transporter_key == logistics.carrier_id).first()
+                    if transporter_obj:
+                        caat_val = transporter_obj.caat_code or ""
+                        scac_val = transporter_obj.transport_code or "" # Mapping transport_code to SCAC
+                        transportista_val = transporter_obj.name or logistics.carrier_id
+
+                # 2. Vehicle (Placas Tracto) - Try transport_id first
+                if logistics.transport_id:
+                    veh_obj = db.query(Vehicle).filter(Vehicle.vehicle_key == logistics.transport_id).first()
+                    if veh_obj:
+                         placas_val = veh_obj.plate_number or placas_val
+                elif logistics.vehicle_num: # Fallback to vehicle_num if populated and transport_id failed/empty
+                     veh_obj = db.query(Vehicle).filter(Vehicle.vehicle_key == logistics.vehicle_num).first()
+                     if veh_obj:
+                         placas_val = veh_obj.plate_number or placas_val
+
+                # 3. Trailer (Placas Remolque)
+                if logistics.trailer_num:
+                    trl_obj = db.query(Trailer).filter(Trailer.trailer_number == logistics.trailer_num).first()
+                    if trl_obj:
+                        placas_remolque_val = trl_obj.plate_number or ""
+
+                # 4. Driver (License)
+                if logistics.carrier_id and logistics.driver_name:
+                    # Attempt to find driver by name + carrier
+                    drv_obj = db.query(Driver).filter(
+                        Driver.transporter_key == logistics.carrier_id,
+                        Driver.driver_name == logistics.driver_name
+                    ).first()
+                    if drv_obj:
+                         licencia_cond_val = drv_obj.license_number or ""
+
+            factura_schema = FacturaSchema(
+                numero=header.invoice_number or "S/N",
+                fecha=str(header.invoice_date) if header.invoice_date else "",
+                tipo_cambio=float(financials.exchange_rate) if (financials and financials.exchange_rate) else (float(pedimento.exchange_rate) if pedimento and pedimento.exchange_rate else 1.0),
+                moneda=getattr(header, 'currency', "USD") or "USD",
+                incoterm=(logistics.incoterm or "") if logistics else "",
+                observaciones=header.observation_es or header.observation_en or "",
+                pedimento=f"{pedimento.year}  {pedimento.customs_office[:2] if pedimento.customs_office else ''}  {pedimento.license}  {pedimento.pedimento_number}" if pedimento else "",
+                clave_pedimento=pedimento.pedimento_code if pedimento else "",
+                regimen=header.document_type or "",
+                patente=patente_val,
+                agente_aduanal=nombre_agente,
+                transporte=transporte_txt,
+                num_transporte=num_transporte_val,
+                placas=placas_val,
+                placas_remolque=placas_remolque_val,
+                transportista=transportista_val,
+                caat=caat_val,
+                scac=scac_val,
+                licencia_conductor=licencia_cond_val,
+                aduana=compliance.aduana if (compliance and compliance.aduana) else (pedimento.customs_office[:2] if (pedimento and pedimento.customs_office) else ""),
+                precinto=(logistics.seal_number or "") if logistics else "",
+                destino=(logistics.destination_goods or "") if logistics else "",
+                remesa=remesa_valor, acuse_electronico=acuse_valor
+            )
+            
+            if progress_callback: progress_callback(50, "Procesando partidas...")
+            lines = db.query(LineItem).join(Item, LineItem.item_id == Item.id).filter(Item.invoice_id == header.id).all()
+            partidas_list = []
+            
+            for line in lines:
+                qty = db.query(LineQuantity).filter(LineQuantity.item_line_id == line.id).first()
+                fin = db.query(LineFinancial).filter(LineFinancial.item_line_id == line.id).first()
+                part_master = db.query(Part).filter(Part.id == line.part_number).first()
+
+                desc_final = "S/D"
+                num_parte_final = str(line.part_number or "S/N")
+                fraccion_raw = "" 
+                origen_final = "MEX"
+
+                if part_master:
+                    desc_final = part_master.description_spanish or part_master.description_english or "Sin Desc."
+                    num_parte_final = part_master.part_number
+                    fraccion_raw = part_master.fraction if part_master.fraction else ""
+                    
+                    # Fetch Origin from Master Catalog (FaPart)
+                    if part_master.fa_data and part_master.fa_data.origin_country:
+                        origen_final = part_master.fa_data.origin_country
+
+                
+                fraccion_limpia = fraccion_raw.replace(".", "").strip()
+                if fraccion_limpia:
+                    fraccion_limpia = fraccion_limpia[:8].zfill(8)
+
+                # Consultar tabla tariff_fractions
+                fraccion_db = db.query(TariffFraction).filter(TariffFraction.code == fraccion_limpia).first()
+
+               
+                preferencia_txt = "General" 
+                advalorem_txt = "0%"
+                fraccion_imprimir = fraccion_raw
+
+                if fraccion_db:
+                    # Si el valor en BD es None, "0", o vacío, dejarlo como "0%" o "EXENTO"
+                    adv_db = fraccion_db.adv_impo
+                    if adv_db and adv_db.strip() not in ["0", "0.0", "0.00", ""]:
+                        advalorem_txt = adv_db if "%" in adv_db else f"{adv_db}%"
+                    else:
+                        advalorem_txt = "0%" 
+                    
+                    fraccion_imprimir = fraccion_db.fraction or fraccion_raw
+                else:
+                   
+                    fraccion_imprimir = self._format_fraccion_fallback(fraccion_limpia)
+
+                # Logic to determine values - Prioritize Specific Currency Columns
+                v_unitario = 0.0
+                v_total = 0.0
+                
+                if fin:
+                    is_mxn = (factura_schema.moneda == 'MXN')
+                    
+                    # 1. Try Specific Currency Columns First
+                    if is_mxn:
+                        v_unitario = float(fin.unit_cost_commercial_mxn or 0.0)
+                        v_total = float(fin.value_commercial_mxn or 0.0)
+                    else:
+                        v_unitario = float(fin.unit_cost_commercial_usd or 0.0)
+                        v_total = float(fin.value_commercial_usd or 0.0)
+
+                    # 2. Fallback to Generic independently if Specific is 0
+                    if not v_unitario:
+                         v_unitario = float(fin.commercial_unit_cost or 0.0)
+                    
+                    if not v_total:
+                         v_total = float(fin.total_commercial_value or 0.0)
+
+                    # 3. Calculate from Quantity if still missing
+                    cantidad = float(qty.quantity) if (qty and qty.quantity) else 0.0
+                    
+                    if cantidad > 0:
+                        if v_unitario > 0 and v_total == 0:
+                            v_total = v_unitario * cantidad
+                        elif v_total > 0 and v_unitario == 0:
+                            v_unitario = v_total / cantidad
+
+                partidas_list.append(PartidaSchema(
+                    numero_parte=num_parte_final,
+                    descripcion=desc_final,
+                    fraccion=fraccion_imprimir,
+                    origen=origen_final,
+                    advalorem=advalorem_txt,
+                    preferencia=preferencia_txt,
+                    cantidad_importacion=self.formatear_numero(qty.quantity if qty else 0),
+                    unidad_medida=qty.weight_unit if qty else "PZA",
+                    cantidad_bultos=int(qty.package_quantity) if qty and qty.package_quantity else 0,
+                    clave_bultos=(qty.package_key or "") if qty else "",
+                    peso_neto=self.formatear_numero(qty.net_weight if qty else 0),
+                    peso_bruto=self.formatear_numero(qty.gross_weight if qty else 0),
+                    valor_costo_unitario=self.formatear_numero(v_unitario),
+                    valor_total=self.formatear_numero(v_total)
+                ))
+
+            totales = self.calcular_totales(partidas_list, Decimal(factura_schema.tipo_cambio))
+
+            return FacturaImportacionCompleta(
+                cliente_proveedor=cliente_proveedor, cliente_vendido=cliente_vendido,
+                cliente_enviado=cliente_enviado, factura=factura_schema,
+                partidas=partidas_list, totales=totales
+            )
+
+        except Exception as e:
+            print(f"Error Service A76: {e}")
+            raise HTTPException(status_code=500, detail=f"Error: {str(e)}")
+
+    def calcular_totales(self, partidas: List[PartidaSchema], tipo_cambio: Decimal) -> TotalesSchema:
+        cant = sum(p.cantidad_importacion for p in partidas)
+        valor = sum(p.valor_total for p in partidas)
+        peso_n = sum(p.peso_neto for p in partidas)
+        peso_b = sum(p.peso_bruto for p in partidas)
+        bultos = sum(p.cantidad_bultos for p in partidas)
+        claves = [p.clave_bultos for p in partidas if p.clave_bultos]
+        clave_comun = max(set(claves), key=claves.count) if claves else ""
+        if bultos > 1 and clave_comun and not clave_comun.endswith("S"): clave_comun += "S"
+        tc = float(tipo_cambio) if tipo_cambio else 1.0
+        return TotalesSchema(   
+            cantidad_total=self.formatear_numero(cant), bultos_total=bultos, clave_bultos=clave_comun,
+            peso_neto_total=self.formatear_numero(peso_n), peso_bruto_total=self.formatear_numero(peso_b),
+            valor_total_total=self.formatear_numero(valor), valor_total_dolares=self.formatear_numero(valor / tc if tc > 0 else 0)
+        )
+
+    def generar_factura_completa(self, db: Session, invoice_id: int, company_id: int, formato: str = "pdf", progress_callback: Optional[Callable] = None) -> Tuple[bytes, str, str]:
+        if progress_callback: progress_callback(5, "Iniciando servicio de reporte...")
+        datos = self.obtener_datos(db, invoice_id, company_id, progress_callback)
+        
+        if progress_callback: progress_callback(80, "Renderizando plantilla...")
+        
+        # LOGO LOGIC
+        logo_b64 = None
+        try:
+            # Fetch company to get logo path
+
+            comp_logo = db.query(Company).filter(Company.id == company_id).first()
+            if comp_logo and comp_logo.logo:
+                p = Path(comp_logo.logo)
+                
+                # Logic robusta de búsqueda (igual que en routes.py)
+                target_path = p
+                if not target_path.exists():
+                    # Intentar en la ruta estándar: app_data/logos/{id}/{nombre}
+                    # Esto cubre el caso donde solo se guardó el nombre del archivo o la ruta absoluta cambió
+                    fallback = Path(f"app_data/logos/{company_id}") / p.name
+                    if fallback.exists():
+                        target_path = fallback
+
+                if target_path.exists():
+                    with open(target_path, "rb") as image_file:
+                        encoded_string = base64.b64encode(image_file.read()).decode('utf-8')
+                        # Detect MIME type loosely
+                        mime = "image/png"
+                        if target_path.suffix.lower() in ['.jpg', '.jpeg']: mime = "image/jpeg"
+                        logo_b64 = f"data:{mime};base64,{encoded_string}"
+        except Exception as e:
+            print(f"Error loading logo: {e}")
+
+        context = {
+            'cliente_proveedor': datos.cliente_proveedor.model_dump(), 'cliente_vendido': datos.cliente_vendido.model_dump(),
+            'cliente_enviado': datos.cliente_enviado.model_dump(), 'factura': datos.factura.model_dump(),
+            'partidas': [p.model_dump() for p in datos.partidas], 'totales': datos.totales.model_dump(),
+            'logo_b64': logo_b64
+        }
+        html_content = self.template.render(**context)
+        nombre = f"Factura_{datos.factura.numero}.{formato}"
+        if formato == "html": return html_content.encode('utf-8'), nombre, "text/html"
+        
+        if progress_callback: progress_callback(90, "Generando PDF final...")
+        options = {'page-size': 'Letter', 'margin-top': '0.5in', 'margin-right': '0.5in', 'margin-bottom': '0.5in', 'margin-left': '0.5in', 'encoding': "UTF-8", 'enable-local-file-access': None}
+        pdf = pdfkit.from_string(html_content, False, options=options, configuration=self._get_wkhtmltopdf_config())
+        
+        if progress_callback: progress_callback(100, "Completado")
+        return pdf, nombre, "application/pdf"
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py b/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py
new file mode 100644
index 00000000..f7c0d72d
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py
@@ -0,0 +1,48 @@
+from enum import Enum
+from typing import Dict, Any
+from fastapi import APIRouter, Depends, Query, Response, HTTPException
+from sqlalchemy.orm import Session
+from celery.result import AsyncResult 
+from core.celery_app import celery_app 
+from core.database import get_core_db
+from core.security import get_current_user, validate_access_to_resource
+from .mex.service import FacturaImportacionMexService
+from .task import generar_pdf_factura_async
+
+router = APIRouter()
+servicio_mex = FacturaImportacionMexService()
+
+@router.get("/tasks/{task_id}")
+async def get_task_status(
+    task_id: str,
+    current_user: Dict[str, Any] = Depends(get_current_user),
+    db: Session = Depends(get_core_db)
+):
+    task_result = AsyncResult(task_id, app=celery_app)
+
+    response = {
+        "task_id": task_id,
+        "state": task_result.state,
+        "result": None,
+        "info": None
+    }
+
+    if task_result.state == 'FAILURE':
+        response["result"] = str(task_result.result)
+    elif task_result.state == 'SUCCESS':
+        response["result"] = task_result.result
+    elif task_result.state == 'PROCESSING':
+        response["info"] = task_result.info
+
+    return response
+
+@router.post("/{invoice_id}/download-async")
+async def trigger_descarga_factura(
+    invoice_id: int,
+    company_id: int = Query(..., description="ID de la empresa"),
+    current_user: Dict[str, Any] = Depends(get_current_user),
+    db: Session = Depends(get_core_db)
+):
+    validate_access_to_resource(db, company_id, current_user)
+    task = generar_pdf_factura_async.delay(invoice_id, company_id)
+    return {"task_id": task.id, "message": "Generación iniciada"} 
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/task.py b/backend/api/v1/modules/a76/reports/importacion/facturas/task.py
new file mode 100644
index 00000000..6cdf1342
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/task.py
@@ -0,0 +1,52 @@
+import base64
+import logging
+from core.celery_app import celery_app
+from celery import current_task, states
+from core.database import CoreSessionLocal 
+
+from .mex.service import FacturaImportacionMexService
+
+logger = logging.getLogger(__name__)
+
+@celery_app.task(name="generar_pdf_factura_async", bind=True)
+def generar_pdf_factura_async(self, invoice_id: int, company_id: int):
+   
+    # 1. Abrimos conexión a la DB
+    db = CoreSessionLocal()
+    try:
+        logger.info(f"Worker procesando factura {invoice_id}...")
+        
+        # 2. Instanciamos el servicio de reportes
+        service = FacturaImportacionMexService()
+
+        # Update state to PROCESSING
+        self.update_state(state='PROCESSING', meta={'current': 5, 'total': 100, 'status': 'Iniciando generación...'})
+        
+        def progress_callback(progress: int, status: str):
+            self.update_state(state='PROCESSING', meta={'current': progress, 'total': 100, 'status': status})
+
+        # 3. Generamos los bytes del PDF
+        pdf_bytes, nombre, media_type = service.generar_factura_completa(
+            db=db, 
+            invoice_id=invoice_id, 
+            company_id=company_id,
+            progress_callback=progress_callback
+        )
+        
+        # 4. Codificamos a base64 para que viaje seguro por Valkey
+        pdf_base64 = base64.b64encode(pdf_bytes).decode('utf-8')
+        
+        return {
+            "status": "success",
+            "file_name": nombre,
+            "content": pdf_base64,
+            "media_type": media_type
+        }
+
+    except Exception as e:
+        logger.error(f"Error en Celery Worker: {str(e)}")
+        return {"status": "error", "message": str(e)}
+    
+    finally:
+        # 5. MUY IMPORTANTE: Cerramos la conexión para no saturar Postgres
+        db.close()
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/templates/factura_mex_ver.html b/backend/api/v1/modules/a76/reports/importacion/facturas/templates/factura_mex_ver.html
new file mode 100644
index 00000000..ade499e4
--- /dev/null
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/templates/factura_mex_ver.html
@@ -0,0 +1,646 @@
+<!DOCTYPE html>
+<html lang="es" xml:lang="es">
+
+<head>
+    <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
+    <title>Factura Importacion Mexicana - {{ factura.numero }}</title>
+    <style type="text/css">
+        /* ESTILOS EXACTOS DE SCAPII PARA MANTENER EL FORMATO */
+        * {
+            margin: 0;
+            padding: 0;
+            font-family: Tahoma, sans-serif;
+            color: black;
+        }
+
+        .titulo {
+            font-size: 14pt;
+            padding: 3pt 0 0 6pt;
+        }
+
+        .grande {
+            font-size: 13pt;
+            padding-left: 5pt;
+        }
+
+        .medio-bold {
+            font-size: 9pt;
+            font-weight: bold;
+            padding: 3pt 0 0 3pt;
+        }
+
+        .normal {
+            font-size: 8pt;
+        }
+
+        .small-bold {
+            font-size: 8pt;
+            font-weight: bold;
+        }
+
+        .tiny-bold {
+            font-size: 7pt;
+            font-weight: bold;
+        }
+
+        .tiny {
+            font-size: 7pt;
+        }
+
+        .mini {
+            font-size: 5pt;
+        }
+
+        h1 {
+            font-weight: bold;
+            font-size: 8pt;
+        }
+
+        p {
+            font-size: 7pt;
+        }
+
+        .cliente {
+            border-bottom: 1pt solid black;
+            text-decoration: none;
+            display: block;
+            width: 100%
+        }
+
+        .center {
+            text-align: center;
+        }
+
+        .right {
+            text-align: right;
+        }
+
+        .border {
+            border: 1pt solid #808080;
+        }
+
+        .p-t-1 {
+            padding-top: 1pt;
+        }
+
+        .p-t-2 {
+            padding-top: 2pt;
+        }
+
+        .p-t-3 {
+            padding-top: 3pt;
+        }
+
+        .p-t-4 {
+            padding-top: 4pt;
+        }
+
+        .p-t-5 {
+            padding-top: 5pt;
+        }
+
+        .p-t-8 {
+            padding-top: 8pt;
+        }
+
+        .p-t-9 {
+            padding-top: 9pt;
+        }
+
+        .p-l-2 {
+            padding-left: 2pt;
+        }
+
+        .p-l-3 {
+            padding-left: 3pt;
+        }
+
+        .p-l-5 {
+            padding-left: 5pt;
+        }
+
+        .p-l-6 {
+            padding-left: 6pt;
+        }
+
+        .p-l-7 {
+            padding-left: 7pt;
+        }
+
+        .p-l-8 {
+            padding-left: 8pt;
+        }
+
+        .p-l-9 {
+            padding-left: 9pt;
+        }
+
+        .p-l-10 {
+            padding-left: 10pt;
+        }
+
+        .p-r-1 {
+            padding-right: 1pt;
+        }
+
+        .p-r-2 {
+            padding-right: 2pt;
+        }
+
+        .p-r-4 {
+            padding-right: 4pt;
+        }
+
+        .p-r-5 {
+            padding-right: 5pt;
+        }
+
+        .p-r-9 {
+            padding-right: 9pt;
+        }
+
+        .p-b-1 {
+            padding-bottom: 1pt;
+        }
+
+        .h-10 {
+            height: 10pt;
+        }
+
+        .h-11 {
+            height: 11pt;
+        }
+
+        .h-14 {
+            height: 14pt;
+        }
+
+        .h-15 {
+            height: 15pt;
+        }
+
+        .h-18 {
+            height: 18pt;
+        }
+
+        .h-22 {
+            height: 22pt;
+        }
+
+        .h-82 {
+            height: 82pt;
+        }
+
+        .h-384 {
+            height: 384pt;
+        }
+
+        .line-1 {
+            line-height: 1pt;
+        }
+
+        .line-7 {
+            line-height: 7pt;
+        }
+
+        .line-8 {
+            line-height: 8pt;
+        }
+
+        .line-9 {
+            line-height: 9pt;
+        }
+
+        .line-10 {
+            line-height: 10pt;
+        }
+
+        .m-l-3 {
+            margin-left: 3pt;
+        }
+
+        .m-l-5 {
+            margin-left: 5.74pt;
+        }
+
+        .flex-container {
+            width: 100%;
+            overflow: hidden;
+        }
+
+        .flex-container-end {
+            width: 100%;
+            overflow: hidden;
+        }
+
+        .width-48 {
+            width: 48%;
+            float: left;
+        }
+
+        .width-48-right {
+            width: 48%;
+            float: right;
+            text-align: right;
+        }
+
+        .position-relative-centered {
+            position: relative;
+            width: 48%;
+            float: left;
+        }
+
+        .full-width-block {
+            display: block;
+            width: 100%;
+        }
+
+        .clearfix::after {
+            content: "";
+            display: table;
+            clear: both;
+        }
+
+        table,
+        tbody {
+            vertical-align: top;
+            overflow: visible;
+        }
+    </style>
+</head>
+
+<body>
+    <header>
+        <div class="flex-container clearfix">
+            <div class="width-48" style="position: relative;">
+                <p class="titulo">Factura de Importacion</p>
+                <div class="cliente" style="height: 1px;"></div>
+                <p class="cliente p-t-1 p-b-1"></p>
+            </div>
+            <div class="width-48-right">
+                <p class="p-l-5 line-1"><span></span></p>
+                <p class="p-t-2"><br></p>
+            </div>
+        </div>
+        <div class="flex-container-end clearfix" style="overflow: visible;">
+            <div class="position-relative-centered">
+                {% if logo_b64 %}
+                <div style="position: absolute; top: 10pt; left: 0;">
+                    <img src="{{ logo_b64 }}" style="max-height: 70pt; max-width: 120pt;" />
+                </div>
+                {% endif %}
+                <div style="margin-left: 130pt; padding-top: 25pt; text-align: left;">
+                    <h1 class="cliente">{{ cliente_proveedor.header }}</h1>
+                    <p>{{ cliente_proveedor.nombre }}</p>
+                    <p>{{ cliente_proveedor.direccion }}
+                        {% if cliente_proveedor.num_exterior %} Ext: {{ cliente_proveedor.num_exterior }}{% endif %}
+                        {% if cliente_proveedor.num_interior %} Int: {{ cliente_proveedor.num_interior }}{% endif %}
+                    </p>
+                    <p>{{ cliente_proveedor.colonia }} {% if cliente_proveedor.codigo_postal %} CP: {{
+                        cliente_proveedor.codigo_postal }}{% endif %}</p>
+                    <p>{{ cliente_proveedor.ciudad }}, {{ cliente_proveedor.estado }}, {{ cliente_proveedor.pais }}</p>
+                    <p>TAX ID: {{ cliente_proveedor.tax_id }}
+                        {% if cliente_proveedor.programa and cliente_proveedor.programa != 'Ninguno' %}
+                        {{ cliente_proveedor.programa }}: {{ cliente_proveedor.autorizacion }}
+                        {% endif %}
+                    </p>
+                    <p><br></p>
+                </div>
+            </div>
+
+            <div style="position: relative;">
+                <table cellspacing="0" class="m-l-3" style="float: right; text-align: left;">
+                    <tbody>
+                        <tr class="h-18">
+                            <td bgcolor="#E4E4E4" class="border" style="width:52pt">
+                                <p class="medio-bold">FACTURA:</p>
+                            </td>
+                            <td class="border" colspan="3" style="width:176pt">
+                                <p class="grande">{{ factura.numero }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-11">
+                            <td bgcolor="#E4E4E4" class="border" style="width:52pt">
+                                <p class="normal p-l-3 line-9">Fecha:</p>
+                            </td>
+                            <td class="border" style="width:72pt">
+                                <p class="normal p-l-2 line-9">{{ factura.fecha }}</p>
+                            </td>
+                            <td bgcolor="#E4E4E4" class="border" style="width:52pt">
+                                <p class="normal p-l-2 line-9">T. Cambio:</p>
+                            </td>
+                            <td class="border" style="width:52pt">
+                                <p class="normal center line-9">{{ factura.tipo_cambio }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-11">
+                            <td bgcolor="#E4E4E4" class="border" style="width:52pt">
+                                <p class="small-bold p-l-3 line-9">Pedimento:</p>
+                            </td>
+                            <td class="border" colspan="1" style="width:109pt">
+                                <p class="normal p-l-3 line-9">{{ factura.pedimento }}</p>
+                            </td>
+                            <td bgcolor="#E4E4E4" class="border">
+                                <p class="normal p-l-3 line-9">Clave:</p>
+                            </td>
+                            <td class="border" style="width:37pt">
+                                <p class="normal p-r-2 line-9 center">{{ factura.clave_pedimento }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-11">
+                            <td bgcolor="#E4E4E4" class="border" style="width:52pt">
+                                <p class="normal p-l-3 line-9">Remesa:</p>
+                            </td>
+                            <td class="border" style="width:38pt">
+                                <p class="normal p-l-10 line-9">{{ factura.remesa }}</p>
+                            </td>
+                            <td bgcolor="#E4E4E4" class="border" style="width:79pt">
+                                <p class="normal p-l-6 line-9">Acuse:</p>
+                            </td>
+                            <td class="border" style="width:59pt">
+                                <p class="normal p-l-6 line-9">{{ factura.acuse_electronico or 'N/A' }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-22">
+                            <td class="border" colspan="4" style="width:228pt">
+                                <p class="small-bold p-l-3 line-7">Agente Aduanal:</p>
+                                <p class="normal p-l-3 line-7">{{ factura.agente_aduanal or '' }}</p>
+                            </td>
+                        </tr>
+                        <tr class="h-15">
+                            <td class="border" colspan="2">
+                                <p><span class="small-bold p-l-3 line-7">Patente: </span><span
+                                        class="normal p-l-3 line-7">{{ factura.patente or '' }}</span></p>
+                            </td>
+                            <td class="border">
+                                <span class="tiny-bold p-l-3 line-7">Regimen:</span><span class="tiny p-l-3 line-7">{{
+                                    factura.regimen or '' }}</span>
+                            </td>
+                            <td class="border">
+                                <p class="tiny-bold p-l-3 line-7">INCOTERM:</p>
+                                <p class="tiny p-l-3 line-7">{{ factura.incoterm or '' }}</p>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="border" colspan="2">
+                                {% if factura.precinto %}
+                                <p class="tiny-bold p-l-3 line-7">Precinto: {{ factura.precinto }}</p>
+                                {% endif %}
+                            </td>
+                            <td class="border">
+                                <p class="tiny-bold p-l-3 line-7">Aduana: {{ factura.aduana }}</p>
+                            </td>
+                            <td class="border">
+                                {% if factura.destino %}
+                                <p class="tiny-bold p-l-3 line-7">Destino: {{ factura.destino }}</p>
+                                {% endif %}
+                            </td>
+                        </tr>
+                    </tbody>
+                </table>
+            </div>
+        </div>
+
+        <div class="flex-container clearfix">
+            <div class="width-48">
+                <h1 class="p-t-5 p-l-5 line-10 cliente">{{ cliente_vendido.header }}</h1>
+                <p class="p-l-5 line-8">{{ cliente_vendido.nombre }}</p>
+                <p class="p-l-5">{{ cliente_vendido.direccion }}
+                    {% if cliente_vendido.num_exterior %} Ext: {{ cliente_vendido.num_exterior }}{% endif %}
+                    {% if cliente_vendido.num_interior %} Int: {{ cliente_vendido.num_interior }}{% endif %}
+                </p>
+                <p class="p-l-5">{{ cliente_vendido.colonia }} {% if cliente_vendido.codigo_postal %} CP: {{
+                    cliente_vendido.codigo_postal }}{% endif %}</p>
+                <p class="p-l-5">{{ cliente_vendido.ciudad }}, {{ cliente_vendido.estado }}, {{ cliente_vendido.pais }}
+                </p>
+                <p class="p-l-5">RFC: {{ cliente_vendido.tax_id }}
+                    {% if cliente_vendido.programa and cliente_vendido.programa != 'Ninguno' %}
+                    {{ cliente_vendido.programa }}: {{ cliente_vendido.autorizacion }}
+                    {% endif %}
+                </p>
+                <p class="p-l-5">
+                    {% if cliente_vendido.prosec %}PROSEC: {{ cliente_vendido.prosec }} {% endif %}
+                    {% if cliente_vendido.reg_emp %}REG EMP: {{ cliente_vendido.reg_emp }} {% endif %}
+                    {% if cliente_vendido.cert %}CERT: {{ cliente_vendido.cert }}{% endif %}
+                </p>
+            </div>
+
+            <div class="width-48-right" style="text-align: left;">
+                <h1 class="p-t-5 p-l-5 line-10 cliente full-width-block">{{ cliente_enviado.header }}</h1>
+                <p class="p-l-5 line-8">{{ cliente_enviado.nombre }}</p>
+                <p class="p-l-5">{{ cliente_enviado.direccion }}
+                    {% if cliente_enviado.num_exterior %} Ext: {{ cliente_enviado.num_exterior }}{% endif %}
+                    {% if cliente_enviado.num_interior %} Int: {{ cliente_enviado.num_interior }}{% endif %}
+                </p>
+                <p class="p-l-5">{{ cliente_enviado.colonia }} {% if cliente_enviado.codigo_postal %} CP: {{
+                    cliente_enviado.codigo_postal }}{% endif %}</p>
+                <p class="p-l-5">{{ cliente_enviado.ciudad }}, {{ cliente_enviado.estado }}, {{ cliente_enviado.pais }}
+                </p>
+                <p class="p-l-5">RFC: {{ cliente_enviado.tax_id }}
+                    {% if cliente_enviado.programa and cliente_enviado.programa != 'Ninguno' %}
+                    {{ cliente_enviado.programa }}: {{ cliente_enviado.autorizacion }}
+                    {% endif %}
+                </p>
+                <p class="p-l-5">
+                    {% if cliente_enviado.prosec %}PROSEC: {{ cliente_enviado.prosec }} {% endif %}
+                    {% if cliente_enviado.reg_emp %}REG EMP: {{ cliente_enviado.reg_emp }} {% endif %}
+                    {% if cliente_enviado.cert %}CERT: {{ cliente_enviado.cert }}{% endif %}
+                </p>
+            </div>
+        </div>
+        <p class="p-t-8"><br /></p>
+    </header>
+
+    <table cellspacing="0" class="m-l-5" style="width: 99%; max-width: 580pt;">
+        <thead>
+            <tr class="h-10">
+                <td bgcolor="#E4E4E4" class="border" style="width:60pt">
+                    <p class="tiny line-9">Transportista:</p>
+                </td>
+                <td class="border" colspan="4" style="width:120pt">
+                    <p class="tiny">{{ factura.transportista }}</p>
+                </td>
+                <td class="border" style="width:40pt">
+                    <p class="tiny">SCAC: {{ factura.scac }}</p>
+                </td>
+                <td bgcolor="#E4E4E4" class="border" style="width:40pt">
+                    <p class="tiny">INCOTERM:</p>
+                </td>
+                <td class="border" style="width:40pt">
+                    <p class="tiny">{{ factura.incoterm }}</p>
+                </td>
+                <td class="border" style="width:50pt">
+                    <p class="tiny line-9">Aduana: <span class="mini">{{ factura.aduana }}</span> / Ped: <span
+                            class="mini">{{ factura.pedimento }}</span></p>
+                </td>
+                <td bgcolor="#E4E4E4" class="border" style="width:20pt">
+                    <p><br /></p>
+                </td>
+            </tr>
+            <tr class="h-10">
+                <td bgcolor="#E4E4E4" class="border" style="width:60pt">
+                    <p class="tiny line-9">Transporte:</p>
+                </td>
+                <td class="border" colspan="4" style="width:120pt">
+                    <p class="tiny">{{ factura.transporte }}: {{ factura.num_transporte }}</p>
+                </td>
+                <td class="border" colspan="3" style="width:80pt">
+                    <p class="tiny">CAAT: {{ factura.caat }}</p>
+                </td>
+                <td class="border" colspan="2" style="width:100pt">
+                    <p class="tiny p-t-1 line-8">Placas: {{ factura.placas or '' }} / Rem: {{ factura.placas_remolque or
+                        '' }}</p>
+                </td>
+            </tr>
+            <tr class="h-10">
+                <td bgcolor="#E4E4E4" class="border" colspan="2" style="width:80pt">
+                    <p class="tiny p-l-1 line-9">Chofer/Licencia:</p>
+                </td>
+                <td class="border" colspan="8">
+                    <p class="tiny p-l-3">{{ factura.licencia_conductor or 'N/A' }}</p>
+                </td>
+            </tr>
+
+            <tr class="h-10">
+                <td class="border" rowspan="2">
+                    <p class="tiny-bold p-t-5 center">Línea</p>
+                </td>
+                <td class="border" rowspan="2">
+                    <p class="tiny-bold p-l-2 line-10">Número de Parte</p>
+                    <p class="tiny-bold p-l-2 line-10">Descripción</p>
+                </td>
+                <td class="border" colspan="3">
+                    <p class="tiny-bold center line-9">Comercial</p>
+                </td>
+                <td class="border" style="width:50pt">
+                    <p class="tiny-bold center line-9">Empaque</p>
+                </td>
+                <td class="border" colspan="2">
+                    <p class="tiny-bold center line-9">Peso (KGS)</p>
+                </td>
+                <td class="border" colspan="2">
+                    <p class="tiny-bold line-9 center">Valores</p>
+                </td>
+            </tr>
+            <tr class="h-11">
+                <td class="border center" colspan="2">
+                    <p class="mini p-l-2">Cantidad</p>
+                </td>
+                <td class="border center">
+                    <p class="mini p-l-1">U.M.</p>
+                </td>
+                <td class="border">
+                    <p class="mini center">Tipo</p>
+                </td>
+                <td class="border">
+                    <p class="mini center">Neto</p>
+                </td>
+                <td class="border">
+                    <p class="mini center">Bruto</p>
+                </td>
+                <td class="border">
+                    <p class="mini center">Unitario</p>
+                </td>
+                <td class="border">
+                    <p class="mini center">Total</p>
+                </td>
+            </tr>
+        </thead>
+
+        <tbody class="h-384" style="width: 100%;">
+            {% for partida in partidas %}
+            <tr>
+                <td class="border">
+                    <p class="mini p-t-3 center">{{ loop.index }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-1" style="font-weight: bold;">{{ partida.numero_parte }}</p>
+                    <p class="mini">{{ partida.descripcion }}</p>
+                    <p class="mini">Frac: {{ partida.fraccion }} / Orig: {{ partida.origen or 'MEX' }}</p>
+                    <p class="mini">
+                        {% if partida.advalorem %}ADV: {{ partida.advalorem }}{% endif %}
+                        {% if partida.preferencia %} / PREF: {{ partida.preferencia }}{% endif %}
+                    </p>
+                </td>
+                <td class="border" colspan="2">
+                    <p class="mini p-t-2 center">{{ partida.cantidad_importacion }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">{{ partida.unidad_medida }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">
+                        {% if partida.cantidad_bultos != 0 %}{{ partida.cantidad_bultos }}{% endif %}
+                        {{ partida.clave_bultos }}
+                    </p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-3 center">{{ partida.peso_neto }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-3 center">{{ partida.peso_bruto }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 center">${{ partida.valor_costo_unitario }}</p>
+                </td>
+                <td class="border">
+                    <p class="mini p-t-2 right p-r-2">${{ partida.valor_total }}</p>
+                </td>
+            </tr>
+            {% endfor %}
+        </tbody>
+
+        <tfoot>
+            <tr class="h-14">
+                <td bgcolor="#E4E4E4" class="border" colspan="2" style="width:123pt">
+                    <p class="small-bold p-t-2 p-l-3 line-10">
+                        <span>Observaciones:</span>
+                        <span class="small-bold" style="float: right; margin-right: 2pt;">TOTALES</span>
+                    </p>
+                </td>
+                <td class="border" colspan="2" style="width:28pt">
+                    <p class="tiny p-t-5 p-r-1 line-8 center">{{ totales.cantidad_total }}</p>
+                </td>
+                <td class="border" style="width:22pt"></td>
+                <td class="border" style="width:40pt">
+                    <p class="tiny p-t-4 center line-8">
+                        {% if totales.bultos_total != 0 %}{{ totales.bultos_total }}{% endif %}
+                        <span>{{ totales.clave_bultos or '' }}</span>
+                    </p>
+                </td>
+                <td class="border" style="width:27pt">
+                    <p class="tiny p-t-5 center line-8">{{ totales.peso_neto_total }}</p>
+                </td>
+                <td class="border" style="width:28pt">
+                    <p class="tiny p-t-5 center line-8">{{ totales.peso_bruto_total }}</p>
+                </td>
+                <td style="width:30pt"></td>
+                <td class="border" style="width:35pt">
+                    <p class="tiny p-t-5 right line-8 p-r-2">${{ totales.valor_total_total }}</p>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="2" class="border" style="height: 100pt; text-align:start; vertical-align: top;">
+                    <p class="mini p-l-2 p-t-2">{{ factura.observaciones }}</p>
+                </td>
+                <td colspan="8" style="width:336pt; vertical-align: bottom; height: 100%;">
+                    <p style="border-bottom: 1pt solid black; width: 80%; margin: 0 auto 2pt auto;"></p>
+                    <p class="normal center" style="margin-bottom: 0;">{{ cliente_proveedor.nombre }}</p>
+                    <p style="margin-bottom: 0;"><br /></p>
+                    <p class="small-bold center line-7" style="margin-bottom: 0;">Los valores expresados en esta factura
+                        son en: {{ factura.moneda }}</p>
+                </td>
+            </tr>
+            <tr>
+                <td colspan="10" style="width:580pt; vertical-align: top; height: 100%;">
+                    <p class="p-t-8"><br /></p>
+                    <p class="p-l-5 line-8 tiny-bold">Normal Por Parte</p>
+                    <p class="normal p-l-5 line-9">Declaro bajo protesta de decir verdad que la información contenida en
+                        este documento es verdadera y me hago responsable de comprobar lo aquí declarado.</p>
+                </td>
+            </tr>
+        </tfoot>
+    </table>
+</body>
+
+</html>
\ No newline at end of file
diff --git a/backend/api/v1/modules/a76/router.py b/backend/api/v1/modules/a76/router.py
index 95f5791a..24220d6d 100644
--- a/backend/api/v1/modules/a76/router.py
+++ b/backend/api/v1/modules/a76/router.py
@@ -48,6 +48,10 @@ from .transportation.transporters.routes import router as transporters_router
 from .transportation.vehicles.routes import router as vehicles_router
 from api.v1.modules.public.reference_data.material_types.routes import router as material_types_router
 
+# --- NUEVO IMPORT PARA REPORTES DE FACTURAS ---
+from .reports.importacion.facturas.routes import router as invoices_reports_router
+from .reports.importacion.consolidados.routes import router as consolidated_reports_router
+
 
 # Router principal
 router = APIRouter()
@@ -114,3 +118,16 @@ router.include_router(
     prefix="/public/reference-data", 
     tags=["Reference Data"]
 )
+
+# --- REGISTRO DE RUTAS DE REPORTES ---
+router.include_router(
+    invoices_reports_router, 
+    prefix="/a76/reports/importacion/facturas", 
+    tags=["a76 / reports"]
+)
+
+router.include_router(
+    consolidated_reports_router, 
+    prefix="/a76/reports/importacion/consolidados", 
+    tags=["a76 / reports"]
+)
\ No newline at end of file
diff --git a/backend/api/v1/modules/core/tenants/models.py b/backend/api/v1/modules/core/tenants/models.py
index 91eb9aff..fbc6af78 100644
--- a/backend/api/v1/modules/core/tenants/models.py
+++ b/backend/api/v1/modules/core/tenants/models.py
@@ -12,8 +12,7 @@ from sqlalchemy import Enum as SQLEnum
 from sqlalchemy import Integer, String, Text
 from sqlalchemy.orm import Mapped, relationship
 
-if TYPE_CHECKING:
-    from api.v1.modules.core.user_tenant.models import UserTenant
+from api.v1.modules.core.user_tenant.models import UserTenant
 
 
 class TenantType(enum.Enum):
diff --git a/backend/api/v1/modules/public/reference_data/containers/models.py b/backend/api/v1/modules/public/reference_data/containers/models.py
index b8d3c630..c6081c34 100644
--- a/backend/api/v1/modules/public/reference_data/containers/models.py
+++ b/backend/api/v1/modules/public/reference_data/containers/models.py
@@ -7,11 +7,11 @@ class Container(Base):
     __tablename__ = "containers"  # GContenedores
     __table_args__ = (
         PrimaryKeyConstraint("key", name="containers_pkey"),
-        {"schema": "public", "extend_existing": True},  # opcional
+        {"extend_existing": True},  # opcional
     )
 
     key: Mapped[str] = mapped_column(
-        String(3), nullable=False
+        String(3), primary_key=True, nullable=False
     )  # mantiene ceros iniciales
     description: Mapped[str] = mapped_column(
         String(500), nullable=False
diff --git a/backend/api/v1/modules/public/reference_data/material_types/models.py b/backend/api/v1/modules/public/reference_data/material_types/models.py
index 04fa9478..5862649a 100644
--- a/backend/api/v1/modules/public/reference_data/material_types/models.py
+++ b/backend/api/v1/modules/public/reference_data/material_types/models.py
@@ -11,7 +11,7 @@ class MaterialType(Base):
     )
 
     key: Mapped[str] = mapped_column(
-        String(10), nullable=False)  # clave del material
+        String(10), primary_key=True, nullable=False)  # clave del material
     type: Mapped[str] = mapped_column(String(15), nullable=False)  # tipo
     description: Mapped[str] = mapped_column(
         String(256), nullable=False
diff --git a/backend/api/v1/router.py b/backend/api/v1/router.py
index 1a4a8c47..d9b4d517 100644
--- a/backend/api/v1/router.py
+++ b/backend/api/v1/router.py
@@ -12,6 +12,7 @@ from .modules.a24.router import router as a24_router
 from .modules.public.router import router as public_router
 from .modules.a24.router import router as a24_router
 
+
 # Router principal
 router = APIRouter()
 
@@ -29,3 +30,5 @@ router.include_router(a24_router)
 def status():
     """Health check de la API"""
     return {"status": "ok", "version": "1.0.0", "api": "v1"}
+
+
diff --git a/backend/core/celery_app.py b/backend/core/celery_app.py
new file mode 100644
index 00000000..c118db31
--- /dev/null
+++ b/backend/core/celery_app.py
@@ -0,0 +1,28 @@
+import os
+from celery import Celery
+
+
+valkey_url = os.getenv("VALKEY_URL", "redis://valkey:6379/0")
+
+celery_app = Celery(
+    "anexo76_tasks",
+    broker=valkey_url,
+    backend=valkey_url,
+    include=[
+        "api.v1.modules.a76.reports.importacion.facturas.task",
+        "api.v1.modules.a76.reports.importacion.consolidados.task"
+    ] # Ruta al módulo donde están las tareas
+)
+
+# Configuraciones adicionales
+celery_app.conf.update(
+    task_track_started=True,
+    task_serializer="json",
+    accept_content=["json"],
+    result_serializer="json",
+    timezone="America/Mexico_City",
+    enable_utc=True,
+)
+
+if __name__ == "__main__":
+    celery_app.start()
\ No newline at end of file
diff --git a/backend/core/middleware.py b/backend/core/middleware.py
index 0ed55a15..d7da611b 100644
--- a/backend/core/middleware.py
+++ b/backend/core/middleware.py
@@ -1,29 +1,15 @@
-"""
-Middleware personalizado para Anexo76
-- Validación de licencias
-- Gestión de multi-tenancy
-- Logging de requests
-"""
-
 import logging
 import time
 from typing import Callable
-
-from fastapi import HTTPException, Request
+from fastapi import HTTPException, Request, Response 
 from starlette.middleware.base import BaseHTTPMiddleware
-
 from .config import settings
 from .database import CoreSessionLocal
 from .security import get_tenant_from_token, verify_token
 
 logger = logging.getLogger(__name__)
 
-
 class TenantMiddleware(BaseHTTPMiddleware):
-    """
-    Middleware para identificar y validar el tenant en cada request
-    """
-
     async def dispatch(self, request: Request, call_next: Callable):
         # Rutas públicas que no requieren tenant
         # Permitir acceso sin autenticación a rutas de documentación y salud
@@ -37,53 +23,35 @@ class TenantMiddleware(BaseHTTPMiddleware):
         ]
 
         path = request.url.path
-        # Permitir cualquier subruta de docs/redoc/openapi.json (por ejemplo, /api/docs, /api/docs/, /api/docs/oauth2-redirect)
-        if any(
-            path == prefix or path.startswith(prefix + "/") for prefix in doc_prefixes
-        ):
+
+        # 3. Bypass para rutas públicas y docs
+        if any(path == prefix or path.startswith(prefix + "/") for prefix in doc_prefixes):
             return await call_next(request)
-        # Permitir rutas públicas exactas o con prefijo
-        if any(
-            path == prefix or (prefix != "/" and path.startswith(prefix))
-            for prefix in public_prefixes
-        ):
+            
+        if any(path == prefix or (prefix != "/" and path.startswith(prefix)) for prefix in public_prefixes):
             return await call_next(request)
 
-        # Extraer token y obtener tenant
+        # 4. Validación estricta de Token (solo para lo que no es público ni OPTIONS)
         auth_header = request.headers.get("Authorization")
-
         if not auth_header or not auth_header.startswith("Bearer "):
             raise HTTPException(
-                status_code=401, detail="Missing or invalid authorization header"
+                status_code=401, 
+                detail="Missing or invalid authorization header"
             )
 
         token = auth_header.split(" ")[1]
-
         try:
             user_info = verify_token(token)
             tenant_id = get_tenant_from_token(user_info)
-
-            # ⚠️ NOTA: tenant_id puede ser None para usuarios SSO que aún no tienen tenant asignado
-            # En ese caso, el endpoint específico deberá manejarlo
-            if not tenant_id:
-                logger.warning(
-                    f"⚠️ Token sin tenant_id para usuario: {user_info.get('sub', 'unknown')}"
-                )
-                # No lanzamos error aquí, dejamos que el endpoint decida qué hacer
-
-            # Agregar tenant_id al state del request (puede ser None)
+            
             request.state.tenant_id = tenant_id
             request.state.user_info = user_info
-
-        except HTTPException:
-            # Re-lanzar HTTPException directamente
-            raise
         except Exception as e:
             logger.error(f"❌ Tenant validation error: {str(e)}")
             raise HTTPException(status_code=401, detail="Invalid authentication")
 
-        response = await call_next(request)
-        return response
+        # 5. Continuar con la petición real
+        return await call_next(request)
 
 
 class LicenseValidationMiddleware(BaseHTTPMiddleware):
diff --git a/backend/requirements.txt b/backend/requirements.txt
index 1e600ac7..ff7a7cfa 100644
--- a/backend/requirements.txt
+++ b/backend/requirements.txt
@@ -38,3 +38,12 @@ black==25.9.0
 flake8==7.3.0
 mypy==1.18.2
 pylint==4.0.2
+
+# reportes
+Jinja2==3.1.6
+pdfkit==1.0.0
+
+# Desarrollo en seguno plano
+celery==5.3.6
+redis==5.0.1
+flower==2.0.1
\ No newline at end of file
diff --git a/debug_values.py b/debug_values.py
new file mode 100644
index 00000000..337140ee
--- /dev/null
+++ b/debug_values.py
@@ -0,0 +1,76 @@
+from sqlalchemy import create_engine, text
+from sqlalchemy.orm import sessionmaker
+from api.v1.modules.a76.items.line_items.models import LineItem
+from api.v1.modules.a76.items.line_quantities.models import LineQuantity
+from api.v1.modules.a76.items.line_financials.models import LineFinancial
+from api.v1.modules.a76.parts.models import Part
+from api.v1.modules.a76.invoices.models import InvoiceHeader
+from api.v1.modules.a76.pedmientos.models import Pedimentos
+
+# Setup DB (Adjust connection string if needed, checking environment assumption)
+# Assuming local connection string or deriving from environment/config
+# For this environment, I'll attempt a standard connection or reuse existing if possible.
+# Since I cannot easily import 'db' from main app without setup, I will rely on standard raw SQL or simple ORM setup if I can import 'Session'.
+# Using the imports available in the user's file.
+
+import sys
+sys.path.append('/home/josmar/dev/anexo76/backend')
+
+from core.database import CoreSessionLocal
+
+# Manual Session creation
+db = CoreSessionLocal()
+
+try:
+    # 1. Find the lines matching the description (Qty 1500 + HTS)
+    # The user said HTS: 2710190650
+    # Qty: 1500
+    
+    print("--- SEARCHING FOR LINES ---")
+    
+    # We look for lines with quantity 1500 first
+    candidates = db.query(LineItem).join(LineQuantity).filter(
+        LineQuantity.quantity == 1500
+    ).all()
+    
+    found = False
+    for line in candidates:
+        part = db.query(Part).filter(Part.id == line.part_number).first()
+        fin = db.query(LineFinancial).filter(LineFinancial.item_line_id == line.id).first()
+        inv = db.query(InvoiceHeader).filter(InvoiceHeader.id == line.item.invoice_id).first() if line.item else None
+        
+        us_frac = part.us_fraction if part else "N/A"
+        
+        # Check fraction match (loose match)
+        if "2710190650" in us_frac.replace(".","").replace(" ",""):
+             found = True
+             print(f"\nMATCH FOUND: Line ID {line.id} - Invoice {inv.invoice_number if inv else 'N/A'}")
+             print(f"HTS: {us_frac}")
+             print(f"Qty: {1500}")
+             print(f"Inv Currency: {inv.financials.currency} / {inv.financials.currency_type} Rate: {inv.financials.exchange_rate}")
+             
+             print("\nFINANCIALS:")
+             if fin:
+                 print(f"  value_usd: {fin.value_usd}")
+                 print(f"  value_mxn: {fin.value_mxn}")
+                 print(f"  value_commercial_usd: {fin.value_commercial_usd}")
+                 print(f"  value_commercial_mxn: {fin.value_commercial_mxn}")
+                 print(f"  unit_cost_usd: {fin.unit_cost_usd}")
+                 print(f"  unit_cost_commercial_usd: {fin.unit_cost_commercial_usd}")
+                 print(f"  unit_cost_mxn: {fin.unit_cost_mxn}")
+                 
+                 # Check calculation hypothesis
+                 val_usd = float(fin.value_usd or 0)
+                 val_mxn = float(fin.value_mxn or 0)
+                 rate = float(inv.financials.exchange_rate or 1)
+                 
+                 print(f"\n  If using ValueMXN/Rate: {val_mxn} / {rate} = {val_mxn/rate}")
+                 print(f"  If using Max(MXN, USD): {max(val_mxn, val_usd)}")
+             else:
+                 print("  No Financials found.")
+
+    if not found:
+        print("No matching line (1500 qty, HTS 2710190650) found.")
+
+finally:
+    db.close()
diff --git a/docker-compose.yml b/docker-compose.yml
index 655340d1..c26575a5 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -17,7 +17,7 @@ services:
       - backend-net
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d anexo76_core || exit 1"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres -d anexo76_core || exit 1" ]
       interval: 5s
       timeout: 3s
       retries: 10
@@ -54,7 +54,7 @@ services:
       - backend-net
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U postgres -d keycloak || exit 1"]
+      test: [ "CMD-SHELL", "pg_isready -U postgres -d keycloak || exit 1" ]
       interval: 5s
       timeout: 3s
       retries: 10
@@ -97,7 +97,7 @@ services:
       KC_HOSTNAME_PATH: /kcauth
       KC_LOG_LEVEL: INFO
       JAVA_OPTS_APPEND: "-Xms256m -Xmx512m -XX:MetaspaceSize=96M -XX:MaxMetaspaceSize=256m -Djava.net.preferIPv4Stack=true"
-    command: 
+    command:
       - start-dev
       - --http-relative-path=/kcauth
       - --db=postgres
@@ -122,7 +122,19 @@ services:
       - backend-net
     restart: unless-stopped
     healthcheck:
-      test: ["CMD-SHELL", "exec 3<>/dev/tcp/127.0.0.1/9000; echo -e 'GET /kcauth/health/ready HTTP/1.1\r\nhost: 127.0.0.1\r\nConnection: close\r\n\r\n' >&3; grep -q 'HTTP/1.1 200' <&3 || exit 1"]
+      test:
+        [
+          "CMD-SHELL",
+          "exec 3<>/dev/tcp/127.0.0.1/9000; echo -e 'GET /kcauth/health/ready HTTP/1.1\r
+
+            host: 127.0.0.1\r
+
+            Connection: close\r
+
+            \r
+
+            ' >&3; grep -q 'HTTP/1.1 200' <&3 || exit 1"
+        ]
       interval: 10s
       timeout: 5s
       retries: 30
@@ -178,10 +190,10 @@ services:
       - backend-net
       - frontend-net
     restart: unless-stopped
-    entrypoint: ["/entrypoint.sh"]
-    command: ["uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--log-level", "info"]
+    entrypoint: [ "/entrypoint.sh" ]
+    command: [ "uvicorn", "main:app", "--host", "0.0.0.0", "--port", "8000", "--reload", "--log-level", "info" ]
     healthcheck:
-      test: ["CMD-SHELL", "curl -f http://localhost:8000/api/health || exit 1"]
+      test: [ "CMD-SHELL", "curl -f http://localhost:8000/api/health || exit 1" ]
       interval: 15s
       timeout: 5s
       retries: 5
@@ -223,7 +235,7 @@ services:
     depends_on:
       backend:
         condition: service_healthy
-    entrypoint: ["/frontend-entrypoint.sh"]
+    entrypoint: [ "/frontend-entrypoint.sh" ]
     volumes:
       - ./frontend:/app
       - frontend_node_modules:/app/node_modules
@@ -232,9 +244,9 @@ services:
       - frontend-net
       - auth-net
     restart: unless-stopped
-    command: ["pnpm", "run", "dev", "--", "--host", "0.0.0.0"]
+    command: [ "pnpm", "run", "dev", "--", "--host", "0.0.0.0" ]
     healthcheck:
-      test: ["CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:5173/ || exit 1"]
+      test: [ "CMD-SHELL", "wget --no-verbose --tries=1 --spider http://localhost:5173/ || exit 1" ]
       interval: 15s
       timeout: 5s
       retries: 5
@@ -250,6 +262,27 @@ services:
           memory: 1G
         reservations:
           memory: 512M
+  # celery
+  celery_worker:
+    build: ./backend
+    container_name: a76_worker
+    command: celery -A core.celery_app worker --loglevel=info
+    environment:
+      - VALKEY_URL=redis://valkey:6379/0
+    depends_on:
+      - backend
+      - valkey
+    networks:
+      - backend-net
+
+  valkey:
+    image: valkey/valkey:7.2
+    container_name: a76_valkey
+    restart: always
+    ports:
+      - "6379:6379"
+    networks:
+      - backend-net
 
 volumes:
   postgres_app_data:
@@ -278,4 +311,4 @@ networks:
     driver: bridge
     ipam:
       config:
-        - subnet: 172.22.0.0/16
\ No newline at end of file
+        - subnet: 172.22.0.0/16
diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts
index 0f0aeaa4..f17d6fd5 100644
--- a/frontend/src/lib/api.ts
+++ b/frontend/src/lib/api.ts
@@ -46,7 +46,7 @@ async function refreshToken(): Promise<string | null> {
 	if (!browser) return null;
 
 	let refreshTokenValue = localStorage.getItem('refresh_token');
-	
+
 	// Si no está en localStorage, intentar obtenerlo de las cookies
 	if (!refreshTokenValue) {
 		const getCookie = (name: string): string | null => {
@@ -55,18 +55,18 @@ async function refreshToken(): Promise<string | null> {
 			if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
 			return null;
 		};
-		
+
 		refreshTokenValue = getCookie('refresh_token');
-		if (refreshTokenValue) {			
+		if (refreshTokenValue) {
 			localStorage.setItem('refresh_token', refreshTokenValue);
 		}
 	}
-	
+
 	if (!refreshTokenValue) {
 		console.error('❌ [API] No hay refresh token disponible');
 		return null;
-	}	
-	
+	}
+
 	try {
 		const response = await fetch(`${API_BASE_URL}/v1/auth/refresh`, {
 			method: 'POST',
@@ -94,25 +94,25 @@ async function refreshToken(): Promise<string | null> {
 			return null;
 		}
 
-		const data = await response.json();		
+		const data = await response.json();
 
 		// Guardar los nuevos tokens
 		if (data.access_token) {
 			localStorage.setItem('access_token', data.access_token);
-			
+
 			if (data.refresh_token) {
 				localStorage.setItem('refresh_token', data.refresh_token);
 			}
-			
+
 			// Actualizar también las cookies
 			const isSecure = window.location.protocol === 'https:';
 			const secureFlag = isSecure ? '; Secure' : '';
-			
+
 			document.cookie = `access_token=${data.access_token}; path=/; max-age=${60 * 60 * 24 * 7}; SameSite=Lax${secureFlag}`;
 			if (data.refresh_token) {
 				document.cookie = `refresh_token=${data.refresh_token}; path=/; max-age=${60 * 60 * 24 * 30}; SameSite=Lax${secureFlag}`;
 			}
-			
+
 			// Actualizar el authStore si está disponible
 			try {
 				const { authStore } = await import('./auth');
@@ -121,7 +121,7 @@ async function refreshToken(): Promise<string | null> {
 				// Si no se puede importar authStore, no es crítico
 				console.warn('⚠️ [API] No se pudo actualizar authStore:', e);
 			}
-			
+
 			return data.access_token;
 		}
 
@@ -141,7 +141,7 @@ async function fetchApi<T = any>(
 	retryCount = 0
 ): Promise<ApiResponse<T>> {
 	// Si ya estamos refrescando el token, esperar
-	if (isRefreshing && retryCount === 0) {		
+	if (isRefreshing && retryCount === 0) {
 		return new Promise((resolve) => {
 			subscribeTokenRefresh((newToken) => {
 				resolve(fetchApi<T>(endpoint, options, 1));
@@ -150,16 +150,20 @@ async function fetchApi<T = any>(
 	}
 
 	const token = getToken();
-	
+
 	if (!token && !endpoint.includes('/auth/login')) {
 		console.warn('⚠️ [API] No hay token disponible para', endpoint);
 	}
 
 	const headers: Record<string, string> = {
-		'Content-Type': 'application/json',
 		...((options.headers as Record<string, string>) || {})
 	};
 
+	// Only set Content-Type to application/json if not already set and body is not FormData
+	if (!headers['Content-Type'] && !(options.body instanceof FormData)) {
+		headers['Content-Type'] = 'application/json';
+	}
+
 	if (token) {
 		headers['Authorization'] = `Bearer ${token}`;
 	}
@@ -244,7 +248,7 @@ async function fetchApi<T = any>(
 				// Errores de validación de FastAPI (con detail)
 				else if (data.detail) {
 					let errorMessage = 'Error de validación: ';
-					
+
 					// FastAPI devuelve errores de validación en data.detail como array
 					if (Array.isArray(data.detail)) {
 						const errors = data.detail.map((err: any) => {
@@ -257,14 +261,14 @@ async function fetchApi<T = any>(
 					} else {
 						errorMessage += JSON.stringify(data.detail);
 					}
-					
+
 					return {
 						error: errorMessage,
 						status: response.status
 					};
 				}
 			}
-			
+
 			return {
 				error: data.message || data.detail || 'Error en la petición',
 				status: response.status
@@ -299,7 +303,7 @@ export const api = {
 			method: 'PUT',
 			body: JSON.stringify(body)
 		}),
-		
+
 	patch: <T = any>(endpoint: string, body: any) =>
 		fetchApi<T>(endpoint, {
 			method: 'PATCH',
@@ -332,5 +336,8 @@ export const api = {
 		myLicense: () => api.get('/v1/licenses/my-license'),
 		usage: (tenantId: number) => api.get(`/v1/licenses/usage/${tenantId}`),
 		validate: (tenantId: number) => api.get(`/v1/licenses/validate/${tenantId}`)
-	}
+	},
+
+	// Generic request for custom needs (like file uploads)
+	request: <T = any>(endpoint: string, options: RequestInit = {}) => fetchApi<T>(endpoint, options)
 };
diff --git a/frontend/src/lib/api/dashboard/a76/customs-brokers.ts b/frontend/src/lib/api/dashboard/a76/customs-brokers.ts
index f91acdcb..49b336e1 100644
--- a/frontend/src/lib/api/dashboard/a76/customs-brokers.ts
+++ b/frontend/src/lib/api/dashboard/a76/customs-brokers.ts
@@ -87,13 +87,13 @@ export interface CreateCustomsBrokerData {
  */
 export const customsBrokersApi = {
     list: (companyId: string) => {
-        return api.get<CustomsBroker[]>(`/v1/a76/customs-brokers/?company_id=${companyId}`);
+        return api.get<CustomsBroker[]>(`/v1/a76/customs-brokers?company_id=${companyId}`);
     },
 
     get: (brokerKey: string, companyId: string) => {
         return api.get<CustomsBroker>(`/v1/a76/customs-brokers/${brokerKey}?company_id=${companyId}`);
     },
-	
+
     create: (data: CreateCustomsBrokerData, companyId: string) => {
         return api.post<CustomsBroker>(`/v1/a76/customs-brokers/?company_id=${companyId}`, data);
     },
diff --git a/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts b/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
index fff914d5..0c7fab48 100644
--- a/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
+++ b/frontend/src/lib/api/dashboard/a76/general_catalogs/company.ts
@@ -26,6 +26,13 @@ export interface Company {
     order_format_type?: string | null;
     ctpat_svi?: string | null;
     trusted_exporter_number?: string | null;
+    logo?: string | null;
+    previous_code?: number | null;
+    client_name?: string | null;
+    subassembly_mode?: string | null;
+    inter_db_name?: string | null;
+    prevalidator_key?: string | null;
+    seventh_amendment?: boolean;
     created_at: string | null;
     updated_at: string | null;
 }
diff --git a/frontend/src/lib/api/dashboard/a76/general_catalogs/multi-currency-types.ts b/frontend/src/lib/api/dashboard/a76/general_catalogs/multi-currency-types.ts
index a624e361..fb415397 100644
--- a/frontend/src/lib/api/dashboard/a76/general_catalogs/multi-currency-types.ts
+++ b/frontend/src/lib/api/dashboard/a76/general_catalogs/multi-currency-types.ts
@@ -1,5 +1,11 @@
 import { api } from '$lib/api';
-import type { PaginatedResponse } from '$lib/types';
+
+export interface PaginatedResponse {
+	page: number;
+	page_size: number;
+	total: number;
+	total_pages: number;
+}
 
 export interface MultiCurrencyType {
 	id: number;
@@ -29,11 +35,13 @@ export interface MultiCurrencyTypeListResponse extends PaginatedResponse {
 	items: MultiCurrencyType[];
 }
 
+import type { ApiResponse } from '$lib/api';
+
 export async function getMultiCurrencyTypes(
 	companyId: number,
 	page?: number,
 	pageSize?: number
-): Promise<MultiCurrencyTypeListResponse> {
+): Promise<ApiResponse<MultiCurrencyTypeListResponse>> {
 	const params = new URLSearchParams({ company_id: companyId.toString() });
 	if (page) params.append('page', page.toString());
 	if (pageSize) params.append('page_size', pageSize.toString());
@@ -44,7 +52,7 @@ export async function getMultiCurrencyTypes(
 export async function getMultiCurrencyType(
 	multiCurrencyTypeId: number,
 	companyId: number
-): Promise<MultiCurrencyType> {
+): Promise<ApiResponse<MultiCurrencyType>> {
 	const params = new URLSearchParams({ company_id: companyId.toString() });
 	return api.get<MultiCurrencyType>(`/v1/a76/multi-currency-types/${multiCurrencyTypeId}?${params.toString()}`);
 }
@@ -52,7 +60,7 @@ export async function getMultiCurrencyType(
 export async function createMultiCurrencyType(
 	data: MultiCurrencyTypeCreate,
 	companyId: number
-): Promise<MultiCurrencyType> {
+): Promise<ApiResponse<MultiCurrencyType>> {
 	const params = new URLSearchParams({ company_id: companyId.toString() });
 	return api.post<MultiCurrencyType>(`/v1/a76/multi-currency-types/?${params.toString()}`, data);
 }
@@ -61,7 +69,7 @@ export async function updateMultiCurrencyType(
 	multiCurrencyTypeId: number,
 	data: MultiCurrencyTypeUpdate,
 	companyId: number
-): Promise<MultiCurrencyType> {
+): Promise<ApiResponse<MultiCurrencyType>> {
 	const params = new URLSearchParams({ company_id: companyId.toString() });
 	return api.put<MultiCurrencyType>(
 		`/v1/a76/multi-currency-types/${multiCurrencyTypeId}?${params.toString()}`,
@@ -72,7 +80,7 @@ export async function updateMultiCurrencyType(
 export async function deleteMultiCurrencyType(
 	multiCurrencyTypeId: number,
 	companyId: number
-): Promise<void> {
+): Promise<ApiResponse<any>> {
 	const params = new URLSearchParams({ company_id: companyId.toString() });
 	return api.delete(`/v1/a76/multi-currency-types/${multiCurrencyTypeId}?${params.toString()}`);
 }
\ No newline at end of file
diff --git a/frontend/src/lib/api/dashboard/a76/parts.ts b/frontend/src/lib/api/dashboard/a76/parts.ts
index 88538db8..492c93ea 100644
--- a/frontend/src/lib/api/dashboard/a76/parts.ts
+++ b/frontend/src/lib/api/dashboard/a76/parts.ts
@@ -55,24 +55,24 @@ export interface Part {
     tenant_id: number;
     company_id: number;
     client_id: number;
-    
+
     // Identificación
     part_number: string;
     commercial_part_number: string | null;
-    
+
     // Descripciones y Clase
     description_spanish: string | null;
     description_english: string | null;
     part_class: string | null;
-    unit_of_measure: string | null; 
-    
+    unit_of_measure: string | null;
+
     // Costos y Pesos
     unit_cost: number | null;
     currency_key: string | null;
     currency_type: string | null;
     unit_weight: number | null;
     weight_type: string | null;
-    
+
     // Regulatorio
     fraction: string | null;
     us_fraction: string | null;
@@ -82,14 +82,14 @@ export interface Part {
     eccn: string | null;
     export_code: string | null;
     exclusion_symbol: string | null;
-    
+
     // Estado y Media
     is_active: boolean;
     part_photo: string | null;
     created_at: string;
     updated_at: string;
 
-    
+
     fa_data?: FaData | null;
     inv_data?: InvData | null;
 }
@@ -99,7 +99,7 @@ export interface PartCreate extends Omit<Part, 'id' | 'tenant_id' | 'created_at'
 }
 
 
-export interface PartUpdate extends Partial<PartCreate> {}
+export interface PartUpdate extends Partial<PartCreate> { }
 
 
 export interface PartListResponse {
@@ -112,20 +112,20 @@ export interface PartListResponse {
 
 export const partsApi = {
 
-    list: (params: { 
-        company_id: number; 
-        page?: number; 
-        page_size?: number; 
-        q?: string 
+    list: (params: {
+        company_id: number;
+        page?: number;
+        page_size?: number;
+        q?: string
     }) => {
         const { company_id, page = 1, page_size = 50, q = '' } = params;
         const skip = (page - 1) * page_size;
-        
+
         const query = new URLSearchParams({
             company_id: company_id.toString(),
             skip: skip.toString(),
             limit: page_size.toString(),
-            description: q 
+            description: q
         });
 
         return api.get<PartListResponse>(`/v1/a76/parts/?${query.toString()}`);
@@ -140,11 +140,11 @@ export const partsApi = {
     },
 
     update: (id: number, data: PartUpdate, company_id: number) => {
-        return api.put<Part>(`/v1/a76/parts/${id}?company_id=${company_id}`, data);
+        return api.put<Part>(`/v1/a76/parts/${id}/?company_id=${company_id}`, data);
     },
 
 
     delete: (id: number, company_id: number) => {
-        return api.delete<void>(`/v1/a76/parts/${id}?company_id=${company_id}`);
+        return api.delete<void>(`/v1/a76/parts/${id}/?company_id=${company_id}`);
     }
 };
\ No newline at end of file
diff --git a/frontend/src/lib/api/dashboard/a76/reports/reports-consolidated.ts b/frontend/src/lib/api/dashboard/a76/reports/reports-consolidated.ts
new file mode 100644
index 00000000..9e6c171a
--- /dev/null
+++ b/frontend/src/lib/api/dashboard/a76/reports/reports-consolidated.ts
@@ -0,0 +1,35 @@
+
+const BASE_URL = import.meta.env.VITE_API_URL || '';
+
+export const consolidatedReportsApi = {
+
+    triggerPdfGeneration: async (invoiceId: number, companyId: number) => {
+        const params = new URLSearchParams({ company_id: companyId.toString() });
+        const endpoint = `${BASE_URL}/v1/a76/reports/importacion/consolidados/${invoiceId}/download-async?${params.toString()}`;
+
+        const token = localStorage.getItem('access_token');
+        const response = await fetch(endpoint, {
+            method: 'POST',
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Content-Type': 'application/json'
+            }
+        });
+
+        if (!response.ok) throw new Error('Error al iniciar la generación del consolidado');
+        return await response.json();
+    },
+
+    getTaskStatus: async (taskId: string) => {
+        const endpoint = `${BASE_URL}/v1/a76/reports/importacion/consolidados/tasks/${taskId}`;
+
+        const token = localStorage.getItem('access_token');
+        const response = await fetch(endpoint, {
+            method: 'GET',
+            headers: { 'Authorization': `Bearer ${token}` }
+        });
+
+        if (!response.ok) throw new Error('Error al consultar estado del consolidado');
+        return await response.json();
+    }
+};
diff --git a/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts
new file mode 100644
index 00000000..33c619f7
--- /dev/null
+++ b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts
@@ -0,0 +1,35 @@
+
+const BASE_URL = import.meta.env.VITE_API_URL || ''; 
+
+export const invoicesReportsApi = {
+    
+    triggerPdfGeneration: async (invoiceId: number, companyId: number) => {
+        const params = new URLSearchParams({ company_id: companyId.toString() });
+        const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/${invoiceId}/download-async?${params.toString()}`;
+        
+        const token = localStorage.getItem('access_token');
+        const response = await fetch(endpoint, {
+            method: 'POST', 
+            headers: {
+                'Authorization': `Bearer ${token}`,
+                'Content-Type': 'application/json'
+            }
+        });
+
+        if (!response.ok) throw new Error('Error al iniciar la generación');
+        return await response.json(); 
+    },
+
+    getTaskStatus: async (taskId: string) => {
+        const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/tasks/${taskId}`; 
+        
+        const token = localStorage.getItem('access_token');
+        const response = await fetch(endpoint, {
+            method: 'GET',
+            headers: { 'Authorization': `Bearer ${token}` }
+        });
+
+        if (!response.ok) throw new Error('Error al consultar estado');
+        return await response.json();
+    }
+};
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/clients_and_providers/data-table.svelte b/frontend/src/lib/components/dashboard/clients_and_providers/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/clients_and_providers/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/clients_and_providers/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/goods/classes/forms/FixedAssetClassForm.svelte b/frontend/src/lib/components/dashboard/goods/classes/forms/FixedAssetClassForm.svelte
index e4b4fb5e..06bcd2d0 100644
--- a/frontend/src/lib/components/dashboard/goods/classes/forms/FixedAssetClassForm.svelte
+++ b/frontend/src/lib/components/dashboard/goods/classes/forms/FixedAssetClassForm.svelte
@@ -832,7 +832,7 @@
 			</div>
 			<div class="border rounded-md max-h-96 overflow-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold">Clave</th>
 							<th class="px-4 py-2 text-left font-semibold">Descripción</th>
@@ -876,7 +876,7 @@
 			</div>
 			<div class="border rounded-md max-h-96 overflow-auto">
 				<table class="w-full text-sm">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-3 py-2 text-left font-semibold">Código</th>
 							<th class="px-3 py-2 text-left font-semibold">Descripción</th>
@@ -924,7 +924,7 @@
 			</div>
 			<div class="border rounded-md max-h-[600px] overflow-y-auto overflow-x-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold whitespace-nowrap">Fracción</th>
 							<th class="px-4 py-2 text-left font-semibold whitespace-nowrap">NICO</th>
@@ -982,7 +982,7 @@
 			</div>
 			<div class="border rounded-md max-h-[600px] overflow-y-auto overflow-x-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold whitespace-nowrap">Código</th>
 							<th class="px-4 py-2 text-left font-semibold whitespace-nowrap">Prefijo</th>
@@ -1042,7 +1042,7 @@
 			</div>
 			<div class="border rounded-md max-h-[600px] overflow-y-auto overflow-x-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold">Fracción</th>
 							<th class="px-4 py-2 text-left font-semibold">Descripción</th>
@@ -1098,7 +1098,7 @@
 			</div>
 			<div class="border rounded-md max-h-[600px] overflow-y-auto overflow-x-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold">Clave FDA</th>
 							<th class="px-4 py-2 text-left font-semibold">Descripción</th>
@@ -1152,7 +1152,7 @@
 			</div>
 			<div class="border rounded-md max-h-[600px] overflow-y-auto overflow-x-auto">
 				<table class="w-full">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b sticky top-0">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-4 py-2 text-left font-semibold">Código</th>
 							<th class="px-4 py-2 text-left font-semibold">Descripción</th>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/client-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/client-selector-dialog.svelte
index fadd2e9a..2b7f0e75 100644
--- a/frontend/src/lib/components/dashboard/goods/modales/client-selector-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/goods/modales/client-selector-dialog.svelte
@@ -24,9 +24,10 @@
     // Filtro reactivo local
     let filteredClients = $derived(
         clients.filter(c => 
-            c.name.toLowerCase().includes(searchTerm.toLowerCase()) || 
+            (c.client_or_provider === 'client' || c.client_or_provider === 'both') &&
+            (c.name.toLowerCase().includes(searchTerm.toLowerCase()) || 
             c.rfc.toLowerCase().includes(searchTerm.toLowerCase()) ||
-            c.id.toString().includes(searchTerm)
+            c.id.toString().includes(searchTerm))
         )
     );
 
@@ -42,10 +43,8 @@
         
         loading = true;
         try {
-            // Petición a la API
-            const res = await clientsProvidersApi.list(companyStore.activeCompany.id, 1, 100, { 
-                type: 'client' 
-            });
+            // Petición a la API - Traer todos para filtrar localmente
+            const res = await clientsProvidersApi.list(companyStore.activeCompany.id, 1, 1000);
 
             // Normalización de respuesta
             const responseData = (res as any).data || res;
@@ -103,18 +102,20 @@
                 </div>
             {:else}
                 <table class="w-full text-sm">
-                    <thead class="bg-muted/50 sticky top-0 backdrop-blur-sm">
+                    <thead class="bg-muted/50 backdrop-blur-sm">
                         <tr class="text-left border-b">
                             <th class="p-3 font-medium text-muted-foreground w-[60px]">ID</th>
                             <th class="p-3 font-medium text-muted-foreground w-[130px]">RFC</th>
                             <th class="p-3 font-medium text-muted-foreground">Razón Social</th>
                             <th class="p-3 font-medium text-muted-foreground w-[100px] text-center">Estado</th>
-                            <th class="p-3 font-medium text-muted-foreground w-[80px]">Acción</th>
                         </tr>
                     </thead>
                     <tbody>
                         {#each filteredClients as client}
-                            <tr class="border-b hover:bg-muted/50 transition-colors group">
+                            <tr 
+                                class="border-b hover:bg-accent/50 transition-colors cursor-pointer"
+                                onclick={() => handleSelect(client)}
+                            >
                                 <td class="p-3 font-mono text-xs">{client.id}</td>
                                 <td class="p-3 font-mono text-xs">{client.rfc}</td>
                                 <td class="p-3 font-medium">
@@ -138,17 +139,6 @@
                                         </span>
                                     {/if}
                                 </td>
-                                <td class="p-2">
-                                    <Button 
-                                        type="button" 
-                                        size="sm" 
-                                        variant="ghost" 
-                                        class="h-8 w-full" 
-                                        onclick={() => handleSelect(client)}
-                                    >
-                                        Usar
-                                    </Button>
-                                </td>
                             </tr>
                         {/each}
                     </tbody>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/country-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/country-selector-dialog.svelte
new file mode 100644
index 00000000..27943e6b
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/goods/modales/country-selector-dialog.svelte
@@ -0,0 +1,185 @@
+<script lang="ts">
+    import { Button } from "$lib/components/ui/button";
+    import { Input } from "$lib/components/ui/input";
+    import * as Dialog from "$lib/components/ui/dialog";
+    import * as Table from "$lib/components/ui/table";
+    import { Search, Loader2, Globe } from "lucide-svelte";
+    import { countriesApi, type Country } from "$lib/api/dashboard/refrence_data/countries";
+    import { toast } from "svelte-sonner";
+
+    // --- PROPS ---
+    let { 
+        open = $bindable(false), 
+        onSelect 
+    }: { 
+        open: boolean, 
+        onSelect: (item: Country) => void 
+    } = $props();
+
+    // --- ESTADO ---
+    let items = $state<Country[]>([]);
+    let loading = $state(false);
+    let searchTerm = $state("");
+    let loaded = $state(false);
+
+    // Filtro local
+    let filteredItems = $derived(
+        items.filter(i => 
+            (i.m3_key || "").toLowerCase().includes(searchTerm.toLowerCase()) || 
+            (i.mex_key || "").toLowerCase().includes(searchTerm.toLowerCase()) ||
+            (i.description_es || "").toLowerCase().includes(searchTerm.toLowerCase()) ||
+            (i.description_en || "").toLowerCase().includes(searchTerm.toLowerCase())
+        )
+    );
+
+    // Cargar datos al abrir
+    $effect(() => {
+        console.log("CountrySelectorDialog: open changed", open);
+        if (open) {
+            loadCountries();
+        }
+    });
+
+    async function loadCountries() {
+        loading = true;
+        console.log("CountrySelectorDialog: loading countries...");
+        try {
+            // FIX: Reducir tamaño de página para evitar timeouts y manejo de errores
+            const response = await countriesApi.list(1, 100);
+            console.log("Respuesta países FULL:", response);
+
+            if (response.error) {
+                console.error("Error API:", response.error);
+                toast.error(`Error al cargar países: ${response.error}`);
+                return;
+            }
+            
+            // Caso 1: Estructura esperada { data: { items: [...] } }
+            if (response.data?.items && Array.isArray(response.data.items)) {
+                items = response.data.items;
+                loaded = true;
+            } 
+            // Caso 2: El backend devuelve el array directamente en data { data: [...] }
+            else if (Array.isArray(response.data)) {
+                 items = response.data;
+                 loaded = true;
+            }
+            // Caso 3: La respuesta en sí es el array (poco probable con el wrapper actual pero posible si algo falla antes)
+            else if (Array.isArray(response)) {
+                items = response;
+                loaded = true;
+            }
+            // Caso 4: data es el objeto paginado pero sin la propiedad items correcta o vacía
+            else if (response.data && typeof response.data === 'object') {
+                 // Intentar buscar alguna propiedad que sea array
+                 const possibleArray = Object.values(response.data).find(val => Array.isArray(val));
+                 if (possibleArray) {
+                     items = possibleArray as Country[];
+                     loaded = true;
+                 } else {
+                     console.warn("Estructura de datos no reconocida en countriesApi.list:", response.data);
+                     toast.error("Formato de datos de países no reconocido");
+                 }
+            }
+            else {
+                console.warn("No se encontraron países o formato incorrecto:", response);
+                toast.error("No se encontraron países");
+            }
+            
+            console.log(`Países cargados: ${items.length}`);
+
+        } catch (e: any) {
+            console.error("Error cargando países (excepción):", e);
+            toast.error(`Excepción al cargar países: ${e.message || e}`);
+        } finally {
+            loading = false;
+        }
+    }
+
+    function handleSelect(item: Country) {
+        if (onSelect) onSelect(item);
+        open = false;
+    }
+</script>
+
+<Dialog.Root bind:open={open}>
+    <Dialog.Content class="sm:max-w-[900px] max-h-[80vh] flex flex-col">
+        <Dialog.Header>
+            <Dialog.Title>Seleccionar País</Dialog.Title>
+            <Dialog.Description>
+                Seleccione el país de origen del catálogo.
+            </Dialog.Description>
+        </Dialog.Header>
+
+        <div class="relative w-full my-2">
+            <Search class="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+            <Input 
+                type="search" 
+                placeholder="Buscar por clave o descripción..." 
+                class="pl-9" 
+                bind:value={searchTerm}
+            />
+        </div>
+
+        <div class="flex-1 overflow-y-auto border rounded-md min-h-[300px]">
+            {#if loading}
+                <div class="flex flex-col items-center justify-center h-48 gap-2 text-muted-foreground">
+                    <Loader2 class="h-8 w-8 animate-spin text-primary" />
+                    <p>Cargando catálogo...</p>
+                </div>
+            {:else if filteredItems.length === 0}
+                <div class="flex flex-col items-center justify-center h-48 text-muted-foreground">
+                    <p>No se encontraron países.</p>
+                </div>
+            {:else}
+                <Table.Root>
+                    <Table.Header>
+                        <Table.Row>
+                            <Table.Head class="w-[80px]">M3</Table.Head>
+                            <Table.Head class="w-[80px]">MEX</Table.Head>
+                            <Table.Head class="w-[80px]">AME</Table.Head>
+                            <Table.Head>Descripción ES</Table.Head>
+                            <Table.Head>Description EN</Table.Head>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {#each filteredItems as item}
+                            <Table.Row 
+                                class="cursor-pointer hover:bg-accent/50 transition-colors"
+                                onclick={() => handleSelect(item)}
+                            >
+                                <Table.Cell>
+                                    <div class="flex items-center gap-1">
+                                        <Globe class="h-3 w-3 text-blue-500" />
+                                        <span class="font-mono font-bold text-xs">
+                                            {item.m3_key}
+                                        </span>
+                                    </div>
+                                </Table.Cell>
+                                <Table.Cell class="font-mono text-xs">
+                                    {item.mex_key}
+                                </Table.Cell>
+                                <Table.Cell class="font-mono text-xs">
+                                    {item.ame_key}
+                                </Table.Cell>
+                                <Table.Cell class="font-medium text-sm">
+                                    {item.description_es}
+                                </Table.Cell>
+                                <Table.Cell class="text-sm text-muted-foreground italic">
+                                    {item.description_en}
+                                </Table.Cell>
+                            </Table.Row>
+                        {/each}
+                    </Table.Body>
+                </Table.Root>
+            {/if}
+        </div>
+
+        <Dialog.Footer>
+            <div class="text-xs text-muted-foreground self-center mr-auto">
+                {filteredItems.length} registros encontrados
+            </div>
+            <Button variant="outline" onclick={() => open = false}>Cancelar</Button>
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/currency-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/currency-selector-dialog.svelte
new file mode 100644
index 00000000..4add0b4a
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/goods/modales/currency-selector-dialog.svelte
@@ -0,0 +1,149 @@
+<script lang="ts">
+    import { Button } from "$lib/components/ui/button";
+    import { Input } from "$lib/components/ui/input";
+    import * as Dialog from "$lib/components/ui/dialog";
+    import * as Table from "$lib/components/ui/table";
+    import { toast } from "svelte-sonner";
+    import { Search, Loader2, DollarSign } from "lucide-svelte";
+    import { currencyTypesApi, type CurrencyType } from "$lib/api/dashboard/refrence_data/currency_types";
+
+    // --- PROPS ---
+    let { 
+        open = $bindable(false), 
+        onSelect 
+    }: { 
+        open: boolean, 
+        onSelect: (item: CurrencyType) => void 
+    } = $props();
+
+    // --- ESTADO ---
+    let items = $state<CurrencyType[]>([]);
+    let loading = $state(false);
+    let searchTerm = $state("");
+    let loaded = $state(false);
+
+    // Filtro local
+    let filteredItems = $derived(
+        items.filter(i => 
+            (i.code || "").toLowerCase().includes(searchTerm.toLowerCase()) || 
+            (i.currency_name || "").toLowerCase().includes(searchTerm.toLowerCase()) ||
+            (i.country_description || "").toLowerCase().includes(searchTerm.toLowerCase())
+        )
+    );
+
+    // Cargar datos al abrir
+    $effect(() => {
+        if (open && !loaded) {
+            loadCurrencies();
+        }
+    });
+
+    async function loadCurrencies() {
+        loading = true;
+        console.log("CurrencySelectorDialog: loading currencies (public)...");
+        try {
+            // FIX: Usar API pública, sin company_id
+            const response = await currencyTypesApi.list(1, 100);
+            console.log("Respuesta Monedas Public FULL:", response);
+            
+            if (response.error) {
+                 console.error("CurrencySelectorDialog Error:", response.error);
+                 toast.error(`Error al cargar monedas: ${response.error}`);
+                 return;
+            }
+
+            if (response.data?.items) {
+                items = response.data.items;
+                loaded = true;
+                console.log("CurrencySelectorDialog: loaded items", items.length);
+            } else {
+                console.warn("No se encontraron monedas (public):", response);
+                toast.error("No se encontraron monedas");
+            }
+        } catch (e: any) {
+            console.error("Error cargando monedas:", e);
+            toast.error(`Excepción al cargar monedas: ${e.message || e}`);
+        } finally {
+            loading = false;
+        }
+    }
+
+    function handleSelect(item: CurrencyType) {
+        if (onSelect) onSelect(item);
+        open = false;
+    }
+</script>
+
+<Dialog.Root bind:open={open}>
+    <Dialog.Content class="sm:max-w-[700px] max-h-[80vh] flex flex-col">
+        <Dialog.Header>
+            <Dialog.Title>Seleccionar Moneda</Dialog.Title>
+            <Dialog.Description>
+                Seleccione el tipo de moneda del catálogo público.
+            </Dialog.Description>
+        </Dialog.Header>
+
+        <div class="relative w-full my-2">
+            <Search class="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+            <Input 
+                type="search" 
+                placeholder="Buscar por código, nombre o país..." 
+                class="pl-9" 
+                bind:value={searchTerm}
+            />
+        </div>
+
+        <div class="flex-1 overflow-y-auto border rounded-md min-h-[300px]">
+            {#if loading}
+                <div class="flex flex-col items-center justify-center h-48 gap-2 text-muted-foreground">
+                    <Loader2 class="h-8 w-8 animate-spin text-primary" />
+                    <p>Cargando catálogo...</p>
+                </div>
+            {:else if filteredItems.length === 0}
+                <div class="flex flex-col items-center justify-center h-48 text-muted-foreground">
+                    <p>No se encontraron monedas.</p>
+                </div>
+            {:else}
+                <Table.Root>
+                    <Table.Header>
+                        <Table.Row>
+                            <Table.Head class="w-[100px]">Código</Table.Head>
+                            <Table.Head>Moneda</Table.Head>
+                            <Table.Head>País</Table.Head>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {#each filteredItems as item}
+                            <Table.Row 
+                                class="cursor-pointer hover:bg-accent/50 transition-colors"
+                                onclick={() => handleSelect(item)}
+                            >
+                                <Table.Cell>
+                                    <div class="flex items-center gap-2">
+                                        <DollarSign class="h-3 w-3 text-green-500" />
+                                        <span class="font-mono font-bold text-primary">
+                                            {item.code}
+                                        </span>
+                                    </div>
+                                </Table.Cell>
+                                <Table.Cell class="font-medium">
+                                    {item.currency_name}
+                                </Table.Cell>
+                                <Table.Cell class="text-sm text-muted-foreground">
+                                    {item.country_description || '-'}
+                                </Table.Cell>
+                            </Table.Row>
+                        {/each}
+                    </Table.Body>
+                </Table.Root>
+            {/if}
+        </div>
+
+        <Dialog.Footer>
+            <div class="text-xs text-muted-foreground self-center mr-auto">
+                {filteredItems.length} registros encontrados
+            </div>
+            <Button variant="outline" onclick={() => open = false}>Cancelar</Button>
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/fraction-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/fraction-selector-dialog.svelte
new file mode 100644
index 00000000..ea9819ed
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/goods/modales/fraction-selector-dialog.svelte
@@ -0,0 +1,156 @@
+<script lang="ts">
+    import { Button } from "$lib/components/ui/button";
+    import { Input } from "$lib/components/ui/input";
+    import * as Dialog from "$lib/components/ui/dialog";
+    import * as Table from "$lib/components/ui/table";
+    import { toast } from "svelte-sonner";
+    import { Search, Loader2, Hash } from "lucide-svelte";
+    import { getTariffFractions, type TariffFraction } from "$lib/api/dashboard/a76/general_catalogs/tariff-fractions";
+    import { companyStore } from "$lib/stores/company.svelte";
+
+    // --- PROPS ---
+    let { 
+        open = $bindable(false), 
+        onSelect 
+    }: { 
+        open: boolean, 
+        onSelect: (item: TariffFraction) => void 
+    } = $props();
+
+    // --- ESTADO ---
+    let items = $state<TariffFraction[]>([]);
+    let loading = $state(false);
+    let searchTerm = $state("");
+    let loaded = $state(false);
+
+    // Filtro local
+    let filteredItems = $derived(
+        items.filter(i => 
+            (i.fraction || "").includes(searchTerm) || 
+            (i.description || "").toLowerCase().includes(searchTerm.toLowerCase()) ||
+            (i.nico || "").includes(searchTerm) ||
+            (i.code || "").toLowerCase().includes(searchTerm.toLowerCase())
+        )
+    );
+
+    // Cargar datos al abrir
+    $effect(() => {
+        if (open && !loaded && companyStore.activeCompany?.id) {
+            loadFractions();
+        }
+    });
+
+    async function loadFractions() {
+        if (!companyStore.activeCompany?.id) {
+            toast.error("No hay empresa seleccionada");
+            return;
+        }
+        
+        loading = true;
+        try {
+            const response = await getTariffFractions(1, 1000, companyStore.activeCompany.id);
+            
+            if (response.error) {
+                console.error("Error al cargar fracciones:", response.error);
+                toast.error(`Error: ${response.error}`);
+                return;
+            }
+
+            if (response.data?.items) {
+                items = response.data.items;
+                loaded = true;
+            } else {
+                console.warn("No se encontraron fracciones:", response);
+                toast.info("No se encontraron fracciones registradas");
+            }
+        } catch (e: any) {
+            console.error("Excepción cargando fracciones:", e);
+            toast.error(`Error de conexión: ${e.message || e}`);
+        } finally {
+            loading = false;
+        }
+    }
+
+    function handleSelect(item: TariffFraction) {
+        if (onSelect) onSelect(item);
+        open = false;
+    }
+</script>
+
+<Dialog.Root bind:open={open}>
+    <Dialog.Content class="sm:max-w-[900px] max-h-[80vh] flex flex-col">
+        <Dialog.Header>
+            <Dialog.Title>Seleccionar Fracción Arancelaria</Dialog.Title>
+            <Dialog.Description>
+                Seleccione la fracción arancelaria del catálogo.
+            </Dialog.Description>
+        </Dialog.Header>
+
+        <div class="relative w-full my-2">
+            <Search class="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+            <Input 
+                type="search" 
+                placeholder="Buscar por fracción, NICO o descripción..." 
+                class="pl-9" 
+                bind:value={searchTerm}
+            />
+        </div>
+
+        <div class="flex-1 overflow-y-auto border rounded-md min-h-[300px]">
+            {#if loading}
+                <div class="flex flex-col items-center justify-center h-48 gap-2 text-muted-foreground">
+                    <Loader2 class="h-8 w-8 animate-spin text-primary" />
+                    <p>Cargando catálogo...</p>
+                </div>
+            {:else if filteredItems.length === 0}
+                <div class="flex flex-col items-center justify-center h-48 text-muted-foreground">
+                    <p>No se encontraron fracciones.</p>
+                </div>
+            {:else}
+                <Table.Root>
+                    <Table.Header>
+                        <Table.Row>
+                            <Table.Head class="w-[100px]">Código</Table.Head>
+                            <Table.Head class="w-[120px]">Fracción</Table.Head>
+                            <Table.Head class="w-[80px]">NICO</Table.Head>
+                            <Table.Head>Descripción</Table.Head>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {#each filteredItems as item}
+                            <Table.Row 
+                                class="cursor-pointer hover:bg-accent/50 transition-colors"
+                                onclick={() => handleSelect(item)}
+                            >
+                                <Table.Cell class="font-mono text-xs text-muted-foreground">
+                                    {item.code}
+                                </Table.Cell>
+                                <Table.Cell>
+                                    <div class="flex items-center gap-2">
+                                        <Hash class="h-3 w-3 text-orange-500" />
+                                        <span class="font-mono font-bold text-orange-600 dark:text-orange-400">
+                                            {item.fraction}
+                                        </span>
+                                    </div>
+                                </Table.Cell>
+                                <Table.Cell class="font-mono text-sm">
+                                    {item.nico || '-'}
+                                </Table.Cell>
+                                <Table.Cell class="font-medium text-sm">
+                                    {item.description || '-'}
+                                </Table.Cell>
+                            </Table.Row>
+                        {/each}
+                    </Table.Body>
+                </Table.Root>
+            {/if}
+        </div>
+
+        <Dialog.Footer>
+            <div class="text-xs text-muted-foreground self-center mr-auto">
+                {filteredItems.length} registros encontrados
+            </div>
+            <Button variant="outline" onclick={() => open = false}>Cancelar</Button>
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/material-type-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/material-type-selector-dialog.svelte
index 5fa0974f..3e03b975 100644
--- a/frontend/src/lib/components/dashboard/goods/modales/material-type-selector-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/goods/modales/material-type-selector-dialog.svelte
@@ -93,7 +93,7 @@
                 </div>
             {:else}
                 <table class="w-full text-sm">
-                    <thead class="bg-muted/50 sticky top-0 backdrop-blur-sm">
+                    <thead class="bg-muted/50 backdrop-blur-sm">
                         <tr class="text-left border-b">
                             <th class="p-3 font-medium text-muted-foreground w-[80px]">Clave</th>
                             <th class="p-3 font-medium text-muted-foreground">Descripción</th>
diff --git a/frontend/src/lib/components/dashboard/goods/modales/unit-measure-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/unit-measure-dialog.svelte
index 0deb485c..2520f8b6 100644
--- a/frontend/src/lib/components/dashboard/goods/modales/unit-measure-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/goods/modales/unit-measure-dialog.svelte
@@ -116,7 +116,6 @@
                         <Table.Row>
                             <Table.Head class="w-[80px]">Código</Table.Head>
                             <Table.Head>Descripción</Table.Head>
-                            <Table.Head class="text-right w-[50px]"></Table.Head>
                         </Table.Row>
                     </Table.Header>
                     <Table.Body>
@@ -129,7 +128,7 @@
                         {:else}
                             {#each items as item}
                                 <Table.Row 
-                                    class="cursor-pointer hover:bg-muted/50"
+                                    class="cursor-pointer hover:bg-accent/50 transition-colors"
                                     onclick={() => handleSelect(item)}
                                 >
                                     <Table.Cell class="font-mono font-bold">{item.code}</Table.Cell>
@@ -141,11 +140,6 @@
                                             {/if}
                                         </div>
                                     </Table.Cell>
-                                    <Table.Cell class="text-right">
-                                        <Button variant="ghost" size="icon" class="h-6 w-6">
-                                            <Check class="h-4 w-4" />
-                                        </Button>
-                                    </Table.Cell>
                                 </Table.Row>
                             {/each}
                         {/if}
diff --git a/frontend/src/lib/components/dashboard/goods/modales/us-fraction-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/modales/us-fraction-selector-dialog.svelte
new file mode 100644
index 00000000..1f514190
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/goods/modales/us-fraction-selector-dialog.svelte
@@ -0,0 +1,146 @@
+<script lang="ts">
+    import { Button } from "$lib/components/ui/button";
+    import { Input } from "$lib/components/ui/input";
+    import * as Dialog from "$lib/components/ui/dialog";
+    import * as Table from "$lib/components/ui/table";
+    import { toast } from "svelte-sonner";
+    import { Search, Loader2, Hash } from "lucide-svelte";
+    import { getUSTariffFractions, type USTariffFraction } from "$lib/api/dashboard/a76/general_catalogs/us-tariff-fractions";
+    import { companyStore } from "$lib/stores/company.svelte";
+
+    // --- PROPS ---
+    let { 
+        open = $bindable(false), 
+        onSelect 
+    }: { 
+        open: boolean, 
+        onSelect: (item: USTariffFraction) => void 
+    } = $props();
+
+    // --- ESTADO ---
+    let items = $state<USTariffFraction[]>([]);
+    let loading = $state(false);
+    let searchTerm = $state("");
+    let loaded = $state(false);
+
+    // Filtro local
+    let filteredItems = $derived(
+        items.filter(i => 
+            (i.code || "").includes(searchTerm) || 
+            (i.description || "").toLowerCase().includes(searchTerm.toLowerCase())
+        )
+    );
+
+    // Cargar datos al abrir
+    $effect(() => {
+        if (open && !loaded && companyStore.activeCompany?.id) {
+            loadFractions();
+        }
+    });
+
+    async function loadFractions() {
+        if (!companyStore.activeCompany?.id) {
+            toast.error("No hay empresa seleccionada");
+            return;
+        }
+        
+        loading = true;
+        try {
+            const response = await getUSTariffFractions(1, 1000, companyStore.activeCompany.id);
+            
+            if (response.error) {
+                console.error("Error al cargar fracciones americanas:", response.error);
+                toast.error(`Error: ${response.error}`);
+                return;
+            }
+
+            if (response.data?.items) {
+                items = response.data.items;
+                loaded = true;
+            } else {
+                console.warn("No se encontraron fracciones americanas:", response);
+                toast.info("No se encontraron fracciones americanas registradas");
+            }
+        } catch (e: any) {
+            console.error("Excepción cargando fracciones americanas:", e);
+            toast.error(`Error de conexión: ${e.message || e}`);
+        } finally {
+            loading = false;
+        }
+    }
+
+    function handleSelect(item: USTariffFraction) {
+        if (onSelect) onSelect(item);
+        open = false;
+    }
+</script>
+
+<Dialog.Root bind:open={open}>
+    <Dialog.Content class="sm:max-w-[800px] max-h-[80vh] flex flex-col">
+        <Dialog.Header>
+            <Dialog.Title>Seleccionar Fracción Americana</Dialog.Title>
+            <Dialog.Description>
+                Seleccione la fracción arancelaria (HTS) del catálogo.
+            </Dialog.Description>
+        </Dialog.Header>
+
+        <div class="relative w-full my-2">
+            <Search class="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+            <Input 
+                type="search" 
+                placeholder="Buscar por código o descripción..." 
+                class="pl-9" 
+                bind:value={searchTerm}
+            />
+        </div>
+
+        <div class="flex-1 overflow-y-auto border rounded-md min-h-[300px]">
+            {#if loading}
+                <div class="flex flex-col items-center justify-center h-48 gap-2 text-muted-foreground">
+                    <Loader2 class="h-8 w-8 animate-spin text-primary" />
+                    <p>Cargando catálogo...</p>
+                </div>
+            {:else if filteredItems.length === 0}
+                <div class="flex flex-col items-center justify-center h-48 text-muted-foreground">
+                    <p>No se encontraron fracciones.</p>
+                </div>
+            {:else}
+                <Table.Root>
+                    <Table.Header>
+                        <Table.Row>
+                            <Table.Head class="w-[150px]">Código (HTS)</Table.Head>
+                            <Table.Head>Descripción</Table.Head>
+                        </Table.Row>
+                    </Table.Header>
+                    <Table.Body>
+                        {#each filteredItems as item}
+                            <Table.Row 
+                                class="cursor-pointer hover:bg-accent/50 transition-colors"
+                                onclick={() => handleSelect(item)}
+                            >
+                                <Table.Cell>
+                                    <div class="flex items-center gap-2">
+                                        <Hash class="h-3 w-3 text-blue-500" />
+                                        <span class="font-mono font-bold text-blue-600 dark:text-blue-400">
+                                            {item.code}
+                                        </span>
+                                    </div>
+                                </Table.Cell>
+                                <Table.Cell class="font-medium text-sm">
+                                    {item.description || '-'}
+                                </Table.Cell>
+                            </Table.Row>
+                        {/each}
+                    </Table.Body>
+                </Table.Root>
+            {/if}
+        </div>
+
+        <Dialog.Footer>
+            <div class="text-xs text-muted-foreground self-center mr-auto">
+                {filteredItems.length} registros encontrados
+            </div>
+            <Button variant="outline" onclick={() => open = false}>Cancelar</Button>
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/goods/parts/class-selector-dialog.svelte b/frontend/src/lib/components/dashboard/goods/parts/class-selector-dialog.svelte
index 5d03286a..04a8ce34 100644
--- a/frontend/src/lib/components/dashboard/goods/parts/class-selector-dialog.svelte
+++ b/frontend/src/lib/components/dashboard/goods/parts/class-selector-dialog.svelte
@@ -110,12 +110,14 @@
                             <th class="p-3 font-medium text-muted-foreground w-[100px]">Clave</th>
                             <th class="p-3 font-medium text-muted-foreground">Descripción</th>
                             <th class="p-3 font-medium text-muted-foreground w-[80px]">UM</th>
-                            <th class="p-3 font-medium text-muted-foreground w-[80px]">Acción</th>
                         </tr>
                     </thead>
                     <tbody>
                         {#each filteredItems as item}
-                            <tr class="border-b hover:bg-muted/50 transition-colors">
+                            <tr 
+                                class="border-b hover:bg-accent/50 transition-colors cursor-pointer"
+                                onclick={() => handleSelect(item)}
+                            >
                                 <td class="p-3">
                                     <span class="font-mono font-bold text-primary bg-primary/10 px-2 py-1 rounded text-xs">
                                         {item.class_code}
@@ -137,18 +139,6 @@
                                         {item.unit_of_measure || '-'}
                                     </div>
                                 </td>
-
-                                <td class="p-2">
-                                    <Button 
-                                        type="button" 
-                                        size="sm" 
-                                        variant="ghost" 
-                                        class="h-8 w-full" 
-                                        onclick={() => handleSelect(item)}
-                                    >
-                                        Usar
-                                    </Button>
-                                </td>
                             </tr>
                         {/each}
                     </tbody>
diff --git a/frontend/src/lib/components/dashboard/goods/parts/data-table.svelte b/frontend/src/lib/components/dashboard/goods/parts/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/goods/parts/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/goods/parts/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte b/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
index db5d7d67..5991f15e 100644
--- a/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
+++ b/frontend/src/lib/components/dashboard/goods/parts/partForm.svelte
@@ -9,14 +9,17 @@
     import * as Tabs from '$lib/components/ui/tabs';
     import * as Card from '$lib/components/ui/card';
     import * as Select from "$lib/components/ui/select";
-    import { Switch } from "$lib/components/ui/switch"; 
+    import { Switch } from "$lib/components/ui/switch";
+    import { Separator } from '$lib/components/ui/separator';
+    import { Badge } from '$lib/components/ui/badge'; 
     
     // Iconos
     import { 
         ArrowLeft, LoaderCircle, Save, Package, DollarSign, 
         FileText, Settings, Image as ImageIcon, FolderSearch,
-        UserCheck, CheckCircle2, XCircle, Tag, Layers, Scale, Info, Briefcase, ShieldCheck
+        UserCheck, CheckCircle2, XCircle, Tag, Layers, Scale, Info, Briefcase, ShieldCheck, Globe
     } from 'lucide-svelte';
+    import { toast } from "svelte-sonner";
 
     // Stores & APIs
     import { companyStore } from '$lib/stores/company.svelte';
@@ -30,6 +33,10 @@
     import ClassSelectorDialog from '$lib/components/dashboard/goods/parts/class-selector-dialog.svelte';
     import MaterialTypeSelectorDialog from '$lib/components/dashboard/goods/modales/material-type-selector-dialog.svelte';
     import UnitMeasureSelectorDialog from '$lib/components/dashboard/goods/modales/unit-measure-dialog.svelte';
+    import CurrencySelectorDialog from '$lib/components/dashboard/goods/modales/currency-selector-dialog.svelte';
+    import CountrySelectorDialog from '$lib/components/dashboard/goods/modales/country-selector-dialog.svelte';
+    import FractionSelectorDialog from '$lib/components/dashboard/goods/modales/fraction-selector-dialog.svelte';
+    import USFractionSelectorDialog from '$lib/components/dashboard/goods/modales/us-fraction-selector-dialog.svelte';
 
     // --- PROPS ---
     let { partId = null, formType = 'inv' }: { partId?: number | null, formType?: 'inv' | 'fa' } = $props();
@@ -40,6 +47,7 @@
 
     let loading = $state(false);
     let error = $state<string | null>(null);
+    let activeTab = $state('general');
 
     // Estado Modales
     let showClientModal = $state(false);
@@ -47,11 +55,17 @@
     let showMaterialModal = $state(false);
     let showUOMModal = $state(false);
     let showAltUOMModal = $state(false); 
+    let showCurrencyModal = $state(false);
+    let showCountryModal = $state(false);
+    let showFractionModal = $state(false);
+    let showUSFractionModal = $state(false);
 
     // Descripciones Visuales
     let selectedClientName = $state(""); 
     let selectedClientStatus = $state(true); 
     let selectedClassDesc = $state("");
+    let selectedCurrencyName = $state("");
+    let selectedCountryName = $state("");
     let selectedMaterialDesc = $state("");
 
     // Estado Formulario
@@ -60,13 +74,14 @@
         part_number: '',
         description_spanish: '',
         description_english: '',
-        part_class: '',           
+        part_class: '',          
         material_type: '',       
         unit_of_measure: 'PZ',   
         unit_weight: 0,
         weight_type: 'KG',
         unit_cost: 0,
-        currency_key: 'USD',
+        currency_type: '',
+        currency_key: null as string | null,
         added_value: 0,
         value_added_type: 'USD',
         us_fraction: '',
@@ -129,10 +144,14 @@
                     alternate_unit_measure: d.inv_data?.alternate_uom || '',
                     part_photo: d.part_photo || '',
                     is_active: d.is_active ?? true,
-                    // Cargar datos FA si existen
                     sector: d.fa_data?.sector || '',
-                    fraction_type: d.fa_data?.fraction_type || ''
+                    fraction_type: d.fa_data?.fraction_type || '',
+                    currency_type: '' // Initialize to match type
                 };
+                // Ensure currency_type is mapped correctly if coming from DB (optional, depending on DB values)
+                if (d.currency_key === 'MXN') formData.currency_type = 'NA';
+                else if (d.currency_key === 'USD') formData.currency_type = 'EX';
+
                 if (d.client_id) await fetchClientName(d.client_id, companyId);
                 if (d.part_class) await fetchClassDesc(d.part_class, companyId);
                 if (d.inv_data?.material_type) await fetchMaterialName(d.inv_data.material_type);
@@ -140,6 +159,18 @@
         } catch (e) { console.error(e); } finally { loading = false; }
     }
 
+    // --- EFECTOS REACTIVOS ---
+    $effect(() => {
+        // Auto-set currency based on type selection
+        if (formData.currency_type === 'NA') {
+            formData.currency_key = 'MXN';
+            selectedCurrencyName = 'MXN';
+        } else if (formData.currency_type === 'EX') {
+            formData.currency_key = 'USD';
+            selectedCurrencyName = 'USD';
+        }
+    });
+
     // --- HELPERS VISUALES ---
     async function fetchClientName(clientId: number, companyId: number) {
         try {
@@ -180,6 +211,20 @@
     function handleMaterialSelect(item: any) { formData.material_type = item.key; selectedMaterialDesc = item.description; }
     function handleUOMSelect(item: any) { formData.unit_of_measure = item.code; }
     function handleAltUOMSelect(item: any) { formData.alternate_unit_measure = item.code; }
+    function handleCurrencySelect(currency: any) { 
+        formData.currency_type = ''; // Reset type legacy field
+        // FIX: Usar 'code' de la API pública currency_types
+        const code = currency.code || currency.currency_type_code; 
+        formData.currency_key = code;
+        selectedCurrencyName = code; 
+    }
+    function handleCountrySelect(country: any) { 
+        // FIX: Asegurar que se asigna la clave correcta
+        formData.origin_country = country.m3_key || country.country_key; 
+        selectedCountryName = country.description_es; 
+    }
+    function handleFractionSelect(item: any) { formData.fraction = item.fraction; }
+    function handleUSFractionSelect(item: any) { formData.us_fraction = item.code; }
 
     // --- SUBMIT ---
     async function handleSubmit() {
@@ -191,134 +236,185 @@
         
         loading = true;
         try {
-            // Construimos el payload.
-            // Si es FA, inyectamos el objeto fa_data anidado.
             let commonData: any = { ...formData };
-            
+            if (!commonData.currency_key || commonData.currency_key === 'USD') {
+                commonData.currency_key = null;
+            }
             if (formType === 'fa') {
                 commonData.fa_data = {
                     sector: formData.sector,
                     fraction_type: formData.fraction_type,
                     origin_country: formData.origin_country
                 };
+                delete commonData.sector;
+                delete commonData.fraction_type;
+                delete commonData.origin_country;
             }
 
+            console.log("Submitting Part Data:", { 
+                isEdit, 
+                partId, 
+                commonData 
+            });
+
             if (isEdit && partId) {
-                await partsApi.update(partId, commonData, activeCompanyId);
+                // TODO: Verify partId is number/string as expected
+                const res = await partsApi.update(Number(partId), commonData, activeCompanyId);
+                console.log("Update Response:", res);
+                if (res.error) throw new Error(res.error);
             } else {
-                await partsApi.create({ ...commonData, company_id: activeCompanyId }, activeCompanyId);
+                const result = await partsApi.create({ ...commonData, company_id: activeCompanyId }, activeCompanyId);
+                console.log("Create Response:", result);
+                if (result.error) { error = result.error; return; }
             }
+            toast.success(isEdit ? "Parte actualizada" : "Parte creada");
             goto('/dashboard/goods/parts');
-        } catch (e: any) { error = e.message || 'Error al guardar'; } finally { loading = false; }
+        } catch (e: any) { 
+            console.error("Submit Error:", e);
+            error = e.message || 'Error al guardar'; 
+            toast.error(error);
+        } finally { loading = false; }
     }
 </script>
 
-<div class="w-full mx-auto max-w-6xl py-6 px-4 space-y-6 pb-48">
-    <div class="flex items-center gap-4">
-        <Button variant="outline" size="icon" href="/dashboard/goods/parts">
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">{title}</h1>
-            <p class="text-muted-foreground">
-                {formType === 'fa' ? 'Gestión de Activos Fijos (Q-Partes)' : 'Gestión detallada de números de parte (S-Partes).'}
+<div class="space-y-4">
+    <div class="flex items-center justify-between">
+        <div class="space-y-1">
+            <div class="flex items-center gap-3">
+                <Button variant="ghost" size="icon" href="/dashboard/goods/parts">
+                    <ArrowLeft size={20} />
+                </Button>
+                <h1 class="text-3xl font-bold tracking-tight">{title}</h1>
+                <Badge variant={isEdit ? "secondary" : "default"}>
+                    {isEdit ? "Editar" : "Nueva"}
+                </Badge>
+            </div>
+            <p class="text-muted-foreground ml-11">
+                {formType === 'fa' ? 'Gestión de Activo Fijo' : 'Gestión de Inventario'}
             </p>
         </div>
     </div>
 
+    <Separator />
+
     {#if error}
-        <div class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium">
+        <div class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium animate-in slide-in-from-top-2">
             ⚠️ {error}
         </div>
     {/if}
 
+    <div class="pb-48">
+
     {#if formType === 'fa'}
         <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6">
-            <Card.Root>
+            <Card.Root class="shadow-sm">
                 <Card.Content class="p-6">
-                    <Tabs.Root value="general" class="w-full">
+                    <Tabs.Root bind:value={activeTab} class="w-full">
                         
                         <div class="min-h-[500px]">
-                            
-                            <Tabs.Content value="general" class="space-y-6 pt-4 animate-in fade-in duration-300">
+                            <Tabs.Content value="general" class="space-y-8 pt-6 animate-in fade-in duration-300">
                                 
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-6 space-y-2">
                                         <Label for="fa_pn" class="text-base font-semibold required">Número de Parte</Label>
-                                        <Input id="fa_pn" bind:value={formData.part_number} disabled={isEdit} maxlength={50} class="text-lg font-mono" placeholder="Ej: MAQ-001"/>
-                                    </div>
-                                    <div class="grid gap-2">
-                                        <Label for="fa_client" class="required">Cliente Asignado</Label>
-                                        <div class="flex gap-2">
-                                            <Input id="fa_client" bind:value={formData.client_id} readonly onclick={() => showClientModal = true} class="cursor-pointer font-mono" placeholder="Seleccione..."/>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showClientModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                        <div class="relative">
+                                            <Package class="absolute left-3 top-2.5 h-5 w-5 text-muted-foreground" />
+                                            <Input id="fa_pn" bind:value={formData.part_number} disabled={isEdit} maxlength={50} class="pl-10 text-lg font-mono bg-muted/20" placeholder="Ej: MAQ-001"/>
+                                        </div>
+                                    </div>
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="fa_client" class="text-base font-semibold required">Cliente Asignado</Label>
+                                        <div class="flex gap-2">
+                                            <div class="relative w-full">
+                                                <UserCheck class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                <Input id="fa_client" bind:value={selectedClientName} readonly onclick={() => showClientModal = true} class="pl-9 cursor-pointer hover:bg-muted/50 transition-colors" placeholder="Seleccione un cliente..."/>
+                                            </div>
+                                            <Button variant="secondary" size="icon" type="button" onclick={() => showClientModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
-                                        {#if selectedClientName}<div class="text-xs font-semibold text-primary">{selectedClientName}</div>{/if}
                                     </div>
                                 </div>
 
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="fa_desc_es">Descripción Español</Label>
-                                        <Textarea id="fa_desc_es" bind:value={formData.description_spanish} rows={2}/>
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="fa_desc_es" class="flex items-center gap-2">Descripción Español <span class="text-xs text-muted-foreground font-normal">(Requerido)</span></Label>
+                                        <Textarea id="fa_desc_es" bind:value={formData.description_spanish} rows={3} class="resize-none" placeholder="Descripción detallada en español..."/>
                                     </div>
-                                    <div class="grid gap-2">
-                                        <Label for="fa_desc_en">Descripción Inglés</Label>
-                                        <Textarea id="fa_desc_en" bind:value={formData.description_english} rows={2}/>
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="fa_desc_en" class="flex items-center gap-2">Descripción Inglés</Label>
+                                        <Textarea id="fa_desc_en" bind:value={formData.description_english} rows={3} class="resize-none" placeholder="English description..."/>
                                     </div>
                                 </div>
 
-                                <div class="grid grid-cols-1 md:grid-cols-3 gap-4 p-4 border rounded-lg bg-slate-50 dark:bg-slate-900/30">
-                                    <div class="grid gap-2">
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-4 space-y-2">
                                         <Label for="fa_class" class="required">Clase</Label>
                                         <div class="flex gap-2">
-                                            <Input id="fa_class" bind:value={formData.part_class} readonly onclick={() => showClassModal = true} class="cursor-pointer" placeholder="Seleccione..."/>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showClassModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                            <Input id="fa_class" bind:value={formData.part_class} readonly onclick={() => showClassModal = true} class="cursor-pointer font-mono" placeholder="Seleccione..."/>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showClassModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
-                                        {#if selectedClassDesc}<div class="text-xs text-muted-foreground">{selectedClassDesc}</div>{/if}
+                                        {#if selectedClassDesc}<p class="text-[11px] text-muted-foreground truncate px-1">{selectedClassDesc}</p>{/if}
                                     </div>
 
-                                    <div class="grid gap-2">
+                                    <div class="md:col-span-4 space-y-2">
                                         <Label for="fa_uom" class="required">Unidad Medida</Label>
                                         <div class="flex gap-2">
-                                            <Input id="fa_uom" bind:value={formData.unit_of_measure} readonly onclick={() => showUOMModal = true} class="cursor-pointer" placeholder="PZ"/>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showUOMModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                            <div class="relative w-full">
+                                                <Scale class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                <Input id="fa_uom" bind:value={formData.unit_of_measure} readonly onclick={() => showUOMModal = true} class="pl-9 cursor-pointer font-mono" placeholder="PZ"/>
+                                            </div>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showUOMModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
                                     </div>
 
-                                    <div class="grid gap-2">
-                                        <Label for="fa_origin">País Origen (ISO)</Label>
-                                        <Input id="fa_origin" bind:value={formData.origin_country} maxlength={3} placeholder="MEX"/>
+                                    <div class="md:col-span-4 space-y-2">
+                                        <Label for="fa_origin">País Origen</Label>
+                                        <div class="flex gap-2">
+                                            <div class="relative w-full">
+                                                <Globe class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                <Input id="fa_origin" bind:value={selectedCountryName} readonly onclick={() => showCountryModal = true} class="pl-9 cursor-pointer" placeholder="Seleccione..."/>
+                                            </div>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showCountryModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                        </div>
                                     </div>
                                 </div>
 
-                                <div class="p-4 border rounded-lg bg-green-50/50 dark:bg-green-900/10 space-y-4">
-                                    <h3 class="font-medium text-sm text-green-800 dark:text-green-300 flex items-center gap-2"><DollarSign class="h-4 w-4"/> Costos y Pesos</h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                        <div class="grid gap-2">
+                                <div class="p-5 border rounded-xl bg-slate-50 dark:bg-slate-900/30 space-y-4">
+                                    <h3 class="font-semibold text-sm text-primary flex items-center gap-2">
+                                        <DollarSign class="h-4 w-4"/> Información Financiera y Pesos
+                                    </h3>
+                                    <Separator class="bg-primary/10" />
+                                    <div class="grid grid-cols-1 md:grid-cols-12 gap-6 pt-2">
+                                        <div class="md:col-span-4 space-y-2">
                                             <Label for="fa_cost">Costo Unitario</Label>
                                             <div class="relative">
-                                                <span class="absolute left-3 top-2.5 text-muted-foreground">$</span>
-                                                <Input type="number" step="0.0001" id="fa_cost" bind:value={formData.unit_cost} class="pl-7" />
+                                                <span class="absolute left-3 top-1/2 -translate-y-1/2 text-muted-foreground font-semibold text-sm">$</span>
+                                                <Input type="number" step="0.0001" id="fa_cost" bind:value={formData.unit_cost} class="pl-7 h-10" placeholder="0.0000" />
                                             </div>
                                         </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_currency">Moneda</Label>
-                                            <Select.Root type="single" bind:value={formData.currency_key}>
-                                                <Select.Trigger id="fa_currency">{formData.currency_key}</Select.Trigger>
-                                                <Select.Content>
-                                                    <Select.Item value="USD">Extranjera (USD)</Select.Item>
-                                                    <Select.Item value="MXN">Nacional (MXN)</Select.Item>
-                                                    <Select.Item value="EUR">Euros (EUR)</Select.Item>
-                                                </Select.Content>
-                                            </Select.Root>
+
+                                        <div class="md:col-span-4 space-y-2">
+                                            <Label>Moneda</Label>
+                                            <div class="space-y-2">
+                                                <Button variant="outline" type="button" onclick={() => { formData.currency_type = 'CATALOG'; showCurrencyModal = true; }} class="w-full h-10 justify-between font-normal px-3">
+                                                    <span class="flex items-center gap-2 text-muted-foreground"><FolderSearch class="h-4 w-4" /> {selectedCurrencyName || 'Catálogo'}</span>
+                                                </Button>
+                                                <div class="flex gap-4 mb-2">
+                                                    <label class="text-xs flex items-center gap-2 cursor-pointer hover:text-primary transition-colors">
+                                                        <input type="radio" name="fa_currency_type" value="NA" bind:group={formData.currency_type} class="accent-primary" /> Nacional
+                                                    </label>
+                                                    <label class="text-xs flex items-center gap-2 cursor-pointer hover:text-primary transition-colors">
+                                                        <input type="radio" name="fa_currency_type" value="EX" bind:group={formData.currency_type} class="accent-primary" /> Extranjera
+                                                    </label>
+                                                </div>
+                                            </div>
                                         </div>
-                                        <div class="grid gap-2">
+
+                                        <div class="md:col-span-4 space-y-2">
                                             <Label for="fa_weight">Peso Unitario</Label>
                                             <div class="flex gap-2">
                                                 <Input type="number" step="0.0001" id="fa_weight" bind:value={formData.unit_weight} placeholder="0.0000" />
                                                 <Select.Root type="single" bind:value={formData.weight_type}>
-                                                    <Select.Trigger class="w-[80px]">{formData.weight_type}</Select.Trigger>
+                                                    <Select.Trigger class="w-[85px]">{formData.weight_type}</Select.Trigger>
                                                     <Select.Content>
                                                         <Select.Item value="KG">KG</Select.Item>
                                                         <Select.Item value="LB">LB</Select.Item>
@@ -329,213 +425,215 @@
                                     </div>
                                 </div>
 
-                                <div class="space-y-4 p-4 border rounded-lg">
-                                    <h3 class="font-medium text-sm text-muted-foreground flex items-center gap-2"><Briefcase class="h-4 w-4"/> Datos Aduaneros</h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                        <div class="grid gap-2">
+                                <div class="p-5 border rounded-xl space-y-4">
+                                    <h3 class="font-semibold text-sm text-muted-foreground flex items-center gap-2">
+                                        <Briefcase class="h-4 w-4"/> Clasificación Aduanera
+                                    </h3>
+                                    <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                        <div class="md:col-span-6 space-y-2">
                                             <Label for="fa_fraction">Fracción UMT (MX)</Label>
-                                            <Input id="fa_fraction" bind:value={formData.fraction} maxlength={10} />
+                                            <div class="flex gap-2">
+                                                <Input id="fa_fraction" bind:value={formData.fraction} readonly onclick={() => showFractionModal = true} class="cursor-pointer font-mono" placeholder="Seleccione..."/>
+                                                <Button variant="outline" size="icon" type="button" onclick={() => showFractionModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                            </div>
                                         </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_sector">Sector</Label>
-                                            <Input id="fa_sector" bind:value={formData.sector} placeholder="Ej: Automotriz"/>
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_fraction_type">Tipo Tarifa</Label>
-                                            <Input id="fa_fraction_type" bind:value={formData.fraction_type} />
-                                        </div>
-                                        <div class="grid gap-2">
+                                        <div class="md:col-span-6 space-y-2">
                                             <Label for="fa_us_fraction">Fracción Americana</Label>
-                                            <Input id="fa_us_fraction" bind:value={formData.us_fraction} maxlength={10} />
+                                            <div class="flex gap-2">
+                                                <Input id="fa_us_fraction" bind:value={formData.us_fraction} maxlength={10} class="font-mono cursor-pointer" placeholder="HTS Code" readonly onclick={() => showUSFractionModal = true}/>
+                                                <Button variant="outline" size="icon" type="button" onclick={() => showUSFractionModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                            </div>
+                                        </div>
+                                        <div class="md:col-span-6 space-y-2">
+                                            <Label for="fa_sector">Sector</Label>
+                                            <Input id="fa_sector" bind:value={formData.sector} maxlength={8} placeholder="Ej: VIII"/>
+                                        </div>
+                                        <div class="md:col-span-6 space-y-2">
+                                            <Label for="fa_fraction_type">Tipo Tarifa</Label>
+                                            <Input id="fa_fraction_type" bind:value={formData.fraction_type} maxlength={7} />
                                         </div>
                                     </div>
                                 </div>
 
-                                <div class="flex items-center gap-3 pt-2">
+                                <div class="flex items-center gap-3 pt-2 pl-1">
                                     <Switch id="fa_is_active" bind:checked={formData.is_active} />
-                                    <Label for="fa_is_active">Activo en sistema</Label>
+                                    <Label for="fa_is_active" class="cursor-pointer">Parte activa en sistema</Label>
                                 </div>
 
                             </Tabs.Content>
 
-                            <Tabs.Content value="cont1" class="space-y-6 pt-4 animate-in fade-in duration-300">
-                                <div class="p-6 border rounded-lg space-y-4">
-                                    <div class="grid gap-4 max-w-lg mx-auto">
-                                        <Label for="fa_photo" class="text-left flex items-center gap-2">
-                                            <ImageIcon class="h-4 w-4"/> URL Imagen de la parte
+                            <Tabs.Content value="cont1" class="space-y-6 pt-6 animate-in fade-in duration-300">
+                                <div class="p-6 border rounded-xl space-y-4">
+                                    <div class="max-w-2xl mx-auto space-y-4">
+                                        <Label for="fa_photo" class="flex items-center gap-2 text-base">
+                                            <ImageIcon class="h-5 w-5"/> URL Imagen de la parte
                                         </Label>
-                                        <Input id="fa_photo" bind:value={formData.part_photo} maxlength={255} placeholder="https://ejemplo.com/imagen.jpg" />
+                                        <div class="flex gap-2">
+                                            <Input id="fa_photo" bind:value={formData.part_photo} maxlength={255} placeholder="https://ejemplo.com/imagen.jpg" />
+                                            <Button variant="outline" class="shrink-0">Vista Previa</Button>
+                                        </div>
+                                        {#if formData.part_photo}
+                                            <div class="mt-4 aspect-video rounded-lg bg-muted flex items-center justify-center border overflow-hidden">
+                                                <img src={formData.part_photo} alt="Vista previa" class="h-full w-full object-contain" />
+                                            </div>
+                                        {/if}
                                     </div>
                                 </div>
                             </Tabs.Content>
 
-                            <Tabs.Content value="cont2" class="space-y-6 pt-4 animate-in fade-in duration-300">
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                                    <div class="space-y-4 p-4 border rounded-lg">
+                            <Tabs.Content value="cont2" class="space-y-6 pt-6 animate-in fade-in duration-300">
+                                <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
+                                    <div class="p-5 border rounded-xl space-y-4">
                                         <h3 class="font-medium text-sm text-muted-foreground flex items-center gap-2"><ShieldCheck class="h-4 w-4"/> Control de Exportación</h3>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_lic">License Code</Label>
-                                            <Input id="fa_lic" bind:value={formData.license_code} maxlength={3} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_exp">Export Code</Label>
-                                            <Input id="fa_exp" bind:value={formData.export_code} maxlength={2} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_eccn">ECCN</Label>
-                                            <Input id="fa_eccn" bind:value={formData.eccn} maxlength={20} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_exc">Símbolo Excepción Licencia</Label>
-                                            <Input id="fa_exc" bind:value={formData.exclusion_symbol} maxlength={19} />
+                                        <div class="grid gap-4">
+                                            <div class="grid grid-cols-2 gap-4">
+                                                <div class="space-y-2">
+                                                    <Label for="fa_lic">License Code</Label>
+                                                    <Input id="fa_lic" bind:value={formData.license_code} maxlength={3} class="font-mono" />
+                                                </div>
+                                                <div class="space-y-2">
+                                                    <Label for="fa_exp">Export Code</Label>
+                                                    <Input id="fa_exp" bind:value={formData.export_code} maxlength={2} class="font-mono" />
+                                                </div>
+                                            </div>
+                                            <div class="space-y-2">
+                                                <Label for="fa_eccn">ECCN</Label>
+                                                <Input id="fa_eccn" bind:value={formData.eccn} maxlength={20} class="font-mono" />
+                                            </div>
+                                            <div class="space-y-2">
+                                                <Label for="fa_exc">Símbolo Excepción Licencia</Label>
+                                                <Input id="fa_exc" bind:value={formData.exclusion_symbol} maxlength={19} />
+                                            </div>
                                         </div>
                                     </div>
 
-                                    <div class="space-y-4 p-4 border rounded-lg">
+                                    <div class="p-5 border rounded-xl space-y-4">
                                         <h3 class="font-medium text-sm text-muted-foreground flex items-center gap-2"><Info class="h-4 w-4"/> Regulaciones Adicionales</h3>
-                                        <div class="grid gap-2">
-                                            <Label for="fa_fda">Clave FDA</Label>
-                                            <Input id="fa_fda" bind:value={formData.fda_key} maxlength={20} />
-                                        </div>
-                                        
-                                        <div class="grid gap-2">
-                                            <Label for="fa_fcc">Clave FCC</Label>
-                                            <Input id="fa_fcc" bind:value={formData.fcc_key} maxlength={30} />
+                                        <div class="space-y-4">
+                                            <div class="space-y-2">
+                                                <Label for="fa_fda">Clave FDA</Label>
+                                                <Input id="fa_fda" bind:value={formData.fda_key} maxlength={20} />
+                                            </div>
+                                            <div class="space-y-2">
+                                                <Label for="fa_fcc">Clave FCC</Label>
+                                                <Input id="fa_fcc" bind:value={formData.fcc_key} maxlength={30} />
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
                             </Tabs.Content>
 
                         </div>
-
-                        <Tabs.List class="grid grid-cols-3 fixed bottom-24 left-1/2 -translate-x-1/2 w-[95%] max-w-xl z-40 shadow-2xl bg-background border p-1 rounded-xl">
-                            <Tabs.Trigger value="general" class="flex gap-2 items-center justify-center">Generales</Tabs.Trigger>
-                            <Tabs.Trigger value="cont1" class="flex gap-2 items-center justify-center">Continuación 1</Tabs.Trigger>
-                            <Tabs.Trigger value="cont2" class="flex gap-2 items-center justify-center">Continuación 2</Tabs.Trigger>
-                        </Tabs.List>
-
                     </Tabs.Root>
                 </Card.Content>
             </Card.Root>
-
-            <div class="fixed bottom-0 right-0 left-0 md:left-64 p-4 border-t bg-background/95 backdrop-blur z-50">
-                <div class="max-w-6xl mx-auto flex justify-end gap-4">
-                    <Button variant="ghost" href="/dashboard/goods/parts" disabled={loading}>Cancelar</Button>
-                    <Button type="submit" disabled={loading} class="min-w-[140px] bg-amber-600 hover:bg-amber-700">
-                        {#if loading}<LoaderCircle class="mr-2 h-4 w-4 animate-spin" />{:else}<Save class="mr-2 h-4 w-4" />{/if}
-                        {isEdit ? 'Actualizar Activo' : 'Guardar Activo'}
-                    </Button>
-                </div>
-            </div>
         </form>
 
     {:else}
         <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6">
-            <Card.Root>
+            <Card.Root class="shadow-sm">
                 <Card.Content class="p-6">
-                    <Tabs.Root value="general" class="w-full">
+                    <Tabs.Root bind:value={activeTab} class="w-full">
                         
                         <div class="min-h-[500px]">
-                            
-                            <Tabs.Content value="general" class="space-y-6 pt-4 animate-in fade-in duration-300">
+                            <Tabs.Content value="general" class="space-y-8 pt-6 animate-in fade-in duration-300">
                                 
-                                <div class="grid gap-2">
-                                    <Label for="part_number" class="text-base font-semibold required">Número de Parte</Label>
-                                    <Input id="part_number" bind:value={formData.part_number} disabled={isEdit} maxlength={50} class="text-lg font-mono" placeholder="Ej: 123-ABC-456"/>
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-4 space-y-2">
+                                        <Label for="part_number" class="text-base font-semibold required">Número de Parte</Label>
+                                        <div class="relative">
+                                            <Package class="absolute left-3 top-2.5 h-5 w-5 text-muted-foreground" />
+                                            <Input id="part_number" bind:value={formData.part_number} disabled={isEdit} maxlength={50} class="pl-10 text-lg font-mono bg-muted/20" placeholder="Ej: 123-ABC-456"/>
+                                        </div>
+                                    </div>
                                 </div>
 
-                                <div class="space-y-3 p-4 border rounded-lg bg-slate-50 dark:bg-slate-900/30">
+                                <div class="p-5 border rounded-xl bg-slate-50 dark:bg-slate-900/30 space-y-4">
                                     <h3 class="font-medium text-sm text-muted-foreground flex items-center gap-2">
-                                        <FileText class="h-4 w-4"/> Descripción
+                                        <FileText class="h-4 w-4"/> Descripción de Mercancía
                                     </h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                        <div class="grid gap-2">
-                                            <Label for="desc_es">Español</Label>
-                                            <Textarea id="desc_es" bind:value={formData.description_spanish} maxlength={500} rows={3}/>
+                                    <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                        <div class="md:col-span-6 space-y-2">
+                                            <Label for="desc_es">Español <span class="text-xs text-muted-foreground font-normal ml-1">(Principal)</span></Label>
+                                            <Textarea id="desc_es" bind:value={formData.description_spanish} maxlength={500} rows={3} class="bg-background"/>
                                         </div>
-                                        <div class="grid gap-2">
+                                        <div class="md:col-span-6 space-y-2">
                                             <Label for="desc_en">Inglés</Label>
-                                            <Textarea id="desc_en" bind:value={formData.description_english} maxlength={500} rows={3}/>
+                                            <Textarea id="desc_en" bind:value={formData.description_english} maxlength={500} rows={3} class="bg-background"/>
                                         </div>
                                     </div>
                                 </div>
 
-                                <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                    <div class="grid gap-2">
-                                        <Label for="part_class_client" class="required">Clase (Anexo 24 - Cliente)</Label>
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="part_class_client" class="required">Clase (Anexo 24)</Label>
                                         <div class="flex gap-2">
-                                            <div class="relative flex-1">
-                                                <div class="absolute left-3 top-2.5 text-muted-foreground">
-                                                    <Package class="h-4 w-4" /> 
-                                                </div>
-                                                <Input id="part_class_client" bind:value={formData.part_class} maxlength={8} placeholder="Seleccione Clase..." class="pl-9 font-mono cursor-pointer" readonly onclick={() => showClassModal = true}/>
+                                            <div class="relative w-full">
+                                                <Tag class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                <Input id="part_class_client" bind:value={formData.part_class} maxlength={15} placeholder="Clase..." class="pl-9 font-mono"/>
                                             </div>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showClassModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showClassModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
-                                        {#if selectedClassDesc}<div class="text-xs text-primary font-medium px-1 flex items-center gap-1"><Tag class="h-3 w-3" />{selectedClassDesc}</div>{/if}
+                                        {#if selectedClassDesc}<p class="text-[11px] text-primary font-medium px-1">{selectedClassDesc}</p>{/if}
                                     </div>
 
-                                    <div class="grid gap-2">
-                                        <Label for="part_class_material">Tipo Material (Catálogo General)</Label>
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="part_class_material">Tipo Material <span class="text-xs text-muted-foreground font-normal ml-1">(Catálogo General)</span></Label>
                                         <div class="flex gap-2">
-                                            <div class="relative flex-1">
-                                                <div class="absolute left-3 top-2.5 text-muted-foreground">
-                                                    <Layers class="h-4 w-4" /> 
-                                                </div>
+                                            <div class="relative w-full">
+                                                <Layers class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
                                                 <Input id="part_class_material" bind:value={formData.material_type} maxlength={8} placeholder="Seleccione Material..." class="pl-9 font-mono cursor-pointer" readonly onclick={() => showMaterialModal = true}/>
                                             </div>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showMaterialModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showMaterialModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
-                                        {#if selectedMaterialDesc}<div class="text-xs text-blue-600 font-medium px-1 flex items-center gap-1"><Layers class="h-3 w-3" />{selectedMaterialDesc}</div>{/if}
-                                        <p class="text-[10px] text-muted-foreground">Opcional: Clasificación adicional por tipo de material.</p>
+                                        {#if selectedMaterialDesc}<p class="text-[11px] text-blue-600 font-medium px-1">{selectedMaterialDesc}</p>{/if}
                                     </div>
+                                </div>
 
-                                    <div class="grid gap-2">
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                    <div class="md:col-span-6 space-y-2">
                                         <Label for="country">País Origen (ISO)</Label>
-                                        <Input id="country" bind:value={formData.origin_country} maxlength={3} placeholder="MEX"/>
+                                        <div class="flex gap-2">
+                                            <div class="relative w-full">
+                                                <Globe class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                <Input id="country" bind:value={selectedCountryName} readonly onclick={() => showCountryModal = true} class="pl-9 cursor-pointer" placeholder="Seleccione..."/>
+                                            </div>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showCountryModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                        </div>
                                     </div>
 
-                                    <div class="grid gap-2">
+                                    <div class="md:col-span-6 space-y-2">
                                         <Label for="uom" class="required">Unidad de Medida (TIGIE)</Label>
                                         <div class="flex gap-2">
-                                            <div class="relative flex-1">
-                                                <div class="absolute left-3 top-2.5 text-muted-foreground">
-                                                    <Scale class="h-4 w-4" /> 
-                                                </div>
+                                            <div class="relative w-full">
+                                                <Scale class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
                                                 <Input id="uom" bind:value={formData.unit_of_measure} placeholder="Seleccione..." class="pl-9 font-mono cursor-pointer" readonly onclick={() => showUOMModal = true}/>
                                             </div>
-                                            <Button variant="outline" size="icon" type="button" onclick={() => showUOMModal = true}><FolderSearch class="h-4 w-4" /></Button>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showUOMModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
                                         </div>
                                     </div>
                                 </div>
 
-                                <div class="p-4 border rounded-lg bg-green-50/50 dark:bg-green-900/10 space-y-4">
-                                    <h3 class="font-medium text-sm text-green-800 dark:text-green-300 flex items-center gap-2"><DollarSign class="h-4 w-4"/> Costos, valores y peso unitario</h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-3 gap-4">
-                                        <div class="grid gap-2">
-                                            <Label for="currency">Tipos de Moneda</Label>
-                                            <Select.Root type="single" bind:value={formData.currency_key}>
-                                                <Select.Trigger id="currency">{formData.currency_key}</Select.Trigger>
-                                                <Select.Content>
-                                                    <Select.Item value="USD">Dólares (USD)</Select.Item>
-                                                    <Select.Item value="MXN">Pesos (MXN)</Select.Item>
-                                                    <Select.Item value="EUR">Euros (EUR)</Select.Item>
-                                                </Select.Content>
-                                            </Select.Root>
-                                        </div>
-                                        <div class="grid gap-2">
+                                <div class="p-5 border rounded-xl bg-slate-50 dark:bg-slate-900/30 space-y-6">
+                                    <h3 class="font-medium text-sm text-green-700 dark:text-green-400 flex items-center gap-2">
+                                        <DollarSign class="h-4 w-4"/> Costos y Valor Agregado
+                                    </h3>
+                                    
+                                    <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                        <div class="md:col-span-4 space-y-2">
                                             <Label for="unit_cost">Costo Unitario</Label>
                                             <div class="relative">
-                                                <span class="absolute left-3 top-2.5 text-muted-foreground">$</span>
-                                                <Input type="number" step="0.0001" id="unit_cost" bind:value={formData.unit_cost} class="pl-7" />
+                                                <span class="absolute left-3 top-2.5 text-muted-foreground font-semibold">$</span>
+                                                <Input type="number" step="0.0001" id="unit_cost" bind:value={formData.unit_cost} class="pl-7 bg-background" />
                                             </div>
                                         </div>
-                                        <div class="grid gap-2">
+
+                                        <div class="md:col-span-4 space-y-2">
                                             <Label for="unit_weight">Peso Unitario</Label>
                                             <div class="flex gap-2">
-                                                <Input type="number" step="0.0001" id="unit_weight" bind:value={formData.unit_weight} placeholder="0.0000" />
+                                                <Input type="number" step="0.0001" id="unit_weight" bind:value={formData.unit_weight} placeholder="0.0000" class="bg-background"/>
                                                 <Select.Root type="single" bind:value={formData.weight_type}>
-                                                    <Select.Trigger class="w-[100px]">{formData.weight_type}</Select.Trigger>
+                                                    <Select.Trigger class="w-[90px] bg-background">{formData.weight_type}</Select.Trigger>
                                                     <Select.Content>
                                                         <Select.Item value="KG">KG</Select.Item>
                                                         <Select.Item value="LB">LB</Select.Item>
@@ -543,158 +641,249 @@
                                                 </Select.Root>
                                             </div>
                                         </div>
-                                    </div>
-                                </div>
 
-                                <div class="space-y-3 p-4 border rounded-lg">
-                                    <Label class="font-semibold">Tipo Valor Agregado</Label>
-                                    <div class="flex flex-wrap gap-6">
-                                        <div class="flex items-center space-x-2">
-                                            <input type="radio" id="va_ext" name="va_type" value="USD" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
-                                            <Label for="va_ext" class="font-normal cursor-pointer">Extranjera (Dls)</Label>
-                                        </div>
-                                        <div class="flex items-center space-x-2">
-                                            <input type="radio" id="va_nac" name="va_type" value="MXN" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
-                                            <Label for="va_nac" class="font-normal cursor-pointer">Nacional (Pesos)</Label>
-                                        </div>
-                                        <div class="flex items-center space-x-2">
-                                            <input type="radio" id="va_pct" name="va_type" value="PERCENT" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
-                                            <Label for="va_pct" class="font-normal cursor-pointer">Porcentaje</Label>
+                                        <div class="md:col-span-4 space-y-2">
+                                            <Label>Moneda</Label>
+                                            <div class="flex flex-col gap-2">
+                                                <div class="flex gap-4">
+                                                    <label class="text-xs flex items-center gap-2 cursor-pointer">
+                                                        <input type="radio" name="inv_currency_type" value="NA" bind:group={formData.currency_type} class="accent-green-600" /> Nacional
+                                                    </label>
+                                                    <label class="text-xs flex items-center gap-2 cursor-pointer">
+                                                        <input type="radio" name="inv_currency_type" value="EX" bind:group={formData.currency_type} class="accent-green-600" /> Extranjera
+                                                    </label>
+                                                </div>
+                                                <Button variant="outline" size="sm" type="button" onclick={() => { formData.currency_type = 'CATALOG'; showCurrencyModal = true; }} class="w-full justify-between bg-background">
+                                                    <span class="flex items-center gap-2 text-xs"><FolderSearch class="h-3 w-3" /> {selectedCurrencyName || 'Catálogo'}</span>
+                                                </Button>
+                                            </div>
                                         </div>
                                     </div>
-                                    <div class="grid gap-2 mt-2">
-                                        <div class="relative max-w-xs">
-                                            {#if formData.value_added_type === 'PERCENT'}
-                                                <span class="absolute right-3 top-2.5 text-muted-foreground">%</span>
-                                            {:else}
-                                                <span class="absolute left-3 top-2.5 text-muted-foreground">$</span>
-                                            {/if}
-                                            <Input type="number" step="0.0001" id="added_value" bind:value={formData.added_value} class={formData.value_added_type === 'PERCENT' ? 'pr-7' : 'pl-7'} placeholder="0.00"/>
+
+                                    <Separator class="bg-border/60" />
+
+                                    <div class="grid grid-cols-1 md:grid-cols-12 gap-6">
+                                        <div class="md:col-span-8 space-y-3">
+                                            <Label class="font-semibold text-xs uppercase tracking-wider text-muted-foreground">Tipo Valor Agregado</Label>
+                                            <div class="flex flex-wrap gap-6 pt-1">
+                                                <div class="flex items-center space-x-2 bg-background px-3 py-1.5 rounded-md border shadow-sm">
+                                                    <input type="radio" id="va_ext" name="va_type" value="USD" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
+                                                    <Label for="va_ext" class="font-normal cursor-pointer text-sm">Extranjera (Dls)</Label>
+                                                </div>
+                                                <div class="flex items-center space-x-2 bg-background px-3 py-1.5 rounded-md border shadow-sm">
+                                                    <input type="radio" id="va_nac" name="va_type" value="MXN" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
+                                                    <Label for="va_nac" class="font-normal cursor-pointer text-sm">Nacional (Pesos)</Label>
+                                                </div>
+                                                <div class="flex items-center space-x-2 bg-background px-3 py-1.5 rounded-md border shadow-sm">
+                                                    <input type="radio" id="va_pct" name="va_type" value="PERCENT" bind:group={formData.value_added_type} class="accent-primary h-4 w-4 cursor-pointer" />
+                                                    <Label for="va_pct" class="font-normal cursor-pointer text-sm">Porcentaje</Label>
+                                                </div>
+                                            </div>
+                                        </div>
+                                        <div class="md:col-span-4 space-y-2">
+                                            <Label for="added_value">Valor / Porcentaje</Label>
+                                            <div class="relative">
+                                                {#if formData.value_added_type === 'PERCENT'}
+                                                    <span class="absolute right-3 top-2.5 text-muted-foreground font-bold">%</span>
+                                                {:else}
+                                                    <span class="absolute left-3 top-2.5 text-muted-foreground font-semibold">$</span>
+                                                {/if}
+                                                <Input type="number" step="0.0001" id="added_value" bind:value={formData.added_value} class="{formData.value_added_type === 'PERCENT' ? 'pr-8' : 'pl-7'} bg-background" placeholder="0.00"/>
+                                            </div>
                                         </div>
                                     </div>
                                 </div>
 
-                                <div class="grid gap-2 pt-4 border-t">
-                                    <Label for="frac_us">Fracción Americana (HTS)</Label>
-                                    <Input id="frac_us" bind:value={formData.us_fraction} maxlength={16} placeholder="Ej: 8501.10.00" />
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-6 pt-4 border-t">
+                                    <div class="md:col-span-6 space-y-2">
+                                        <Label for="frac_us">Fracción Americana (HTS)</Label>
+                                        <div class="flex gap-2">
+                                            <Input id="frac_us" bind:value={formData.us_fraction} maxlength={16} placeholder="Ej: 8501.10.00" class="font-mono cursor-pointer" readonly onclick={() => showUSFractionModal = true}/>
+                                            <Button variant="outline" size="icon" type="button" onclick={() => showUSFractionModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                        </div>
+                                    </div>
                                 </div>
 
                             </Tabs.Content>
 
-                            <Tabs.Content value="opciones" class="space-y-6 pt-4 animate-in fade-in duration-300">
-                                <div class="space-y-4 p-4 border rounded-lg bg-card">
+                            <Tabs.Content value="opciones" class="space-y-6 pt-6 animate-in fade-in duration-300">
+                                <div class="p-6 border rounded-xl space-y-6">
                                     <h3 class="font-medium text-sm text-muted-foreground">Configuración General</h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                                        <div class="grid gap-2">
+                                    <div class="grid grid-cols-1 md:grid-cols-2 gap-8">
+                                        <div class="space-y-2">
                                             <Label for="fcc">Clave FCC</Label>
                                             <Input id="fcc" bind:value={formData.fcc_key} maxlength={30} />
                                         </div>
-                                        <div class="grid gap-2">
+                                        <div class="space-y-2">
                                             <Label for="supplier">Proveedor (Textil)</Label>
                                             <Input id="supplier" bind:value={formData.supplier} maxlength={14} />
                                         </div>
                                     </div>
-                                    <div class="grid gap-2">
+                                    <div class="space-y-2">
                                         <Label for="photo" class="flex items-center gap-2"><ImageIcon class="h-4 w-4"/> URL Imagen de la parte</Label>
                                         <Input id="photo" bind:value={formData.part_photo} maxlength={255} placeholder="https://..." />
                                     </div>
                                 </div>
                             </Tabs.Content>
 
-                            <Tabs.Content value="opcionales2" class="space-y-6 pt-4 animate-in fade-in duration-300">
-                                <div class="p-4 border rounded-lg space-y-4">
-                                    <h3 class="font-medium text-sm text-muted-foreground">FDA</h3>
-                                    <div class="grid gap-2">
-                                        <Label for="fda">Clave FDA</Label>
-                                        <Input id="fda" bind:value={formData.fda_key} maxlength={20} />
+                            <Tabs.Content value="opcionales2" class="space-y-6 pt-6 animate-in fade-in duration-300">
+                                <div class="p-6 border rounded-xl space-y-4">
+                                    <h3 class="font-medium text-sm text-muted-foreground">Regulaciones Sanitarias</h3>
+                                    <div class="grid grid-cols-1 md:grid-cols-2">
+                                        <div class="space-y-2">
+                                            <Label for="fda">Clave FDA</Label>
+                                            <Input id="fda" bind:value={formData.fda_key} maxlength={20} />
+                                        </div>
                                     </div>
                                 </div>
                             </Tabs.Content>
 
-                            <Tabs.Content value="otros" class="space-y-6 pt-4 animate-in fade-in duration-300">
-                                <div class="grid gap-2">
-                                    <Label for="client_id" class="required">Cliente Asignado</Label>
-                                    <div class="flex gap-2">
-                                        <div class="relative flex-1">
-                                            <UserCheck class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
-                                            <Input type="number" id="client_id" bind:value={formData.client_id} class="pl-9 font-mono" placeholder="Seleccione un cliente..." readonly onclick={() => showClientModal = true}/>
+                            <Tabs.Content value="otros" class="space-y-6 pt-6 animate-in fade-in duration-300">
+                                <div class="grid grid-cols-1 md:grid-cols-12 gap-8">
+                                    
+                                    <div class="md:col-span-6 space-y-6">
+                                        <div class="space-y-2">
+                                            <Label for="client_id" class="required">Cliente Asignado</Label>
+                                            <div class="flex gap-2">
+                                                <div class="relative w-full">
+                                                    <UserCheck class="absolute left-3 top-2.5 h-4 w-4 text-muted-foreground" />
+                                                    <Input id="client_id" bind:value={selectedClientName} class="pl-9 cursor-pointer" placeholder="Seleccione un cliente..." readonly onclick={() => showClientModal = true}/>
+                                                </div>
+                                                <Button variant="outline" class="shrink-0" type="button" onclick={() => showClientModal = true}><FolderSearch class="h-4 w-4 mr-2" /> Buscar</Button>
+                                            </div>
+                                            {#if selectedClientName}
+                                                <div class="flex items-center gap-2 text-xs pt-1">
+                                                    {#if selectedClientStatus}<span class="text-green-600 flex items-center gap-1 font-medium"><CheckCircle2 class="h-3 w-3"/> Cliente Activo</span>{:else}<span class="text-red-600 flex items-center gap-1 font-medium"><XCircle class="h-3 w-3"/> Cliente Inactivo</span>{/if}
+                                                </div>
+                                            {/if}
                                         </div>
-                                        <Button variant="outline" class="shrink-0" type="button" onclick={() => showClientModal = true}><FolderSearch class="h-4 w-4 mr-2" /> Buscar</Button>
-                                    </div>
-                                    {#if selectedClientName}
-                                        <div class="flex items-center gap-2 mt-1 px-3 py-2 bg-slate-50 dark:bg-slate-900/50 border rounded-md text-sm">
-                                            <span class="font-semibold text-primary">{selectedClientName}</span>
-                                            {#if selectedClientStatus}<span class="text-green-600 flex items-center gap-1 text-xs font-medium"><CheckCircle2 class="h-3 w-3"/> Activo</span>{:else}<span class="text-red-600 flex items-center gap-1 text-xs font-medium"><XCircle class="h-3 w-3"/> Inactivo</span>{/if}
+
+                                        <div class="space-y-2">
+                                            <Label for="comm_pn">Número de Parte Comercial</Label>
+                                            <Input id="comm_pn" bind:value={formData.commercial_part_number} maxlength={70} />
                                         </div>
-                                    {/if}
-                                </div>
-                                <div class="grid gap-2">
-                                    <Label for="comm_pn">Número de Parte Comercial</Label>
-                                    <Input id="comm_pn" bind:value={formData.commercial_part_number} maxlength={70} />
-                                </div>
-                                <div class="p-4 border rounded-lg space-y-4">
-                                    <Label for="alt_um">UM Conversión (Alterna)</Label>
-                                    <div class="flex gap-2">
-                                        <div class="relative flex-1">
-                                            <div class="absolute left-3 top-2.5 text-muted-foreground"><Scale class="h-4 w-4" /></div>
-                                            <Input id="alt_um" bind:value={formData.alternate_unit_measure} placeholder="Seleccione..." class="pl-9 font-mono cursor-pointer" readonly onclick={() => showAltUOMModal = true}/>
-                                        </div>
-                                        <Button variant="outline" size="icon" type="button" onclick={() => showAltUOMModal = true}><FolderSearch class="h-4 w-4" /></Button>
-                                    </div>
-                                </div>
-                                <div class="p-4 border rounded-lg space-y-4 bg-slate-50 dark:bg-slate-900/30">
-                                    <h3 class="font-medium text-sm text-muted-foreground">Datos Regulatorios</h3>
-                                    <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
-                                        <div class="grid gap-2">
-                                            <Label for="fraction_mx" class="required">Fracción Arancelaria (MX)</Label>
-                                            <Input id="fraction_mx" bind:value={formData.fraction} maxlength={10} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="eccn">ECCN</Label>
-                                            <Input id="eccn" bind:value={formData.eccn} maxlength={20} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="lic_code">License Code</Label>
-                                            <Input id="lic_code" bind:value={formData.license_code} maxlength={3} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="exp_code">Export Code</Label>
-                                            <Input id="exp_code" bind:value={formData.export_code} maxlength={2} />
-                                        </div>
-                                        <div class="grid gap-2">
-                                            <Label for="exc_sym">Símbolo de Exclusión</Label>
-                                            <Input id="exc_sym" bind:value={formData.exclusion_symbol} maxlength={19} />
+
+                                        <div class="p-4 border rounded-xl space-y-3 bg-muted/20">
+                                            <Label for="alt_um" class="flex items-center gap-2"><Scale class="h-4 w-4"/> UM Conversión (Alterna)</Label>
+                                            <div class="flex gap-2">
+                                                <Input id="alt_um" bind:value={formData.alternate_unit_measure} placeholder="Seleccione..." class="font-mono cursor-pointer" readonly onclick={() => showAltUOMModal = true}/>
+                                                <Button variant="outline" size="icon" type="button" onclick={() => showAltUOMModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                            </div>
                                         </div>
                                     </div>
-                                </div>
-                                <div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
-                                    <Switch id="is_active" bind:checked={formData.is_active} disabled={loading} />
-                                    <Label for="is_active">Parte Activa en Sistema</Label>
+
+                                    <div class="md:col-span-6 space-y-6">
+                                        <div class="p-6 border rounded-xl space-y-4 bg-slate-50 dark:bg-slate-900/30">
+                                            <h3 class="font-medium text-sm text-muted-foreground">Datos Regulatorios Adicionales</h3>
+                                            
+                                            <div class="space-y-4">
+                                                <div class="space-y-2">
+                                                    <Label for="fraction_mx" class="required">Fracción Arancelaria (MX)</Label>
+                                                    <div class="flex gap-2">
+                                                        <Input id="fraction_mx" bind:value={formData.fraction} readonly onclick={() => showFractionModal = true} class="cursor-pointer font-mono" placeholder="Seleccione..."/>
+                                                        <Button variant="outline" size="icon" type="button" onclick={() => showFractionModal = true} class="shrink-0"><FolderSearch class="h-4 w-4" /></Button>
+                                                    </div>
+                                                </div>
+
+                                                <div class="grid grid-cols-2 gap-4">
+                                                    <div class="space-y-2">
+                                                        <Label for="eccn">ECCN</Label>
+                                                        <Input id="eccn" bind:value={formData.eccn} maxlength={20} class="font-mono"/>
+                                                    </div>
+                                                    <div class="space-y-2">
+                                                        <Label for="lic_code">License Code</Label>
+                                                        <Input id="lic_code" bind:value={formData.license_code} maxlength={3} class="font-mono"/>
+                                                    </div>
+                                                </div>
+
+                                                <div class="grid grid-cols-2 gap-4">
+                                                    <div class="space-y-2">
+                                                        <Label for="exp_code">Export Code</Label>
+                                                        <Input id="exp_code" bind:value={formData.export_code} maxlength={2} class="font-mono"/>
+                                                    </div>
+                                                    <div class="space-y-2">
+                                                        <Label for="exc_sym">Símbolo Exclusión</Label>
+                                                        <Input id="exc_sym" bind:value={formData.exclusion_symbol} maxlength={19} />
+                                                    </div>
+                                                </div>
+                                            </div>
+                                        </div>
+
+                                        <div class="flex items-center gap-3 p-4 border rounded-xl">
+                                            <Switch id="is_active" bind:checked={formData.is_active} disabled={loading} />
+                                            <Label for="is_active" class="cursor-pointer">Parte Activa en Sistema</Label>
+                                        </div>
+                                    </div>
+
                                 </div>
                             </Tabs.Content>
                         </div>
 
-                        <Tabs.List class="grid grid-cols-4 fixed bottom-24 left-1/2 -translate-x-1/2 w-[95%] max-w-2xl z-40 shadow-2xl bg-background border p-1 rounded-xl">
-                            <Tabs.Trigger value="general" class="flex gap-2 items-center justify-center"><Package class="h-4 w-4 hidden sm:block" /> General</Tabs.Trigger>
-                            <Tabs.Trigger value="opciones" class="flex gap-2 items-center justify-center"><Settings class="h-4 w-4 hidden sm:block" /> Opciones</Tabs.Trigger>
-                            <Tabs.Trigger value="opcionales2" class="flex gap-2 items-center justify-center"><FileText class="h-4 w-4 hidden sm:block" /> Opcionales 2</Tabs.Trigger>
-                            <Tabs.Trigger value="otros" class="flex gap-2 items-center justify-center"><Settings class="h-4 w-4 hidden sm:block" /> Otros</Tabs.Trigger>
-                        </Tabs.List>
                     </Tabs.Root>
                 </Card.Content>
             </Card.Root>
-
-            <div class="fixed bottom-0 right-0 left-0 md:left-64 p-4 border-t bg-background/95 backdrop-blur z-50">
-                <div class="max-w-6xl mx-auto flex justify-end gap-4">
-                    <Button variant="ghost" href="/dashboard/goods/parts" disabled={loading}>Cancelar</Button>
-                    <Button type="submit" disabled={loading} class="min-w-[140px]">
-                        {#if loading}<LoaderCircle class="mr-2 h-4 w-4 animate-spin" />{:else}<Save class="mr-2 h-4 w-4" />{/if}
-                        {isEdit ? 'Actualizar' : 'Guardar'}
-                    </Button>
-                </div>
-            </div>
         </form>
     {/if}
+    </div>
+</div>
+
+<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))]">
+    <div class="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
+        <Tabs.Root bind:value={activeTab}>
+            <div class="w-full overflow-x-auto pb-2">
+                {#if formType === 'fa'}
+                    <Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-3">
+                        <Tabs.Trigger value="general" class="whitespace-nowrap">
+                            <Package size={16} class="mr-2" />
+                            General
+                        </Tabs.Trigger>
+                        <Tabs.Trigger value="cont1" class="whitespace-nowrap">
+                            <FileText size={16} class="mr-2" />
+                            Continuación 1
+                        </Tabs.Trigger>
+                        <Tabs.Trigger value="cont2" class="whitespace-nowrap">
+                            <Settings size={16} class="mr-2" />
+                            Continuación 2
+                        </Tabs.Trigger>
+                    </Tabs.List>
+                {:else}
+                    <Tabs.List class="inline-flex md:grid md:w-full md:grid-cols-4">
+                        <Tabs.Trigger value="general" class="whitespace-nowrap">
+                            <Package size={16} class="mr-2" />
+                            General
+                        </Tabs.Trigger>
+                        <Tabs.Trigger value="opciones" class="whitespace-nowrap">
+                            <Settings size={16} class="mr-2" />
+                            Opciones
+                        </Tabs.Trigger>
+                        <Tabs.Trigger value="opcionales2" class="whitespace-nowrap">
+                            <FileText size={16} class="mr-2" />
+                            Opcionales 2
+                        </Tabs.Trigger>
+                        <Tabs.Trigger value="otros" class="whitespace-nowrap">
+                            <DollarSign size={16} class="mr-2" />
+                            Otros
+                        </Tabs.Trigger>
+                    </Tabs.List>
+                {/if}
+            </div>
+        </Tabs.Root>
+
+        <div class="flex justify-end gap-3">
+            <Button type="button" variant="outline" href="/dashboard/goods/parts" disabled={loading}>
+                Cancelar
+            </Button>
+            <Button type="button" onclick={handleSubmit} disabled={loading}>
+                {#if loading}
+                    <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+                    Guardando...
+                {:else}
+                    <Save size={16} class="mr-2" />
+                    {isEdit ? 'Actualizar' : 'Guardar'}
+                {/if}
+            </Button>
+        </div>
+    </div>
 </div>
 
 <ClientSelectorDialog bind:open={showClientModal} onSelect={handleClientSelect} />
@@ -702,6 +891,10 @@
 <MaterialTypeSelectorDialog bind:open={showMaterialModal} onSelect={handleMaterialSelect} />
 <UnitMeasureSelectorDialog bind:open={showUOMModal} onSelect={handleUOMSelect} />
 <UnitMeasureSelectorDialog bind:open={showAltUOMModal} onSelect={handleAltUOMSelect} />
+<CurrencySelectorDialog bind:open={showCurrencyModal} onSelect={handleCurrencySelect} />
+<CountrySelectorDialog bind:open={showCountryModal} onSelect={handleCountrySelect} />
+<FractionSelectorDialog bind:open={showFractionModal} onSelect={handleFractionSelect} />
+<USFractionSelectorDialog bind:open={showUSFractionModal} onSelect={handleUSFractionSelect} />
 
 <style>
     :global(.required::after) {
diff --git a/frontend/src/lib/components/dashboard/invoices/columns.ts b/frontend/src/lib/components/dashboard/invoices/columns.ts
index 821ff1cc..ead71f11 100644
--- a/frontend/src/lib/components/dashboard/invoices/columns.ts
+++ b/frontend/src/lib/components/dashboard/invoices/columns.ts
@@ -4,9 +4,6 @@ import { createRawSnippet } from "svelte";
 import DataTableActions from "./data-table-actions.svelte";
 import type { Invoice } from '$lib/api/dashboard/a76/invoices';
 
-/**
- * Formatea una fecha
- */
 function formatDate(date?: string | null): string {
 	if (!date) return '-';
 	return new Date(date).toLocaleDateString('es-MX', {
@@ -16,14 +13,43 @@ function formatDate(date?: string | null): string {
 	});
 }
 
-export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
+export function createColumns(
+	onSuccess?: () => void
+): ColumnDef<Invoice>[] {
 	return [
+		// 0. NUEVA COLUMNA: Checkbox visual (el estado real lo maneja la opacidad)
+		{
+			id: "select",
+			header: ({ table }) => {
+				return renderSnippet(
+					createRawSnippet(() => ({
+						render: () => `<div class="w-4"></div>`
+					}))
+				);
+			},
+			cell: ({ row }) => {
+				const isSelected = row.getIsSelected();
+
+				const checkboxSnippet = createRawSnippet<[{ selected: boolean }]>((getProps) => {
+					const { selected } = getProps();
+					return {
+						render: () => `<div class="flex items-center justify-center">
+							<input type="checkbox" class="h-4 w-4" ${selected ? 'checked' : ''} />
+						</div>`
+					};
+				});
+
+				return renderSnippet(checkboxSnippet, { selected: isSelected });
+			},
+			enableSorting: false,
+			enableHiding: false,
+		},
 		{
 			accessorKey: "operation_type",
 			header: "Operación",
 			cell: ({ row }) => {
 				const operationType = row.original.operation_type;
-				
+
 				const operationSnippet = createRawSnippet<[{ type?: string | null }]>((getType) => {
 					const { type } = getType();
 					const isImport = type === 'imp';
@@ -32,8 +58,8 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 					return {
 						render: () =>
 							`<span class="inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${colorClass}">
-								${label}
-							</span>`
+                                ${label}
+                            </span>`
 					};
 				});
 				return renderSnippet(operationSnippet, { type: operationType });
@@ -44,7 +70,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Tipo Factura",
 			cell: ({ row }) => {
 				const invoiceType = row.original.invoice_type;
-				
+
 				const typeSnippet = createRawSnippet<[{ type?: string | null }]>((getType) => {
 					const { type } = getType();
 					return {
@@ -74,10 +100,10 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Pedimento 18",
 			cell: ({ row }) => {
 				const pedimento = row.original.compliance_mx?.pedimento;
-				const fullNumber = pedimento 
+				const fullNumber = pedimento
 					? `${pedimento.year || ''}-${pedimento.customs_office || ''}-${pedimento.license || ''}-${pedimento.pedimento_number || ''}`
 					: null;
-				
+
 				const pedimentoSnippet = createRawSnippet<[{ number?: string | null }]>((getPedimento) => {
 					const { number } = getPedimento();
 					return {
@@ -93,7 +119,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Remesa",
 			cell: ({ row }) => {
 				const remesa = row.original.compliance_mx?.remesa;
-				
+
 				const remesaSnippet = createRawSnippet<[{ remesa?: number | null }]>((getRemesa) => {
 					const { remesa } = getRemesa();
 					return {
@@ -123,7 +149,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Clave Ped.",
 			cell: ({ row }) => {
 				const pedimentoCode = row.original.compliance_mx?.pedimento?.pedimento_code;
-				
+
 				const claveSnippet = createRawSnippet<[{ code?: string }]>((getClave) => {
 					const { code } = getClave();
 					return {
@@ -152,9 +178,8 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			accessorKey: "total_items",
 			header: "Total Partidas",
 			cell: ({ row }) => {
-				// El total de items viene del conteo de details
 				const totalItems = row.original.details?.length || 0;
-				
+
 				const itemsSnippet = createRawSnippet<[{ total: number }]>((getTotal) => {
 					const { total } = getTotal();
 					return {
@@ -170,7 +195,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Moneda",
 			cell: ({ row }) => {
 				const currency = row.original.financials?.currency;
-				
+
 				const currencySnippet = createRawSnippet<[{ currency?: string | null }]>((getCurrency) => {
 					const { currency } = getCurrency();
 					return {
@@ -186,7 +211,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Tipo Moneda",
 			cell: ({ row }) => {
 				const currencyType = row.original.financials?.currency_type;
-				
+
 				const typeSnippet = createRawSnippet<[{ type?: string | null }]>((getType) => {
 					const { type } = getType();
 					return {
@@ -201,9 +226,8 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			accessorKey: "logistics.weight_type",
 			header: "Tipo Peso",
 			cell: ({ row }) => {
-				// weight_type está en logistics que es un array, tomamos el primer elemento
 				const weightType = row.original.logistics?.weight_type;
-				
+
 				const weightSnippet = createRawSnippet<[{ type?: string | null }]>((getType) => {
 					const { type } = getType();
 					return {
@@ -219,7 +243,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Actualizado",
 			cell: ({ row }) => {
 				const isUpdated = row.original.is_updated;
-				
+
 				const updatedSnippet = createRawSnippet<[{ isUpdated?: boolean | null }]>((getUpdated) => {
 					const { isUpdated } = getUpdated();
 					const colorClass = isUpdated ? 'bg-green-100 text-green-800' : 'bg-gray-100 text-gray-800';
@@ -227,8 +251,8 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 					return {
 						render: () =>
 							`<span class="inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${colorClass}">
-								${label}
-							</span>`
+                                ${label}
+                            </span>`
 					};
 				});
 				return renderSnippet(updatedSnippet, { isUpdated });
@@ -239,7 +263,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Mixto",
 			cell: ({ row }) => {
 				const isMixed = row.original.compliance_mx?.is_mixed;
-				
+
 				const mixedSnippet = createRawSnippet<[{ isMixed?: boolean | null }]>((getMixed) => {
 					const { isMixed } = getMixed();
 					const colorClass = isMixed ? 'bg-blue-100 text-blue-800' : 'bg-gray-100 text-gray-800';
@@ -247,8 +271,8 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 					return {
 						render: () =>
 							`<span class="inline-flex items-center rounded-full px-2.5 py-0.5 text-xs font-medium ${colorClass}">
-								${label}
-							</span>`
+                                ${label}
+                            </span>`
 					};
 				});
 				return renderSnippet(mixedSnippet, { isMixed });
@@ -259,7 +283,7 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 			header: "Doc. Relacionado",
 			cell: ({ row }) => {
 				const relDoc = row.original.related_doc_id;
-				
+
 				const relDocSnippet = createRawSnippet<[{ relDoc?: number | null }]>((getRelDoc) => {
 					const { relDoc } = getRelDoc();
 					return {
@@ -270,14 +294,18 @@ export function createColumns(onSuccess?: () => void): ColumnDef<Invoice>[] {
 				return renderSnippet(relDocSnippet, { relDoc });
 			}
 		},
+		// 2. MODIFICAMOS AQUÍ: Pasamos onDownload al componente
 		{
 			id: "actions",
 			cell: ({ row }) => {
-				return renderComponent(DataTableActions, { invoice: row.original, onSuccess });
+				return renderComponent(DataTableActions, {
+					invoice: row.original,
+					onSuccess
+				});
 			}
 		}
 	];
 }
 
-// Mantener compatibilidad hacia atrás
-export const columns = createColumns();
+
+export const columns = createColumns();
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/invoices/data-table-actions.svelte b/frontend/src/lib/components/dashboard/invoices/data-table-actions.svelte
index bbb7a09f..6144ee75 100644
--- a/frontend/src/lib/components/dashboard/invoices/data-table-actions.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/data-table-actions.svelte
@@ -1,71 +1,72 @@
 <script lang="ts">
-	import type { Invoice } from '$lib/api/dashboard/a76/invoices';
-	import { Button } from '$lib/components/ui/button';
-	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
-	import { Ellipsis, Eye, Pencil, Trash2 } from 'lucide-svelte';
-	import DetailsDialog from './details-dialog.svelte';
-	import DeleteDialog from './delete-dialog.svelte';
+    import type { Invoice } from '$lib/api/dashboard/a76/invoices';
+    import { Button } from '$lib/components/ui/button';
+    import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
+    // 1. Agregamos FileDown a los imports
+    import { Ellipsis, Eye, Pencil, Trash2 } from 'lucide-svelte';
+    import DetailsDialog from './details-dialog.svelte';
+    import DeleteDialog from './delete-dialog.svelte';
 
-	interface Props {
-		invoice: Invoice;
-		onSuccess?: () => void;
-	}
+    interface Props {
+        invoice: Invoice;
+        onSuccess?: () => void;
+    }
 
-	let { invoice, onSuccess }: Props = $props();
-	
-	let showDetails = $state(false);
-	let showDelete = $state(false);
+    // 3. Desestructuramos onDownload de los props
+    let { invoice, onSuccess }: Props = $props();
+    
+    let showDetails = $state(false);
+    let showDelete = $state(false);
 
-	function handleEdit() {
-		// Redirigir a la página de edición
-		window.location.href = `/dashboard/invoices/edit/${invoice.id}`;
-	}
+    function handleEdit() {
+        window.location.href = `/dashboard/invoices/edit/${invoice.id}`;
+    }
 
 </script>
 
 <DropdownMenu.Root>
-	<DropdownMenu.Trigger>
-		{#snippet child({ props })}
-			<Button {...props} variant="ghost" size="icon" class="h-8 w-8 p-0">
-				<span class="sr-only">Abrir menú</span>
-				<Ellipsis class="h-4 w-4" />
-			</Button>
-		{/snippet}
-	</DropdownMenu.Trigger>
-	<DropdownMenu.Content align="end">
-		<DropdownMenu.Label>Acciones</DropdownMenu.Label>
-		<DropdownMenu.Separator />
-		
-		<DropdownMenu.Item onclick={() => showDetails = true}>
-			<Eye class="mr-2 h-4 w-4" />
-			Ver Detalles
-		</DropdownMenu.Item>
+    <DropdownMenu.Trigger>
+        {#snippet child({ props })}
+            <Button {...props} variant="ghost" size="icon" class="h-8 w-8 p-0">
+                <span class="sr-only">Abrir menú</span>
+                <Ellipsis class="h-4 w-4" />
+            </Button>
+        {/snippet}
+    </DropdownMenu.Trigger>
+    <DropdownMenu.Content align="end">
+        <DropdownMenu.Label>Acciones</DropdownMenu.Label>
+        <DropdownMenu.Separator />
+        
+        <DropdownMenu.Item onclick={() => showDetails = true}>
+            <Eye class="mr-2 h-4 w-4" />
+            Ver Detalles
+        </DropdownMenu.Item>
 
-		<DropdownMenu.Item onclick={handleEdit}>
-			<Pencil class="mr-2 h-4 w-4" />
-			Editar
-		</DropdownMenu.Item>
 
-		<DropdownMenu.Separator />
-		<DropdownMenu.Item onclick={() => showDelete = true} class="text-destructive">
-			<Trash2 class="mr-2 h-4 w-4" />
-			Eliminar
-		</DropdownMenu.Item>
-	</DropdownMenu.Content>
+        <DropdownMenu.Item onclick={handleEdit}>
+            <Pencil class="mr-2 h-4 w-4" />
+            Editar
+        </DropdownMenu.Item>
+
+        <DropdownMenu.Separator />
+        <DropdownMenu.Item onclick={() => showDelete = true} class="text-destructive">
+            <Trash2 class="mr-2 h-4 w-4" />
+            Eliminar
+        </DropdownMenu.Item>
+    </DropdownMenu.Content>
 </DropdownMenu.Root>
 
-<!-- Diálogos -->
 {#if showDetails}
-	<DetailsDialog 
-		invoice={invoice}
-		onClose={() => showDetails = false}
-	/>
+    <DetailsDialog 
+        invoice={invoice}
+        onClose={() => showDetails = false}
+    />
 {/if}
 
 {#if showDelete}
-	<DeleteDialog
-		invoice={invoice}
-		onClose={() => showDelete = false}
-		{onSuccess}
-	/>
+    <DeleteDialog
+        invoice={invoice}
+        onClose={() => showDelete = false}
+        {onSuccess}
+    />
 {/if}
\ No newline at end of file
diff --git a/frontend/src/lib/components/dashboard/invoices/data-table.svelte b/frontend/src/lib/components/dashboard/invoices/data-table.svelte
index ef98de23..d549b5a2 100644
--- a/frontend/src/lib/components/dashboard/invoices/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/invoices/data-table.svelte
@@ -13,6 +13,9 @@
 		loading: boolean;
 		hasMore: boolean;
 		loadMore: () => void;
+		// Props para selección
+		selectedId?: number | null;
+		onRowClick?: (row: TData) => void;
 	};
 
 	let {
@@ -20,7 +23,9 @@
 		columns,
 		loading,
 		hasMore,
-		loadMore
+		loadMore,
+		selectedId = null,
+		onRowClick
 	}: DataTableProps<TData, TValue> = $props();
 
 	const table = createSvelteTable({
@@ -28,7 +33,17 @@
 			return data;
 		},
 		columns,
-		getCoreRowModel: getCoreRowModel()
+		getCoreRowModel: getCoreRowModel(),
+		getRowId: (row: any) => row.id?.toString(), // Usar ID para identificar filas
+		state: {
+			get rowSelection() {
+				// Mapear el ID seleccionado al formato que espera TanStack Table
+				return selectedId ? { [selectedId]: true } : {};
+			}
+		},
+		enableRowSelection: true,
+		enableMultiRowSelection: false, // Solo permitir una selección a la vez
+		// No necesitamos onRowSelectionChange porque controlamos el estado desde fuera
 	});
 
 	let scrollContainer = $state<HTMLDivElement>();
@@ -62,7 +77,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
@@ -80,7 +95,11 @@
 			</Table.Header>
 			<Table.Body>
 				{#each table.getRowModel().rows as row (row.id)}
-					<Table.Row data-state={row.getIsSelected() && "selected"}>
+					<Table.Row 
+						data-state={row.getIsSelected() && "selected"}
+						class="cursor-pointer transition-colors {row.getIsSelected() ? 'bg-gray-300 dark:bg-gray-600' : 'hover:bg-gray-100 dark:hover:bg-gray-700'}"
+						onclick={() => onRowClick && onRowClick(row.original)}
+					>
 						{#each row.getVisibleCells() as cell (cell.id)}
 							<Table.Cell>
 								<FlexRender
diff --git a/frontend/src/lib/components/dashboard/invoices/download-invoice-button.svelte b/frontend/src/lib/components/dashboard/invoices/download-invoice-button.svelte
new file mode 100644
index 00000000..a04b550b
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/invoices/download-invoice-button.svelte
@@ -0,0 +1,90 @@
+<script lang="ts">
+    import { Button } from '$lib/components/ui/button';
+    import { FileDown, LoaderCircle } from 'lucide-svelte';
+    import { toast } from 'svelte-sonner';
+    import { invoicesReportsApi } from '$lib/api/dashboard/a76/reports/reports-invoices';
+
+    export let invoiceId: number;
+    export let companyId: number;
+
+    let processing = false;
+
+    async function startDownload() {
+        if (processing) return;
+        
+        processing = true;
+        const toastId = toast.loading('Iniciando generación de PDF...');
+
+        try {
+            const { task_id } = await invoicesReportsApi.triggerPdfGeneration(invoiceId, companyId);
+            
+            const pollInterval = setInterval(async () => {
+                try {
+                    const statusData = await invoicesReportsApi.getTaskStatus(task_id);
+                    
+                    if (statusData.state === 'SUCCESS') {
+                        clearInterval(pollInterval);
+                        toast.success('Factura generada correctamente', { id: toastId });
+                        
+                        const { content, file_name, media_type } = statusData.result;
+                        downloadBase64File(content, media_type, file_name);
+                        
+                        processing = false;
+
+                    } else if (statusData.state === 'FAILURE') {
+                         clearInterval(pollInterval);
+                         throw new Error(statusData.result || 'Error desconocido');
+
+                    } else if (statusData.state === 'PROCESSING') {
+                        const meta = statusData.result;
+                        if (meta && typeof meta === 'object') {
+                             const current = meta.current || 0;
+                             const total = meta.total || 100;
+                             const progress = Math.round((current / total) * 100);
+                             // Update toast with progress
+                             toast.loading(`Generando PDF: ${progress}%`, { 
+                                id: toastId,
+                                description: meta.status || 'Procesando...'
+                             });
+                        }
+                    }
+                } catch (err: any) {
+                    clearInterval(pollInterval);
+                    handleError(err, toastId);
+                }
+            }, 1000);
+
+        } catch (err: any) {
+            handleError(err, toastId);
+        }
+    }
+    
+    function handleError(err: any, toastId: string | number) {
+        processing = false;
+        console.error(err);
+        toast.error('Error al generar PDF: ' + (err.message || 'Error desconocido'), { id: toastId });
+    }
+
+    function downloadBase64File(base64Data: string, contentType: string, fileName: string) {
+         const linkSource = `data:${contentType};base64,${base64Data}`;
+         const downloadLink = document.createElement("a");
+         downloadLink.href = linkSource;
+         downloadLink.download = fileName;
+         downloadLink.click();
+    }
+</script>
+
+<Button 
+    variant="outline" 
+    onclick={startDownload} 
+    disabled={processing} 
+    class="w-[100px]"
+>
+    {#if processing}
+        <LoaderCircle size={16} class="mr-2 animate-spin" />
+        PDF
+    {:else}
+        <FileDown size={16} class="mr-2" />
+        PDF
+    {/if}
+</Button>
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 282ca299..4cc6852d 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
@@ -493,7 +493,7 @@
 			class="max-h-[500px] overflow-auto border rounded-md"
 		>
 			<Table.Root>
-				<Table.Header class="sticky top-0 bg-background z-10">
+				<Table.Header class="bg-background">
 					<Table.Row>					
 						<Table.Head>Línea</Table.Head>		
 						<Table.Head>P/S</Table.Head>	
diff --git a/frontend/src/lib/components/dashboard/invoices/pdf-progress-dialog.svelte b/frontend/src/lib/components/dashboard/invoices/pdf-progress-dialog.svelte
new file mode 100644
index 00000000..36fc7e38
--- /dev/null
+++ b/frontend/src/lib/components/dashboard/invoices/pdf-progress-dialog.svelte
@@ -0,0 +1,128 @@
+<script lang="ts">
+    import * as Dialog from "$lib/components/ui/dialog";
+    import { Progress } from "$lib/components/ui/progress";
+    import { invoicesReportsApi } from "$lib/api/dashboard/a76/reports/reports-invoices";
+    import { toast } from "svelte-sonner";
+    import { Loader2, CheckCircle2, XCircle, FileDown } from "lucide-svelte";
+    import { Button } from "$lib/components/ui/button";
+
+    export let open = false;
+    export let taskId: string | null = null;
+    export let onClose: () => void;
+    export let onComplete: (result: any) => void;
+
+    export let getStatus: ((taskId: string) => Promise<any>) | null = null;
+
+    let progress = 0;
+    let statusMessage = "Iniciando...";
+    let pollingInterval: any = null;
+    let isComplete = false;
+    let hasError = false;
+
+    // Reiniciar estado cuando se abre el diálogo con un nuevo taskId
+    $: if (open && taskId) {
+        progress = 0;
+        statusMessage = "Iniciando...";
+        isComplete = false;
+        hasError = false;
+        startPolling();
+    } else if (!open) {
+        stopPolling();
+    }
+
+    function stopPolling() {
+        if (pollingInterval) {
+            clearInterval(pollingInterval);
+            pollingInterval = null;
+        }
+    }
+
+    async function startPolling() {
+        stopPolling(); // Asegurar limpieza previa
+        
+        pollingInterval = setInterval(async () => {
+            if (!taskId) return;
+
+            try {
+                const apiCall = getStatus || invoicesReportsApi.getTaskStatus;
+                const response = await apiCall(taskId);
+                
+                if (response.state === 'PROCESSING' && response.info) {
+                    progress = response.info.current || 0;
+                    statusMessage = response.info.status || "Procesando...";
+                } 
+                else if (response.state === 'SUCCESS') {
+                    progress = 100;
+                    statusMessage = "¡Completado!";
+                    isComplete = true;
+                    stopPolling();
+                    // Pequeña pausa para ver el 100%
+                    setTimeout(() => {
+                        onComplete(response.result);
+                    }, 500);
+                }
+                else if (response.state === 'FAILURE') {
+                    hasError = true;
+                    statusMessage = "Error al generar el PDF";
+                    stopPolling();
+                    toast.error("Falló la generación del PDF");
+                }
+            } catch (error) {
+                console.error("Error polling task status:", error);
+                // No detenemos el polling inmediatamente por un error de red transitorio,
+                // pero podríamos contar intentos fallidos si fuera necesario.
+            }
+        }, 1000);
+    }
+
+    function handleOpenChange(newOpen: boolean) {
+        if (!newOpen) {
+            stopPolling();
+            onClose();
+        }
+    }
+</script>
+
+<Dialog.Root bind:open={open} onOpenChange={handleOpenChange}>
+    <Dialog.Content class="sm:max-w-[425px]">
+        <Dialog.Header>
+            <Dialog.Title>Generando PDF</Dialog.Title>
+            <Dialog.Description>
+                Por favor espere mientras se genera su documento.
+            </Dialog.Description>
+        </Dialog.Header>
+
+        <div class="py-6 flex flex-col gap-6">
+            <div class="flex items-center justify-between text-sm mb-1">
+                <span class="text-muted-foreground">{statusMessage}</span>
+                <span class="font-medium">{progress}%</span>
+            </div>
+            
+            <Progress value={progress} class="w-full h-2" />
+
+            <div class="flex justify-center items-center h-16">
+                {#if isComplete}
+                    <div class="flex flex-col items-center text-green-600 animate-in fade-in zoom-in duration-300">
+                        <CheckCircle2 size={48} />
+                        <span class="text-sm font-medium mt-2">Listo para descargar</span>
+                    </div>
+                {:else if hasError}
+                    <div class="flex flex-col items-center text-destructive animate-in fade-in zoom-in duration-300">
+                        <XCircle size={48} />
+                        <span class="text-sm font-medium mt-2">Ocurrió un error</span>
+                    </div>
+                {:else}
+                    <div class="flex flex-col items-center text-primary animate-pulse">
+                        <FileDown size={48} class="opacity-50" />
+                    </div>
+                {/if}
+            </div>
+        </div>
+
+        <Dialog.Footer>
+             {#if hasError}
+                <Button variant="secondary" onclick={onClose}>Cerrar</Button>
+            {/if}
+        </Dialog.Footer>
+    </Dialog.Content>
+</Dialog.Root>
diff --git a/frontend/src/lib/components/dashboard/pedimentos/data-table.svelte b/frontend/src/lib/components/dashboard/pedimentos/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/pedimentos/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/pedimentos/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/pedimentos/edit/digitization-tab-form.svelte b/frontend/src/lib/components/dashboard/pedimentos/edit/digitization-tab-form.svelte
index 52646ac0..2194b826 100644
--- a/frontend/src/lib/components/dashboard/pedimentos/edit/digitization-tab-form.svelte
+++ b/frontend/src/lib/components/dashboard/pedimentos/edit/digitization-tab-form.svelte
@@ -591,7 +591,7 @@
 				{:else}
 					<div class="overflow-y-auto h-full">
 						<Table>
-							<TableHeader class="sticky top-0 bg-background z-10 border-b">
+							<TableHeader class="bg-background border-b">
 								<TableRow>
 									<TableHead class="w-[100px]">Código</TableHead>
 									<TableHead>Descripción</TableHead>
diff --git a/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/code_pedimento_regimens/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/containers/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/containers/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/containers/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/containers/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/countries/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/countries/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/countries/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/countries/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/currency_types/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/customs_sections/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/customs_warehouses/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/incoterms/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/invoice_types/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/material_types/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/material_types/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/material_types/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/material_types/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/payment_methods/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/pedimento_codes/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/pedimento_regimens/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/sectors/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/sectors/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/sectors/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/sectors/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/states/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/states/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/states/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/states/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/transport_modes/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table.svelte
index ef98de23..4c448e3d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/transport_types/data-table.svelte
@@ -62,7 +62,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table.svelte b/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table.svelte
index 5b6be70f..4c84570d 100644
--- a/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/reference_data/valuation_methods/data-table.svelte
@@ -63,7 +63,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/dashboard/seal/data-table.svelte b/frontend/src/lib/components/dashboard/seal/data-table.svelte
index 7f02c1cc..2438370f 100644
--- a/frontend/src/lib/components/dashboard/seal/data-table.svelte
+++ b/frontend/src/lib/components/dashboard/seal/data-table.svelte
@@ -63,7 +63,7 @@
 <div class="w-full">
 	<div class="rounded-md border max-h-[600px] overflow-y-auto" bind:this={scrollContainer}>
 		<Table.Root>
-			<Table.Header class="sticky top-0 bg-background z-10">
+			<Table.Header class="bg-background">
 				{#each table.getHeaderGroups() as headerGroup (headerGroup.id)}
 					<Table.Row>
 						{#each headerGroup.headers as header (header.id)}
diff --git a/frontend/src/lib/components/ui/progress/index.ts b/frontend/src/lib/components/ui/progress/index.ts
new file mode 100644
index 00000000..0477d4ff
--- /dev/null
+++ b/frontend/src/lib/components/ui/progress/index.ts
@@ -0,0 +1,2 @@
+
+export { default as Progress } from "./progress.svelte";
diff --git a/frontend/src/lib/components/ui/progress/progress.svelte b/frontend/src/lib/components/ui/progress/progress.svelte
new file mode 100644
index 00000000..1a45e279
--- /dev/null
+++ b/frontend/src/lib/components/ui/progress/progress.svelte
@@ -0,0 +1,27 @@
+<script lang="ts">
+  import { cn } from "$lib/utils";
+
+  export let value = 0;
+  export let max = 100;
+  let className: string | undefined = undefined;
+  export { className as class };
+
+  $: percentage = (value / max) * 100;
+</script>
+
+<div
+  role="progressbar"
+  aria-valuemin={0}
+  aria-valuemax={max}
+  aria-valuenow={value}
+  class={cn(
+    "relative h-4 w-full overflow-hidden rounded-full bg-secondary",
+    className
+  )}
+  {...$$restProps}
+>
+  <div
+    class="h-full w-full flex-1 bg-primary transition-all"
+    style="transform: translateX(-{100 - (percentage || 0)}%)"
+  ></div>
+</div>
diff --git a/frontend/src/lib/components/ui/table/table-head.svelte b/frontend/src/lib/components/ui/table/table-head.svelte
index e9dd2378..c7c5e7ec 100644
--- a/frontend/src/lib/components/ui/table/table-head.svelte
+++ b/frontend/src/lib/components/ui/table/table-head.svelte
@@ -14,7 +14,7 @@
 	bind:this={ref}
 	data-slot="table-head"
 	class={cn(
-		"text-foreground h-10 whitespace-nowrap bg-clip-padding px-2 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0",
+		"text-foreground h-10 whitespace-nowrap px-2 text-left align-middle font-medium [&:has([role=checkbox])]:pr-0 bg-background",
 		className
 	)}
 	{...restProps}
diff --git a/frontend/src/lib/server/api.ts b/frontend/src/lib/server/api.ts
index 3b2c6acf..19ed846f 100644
--- a/frontend/src/lib/server/api.ts
+++ b/frontend/src/lib/server/api.ts
@@ -12,19 +12,19 @@ import { redirect, type Cookies } from '@sveltejs/kit';
 export function getServerApiUrl(): string {
 	// Primero intentar con INTERNAL_API_URL (para llamadas server-side en Docker)
 	let apiUrl = process.env.INTERNAL_API_URL;
-	
+
 	// Si no está definida, usar VITE_API_URL del entorno runtime (no import.meta.env)
 	if (!apiUrl) {
 		apiUrl = process.env.VITE_API_URL;
 	}
-	
+
 	// Como último recurso, usar el valor de build-time
 	if (!apiUrl) {
 		apiUrl = import.meta.env.VITE_API_URL;
 		// Reemplazar 'localhost' con 'backend' para llamadas desde el servidor (SSR)
 		apiUrl = apiUrl?.replace('localhost', 'backend').replace('127.0.0.1', 'backend').replace('anexo76-dev.aduanasoft.com', 'backend');
 	}
-	
+
 	// Normalizar la URL: asegurar que termine con '/'
 	return apiUrl?.endsWith('/') ? apiUrl : `${apiUrl}/`;
 }
@@ -43,8 +43,8 @@ export function getAuthTokens(cookies: Cookies) {
  * Establece los tokens de autenticación en las cookies
  */
 export function setAuthTokens(
-	cookies: Cookies, 
-	accessToken: string, 
+	cookies: Cookies,
+	accessToken: string,
 	refreshToken?: string
 ) {
 	cookies.set('access_token', accessToken, {
@@ -54,7 +54,7 @@ export function setAuthTokens(
 		secure: process.env.NODE_ENV === 'production',
 		maxAge: 60 * 60 * 24 * 7 // 7 días
 	});
-	
+
 	if (refreshToken) {
 		cookies.set('refresh_token', refreshToken, {
 			path: '/',
@@ -95,7 +95,7 @@ export async function refreshAccessToken(
 	fetch: typeof globalThis.fetch
 ): Promise<string | null> {
 	const { refreshToken } = getAuthTokens(cookies);
-	
+
 	if (!refreshToken) {
 		return null;
 	}
@@ -115,10 +115,10 @@ export async function refreshAccessToken(
 		}
 
 		const data = await response.json();
-		
+
 		// Actualizar las cookies con los nuevos tokens
 		setAuthTokens(cookies, data.access_token, data.refresh_token);
-		
+
 		return data.access_token;
 	} catch (error) {
 		console.error('🔄 [API] Error al refrescar token:', error);
@@ -225,9 +225,9 @@ export async function authenticatedFetch(
 		if (error && typeof error === 'object' && 'status' in error && 'location' in error) {
 			throw error;
 		}
-		
+
 		console.error('🔴 [API] Error en authenticatedFetch:', endpoint, error);
-		
+
 		// Retornar una respuesta de error simulada en lugar de lanzar
 		return new Response(JSON.stringify({ error: 'Network error', details: String(error) }), {
 			status: 500,
@@ -294,14 +294,14 @@ export async function validateAuth(
 		if (error && typeof error === 'object' && 'status' in error && 'location' in error) {
 			throw error;
 		}
-		
+
 		console.error('🔐 [API] Error validando autenticación:', error);
-		
+
 		if (redirectOnFail) {
 			clearAuthTokens(cookies);
 			throw redirect(303, redirectOnFail);
 		}
-		
+
 		return null;
 	}
 }
diff --git a/frontend/src/lib/stores/company.svelte.ts b/frontend/src/lib/stores/company.svelte.ts
index 22a14cf4..b3da0f1f 100644
--- a/frontend/src/lib/stores/company.svelte.ts
+++ b/frontend/src/lib/stores/company.svelte.ts
@@ -40,15 +40,15 @@ class CompanyStore {
 		if (preloadedCompanies && preloadedCompanies.length > 0) {
 			// Detectar si el tenant ha cambiado
 			const newTenantId = preloadedCompanies[0].tenant_id;
-			
+
 			// Si el tenant cambió, limpiar el store primero
 			if (this._currentTenantId !== null && this._currentTenantId !== newTenantId) {
 				this.clear();
 			}
-			
+
 			this._currentTenantId = newTenantId;
 			this._companies = preloadedCompanies;
-			
+
 			// Si hay compañías y no hay una activa, seleccionar la primera o la guardada
 			if (this._companies.length > 0 && !this._activeCompany) {
 				// Intentar restaurar la compañía guardada
@@ -67,13 +67,13 @@ class CompanyStore {
 			}
 			return;
 		}
-		
+
 		// Si no hay datos pre-cargados, hacer fetch (fallback)
 		// Solo en el navegador, nunca durante SSR
 		if (!browser) {
 			return;
 		}
-		
+
 		this._loading = true;
 		try {
 			const response = await fetch('/api/v1/a76/company/my-companies', {
@@ -81,22 +81,22 @@ class CompanyStore {
 			});
 			if (response.ok) {
 				const newCompanies = await response.json();
-				
+
 				// Detectar si el tenant ha cambiado
 				if (newCompanies.length > 0) {
 					const newTenantId = newCompanies[0].tenant_id;
-					
+
 					// Si el tenant cambió, limpiar el store primero
 					if (this._currentTenantId !== null && this._currentTenantId !== newTenantId) {
-					
+
 						this.clear();
 					}
-					
+
 					this._currentTenantId = newTenantId;
 				}
-				
+
 				this._companies = newCompanies;
-				
+
 				// Si hay compañías y no hay una activa, seleccionar la primera
 				if (this._companies.length > 0 && !this._activeCompany) {
 					this.setActiveCompany(this._companies[0], true); // silent=true para inicialización
@@ -123,23 +123,23 @@ class CompanyStore {
 	setActiveCompany(company: Company, silent: boolean = false) {
 		const previousCompanyId = this._activeCompany?.id;
 		this._activeCompany = company;
-		
+
 		// Guardar en localStorage para persistencia
 		if (typeof window !== 'undefined') {
 			localStorage.setItem('activeCompanyId', company.id.toString());
 		}
-		
+
 		// Guardar en cookie para acceso desde el servidor (SSR)
 		if (typeof document !== 'undefined') {
 			document.cookie = `active_company_id=${company.id}; path=/; max-age=${60 * 60 * 24 * 30}; SameSite=Lax`;
 		}
-		
+
 		// Despachar evento personalizado solo si:
 		// 1. No es silent (no es inicialización)
 		// 2. Y realmente cambió la compañía (el ID es diferente)
 		if (!silent && typeof window !== 'undefined' && previousCompanyId !== company.id) {
-			window.dispatchEvent(new CustomEvent('companyChanged', { 
-				detail: { companyId: company.id } 
+			window.dispatchEvent(new CustomEvent('companyChanged', {
+				detail: { companyId: company.id }
 			}));
 		}
 	}
@@ -167,12 +167,12 @@ class CompanyStore {
 		this._companies = [];
 		this._loading = false;
 		this._currentTenantId = null;
-		
+
 		// Limpiar localStorage
 		if (typeof window !== 'undefined') {
 			localStorage.removeItem('activeCompanyId');
 		}
-		
+
 		// Limpiar cookie
 		if (typeof document !== 'undefined') {
 			document.cookie = 'active_company_id=; path=/; max-age=0';
diff --git a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
index 78e70445..ab04812f 100644
--- a/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
+++ b/frontend/src/routes/dashboard/clients_and_providers/+page.svelte
@@ -1,16 +1,12 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
 	import { clientsProvidersApi, type ClientProvider } from '$lib/api/dashboard/a76/clients-providers';
-	import DataTable from '$lib/components/dashboard/clients_and_providers/data-table.svelte';
-	import { createColumns } from '$lib/components/dashboard/clients_and_providers/columns.js';
-	import * as Card from '$lib/components/ui/card';
 	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
 	import * as Select from '$lib/components/ui/select';
-	import { Plus, RefreshCw } from 'lucide-svelte';
-	import { page } from '$app/stores';
-	import { goto } from '$app/navigation';
-	import type { PageData } from './$types';
-	import { browser } from '$app/environment';
+	import { Plus, RefreshCw, Users, Building2, MapPin, Mail, Phone, Hash } from 'lucide-svelte';
+	import { toast } from 'svelte-sonner';
 	import { companyStore } from '$lib/stores/company.svelte';
 	import type { ApiError } from '$lib/utils/error-handler';
 
@@ -37,44 +33,46 @@
 	}
 
 	// Sincronizar token de cookies a localStorage al montar el componente
+	import { browser } from '$app/environment';
+	import { goto } from '$app/navigation';
+	import { page } from '$app/stores';
+
+	let { data }: { data: any } = $props();
+
+	// State
+	let items = $state<ClientProvider[]>(data.items || []);
+	let selectedItem = $state<ClientProvider | null>(null);
+	let isLoading = $state(false);
+	
+	// Server-side filtering/pagination parameters
+	let currentPage = $state(1);
+	let pageSize = $state(50);
+	let totalItems = $state(data.total || 0);
+
+	// Filter state
+	let searchName = $state('');
+	let searchRfc = $state('');
+	let searchType = $state<string>($page.url.searchParams.get('type') || 'both');
+
+	// --- Lifecycle ---
+	
 	onMount(() => {
 		if (browser) {
-			// Función para obtener el valor de una cookie
-			const getCookie = (name: string): string | null => {
+			// Sincronizar token de cookies a localStorage si es necesario
+			const getCookie = (name: string) => {
 				const value = `; ${document.cookie}`;
 				const parts = value.split(`; ${name}=`);
 				if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
 				return null;
 			};
-
-			// Verificar si hay token en las cookies
 			const cookieToken = getCookie('access_token');
 			const localToken = localStorage.getItem('access_token');
+			if (cookieToken && cookieToken !== localToken) localStorage.setItem('access_token', cookieToken);
 
-			if (cookieToken && cookieToken !== localToken) {
-				localStorage.setItem('access_token', cookieToken);
-			}
-
-			// También sincronizar refresh_token si existe
-			const cookieRefreshToken = getCookie('refresh_token');
-			const localRefreshToken = localStorage.getItem('refresh_token');
-
-			if (cookieRefreshToken && cookieRefreshToken !== localRefreshToken) {
-				localStorage.setItem('refresh_token', cookieRefreshToken);
-			}
-
-			// Escuchar cambios de compañía
-			const handleCompanyChange = (event: CustomEvent) => {				
-				// Recargar la página para obtener datos de la nueva compañía
-				reloadData();
-			};
-
-			window.addEventListener('companyChanged', handleCompanyChange as EventListener);
-
-			// Cleanup
-			return () => {
-				window.removeEventListener('companyChanged', handleCompanyChange as EventListener);
-			};
+			// Listen for company changes
+			const handleCompanyChange = () => loadItems(1); // Reload from page 1
+			window.addEventListener('companyChanged', handleCompanyChange);
+			return () => window.removeEventListener('companyChanged', handleCompanyChange);
 		}
 	});
 
@@ -100,105 +98,89 @@
 				pageSize,
 				selectedType !== 'both' ? { type: selectedType } : undefined
 			);
+	// --- Actions ---
 
-			if (response.error) {
-				console.error('📊 [Page] Error en loadMore:', response.error, 'Status:', response.status);
-				
-				// Si es un error de autenticación (401 o 403) y no se pudo refrescar, mostrar mensaje específico
-				if (response.status === 401 || response.status === 403) {
-					error = 'Sesión expirada. Recargando página...';
-					// Recargar automáticamente después de 2 segundos
-					setTimeout(() => {
-						window.location.reload();
-					}, 2000);
-				} else {
-					error = response.error;
-				}
-				return;
-			}
-
-			if (response.data?.items) {				
-				// Agregar los nuevos items al array existente
-				allItems = [...allItems, ...response.data.items];
-				currentPage++;
-				totalItems = response.data.total;
-			}
-		} catch (e) {
-			error = 'Error cargando más datos';
-			console.error('📊 [Page] Error loading more:', e);
-		} finally {
-			loading = false;
-		}
-	}
-
-	async function reloadData() {
-		// Reset y recargar desde el principio usando la API
-		if (!companyStore.activeCompany) return;
-		
-		loading = true;
-		error = null;
+	async function loadItems(pageToLoad = 1) {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) return;
 
+		isLoading = true;
 		try {
-			const response = await clientsProvidersApi.list(
-				companyStore.activeCompany.id,
-				1,
-				pageSize,
-				selectedType !== 'both' ? { type: selectedType } : undefined
-			);
+			const filters: any = {};
+			if (searchType !== 'both') filters.type = searchType;
+			// Note: The API technically supports name/rfc fitlering if backend implements it. 
+			// Assuming backend supports 'name' and 'rfc' query params based on standard patterns, 
+			// or we filter client side if the list is small. 
+			// Given pagination, we should try sending them. If backend ignores them, we might need client filtering.
+			// Ideally backend should handle this. I will assume backend filters for now or add query params.
+			if (searchName) filters.name = searchName;
+			if (searchRfc) filters.rfc = searchRfc;
+
+			const response = await clientsProvidersApi.list(companyId, pageToLoad, pageSize, filters);
 
 			if (response.error) {
-				console.error('📊 [Page] Error en reloadData:', response.error);
 				if (response.status === 401 || response.status === 403) {
-					error = 'Sesión expirada. Recargando página...';
-					setTimeout(() => {
-						window.location.reload();
-					}, 2000);
-				} else {
-					error = response.error;
+					toast.error('Sesión expirada. Recargando...');
+					setTimeout(() => window.location.reload(), 2000);
+					return;
 				}
+				toast.error(response.error);
 				return;
 			}
 
-			if (response.data?.items) {
-				// Reemplazar todos los items con los nuevos datos
-				allItems = response.data.items;
-				currentPage = 1;
+			if (response.data) {
+				items = response.data.items;
 				totalItems = response.data.total;
+				currentPage = response.data.page;
 			}
 		} catch (e) {
-			error = 'Error recargando datos';
-			console.error('📊 [Page] Error reloading:', e);
+			console.error('Error loading items:', e);
+			toast.error('Error al cargar datos');
 		} finally {
-			loading = false;
+			isLoading = false;
 		}
 	}
 
-	function handleCreateClick() {
-		showCreateDialog = true;
+	function handleTypeChange(value: string) {
+		searchType = value;
+		loadItems(1);
+	}
+	
+	function handleSearch() {
+		loadItems(1);
 	}
 
-	function handleSuccess() {
-		// Recargar datos después de crear/editar/eliminar
-		reloadData();
+	function selectItem(item: ClientProvider) {
+		selectedItem = item;
+	}
+
+	function handleEdit() {
+		if (selectedItem) goto(`/dashboard/clients_and_providers/edit/${selectedItem.id}`);
+	}
+
+	async function handleDelete() {
+		if (!selectedItem || !companyStore.activeCompany?.id) return;
+		if (!confirm('¿Estás seguro de eliminar este registro?')) return;
+		
+		try {
+			await clientsProvidersApi.delete(selectedItem.id, companyStore.activeCompany.id);
+			toast.success('Registro eliminado');
+			selectedItem = null;
+			loadItems(currentPage);
+		} catch (e) {
+			toast.error('Error al eliminar');
+		}
 	}
 
-	// Crear columnas con el callback onSuccess
-	const columns = createColumns(handleSuccess);
 </script>
 
-<div class="space-y-6">
-	<!-- Header -->
-	<div class="flex items-center justify-between">
-		<div>
-			<h1 class="text-3xl font-bold tracking-tight">Clientes y Proveedores</h1>
-			<p class="text-muted-foreground">
-				Gestiona el catálogo de clientes y proveedores de tu empresa
-			</p>
-		</div>
-		<Button href="/dashboard/clients_and_providers/edit">
-			<Plus class="mr-2" size={16} />
-			Nuevo Cliente/Proveedor
-		</Button>
+<div class="flex flex-col h-[calc(100vh-4rem)] p-4 gap-4 pb-15">
+	<!-- Title -->
+	<div class="flex flex-col gap-1">
+		<h1 class="text-2xl font-bold">CLIENTES Y PROVEEDORES</h1>
+		<p class="text-sm text-muted-foreground">
+			Gestiona el catálogo de clientes y proveedores de tu empresa
+		</p>
 	</div>
 
 	<!-- Error Message -->
@@ -254,4 +236,247 @@
 			/>
 		</Card.Content>
 	</Card.Root>
+	<div class="flex-1 flex gap-4 overflow-hidden">
+		<!-- Left Panel: Table -->
+		<div class="flex-1 flex flex-col gap-4 overflow-hidden">
+			<!-- Filters -->
+			<div class="border rounded-lg bg-card">
+				<div class="p-4 space-y-4">
+					<div class="flex items-center justify-between">
+						<h2 class="text-sm font-semibold">Filtros</h2>
+						<span class="text-xs text-muted-foreground">Busque por nombre, RFC o tipo</span>
+					</div>
+					<div class="grid grid-cols-4 gap-4">
+						<div class="space-y-2">
+							<Label class="text-xs">Nombre / Razón Social</Label>
+							<Input 
+								bind:value={searchName} 
+								placeholder="Buscar por nombre..." 
+								class="h-9"
+								onkeydown={(e) => e.key === 'Enter' && handleSearch()}
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label class="text-xs">RFC</Label>
+							<Input 
+								bind:value={searchRfc} 
+								placeholder="RFC..." 
+								class="h-9"
+								onkeydown={(e) => e.key === 'Enter' && handleSearch()}
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label class="text-xs">Tipo</Label>
+							<Select.Root type="single" value={searchType} onValueChange={handleTypeChange}>
+								<Select.Trigger class="h-9">
+									{searchType === 'both' ? 'Todos' : searchType === 'client' ? 'Clientes' : 'Proveedores'}
+								</Select.Trigger>
+								<Select.Content>
+									<Select.Item value="both">Todos</Select.Item>
+									<Select.Item value="client">Clientes</Select.Item>
+									<Select.Item value="provider">Proveedores</Select.Item>
+								</Select.Content>
+							</Select.Root>
+						</div>
+						<div class="flex items-end">
+							<Button variant="secondary" size="sm" class="w-full" onclick={handleSearch}>
+								Buscar
+							</Button>
+						</div>
+					</div>
+				</div>
+			</div>
+
+			<!-- Table -->
+			<div class="flex-1 flex flex-col border rounded-lg overflow-hidden">
+				<div class="flex items-center justify-between p-3 border-b bg-muted/30">
+					<h2 class="text-sm font-semibold">Listado</h2>
+					<div class="flex items-center gap-2">
+						<span class="text-xs text-muted-foreground">
+							{totalItems} registros
+						</span>
+						<Button variant="outline" size="sm" onclick={() => loadItems(currentPage)}>
+							<RefreshCw class="h-4 w-4 mr-2" />
+							Actualizar
+						</Button>
+					</div>
+				</div>
+
+				<div class="flex-1 overflow-auto bg-card">
+					<table class="w-full text-sm">
+						<thead class="bg-muted text-muted-foreground border-b">
+							<tr>
+								<th class="px-3 py-2 text-left w-8">#</th>
+								<th class="px-3 py-2 text-left">RFC</th>
+								<th class="px-3 py-2 text-left">Nombre</th>
+								<th class="px-3 py-2 text-left">Tipo</th>
+								<th class="px-3 py-2 text-left">Estatus</th>
+							</tr>
+						</thead>
+						<tbody>
+							{#if isLoading}
+								<tr><td colspan="5" class="text-center py-8 text-muted-foreground">Cargando...</td></tr>
+							{:else if items.length === 0}
+								<tr><td colspan="5" class="text-center py-8 text-muted-foreground">No se encontraron registros</td></tr>
+							{:else}
+								{#each items as item (item.id)}
+									<tr 
+										class="border-b cursor-pointer transition-colors hover:bg-muted/50 {selectedItem?.id === item.id ? 'bg-muted' : ''}"
+										onclick={() => selectItem(item)}
+									>
+										<td class="px-3 py-2 font-mono text-xs text-muted-foreground">{item.id}</td>
+										<td class="px-3 py-2 font-mono font-medium">{item.rfc}</td>
+										<td class="px-3 py-2">{item.name}</td>
+										<td class="px-3 py-2">
+											{#if item.client_or_provider === 'client'}
+												<span class="inline-flex items-center rounded-full bg-blue-100 px-2 py-0.5 text-xs font-medium text-blue-700">Cliente</span>
+											{:else if item.client_or_provider === 'provider'}
+												<span class="inline-flex items-center rounded-full bg-purple-100 px-2 py-0.5 text-xs font-medium text-purple-700">Proveedor</span>
+											{:else}
+												<span class="inline-flex items-center rounded-full bg-gray-100 px-2 py-0.5 text-xs font-medium text-gray-700">Ambos</span>
+											{/if}
+										</td>
+										<td class="px-3 py-2">
+											<span class="inline-flex items-center rounded-full px-2 py-0.5 text-xs font-medium {item.is_active ? 'bg-green-100 text-green-700' : 'bg-red-100 text-red-700'}">
+												{item.is_active ? 'Activo' : 'Inactivo'}
+											</span>
+										</td>
+									</tr>
+								{/each}
+							{/if}
+						</tbody>
+					</table>
+				</div>
+                <!-- Simple Pagination Controls -->
+                <div class="p-2 border-t flex justify-end gap-2">
+                    <Button 
+                        variant="outline" 
+                        size="sm" 
+                        disabled={currentPage === 1 || isLoading}
+                        onclick={() => loadItems(currentPage - 1)}
+                    >
+                        Anterior
+                    </Button>
+                    <span class="flex items-center text-xs text-muted-foreground px-2">
+                        Página {currentPage} de {Math.ceil(totalItems / pageSize)}
+                    </span>
+                    <Button 
+                        variant="outline" 
+                        size="sm" 
+                        disabled={items.length < pageSize || isLoading}
+                        onclick={() => loadItems(currentPage + 1)}
+                    >
+                        Siguiente
+                    </Button>
+                </div>
+			</div>
+		</div>
+
+		<!-- Right Panel: Details -->
+		<div class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden">
+			<div class="p-4 border-b bg-card">
+				<p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">Detalles del Registro</p>
+				<h2 class="text-xl font-black font-mono tracking-tighter truncate" title={selectedItem?.name || ''}>
+					{selectedItem?.name || '---'}
+				</h2>
+                <div class="flex items-center gap-2 mt-1">
+                    <span class="text-xs font-mono text-muted-foreground">{selectedItem?.rfc || ''}</span>
+                </div>
+			</div>
+
+			<div class="flex-1 overflow-auto p-5 space-y-6 bg-card">
+				{#if selectedItem}
+					<div class="grid grid-cols-1 gap-4">
+                        <div class="space-y-1">
+                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                <Users size={10} /> Tipo
+                             </Label>
+                             <p class="text-sm font-medium capitalize">{selectedItem.client_or_provider}</p>
+                        </div>
+                        
+                        {#if selectedItem.address}
+                         <div class="pt-4 border-t space-y-3">
+                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                <MapPin size={10} /> Dirección
+                             </Label>
+                             <div class="text-sm space-y-1">
+                                <p>{selectedItem.address.streets || ''} {selectedItem.address.exterior_number || ''} {selectedItem.address.interior_number ? 'Int ' + selectedItem.address.interior_number : ''}</p>
+                                <p>{selectedItem.address.neighborhood || ''}</p>
+                                <p>{selectedItem.address.city || ''}, {selectedItem.address.state || ''}</p>
+                                <p>{selectedItem.address.postal_code || ''}, {selectedItem.address.country || ''}</p>
+                             </div>
+                         </div>
+                         
+                         <div class="pt-4 border-t space-y-3">
+                            <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                               <Hash size={10} /> Contacto
+                            </Label>
+                            {#if selectedItem.address.email}
+                                <div class="flex items-center gap-2 text-sm">
+                                    <Mail size={14} class="text-muted-foreground" />
+                                    <span>{selectedItem.address.email}</span>
+                                </div>
+                            {/if}
+                            {#if selectedItem.address.phone}
+                                <div class="flex items-center gap-2 text-sm">
+                                    <Phone size={14} class="text-muted-foreground" />
+                                    <span>{selectedItem.address.phone}</span>
+                                </div>
+                            {/if}
+                         </div>
+                        {:else}
+                            <div class="p-4 rounded-md bg-yellow-50 dark:bg-yellow-900/10 border border-yellow-200 dark:border-yellow-900">
+                                <p class="text-xs text-yellow-600 dark:text-yellow-400">Sin dirección registrada</p>
+                            </div>
+                        {/if}
+
+                         {#if selectedItem.programs}
+                             <div class="pt-4 border-t space-y-3">
+                                 <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                    <Building2 size={10} /> Programas
+                                 </Label>
+                                 <div class="grid grid-cols-2 gap-2 text-sm">
+                                     <div>
+                                         <span class="text-xs text-muted-foreground block">Programa</span>
+                                         <span class="font-medium">{selectedItem.programs.program || '-'}</span>
+                                     </div>
+                                     <div>
+                                         <span class="text-xs text-muted-foreground block">Número</span>
+                                         <span class="font-medium">{selectedItem.programs.program_number || '-'}</span>
+                                     </div>
+                                      <div>
+                                         <span class="text-xs text-muted-foreground block">TAX ID</span>
+                                         <span class="font-medium">{selectedItem.programs.tax_id || '-'}</span>
+                                     </div>
+                                 </div>
+                             </div>
+                         {/if}
+					</div>
+				{:else}
+					<div class="flex flex-col items-center justify-center h-full text-center text-muted-foreground opacity-50">
+						<Building2 class="h-12 w-12 mb-3" />
+						<p class="text-sm">Selecciona un registro</p>
+					</div>
+				{/if}
+			</div>
+		</div>
+	</div>
+</div>
+
+<!-- Sticky Footer Actions -->
+<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))]">
+	<div class="px-4 py-4 max-w-[1400px] mx-auto">
+		<div class="flex justify-end gap-2">
+			<Button size="sm" href="/dashboard/clients_and_providers/edit">
+				<Plus class="h-4 w-4 mr-1" />
+				Nuevo
+			</Button>
+			<Button variant="outline" size="sm" onclick={handleEdit} disabled={!selectedItem}>
+				Editar
+			</Button>
+			<Button variant="outline" size="sm" onclick={handleDelete} disabled={!selectedItem} class="text-destructive hover:text-destructive">
+				Borrar
+			</Button>
+		</div>
+	</div>
 </div>
diff --git a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
index d2953bb1..30b1ecd6 100644
--- a/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/clients_and_providers/edit/[[id]]/+page.svelte
@@ -11,7 +11,10 @@
     import * as Select from "$lib/components/ui/select";
     import * as Tabs from "$lib/components/ui/tabs";
     import { Switch } from "$lib/components/ui/switch";
-    import { LoaderCircle, ArrowLeft, Save, Building2, MapPin, FileText, Settings } from 'lucide-svelte';
+    import { Badge } from '$lib/components/ui/badge';
+    import { Separator } from '$lib/components/ui/separator';
+    import { LoaderCircle, ArrowLeft, Save, Building2, MapPin, FileText, Settings, User, Trash2 } from 'lucide-svelte';
+    import { toast } from 'svelte-sonner';
 
     // API & Stores
     import { clientsProvidersApi } from "$lib/api/dashboard/a76/clients-providers";
@@ -20,7 +23,9 @@
     // --- CONFIGURACIÓN ---
     let id = $derived($page.params.id); 
     let isEditing = $derived(!!id); 
-    let title = $derived(isEditing ? "Editar Socio Comercial" : "Nuevo Socio Comercial");
+    
+    // State for Tabs
+    let activeTab = $state('general');
 
     const typeLabels: Record<string, string> = {
         client: "Cliente",
@@ -130,6 +135,7 @@
             }
         } catch (e: any) {
             error = "Error al cargar: " + e.message;
+            toast.error(error);
         } finally {
             loading = false;
         }
@@ -137,8 +143,8 @@
 
     // --- ENVÍO DE DATOS ---
     async function handleSubmit() {
-        if (!companyStore.activeCompany) { error = "Selecciona una compañía"; return; }
-        if (!formData.rfc.trim() || !formData.name.trim()) { error = "RFC y Nombre obligatorios"; return; }
+        if (!companyStore.activeCompany) { error = "Selecciona una compañía"; toast.error(error); return; }
+        if (!formData.rfc.trim() || !formData.name.trim()) { error = "RFC y Nombre obligatorios"; toast.error(error); return; }
 
         loading = true;
         error = null;
@@ -191,42 +197,63 @@
 
             if (response.error) throw new Error(response.error);
             
+            toast.success(isEditing ? 'Registro actualizado correctamente' : 'Registro creado correctamente');
             goto('/dashboard/clients_and_providers');
 
         } catch (e: any) {
             console.error(e);
             error = e.message || "Error al guardar";
+            toast.error(error);
         } finally {
             loading = false;
         }
     }
+    
+    function handleCancel() {
+        goto('/dashboard/clients_and_providers');
+    }
 </script>
 
-<div class="w-full mx-auto max-w-6xl py-6 px-4 space-y-6 pb-48">
-    <div class="flex items-center gap-4">
-        <Button variant="outline" size="icon" href="/dashboard/clients_and_providers">
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-2xl font-bold tracking-tight">{title}</h1>
-            <p class="text-muted-foreground">Gestión integral del catálogo de socios comerciales.</p>
+<div class="space-y-3">
+    <!-- Header -->
+    <div class="flex items-center justify-between">
+        <div class="space-y-1">
+            <div class="flex items-center gap-3">
+                <Button variant="ghost" size="icon" onclick={handleCancel}>
+                    <ArrowLeft size={20} />
+                </Button>
+                <h1 class="text-3xl font-bold tracking-tight">
+                    {isEditing ? `Socio Comercial #${id}` : 'Nuevo Socio Comercial'}
+                </h1>
+                {#if isEditing}
+                    <Badge variant={formData.is_active ? 'default' : 'secondary'}>
+                        {formData.is_active ? 'Activo' : 'Inactivo'}
+                    </Badge>
+                {:else}
+                    <Badge variant="default">Nuevo</Badge>
+                {/if}
+            </div>
+            <p class="text-muted-foreground ml-12">
+                {isEditing ? 'Edita la información del cliente o proveedor' : 'Registra un nuevo cliente o proveedor en el sistema'}
+            </p>
         </div>
     </div>
 
-    {#if error}
-        <div class="p-4 rounded-md bg-destructive/10 text-destructive border border-destructive/20 text-sm font-medium">
-            ⚠️ {error}
-        </div>
-    {/if}
+    <Separator />
 
-    <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }} class="space-y-6">
-        <Card.Root>
-            <Card.Content class="p-6">
-                <Tabs.Root value="general" class="w-full">
-                    
-                    <div class="min-h-[400px]">
-                        
-                        <Tabs.Content value="general" class="space-y-4 pt-4">
+    <!-- Main Content with Tabs -->
+    <div class="pb-48"> <!-- Padding bottom for sticky footer -->
+        <form onsubmit={(e) => { e.preventDefault(); handleSubmit(); }}>
+            <Tabs.Root bind:value={activeTab}>
+                
+                <!-- Tab Panel: General -->
+                <Tabs.Content value="general">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Información General</Card.Title>
+                            <Card.Description>Datos principales de identificación y clasificación.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-4">
                             <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
                                 <div class="grid gap-2">
                                     <Label for="rfc">RFC <span class="text-destructive">*</span></Label>
@@ -287,9 +314,18 @@
                                     <Input id="position" bind:value={formData.position} disabled={loading} />
                                 </div>
                             </div>
-                        </Tabs.Content>
+                        </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
 
-                        <Tabs.Content value="address" class="space-y-4 pt-4">
+                <!-- Tab Panel: Address -->
+                <Tabs.Content value="address">
+                     <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Dirección y Contacto</Card.Title>
+                            <Card.Description>Ubicación fiscal y datos de contacto.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-4">
                             <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                                 <div class="grid gap-2">
                                     <Label for="street">Calle</Label>
@@ -337,7 +373,9 @@
                                 </div>
                             </div>
 
-                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4 pt-4 border-t">
+                            <Separator class="my-4" />
+
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
                                 <div class="grid gap-2">
                                     <Label for="email">Email de Contacto</Label>
                                     <Input id="email" type="email" bind:value={formData.email} disabled={loading} />
@@ -347,9 +385,18 @@
                                     <Input id="phone" bind:value={formData.phone} disabled={loading} />
                                 </div>
                             </div>
-                        </Tabs.Content>
+                        </Card.Content>
+                     </Card.Root>
+                </Tabs.Content>
 
-                        <Tabs.Content value="programs" class="space-y-4 pt-4">
+                <!-- Tab Panel: Programs -->
+                <Tabs.Content value="programs">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Programas y Certificaciones</Card.Title>
+                            <Card.Description>Información sobre IMMEX, PROSEC y otras certificaciones.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-4">
                             <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
                                 <div class="grid gap-2">
                                     <Label for="program">Programa</Label>
@@ -386,9 +433,18 @@
                                     <Input id="prosec" type="number" bind:value={formData.prosec} disabled={loading} />
                                 </div>
                             </div>
-                        </Tabs.Content>
+                        </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
 
-                        <Tabs.Content value="config" class="space-y-4 pt-4">
+                <!-- Tab Panel: Settings -->
+                <Tabs.Content value="config">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Configuración</Card.Title>
+                            <Card.Description>Ajustes de estado y atributos especiales.</Card.Description>
+                        </Card.Header>
+                         <Card.Content class="space-y-4">
                              <div class="grid grid-cols-1 gap-6 md:grid-cols-2">
                                 <div class="flex items-center gap-3 p-4 border rounded-lg bg-card">
                                     <Switch id="is_active" bind:checked={formData.is_active} disabled={loading} />
@@ -405,49 +461,57 @@
                                     </div>
                                 </div>
                             </div>
-                        </Tabs.Content>
-                    </div>
+                         </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
+            </Tabs.Root>
+        </form>
+    </div>
+</div>
 
-                    <Tabs.List class="grid grid-cols-4 fixed bottom-24 left-1/2 -translate-x-1/2 w-[95%] max-w-2xl z-40 shadow-2xl bg-background border p-1 rounded-xl">
-                        <Tabs.Trigger value="general" class="flex gap-2 items-center justify-center">
-                            <Building2 class="h-4 w-4 hidden sm:block" /> General
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="address" class="flex gap-2 items-center justify-center">
-                            <MapPin class="h-4 w-4 hidden sm:block" /> Dirección
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="programs" class="flex gap-2 items-center justify-center">
-                            <FileText class="h-4 w-4 hidden sm:block" /> Programas
-                        </Tabs.Trigger>
-                        <Tabs.Trigger value="config" class="flex gap-2 items-center justify-center">
-                            <Settings class="h-4 w-4 hidden sm:block" /> Config
-                        </Tabs.Trigger>
-                    </Tabs.List>
-
-                </Tabs.Root>
-            </Card.Content>
-        </Card.Root>
-
-        <div class="fixed bottom-0 right-0 left-0 md:left-64 p-4 border-t bg-background/95 backdrop-blur z-50">
-            <div class="max-w-6xl mx-auto flex justify-end gap-4">
-                <Button type="button" variant="ghost" onclick={() => goto('/dashboard/clients_and_providers')} disabled={loading}>
-                    Cancelar
-                </Button>
-                
-                {#if !isEditing}
-                    <Button type="button" variant="outline" onclick={() => formData = getEmptyForm()} disabled={loading}>
-                        Limpiar
-                    </Button>
-                {/if}
-
-                <Button type="submit" disabled={loading} class="min-w-[140px]">
-                    {#if loading}
-                        <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
-                    {:else}
-                        <Save class="mr-2 h-4 w-4" />
-                    {/if}
-                    {isEditing ? 'Actualizar' : 'Guardar'}
-                </Button>
+<!-- Sticky Footer -->
+<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))]">
+    <div class="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
+        <!-- Tabs Navigation in Footer -->
+        <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-4">
+                    <Tabs.Trigger value="general" class="whitespace-nowrap">
+                        <Building2 size={16} class="mr-2" /> General
+                    </Tabs.Trigger>
+                    <Tabs.Trigger value="address" class="whitespace-nowrap">
+                        <MapPin size={16} class="mr-2" /> Dirección
+                    </Tabs.Trigger>
+                    <Tabs.Trigger value="programs" class="whitespace-nowrap">
+                        <FileText size={16} class="mr-2" /> Programas
+                    </Tabs.Trigger>
+                    <Tabs.Trigger value="config" class="whitespace-nowrap">
+                        <Settings size={16} class="mr-2" /> Config
+                    </Tabs.Trigger>
+                </Tabs.List>
             </div>
+        </Tabs.Root>
+
+        <!-- Actions -->
+        <div class="flex justify-end gap-3">
+            <Button variant="outline" onclick={handleCancel} disabled={loading}>
+                Cancelar
+            </Button>
+            {#if !isEditing}
+                 <Button variant="outline" onclick={() => formData = getEmptyForm()} disabled={loading}>
+                    <!-- <Trash2 size={16} class="mr-2" /> -->
+                    Limpiar
+                </Button>
+            {/if}
+            <Button onclick={handleSubmit} disabled={loading}>
+                {#if loading}
+                    <LoaderCircle class="mr-2 h-4 w-4 animate-spin" />
+                    Guardando...
+                {:else}
+                    <Save size={16} class="mr-2" />
+                    {isEditing ? 'Actualizar Socio' : 'Guardar Socio'}
+                {/if}
+            </Button>
         </div>
-    </form>
+    </div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/customs_brokers/+page.svelte b/frontend/src/routes/dashboard/customs_brokers/+page.svelte
index 19b39457..a1a68f0b 100644
--- a/frontend/src/routes/dashboard/customs_brokers/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/+page.svelte
@@ -1,286 +1,333 @@
 <script lang="ts">
     import { onMount } from 'svelte';
     import { customsBrokersApi, type CustomsBroker } from '$lib/api/dashboard/a76/customs-brokers';
-    import DataTable from '$lib/components/dashboard/customs_brokers/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/customs_brokers/columns.js';
-    import CreateDialog from '$lib/components/dashboard/customs_brokers/create-dialog.svelte';
-    import * as Card from '$lib/components/ui/card';
     import { Button } from '$lib/components/ui/button';
     import { Input } from '$lib/components/ui/input';
     import { Label } from '$lib/components/ui/label';
-    import type { PageData } from './$types';
-    import { browser } from '$app/environment';
+    import { Plus, RefreshCw, Building2, MapPin, Mail, Phone, FileText, Hash } from 'lucide-svelte';
+    import { toast } from 'svelte-sonner';
     import { companyStore } from '$lib/stores/company.svelte';
-    import { Plus, Search, Trash2, Loader2 } from 'lucide-svelte';
+    import { browser } from '$app/environment';
+    import { goto } from '$app/navigation';
+    import { page } from '$app/stores';
 
-    let { data }: { data: PageData } = $props();
-    let showCreateDialog = $state(false);
-
-    let brokersList = $state<CustomsBroker[]>(data.brokers || []);
-    let listLoading = $state(false);
-    let listError = $state<string | null>(data.error || null);
-
-    // Estado para búsqueda
-    let searchKey = $state('');
-    let searchedBroker = $state<CustomsBroker | null>(null);
-    let searchLoading = $state(false);
-    let searchError = $state<string | null>(null);
+    let { data }: { data: any } = $props();
 
+    // State
+    let items = $state<CustomsBroker[]>(data.items || []);
+    let selectedItem = $state<CustomsBroker | null>(null);
+    let isLoading = $state(false);
     
-    let lastLoadedCompanyId = $state<string>(data.currentCompanyId?.toString() || "");
+    // Server-side filtering/pagination (assuming API supports it or we filter client-side if list is short)
+    let allItemsRaw = $state<CustomsBroker[]>(data.brokers || []); 
+    
+    // Filter state
+    let searchName = $state('');
+    let searchPatent = $state('');
 
-    $effect(() => {
-        const currentId = companyStore.activeCompany?.id?.toString();
-        
-       
-        if (browser && currentId && currentId !== lastLoadedCompanyId) {
-            lastLoadedCompanyId = currentId;
-           
-            reloadData(false);
-        }
-    });
+    // Pagination state
+    let currentPage = $state(1);
+    let pageSize = $state(50);
 
+    // Derived filtered items
+    let filteredItems = $derived(
+        allItemsRaw.filter(item => {
+            const matchesName = !searchName || (item.name?.toLowerCase().includes(searchName.toLowerCase()) ?? false);
+            const matchesPatent = !searchPatent || (item.broker_key?.toLowerCase().includes(searchPatent.toLowerCase()) ?? false);
+            return matchesName && matchesPatent;
+        })
+    );
+
+    let paginatedItems = $derived(
+        filteredItems.slice((currentPage - 1) * pageSize, currentPage * pageSize)
+    );
+
+    let totalItems = $derived(filteredItems.length);
+
+    // --- Lifecycle ---
+    
     onMount(() => {
         if (browser) {
-            const getCookie = (name: string): string | null => {
-                const value = `; ${document.cookie}`;
-                const parts = value.split(`; ${name}=`);
-                if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
-                return null;
-            };
-
-            const cookieToken = getCookie('access_token');
-            const localToken = localStorage.getItem('access_token');
-            if (cookieToken && cookieToken !== localToken) localStorage.setItem('access_token', cookieToken);
-
-            const cookieRefreshToken = getCookie('refresh_token');
-            const localRefreshToken = localStorage.getItem('refresh_token');
-            if (cookieRefreshToken && cookieRefreshToken !== localRefreshToken) localStorage.setItem('refresh_token', cookieRefreshToken);
+            const handleCompanyChange = () => loadItems(); 
+            window.addEventListener('companyChanged', handleCompanyChange);
+            return () => window.removeEventListener('companyChanged', handleCompanyChange);
         }
     });
 
-    async function handleSearch() {
-        if (!searchKey.trim()) {
-            searchError = 'Por favor ingresa una clave de agente aduanal';
-            return;
-        }
+    // --- Actions ---
 
-        searchLoading = true;
-        searchError = null;
-        searchedBroker = null;
+    async function loadItems() {
+        const companyId = companyStore.activeCompany?.id;
+        if (!companyId) return;
 
+        isLoading = true;
         try {
-            const companyId = companyStore.activeCompany?.id.toString() || '';
-            const response = await customsBrokersApi.get(searchKey.trim(), companyId);
-
-            if (response.error) {
-                if (response.status === 404) {
-                    searchError = 'No se encontró un agente aduanal con esta clave';
-                } else if (response.status === 401 || response.status === 403) {
-                    searchError = 'Sesión expirada. Recargando página...';
-                    setTimeout(() => window.location.reload(), 2000);
-                } else {
-                    searchError = response.error;
-                }
-                return;
+            const response = await customsBrokersApi.list(companyId.toString());
+            
+            // Handle response wrapper
+            if ((response as any).error) { 
+                 toast.error((response as any).error);
+                 return;
             }
 
-            if (response.data) {
-                searchedBroker = response.data;
+            // Normalizing data structure
+            const data = (response as any).data || response;
+            if (Array.isArray(data)) {
+                allItemsRaw = data;
+            } else if ((data as any).items) {
+                 allItemsRaw = (data as any).items;
             }
-        } catch (e) {
-            searchError = 'Error al buscar agente aduanal';
-            console.error('Error searching broker:', e);
+
+            currentPage = 1;
+
+        } catch (e: any) {
+            console.error('Error loading items:', e);
+            toast.error('Error al cargar datos');
         } finally {
-            searchLoading = false;
+            isLoading = false;
         }
     }
+    
+    function handleSearch() {
+        currentPage = 1; 
+    }
 
-    /**
-     * Recarga los datos.
-     * @param silent Si es true, NO bloquea la tabla con el spinner 
-     */
-    async function reloadData(silent = false) {
-        searchKey = '';
-        searchedBroker = null;
-        searchError = null;
-        
-        if (!companyStore.activeCompany) return;
-        
-        if (!silent) {
-            listLoading = true;
-        }
-        
-        listError = null;
+    function selectItem(item: CustomsBroker) {
+        selectedItem = item;
+    }
 
+    function handleEdit() {
+        if (selectedItem) goto(`/dashboard/customs_brokers/edit/${selectedItem.broker_key}`); 
+    }
+
+    async function handleDelete() {
+        if (!selectedItem || !companyStore.activeCompany?.id) return;
+        if (!confirm('¿Estás seguro de eliminar este Agente Aduanal?')) return;
+        
         try {
-            const response = await customsBrokersApi.list(companyStore.activeCompany.id.toString());
-
-            if (response.error) {
-                console.error('📊 [CustomsBrokers] Error en reloadData:', response.error);
-                if (response.status === 401 || response.status === 403) {
-                    listError = 'Sesión expirada. Recargando página...';
-                    setTimeout(() => window.location.reload(), 2000);
-                } else {
-                    if (!silent) listError = response.error;
-                }
-                return;
-            }
-
-            if (response.data) {
-                if (Array.isArray(response.data)) {
-                     brokersList = response.data;
-                } else if (typeof response.data === 'object' && 'items' in response.data) {
-                     const dataWithItems = response.data as { items?: CustomsBroker[] };
-                     if (Array.isArray(dataWithItems.items)) {
-                         brokersList = dataWithItems.items;
-                     } else {
-                         brokersList = [];
-                     }
-                } else {
-                     console.error("⚠️ Estructura de datos inesperada:", response.data);
-                     brokersList = [];
-                }
-            }
+            await customsBrokersApi.delete(selectedItem.broker_key, companyStore.activeCompany.id.toString());
+            toast.success('Agente eliminado');
+            selectedItem = null;
+            loadItems();
         } catch (e) {
-            listError = 'Error recargando datos';
-            console.error('📊 [CustomsBrokers] Error reloading:', e);
-        } finally {
-            listLoading = false;
+            toast.error('Error al eliminar');
         }
     }
 
-    function handleCreateClick() {
-        showCreateDialog = true;
-    }
-
-    function handleSuccess() {
-        reloadData(false);
-    }
-
-    const columns = createColumns(handleSuccess);
-    const brokers = $derived(searchedBroker ? [searchedBroker] : brokersList);
 </script>
 
-<div class="space-y-6">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-3xl font-bold tracking-tight">Agentes Aduanales</h1>
-            <p class="text-muted-foreground">
-                Gestiona el catálogo de agentes aduanales
-            </p>
-        </div>
-        <Button href="/dashboard/customs_brokers/edit" >
-            <Plus class="mr-2" size={16} />
-            Nuevo Agente Aduanal
-        </Button>
+<div class="flex flex-col h-[calc(100vh-4rem)] p-4 gap-4 pb-15">
+    <!-- Title -->
+    <div class="flex flex-col gap-1">
+        <h1 class="text-2xl font-bold">AGENTES ADUANALES</h1>
+        <p class="text-sm text-muted-foreground">
+            Catálogo de agentes aduanales y apoderados legales
+        </p>
     </div>
 
-    <Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-        <Card.Header>
-            <Card.Description>
-                Ingresa la clave del agente aduanal para buscarlo
-                {#if companyStore.activeCompany}
-                    - Compañía: {companyStore.activeCompany.name}
-                {/if}
-            </Card.Description>
-        </Card.Header>
-        <Card.Content>
-            <form onsubmit={(e) => { e.preventDefault(); handleSearch(); }} class="space-y-4">
-                <div class="flex gap-4">
-                    <div class="flex-1 space-y-2">
-                        <Label for="search-key">Clave del Agente Aduanal</Label>
-                        <Input
-                            id="search-key"
-                            bind:value={searchKey}
-                            placeholder="Ej: 12345"
-                            maxlength={5}
-                            disabled={searchLoading}
-                        />
+    <div class="flex-1 flex gap-4 overflow-hidden">
+        <!-- Left Panel: Table -->
+        <div class="flex-1 flex flex-col gap-4 overflow-hidden">
+            <!-- Filters -->
+            <div class="border rounded-lg bg-card">
+                <div class="p-4 space-y-4">
+                    <div class="flex items-center justify-between">
+                        <h2 class="text-sm font-semibold">Filtros</h2>
+                        <span class="text-xs text-muted-foreground">Busque por nombre o patente</span>
                     </div>
-                    <div class="flex items-end gap-2">
-                        <Button type="submit" disabled={searchLoading}>
-                            {#if searchLoading}
-                                <Loader2 class="mr-2 h-4 w-4 animate-spin" />
-                                Buscando...
-                            {:else}
-                                <Search class="mr-2" size={16} />
-                                Buscar
-                            {/if}
-                        </Button>
-                        {#if searchedBroker}
-                            <Button type="button" variant="outline" onclick={() => reloadData(false)}>
-                                <Trash2 class="mr-2" size={16} />
-                                Limpiar
-                            </Button>
-                        {/if}
-                    </div>
-                </div>
-
-                {#if searchError}
-                    <div class="rounded-lg border border-destructive bg-destructive/10 p-3 text-sm text-destructive">
-                        {searchError}
-                    </div>
-                {/if}
-            </form>
-        </Card.Content>
-    </Card.Root>
-
-    <Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-        <Card.Header>
-            <div class="flex items-center justify-between">
-                <div>
-                    <Card.Title>
-                        {#if searchedBroker}
-                            Resultado de la Búsqueda
-                        {:else}
-                            Agentes Aduanales
-                        {/if}
-                    </Card.Title>
-                    <Card.Description>
-                        {#if searchedBroker}
-                            Se encontró 1 agente aduanal
-                        {:else}
-                            Total: {brokersList.length} agente{brokersList.length !== 1 ? 's' : ''} aduanal{brokersList.length !== 1 ? 'es' : ''}
-                        {/if}
-                    </Card.Description>
-                </div>
-            </div>
-        </Card.Header>
-        
-        <Card.Content class="relative min-h-[200px]">
-            {#if listError}
-                <div class="rounded-lg border border-destructive bg-destructive/10 p-4 text-sm text-destructive">
-                    {listError}
-                </div>
-            {:else}
-                
-                {#if listLoading}
-                    <div class="absolute inset-0 z-10 flex items-center justify-center bg-background/60 backdrop-blur-[1px] rounded-lg transition-all duration-300">
-                        <div class="flex items-center gap-2 rounded-full bg-background px-4 py-2 shadow-lg border animate-in fade-in zoom-in duration-300">
-                            <Loader2 class="h-4 w-4 animate-spin text-primary" />
-                            <span class="text-sm font-medium">Actualizando...</span>
+                    <div class="grid grid-cols-3 gap-4">
+                        <div class="space-y-2">
+                            <Label class="text-xs">Nombre</Label>
+                            <Input 
+                                bind:value={searchName} 
+                                placeholder="Buscar por nombre..." 
+                                class="h-9"
+                                oninput={handleSearch}
+                            />
+                        </div>
+                        <div class="space-y-2">
+                            <Label class="text-xs">Patente / Clave</Label>
+                            <Input 
+                                bind:value={searchPatent} 
+                                placeholder="Num. Patente..." 
+                                class="h-9"
+                                oninput={handleSearch}
+                            />
+                        </div>
+                        <div class="flex items-end">
+                             <!-- Placeholder for layout balance -->
                         </div>
                     </div>
-                {/if}
-
-                <div class={listLoading ? 'opacity-50 transition-opacity duration-300' : 'transition-opacity duration-300'}>
-                    <DataTable
-                        data={brokers}
-                        {columns}
-                    />
                 </div>
-            {/if}
-        </Card.Content>
-    </Card.Root>
+            </div>
+
+            <!-- Table -->
+            <div class="flex-1 flex flex-col border rounded-lg overflow-hidden">
+                <div class="flex items-center justify-between p-3 border-b bg-muted/30">
+                    <h2 class="text-sm font-semibold">Listado</h2>
+                    <div class="flex items-center gap-2">
+                        <span class="text-xs text-muted-foreground">
+                            {filteredItems.length} registros
+                        </span>
+                        <Button variant="outline" size="sm" onclick={loadItems}>
+                            <RefreshCw class="h-4 w-4 mr-2" />
+                            Actualizar
+                        </Button>
+                    </div>
+                </div>
+
+                <div class="flex-1 overflow-auto bg-card">
+                    <table class="w-full text-sm">
+                        <thead class="bg-muted text-muted-foreground border-b">
+                            <tr>
+                                <th class="px-3 py-2 text-left w-24">Patente</th>
+                                <th class="px-3 py-2 text-left">Nombre</th>
+                                <th class="px-3 py-2 text-left">Licencia</th>
+                                <th class="px-3 py-2 text-left">Ciudad</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            {#if isLoading}
+                                <tr><td colspan="4" class="text-center py-8 text-muted-foreground">Cargando...</td></tr>
+                            {:else if paginatedItems.length === 0}
+                                <tr><td colspan="4" class="text-center py-8 text-muted-foreground">No se encontraron registros</td></tr>
+                            {:else}
+                                {#each paginatedItems as item (item.broker_key)}
+                                    <tr 
+                                        class="border-b cursor-pointer transition-colors hover:bg-muted/50 {selectedItem?.broker_key === item.broker_key ? 'bg-muted' : ''}"
+                                        onclick={() => selectItem(item)}
+                                    >
+                                        <td class="px-3 py-2 font-mono font-bold">{item.broker_key}</td>
+                                        <td class="px-3 py-2 font-medium">{item.name || '-'}</td>
+                                        <td class="px-3 py-2 text-muted-foreground">{item.license || '-'}</td>
+                                        <td class="px-3 py-2 text-muted-foreground">{item.city || '-'}</td>
+                                    </tr>
+                                {/each}
+                            {/if}
+                        </tbody>
+                    </table>
+                </div>
+                 <!-- Simple Pagination Controls -->
+                 {#if totalItems > pageSize}
+                    <div class="p-2 border-t flex justify-end gap-2">
+                        <Button 
+                            variant="outline" 
+                            size="sm" 
+                            disabled={currentPage === 1}
+                            onclick={() => currentPage--}
+                        >
+                            Anterior
+                        </Button>
+                        <span class="flex items-center text-xs text-muted-foreground px-2">
+                            Página {currentPage} de {Math.ceil(totalItems / pageSize)}
+                        </span>
+                        <Button 
+                            variant="outline" 
+                            size="sm" 
+                            disabled={currentPage * pageSize >= totalItems}
+                            onclick={() => currentPage++}
+                        >
+                            Siguiente
+                        </Button>
+                    </div>
+                 {/if}
+            </div>
+        </div>
+
+        <!-- Right Panel: Details -->
+        <div class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden">
+            <div class="p-4 border-b bg-card">
+                <p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">Detalles del Agente</p>
+                <h2 class="text-xl font-black font-mono tracking-tighter truncate" title={selectedItem?.name || ''}>
+                    {selectedItem?.name || '---'}
+                </h2>
+                <div class="flex items-center gap-2 mt-1">
+                    <span class="text-xs font-mono text-muted-foreground">Patente: {selectedItem?.broker_key || ''}</span>
+                </div>
+            </div>
+
+            <div class="flex-1 overflow-auto p-5 space-y-6 bg-card">
+                {#if selectedItem}
+                    <div class="grid grid-cols-1 gap-4">
+                        <div class="space-y-1">
+                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                <FileText size={10} /> Licencia / Autorización
+                             </Label>
+                             <p class="text-sm font-medium">{selectedItem.license || '-'}</p>
+                        </div>
+
+                         {#if selectedItem.tax_id}
+                            <div class="space-y-1">
+                                <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                   <Hash size={10} /> RFC / Tax ID
+                                </Label>
+                                <p class="text-sm font-mono">{selectedItem.tax_id}</p>
+                           </div>
+                         {/if}
+                        
+                         <div class="pt-4 border-t space-y-3">
+                             <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                                <MapPin size={10} /> Dirección
+                             </Label>
+                             <div class="text-sm space-y-1">
+                                <p>{selectedItem.address || ''}</p>
+                                <p>
+                                    {[selectedItem.city, selectedItem.state].filter(Boolean).join(', ')}
+                                </p>
+                                <p>
+                                    {[selectedItem.postal_code, selectedItem.country].filter(Boolean).join(', ')}
+                                </p>
+                             </div>
+                         </div>
+                         
+                         <div class="pt-4 border-t space-y-3">
+                            <Label class="text-[10px] uppercase text-muted-foreground font-bold flex items-center gap-1">
+                               <Phone size={10} /> Contacto
+                            </Label>
+                            {#if selectedItem.email}
+                                <div class="flex items-center gap-2 text-sm">
+                                    <Mail size={14} class="text-muted-foreground" />
+                                    <span>{selectedItem.email}</span>
+                                </div>
+                            {/if}
+                            {#if selectedItem.phone}
+                                <div class="flex items-center gap-2 text-sm">
+                                    <Phone size={14} class="text-muted-foreground" />
+                                    <span>{selectedItem.phone}</span>
+                                </div>
+                            {/if}
+                             {#if selectedItem.contact}
+                                <div class="mt-2 text-xs text-muted-foreground">
+                                    <span class="font-bold">Contacto:</span> {selectedItem.contact}
+                                </div>
+                            {/if}
+                         </div>
+                    </div>
+                {:else}
+                    <div class="flex flex-col items-center justify-center h-full text-center text-muted-foreground opacity-50">
+                        <Building2 class="h-12 w-12 mb-3" />
+                        <p class="text-sm">Selecciona un agente</p>
+                    </div>
+                {/if}
+            </div>
+        </div>
+    </div>
 </div>
 
-<CreateDialog 
-    bind:open={showCreateDialog} 
-    companyId={companyStore.activeCompany?.id.toString() || ''}
-    onSave={async (data) => {
-        // El CreateDialog maneja la creación internamente
-        // Después de guardar exitosamente, recargar los datos
-        await handleSuccess();
-    }}
-/>
\ No newline at end of file
+<!-- Sticky Footer Actions -->
+<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))]">
+    <div class="px-4 py-4 max-w-[1400px] mx-auto">
+        <div class="flex justify-end gap-2">
+            <Button size="sm" href="/dashboard/customs_brokers/edit">
+                <Plus class="h-4 w-4 mr-1" />
+                Nuevo
+            </Button>
+            <Button variant="outline" size="sm" onclick={handleEdit} disabled={!selectedItem}>
+                Editar
+            </Button>
+            <Button variant="outline" size="sm" onclick={handleDelete} disabled={!selectedItem} class="text-destructive hover:text-destructive">
+                Borrar
+            </Button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
index 3c6f823f..3da1d7cf 100644
--- a/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/customs_brokers/edit/[[id]]/+page.svelte
@@ -9,7 +9,11 @@
     import { Input } from '$lib/components/ui/input';
     import { Label } from '$lib/components/ui/label';
     import { Separator } from "$lib/components/ui/separator";
-    import { ArrowLeft, Loader2, Save, User, Phone, MapPin } from 'lucide-svelte';
+    import { Badge } from '$lib/components/ui/badge';
+    import * as Tabs from "$lib/components/ui/tabs";
+    import * as Card from "$lib/components/ui/card";
+    import { ArrowLeft, Loader2, Save, User, Phone, MapPin, Settings, FileText, Hash } from 'lucide-svelte';
+    import { toast } from 'svelte-sonner';
 
     // --- 1. LÓGICA DE IDENTIFICACIÓN ---
     let routeId = $derived($page.params.id);
@@ -58,8 +62,9 @@
         loading = true;
         try {
             const res = await customsBrokersApi.get(key, cId);
-            if (res.data) {
-                const d = res.data;
+            const d = (res as any).data || res; // Handle wrapper or direct
+
+            if (d && !d.error) {
                 // Mapeo exhaustivo para asegurar reactividad
                 formData = {
                     broker_key: d.broker_key || "",
@@ -82,11 +87,13 @@
                     company_id: cId
                 };
                 dataLoaded = true;
-            } else if (res.error) {
-                error = res.error;
+            } else if (d.error) {
+                error = d.error;
+                toast.error(error);
             }
-        } catch (e) {
+        } catch (e: any) {
             error = "Error al conectar con el servidor";
+            toast.error(error);
         } finally {
             loading = false;
         }
@@ -94,182 +101,227 @@
 
     // --- 4. GUARDADO ---
     async function handleSave() {
+        if (!companyStore.activeCompany) {
+             toast.error("Selecciona una compañía");
+             return;
+        }
         if (!formData.broker_key?.trim() || !formData.license?.trim()) {
             error = "Clave y Patente son obligatorios";
+            toast.error(error);
             return;
         }
 
         loading = true;
         error = null;
         try {
-            const cId = companyStore.activeCompany?.id.toString() || "";
+            const cId = companyStore.activeCompany.id.toString();
+            // Ensure company_id is set
+            formData.company_id = cId;
+            
             const res = isEdit 
                 ? await customsBrokersApi.update(routeId!, formData, cId)
                 : await customsBrokersApi.create(formData, cId);
             
-            if (res.error) throw new Error(res.error);
+            if ((res as any).error) throw new Error((res as any).error);
+            
+            toast.success(isEdit ? 'Agente actualizado' : 'Agente creado');
             goto('/dashboard/customs_brokers');
         } catch (e: any) {
             error = e.message || "Error al procesar la solicitud";
+            toast.error(error);
         } finally {
             loading = false;
         }
     }
+    
+    function handleCancel() {
+        goto('/dashboard/customs_brokers');
+    }
 </script>
 
-<div class="w-full mx-auto max-w-5xl py-6 px-4 pb-40">
-    <div class="flex items-center gap-4 mb-8">
-        <Button variant="outline" size="icon" href="/dashboard/customs_brokers">
-            <ArrowLeft class="h-4 w-4" />
-        </Button>
-        <div>
-            <h1 class="text-3xl font-bold tracking-tight">{title}</h1>
-            <p class="text-muted-foreground text-sm">
-                {isEdit ? `Modificando registro: ${routeId}` : 'Completa la información para el nuevo Agente.'}
+<div class="space-y-3">
+    <!-- Header -->
+    <div class="flex items-center justify-between">
+        <div class="space-y-1">
+            <div class="flex items-center gap-3">
+                <Button variant="ghost" size="icon" onclick={handleCancel}>
+                    <ArrowLeft size={20} />
+                </Button>
+                <h1 class="text-3xl font-bold tracking-tight">
+                   {isEdit ? `Agente ${formData.broker_key}` : 'Nuevo Agente Aduanal'}
+                </h1>
+                <Badge variant={isEdit ? 'outline' : 'default'}>
+                    {isEdit ? 'Edición' : 'Nuevo'}
+                </Badge>
+            </div>
+            <p class="text-muted-foreground ml-12">
+                {isEdit ? 'Modifica la información del agente aduanal' : 'Registra un nuevo agente aduanal en el sistema'}
             </p>
         </div>
     </div>
 
-    {#if error}
-        <div class="bg-destructive/10 text-destructive p-4 rounded-lg mb-6 border border-destructive/20 flex items-center gap-2 animate-in fade-in zoom-in duration-200">
-            <span class="text-lg">⚠️</span> {error}
-        </div>
-    {/if}
+    <Separator />
 
-    <div class="bg-card border rounded-2xl shadow-sm overflow-hidden">
-        <div class="flex bg-muted/50 p-1 gap-1 border-b">
-            {#each [
-                { id: 'general', label: 'Identificación', icon: User },
-                { id: 'contacto', label: 'Contacto', icon: Phone },
-                { id: 'direccion', label: 'Dirección', icon: MapPin }
-            ] as tab}
-                <button 
-                    type="button"
-                    class="flex items-center justify-center gap-2 flex-1 py-2.5 text-sm font-medium rounded-lg transition-all
-                    {activeTab === tab.id 
-                        ? 'bg-background text-foreground shadow-sm' 
-                        : 'text-muted-foreground hover:bg-background/50 hover:text-foreground'}"
-                    onclick={() => activeTab = tab.id}
-                >
-                    <tab.icon class="h-4 w-4" />
-                    {tab.label}
-                </button>
-            {/each}
-        </div>
-
-        <div class="p-8">
-            <form onsubmit={(e) => { e.preventDefault(); handleSave(); }}>
+    <!-- Main Content -->
+    <div class="pb-48">
+        <form onsubmit={(e) => { e.preventDefault(); handleSave(); }}>
+            <Tabs.Root bind:value={activeTab}>
                 
-                {#if activeTab === 'general'}
-                    <div class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300">
-                        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                            <div class="grid gap-2">
-                                <Label class="required">Clave Agente</Label>
-                                <Input bind:value={formData.broker_key} placeholder="Ej. 550" disabled={isEdit || loading} />
+                <!-- Tab: General -->
+                <Tabs.Content value="general">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Información General</Card.Title>
+                            <Card.Description>Identificación oficial del agente y patente.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-6">
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                                <div class="grid gap-2">
+                                    <Label class="required">Clave Agente <span class="text-destructive">*</span></Label>
+                                    <Input bind:value={formData.broker_key} placeholder="Ej. 550" disabled={isEdit || loading} />
+                                    <p class="text-xs text-muted-foreground">Clave interna o número de patente único.</p>
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label class="required">Patente / Autorización <span class="text-destructive">*</span></Label>
+                                    <Input bind:value={formData.license} placeholder="Ej. 3421" disabled={loading} />
+                                </div>
                             </div>
+                            
+                            <Separator />
+                            
                             <div class="grid gap-2">
-                                <Label class="required">Patente</Label>
-                                <Input bind:value={formData.license} placeholder="Ej. 3421" disabled={loading} />
+                                <Label>Nombre / Razón Social</Label>
+                                <Input bind:value={formData.name} placeholder="Nombre oficial" disabled={loading} />
                             </div>
-                        </div>
-                        <div class="grid gap-2">
-                            <Label>Nombre / Razón Social</Label>
-                            <Input bind:value={formData.name} placeholder="Nombre oficial" disabled={loading} />
-                        </div>
-                        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                            <div class="grid gap-2">
-                                <Label>RFC</Label>
-                                <Input bind:value={formData.tax_id} placeholder="RFC de la empresa" disabled={loading} />
+                            
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                                <div class="grid gap-2">
+                                    <Label>RFC</Label>
+                                    <Input bind:value={formData.tax_id} placeholder="RFC de la empresa" disabled={loading} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label>CURP</Label>
+                                    <Input bind:value={formData.personal_id} placeholder="CURP si aplica" disabled={loading} />
+                                </div>
                             </div>
-                            <div class="grid gap-2">
-                                <Label>CURP</Label>
-                                <Input bind:value={formData.personal_id} placeholder="CURP si aplica" disabled={loading} />
-                            </div>
-                        </div>
-                    </div>
+                        </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
 
-                {:else if activeTab === 'contacto'}
-                    <div class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300">
-                        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                            <div class="grid gap-2">
-                                <Label>Persona de Contacto</Label>
-                                <Input bind:value={formData.contact} placeholder="Nombre del contacto" disabled={loading} />
+                <!-- Tab: Contact -->
+                <Tabs.Content value="contact">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Información de Contacto</Card.Title>
+                            <Card.Description>Datos para comunicación con el agente.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-6">
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                                <div class="grid gap-2">
+                                    <Label>Persona de Contacto</Label>
+                                    <Input bind:value={formData.contact} placeholder="Nombre del contacto" disabled={loading} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label>Puesto / Cargo</Label>
+                                    <Input bind:value={formData.position} placeholder="Ej. Gerente Comercial" disabled={loading} />
+                                </div>
                             </div>
-                            <div class="grid gap-2">
-                                <Label>Puesto / Cargo</Label>
-                                <Input bind:value={formData.position} placeholder="Ej. Gerente Comercial" disabled={loading} />
-                            </div>
-                        </div>
-                        <div class="grid grid-cols-1 md:grid-cols-3 gap-6">
-                            <div class="grid gap-2">
-                                <Label>Teléfono</Label>
-                                <Input bind:value={formData.phone} placeholder="656-000-0000" disabled={loading} />
-                            </div>
-                            <div class="grid gap-2">
-                                <Label>Fax</Label>
-                                <Input bind:value={formData.fax} disabled={loading} />
-                            </div>
-                            <div class="grid gap-2">
-                                <Label>Correo Electrónico</Label>
-                                <Input type="email" bind:value={formData.email} placeholder="correo@empresa.com" disabled={loading} />
-                            </div>
-                        </div>
-                    </div>
+                            
+                            <Separator />
 
-                {:else if activeTab === 'direccion'}
-                    <div class="space-y-6 animate-in fade-in slide-in-from-bottom-2 duration-300">
-                        <div class="grid gap-2">
-                            <Label>Calle y Número</Label>
-                            <Input bind:value={formData.address} placeholder="Dirección completa" disabled={loading} />
-                        </div>
-                        <div class="grid grid-cols-1 md:grid-cols-3 gap-6">
-                            <div class="grid gap-2">
-                                <Label>C.P.</Label>
-                                <Input bind:value={formData.postal_code} placeholder="32000" disabled={loading} />
+                            <div class="grid grid-cols-1 md:grid-cols-3 gap-6">
+                                <div class="grid gap-2">
+                                    <Label>Teléfono</Label>
+                                    <Input bind:value={formData.phone} placeholder="656-000-0000" disabled={loading} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label>Fax</Label>
+                                    <Input bind:value={formData.fax} disabled={loading} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label>Correo Electrónico</Label>
+                                    <Input type="email" bind:value={formData.email} placeholder="correo@empresa.com" disabled={loading} />
+                                </div>
                             </div>
-                            <div class="grid gap-2 md:col-span-2">
-                                <Label>Ciudad</Label>
-                                <Input bind:value={formData.city} placeholder="Ciudad" disabled={loading} />
-                            </div>
-                        </div>
-                        <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
-                            <div class="grid gap-2">
-                                <Label>Estado</Label>
-                                <Input bind:value={formData.state} placeholder="Estado" disabled={loading} />
-                            </div>
-                            <div class="grid gap-2">
-                                <Label>País</Label>
-                                <Input bind:value={formData.country} placeholder="MEX" disabled={loading} />
-                            </div>
-                        </div>
-                    </div>
-                {/if}
+                        </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
 
-                <div class="fixed bottom-0 left-0 right-0 md:left-64 bg-background/95 backdrop-blur-sm border-t p-4 z-50">
-                    <div class="max-w-5xl mx-auto flex justify-end items-center gap-4">
-                        <Button variant="ghost" href="/dashboard/customs_brokers" disabled={loading}>
-                            Cancelar
-                        </Button>
-                        <Button type="submit" disabled={loading} class="min-w-[150px] shadow-lg shadow-primary/20">
-                            {#if loading}
-                                <Loader2 class="mr-2 h-4 w-4 animate-spin" />
-                                Guardando...
-                            {:else}
-                                <Save class="mr-2 h-4 w-4" />
-                                {isEdit ? 'Actualizar Agente' : 'Guardar Agente'}
-                            {/if}
-                        </Button>
-                    </div>
-                </div>
-            </form>
-        </div>
+                <!-- Tab: Address -->
+                <Tabs.Content value="address">
+                    <Card.Root>
+                        <Card.Header>
+                            <Card.Title>Domicilio Fiscal</Card.Title>
+                            <Card.Description>Ubicación registrada del agente aduanal.</Card.Description>
+                        </Card.Header>
+                        <Card.Content class="space-y-6">
+                            <div class="grid gap-2">
+                                <Label>Calle y Número</Label>
+                                <Input bind:value={formData.address} placeholder="Dirección completa" disabled={loading} />
+                            </div>
+                            <div class="grid grid-cols-1 md:grid-cols-3 gap-6">
+                                <div class="grid gap-2">
+                                    <Label>C.P.</Label>
+                                    <Input bind:value={formData.postal_code} placeholder="32000" disabled={loading} />
+                                </div>
+                                <div class="grid gap-2 md:col-span-2">
+                                    <Label>Ciudad</Label>
+                                    <Input bind:value={formData.city} placeholder="Ciudad" disabled={loading} />
+                                </div>
+                            </div>
+                            <div class="grid grid-cols-1 md:grid-cols-2 gap-6">
+                                <div class="grid gap-2">
+                                    <Label>Estado</Label>
+                                    <Input bind:value={formData.state} placeholder="Estado" disabled={loading} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label>País</Label>
+                                    <Input bind:value={formData.country} placeholder="MEX" disabled={loading} />
+                                </div>
+                            </div>
+                        </Card.Content>
+                    </Card.Root>
+                </Tabs.Content>
+
+            </Tabs.Root>
+        </form>
     </div>
 </div>
 
-<style>
-    :global(.required::after) {
-        content: " *";
-        color: hsl(var(--destructive));
-        font-weight: bold;
-    }
-</style>
\ No newline at end of file
+<!-- Sticky Footer -->
+<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))]">
+    <div class="px-4 py-4 space-y-4 max-w-[1400px] mx-auto">
+        <!-- Footer 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-3">
+                    <Tabs.Trigger value="general" class="whitespace-nowrap">
+                        <User size={16} class="mr-2" /> General
+                    </Tabs.Trigger>
+                    <Tabs.Trigger value="contact" class="whitespace-nowrap">
+                        <Phone size={16} class="mr-2" /> Contacto
+                    </Tabs.Trigger>
+                    <Tabs.Trigger value="address" class="whitespace-nowrap">
+                        <MapPin size={16} class="mr-2" /> Dirección
+                    </Tabs.Trigger>
+                </Tabs.List>
+            </div>
+        </Tabs.Root>
+
+        <!-- Actions -->
+        <div class="flex justify-end gap-3">
+            <Button variant="outline" onclick={handleCancel} disabled={loading}>
+                Cancelar
+            </Button>
+            <Button onclick={handleSave} disabled={loading}>
+                {#if loading}
+                    <Loader2 class="mr-2 h-4 w-4 animate-spin" />
+                    Guardando...
+                {:else}
+                    <Save size={16} class="mr-2" />
+                    {isEdit ? 'Actualizar Agente' : 'Guardar Agente'}
+                {/if}
+            </Button>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
index 79454863..136f81ff 100644
--- a/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/company_information/edit/[[id]]/+page.svelte
@@ -23,6 +23,7 @@
     const title = $derived(isEdit ? "Editar Empresa" : "Nueva Empresa");
 
     let loading = $state(false);
+    let uploading = $state(false);
     let error = $state<string | null>(null);
     let logoFile = $state<File | null>(null);
     let logoPreview = $state<string | null>(null);
@@ -55,12 +56,20 @@
         is_service_company: false,
         order_format_type: '',
         ctpat_svi: '',
-        trusted_exporter_number: ''
+        trusted_exporter_number: '',
+        logo: '',
+        previous_code: 0,
+        client_name: '',
+        subassembly_mode: '',
+        broker_company: '',
+        inter_db_name: '',
+        prevalidator_key: '',
+        seventh_amendment: false
     };
 
     let formData = $state({ ...initialData });
 
-    // 3. Efecto para "Heredar" datos o Limpiar
+    // ... (Fetch Data) ...
     $effect(() => {
         if (isEdit) {
             fetchData(String(id));
@@ -73,7 +82,6 @@
     async function fetchData(companyId: string) {
         loading = true;
         try {
-            // Nota: Aquí usamos tu API para traer la info de una sola empresa
             const response = await getCompany(Number(companyId));
             if (response.data) {
                 const item = response.data;
@@ -172,6 +180,31 @@
 
     const clean = (value: any) => (typeof value === 'string' ? value.trim() || null : value);
 
+    async function handleFileSelect(e: Event) {
+        const input = e.target as HTMLInputElement;
+        if (!input.files || input.files.length === 0) return;
+        
+        const file = input.files[0];
+        if (!isEdit) {
+             alert("Primero debes guardar la empresa antes de subir un logo.");
+             return;
+        }
+
+        uploading = true;
+        try {
+            const res = await uploadCompanyLogo(Number(id), file);
+            if (res.data) {
+                formData.logo = res.data.path;
+            } else if (res.error) {
+                alert("Error al subir imagen: " + res.error);
+            }
+        } catch (err) {
+            alert("Error al intentar subir la imagen");
+        } finally {
+            uploading = false;
+        }
+    }
+
     async function handleSubmit() {
         error = null;
         loading = true;
@@ -198,7 +231,15 @@
                 manufacturer_id: clean(formData.manufacturer_id),
                 order_format_type: clean(formData.order_format_type),
                 ctpat_svi: clean(formData.ctpat_svi),
-                trusted_exporter_number: clean(formData.trusted_exporter_number)
+                trusted_exporter_number: clean(formData.trusted_exporter_number),
+                logo: clean(formData.logo),
+                previous_code: Number(formData.previous_code) || 0,
+                client_name: clean(formData.client_name),
+                subassembly_mode: clean(formData.subassembly_mode),
+                broker_company: clean(formData.broker_company),
+                inter_db_name: clean(formData.inter_db_name),
+                prevalidator_key: clean(formData.prevalidator_key),
+                seventh_amendment: formData.seventh_amendment
             };
 
             const response = isEdit 
@@ -303,6 +344,37 @@
                                 <Label for="main_activity">Actividad Principal</Label>
                                 <Input id="main_activity" bind:value={formData.main_activity} />
                             </div>
+                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                                <div class="grid gap-2">
+                                    <Label for="logo">Ruta del Logo</Label>
+                                    <div class="flex items-center gap-2">
+                                        <Input id="logo" bind:value={formData.logo} placeholder="/path/to/logo.png" />
+                                        {#if isEdit}
+                                            <div class="relative">
+                                                <Button variant="outline" size="icon" disabled={uploading}>
+                                                    {#if uploading}
+                                                        <LoaderCircle class="h-4 w-4 animate-spin" />
+                                                    {:else}
+                                                        <Upload class="h-4 w-4" />
+                                                    {/if}
+                                                </Button>
+                                                <input 
+                                                    type="file" 
+                                                    accept="image/*" 
+                                                    class="absolute inset-0 opacity-0 cursor-pointer" 
+                                                    onchange={handleFileSelect} 
+                                                    disabled={uploading}
+                                                />
+                                            </div>
+                                        {/if}
+                                    </div>
+                                    <p class="text-[0.8rem] text-muted-foreground">Sube una imagen para obtener su ruta local.</p>
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label for="client_name">Nombre Cliente (Maquila)</Label>
+                                    <Input id="client_name" bind:value={formData.client_name} />
+                                </div>
+                            </div>
                         </Tabs.Content>
 
                         <Tabs.Content value="programas" class="space-y-4 pt-4">
@@ -326,6 +398,16 @@
                                     <Input id="prosec_auth" bind:value={formData.prosec_authorization} />
                                 </div>
                             </div>
+                            <div class="grid grid-cols-1 gap-4 md:grid-cols-2">
+                                <div class="grid gap-2">
+                                    <Label for="broker_company">Empresa Broker</Label>
+                                    <Input id="broker_company" bind:value={formData.broker_company} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label for="subassembly">Modo Sub-ensamble</Label>
+                                    <Input id="subassembly" bind:value={formData.subassembly_mode} />
+                                </div>
+                            </div>
                         </Tabs.Content>
 
                         <Tabs.Content value="responsable" class="space-y-4 pt-4">
@@ -365,8 +447,24 @@
                                     <Switch id="service" bind:checked={formData.is_service_company} />
                                     <Label for="service">Es Empresa de Servicios</Label>
                                 </div>
+                                <div class="flex items-center gap-3 p-4 border rounded-lg">
+                                    <Switch id="seventh" bind:checked={formData.seventh_amendment} />
+                                    <Label for="seventh">Séptima Enmienda</Label>
+                                </div>
                             </div>
                             <div class="grid grid-cols-1 gap-4 md:grid-cols-2 pt-4">
+                                <div class="grid gap-2">
+                                    <Label for="previous_code">Código Anterior</Label>
+                                    <Input id="previous_code" type="number" bind:value={formData.previous_code} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label for="inter_db">Base de Datos Intermedia</Label>
+                                    <Input id="inter_db" bind:value={formData.inter_db_name} />
+                                </div>
+                                <div class="grid gap-2">
+                                    <Label for="prevalidator">Clave Prevalidador</Label>
+                                    <Input id="prevalidator" bind:value={formData.prevalidator_key} />
+                                </div>
                                 <div class="grid gap-2">
                                     <Label for="man_id">Manufacturer ID (MID)</Label>
                                     <Input id="man_id" bind:value={formData.manufacturer_id} />
diff --git a/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte b/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
index 337aaa4d..370eab1c 100644
--- a/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
+++ b/frontend/src/routes/dashboard/general_catalogs/tariff-fractions/+page.svelte
@@ -122,7 +122,7 @@
 				<!-- Tabla de fracciones -->
 				<div class="border rounded-md overflow-auto max-h-[600px]">
 					<Table.Root>
-						<Table.Header class="sticky top-0 bg-background z-10">
+						<Table.Header class="bg-background z-10">
 							<Table.Row>
 								<Table.Head class="w-[100px]">Código</Table.Head>
 								<Table.Head class="w-[120px]">Fracción</Table.Head>
diff --git a/frontend/src/routes/dashboard/goods/+page.ts b/frontend/src/routes/dashboard/goods/+page.ts
new file mode 100644
index 00000000..3f5e9320
--- /dev/null
+++ b/frontend/src/routes/dashboard/goods/+page.ts
@@ -0,0 +1,5 @@
+import { redirect } from '@sveltejs/kit';
+
+export const load = () => {
+    throw redirect(302, '/dashboard/goods/parts');
+};
diff --git a/frontend/src/routes/dashboard/goods/fixed-asset-classes/+page.svelte b/frontend/src/routes/dashboard/goods/fixed-asset-classes/+page.svelte
index 8a8acf8d..f6d5f3a2 100644
--- a/frontend/src/routes/dashboard/goods/fixed-asset-classes/+page.svelte
+++ b/frontend/src/routes/dashboard/goods/fixed-asset-classes/+page.svelte
@@ -498,7 +498,7 @@
 			<!-- Tabla de clases -->
 			<div class="flex-1 overflow-auto">
 				<table class="w-full text-sm">
-					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white sticky top-0 z-10 border-b">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
 						<tr>
 							<th class="px-2 py-2 text-left w-8">
 								<input type="checkbox" class="h-4 w-4" />
diff --git a/frontend/src/routes/dashboard/goods/parts/+page.svelte b/frontend/src/routes/dashboard/goods/parts/+page.svelte
index bba5417e..ea3f4bb0 100644
--- a/frontend/src/routes/dashboard/goods/parts/+page.svelte
+++ b/frontend/src/routes/dashboard/goods/parts/+page.svelte
@@ -1,180 +1,381 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
-    import { partsApi, type Part } from '$lib/api/dashboard/a76/parts';
-    import DataTable from '$lib/components/dashboard/goods/parts/data-table.svelte';
-    import { createColumns } from '$lib/components/dashboard/goods/parts/columns.js';
-    import * as Card from '$lib/components/ui/card';
-    import { Button } from '$lib/components/ui/button';
-    import { Input } from '$lib/components/ui/input';
-    import { companyStore } from '$lib/stores/company.svelte';
-    import { Plus, Search, RefreshCw, Loader2, Trash2 } from 'lucide-svelte';
+	import { Button } from '$lib/components/ui/button';
+	import { Input } from '$lib/components/ui/input';
+	import { Label } from '$lib/components/ui/label';
+	import { Plus, RefreshCw, Package } from 'lucide-svelte';
+	import { toast } from 'svelte-sonner';
+	import { partsApi, type Part } from '$lib/api/dashboard/a76/parts';
+    import { clientsProvidersApi } from '$lib/api/dashboard/a76/clients-providers';
+	import { companyStore } from '$lib/stores/company.svelte';
 
-    // 1. ESTADOS
-    let partsList = $state<Part[]>([]); 
-    let listLoading = $state(false);
-    let listError = $state<string | null>(null);
+	// Estado de la lista de partes
+	let parts = $state<Part[]>([]);
+    let clientsMap = $state<Record<number, string>>({}); // Mapa ID -> Nombre
+	let selectedPart = $state<Part | null>(null);
+	let isLoading = $state(false);
+	let searchPartNumber = $state('');
+	let searchDescription = $state('');
+	let searchClient = $state('');
+	let searchClass = $state('');
 
-    // Estado Búsqueda
-    let searchCode = $state(''); 
-    let searchResults = $state<Part[]>([]); // Array para guardar los resultados
-    let searchLoading = $state(false);
-    let isSearching = $state(false); // Para saber si estamos viendo resultados de búsqueda
+	// Partes filtradas según búsqueda
+	const filteredParts = $derived(
+		parts.filter((p) => {
+			// Filtro por número de parte
+			const matchesPartNumber = !searchPartNumber || 
+				p.part_number.toLowerCase().includes(searchPartNumber.toLowerCase());
+			
+			// Filtro por descripción (español o inglés)
+			const matchesDescription = !searchDescription || 
+				(p.description_spanish?.toLowerCase().includes(searchDescription.toLowerCase()) ?? false) ||
+				(p.description_english?.toLowerCase().includes(searchDescription.toLowerCase()) ?? false);
+			
+			// Filtro por cliente (Busca en nombre o ID)
+            const clientName = clientsMap[p.client_id] || '';
+			const matchesClient = !searchClient || 
+				(p.client_id?.toString().includes(searchClient) ?? false) ||
+                clientName.toLowerCase().includes(searchClient.toLowerCase());
+			
+			// Filtro por clase
+			const matchesClass = !searchClass || 
+				(p.part_class?.toLowerCase().includes(searchClass.toLowerCase()) ?? false);
+			
+			return matchesPartNumber && matchesDescription && matchesClient && matchesClass;
+		})
+	);
 
-    // 2. CARGA DE DATOS (Lista Completa)
-    async function loadParts() {
+	// Reactively load parts when company changes
+	$effect(() => {
+		const companyId = companyStore.activeCompany?.id;
+		if (companyId) {
+			loadData();
+		}
+	});
+
+	async function loadData() {
+        await Promise.all([loadParts(), loadClients()]);
+    }
+
+    async function loadClients() {
         const companyId = companyStore.activeCompany?.id;
         if (!companyId) return;
 
-        listLoading = true;
-        listError = null;
-        isSearching = false; // Reseteamos modo búsqueda
-        searchResults = [];
-
         try {
-            const response = await partsApi.list({ 
-                company_id: companyId,
-                page: 1,
-                page_size: 100
+            // Fetch all clients/providers to ensure we map "both" types as well
+            const response = await clientsProvidersApi.list(
+                companyId,
+                1, 
+                1000
+            );
+            
+            const data = (response as any).data || response;
+            const items = data.items || [];
+            
+            const map: Record<number, string> = {};
+            items.forEach((c: any) => {
+                map[c.id] = c.name; 
             });
+            clientsMap = map;
 
-            if (response.data) {
-                partsList = response.data.items || []; 
-            } else if (response.error) {
-                listError = response.error;
-            }
         } catch (e) {
-            listError = 'Error de conexión con el servidor';
-        } finally {
-            listLoading = false;
+            console.error("Error cargando clientes:", e);
         }
     }
 
-    // 3. REACTIVIDAD DE COMPAÑÍA
-    $effect(() => {
-        if (companyStore.activeCompany) {
-            loadParts();
-        }
-    });
+	async function loadParts() {
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {			
+			return;
+		}
 
-    // 4. BÚSQUEDA MANUAL
-    async function handleSearch() {
-        if (!searchCode.trim()) return;
-        
-        searchLoading = true;
-        listError = null; // Limpiamos errores previos
-        const companyId = companyStore.activeCompany?.id;
-        
-        if (!companyId) return;
+		isLoading = true;
+		try {			
+			const response = await partsApi.list({
+				company_id: companyId,
+				page: 1,
+				page_size: 1000
+			});
 
+			if (response.data) {
+				parts = response.data.items || [];
+			}
+		} catch (error) {
+			console.error('Error cargando partes:', error);
+			toast.error('Error al cargar las partes');
+		} finally {
+			isLoading = false;
+		}
+	}
+
+	function selectPart(part: Part) {
+		selectedPart = part;
+	}
+
+	async function handleRefresh() {
+		await loadData();
+		toast.success('Partes actualizadas');
+	}
+
+
+	async function handleDelete() {
+		if (!selectedPart) {
+			toast.error('Selecciona una parte para borrar');
+			return;
+		}
+
+        const confirmed = window.confirm(`¿Estás seguro de que deseas eliminar la parte ${selectedPart.part_number}? Esta acción no se puede deshacer.`);
+        if (!confirmed) return;
+
+        isLoading = true;
         try {
-            const response = await partsApi.list({
-                company_id: companyId,
-                q: searchCode.trim()
-            });
-            
-            const results = response.data?.items || [];
-            
-            if (results.length > 0) {
-                searchResults = results; // Guardamos TODOS los resultados
-                isSearching = true; // Activamos modo búsqueda
-            } else {
-                listError = "No se encontraron partes con ese criterio";
-                searchResults = [];
-                isSearching = true; // Aún en modo búsqueda, pero vacía
-            }
+            const companyId = companyStore.activeCompany?.id;
+            if (!companyId) return;
+
+            await partsApi.delete(selectedPart.id, companyId);
+            toast.success('Parte eliminada exitosamente');
+            selectedPart = null;
+            await loadData();
         } catch (e) {
-            listError = "Error en la búsqueda";
+            console.error("Error al eliminar:", e);
+            toast.error('Error al eliminar la parte');
         } finally {
-            searchLoading = false;
+            isLoading = false;
         }
-    }
-
-    function clearSearch() {
-        searchCode = '';
-        searchResults = [];
-        isSearching = false;
-        listError = null;
-        loadParts(); // Recargamos la lista completa
-    }
-
-    const columns = createColumns(loadParts);
-    
-    // Si estamos buscando, mostramos searchResults, si no, la lista completa
-    const tableData = $derived(isSearching ? searchResults : partsList);
+	}
 </script>
 
-<div class="space-y-6 p-4">
-    <div class="flex items-center justify-between">
-        <div>
-            <h1 class="text-3xl font-bold tracking-tight">Catálogo de Partes</h1>
-            <p class="text-muted-foreground">Gestiona las partes y componentes del sistema.</p>
-        </div>
-        <div class="flex gap-2">
-            <Button variant="outline" onclick={loadParts} disabled={listLoading}>
-                <RefreshCw class="mr-2 h-4 w-4 {listLoading ? 'animate-spin' : ''}" />
-                Actualizar
-            </Button>
-            <Button href="/dashboard/goods/parts/edit">
-                <Plus class="mr-2 h-4 w-4" />
-                Nueva Parte
-            </Button>
-        </div>
-    </div>
+<div class="flex flex-col h-[calc(100vh-4rem)] p-4 gap-4 pb-15">
+	<!-- Título -->
+	<div class="flex flex-col gap-1">
+		<h1 class="text-2xl font-bold">CATÁLOGO DE PARTES</h1>
+		<p class="text-sm text-muted-foreground">
+			Gestiona y consulta las partes de inventario y activo fijo
+		</p>
+	</div>
 
-    <Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-        <Card.Content>
-            <div class="flex gap-4">
-                <div class="flex-1 max-w-xl">
-                    <Input 
-                        bind:value={searchCode} 
-                        placeholder="Buscar por número de parte o descripción..." 
-                        onkeydown={(e) => e.key === 'Enter' && handleSearch()}
-                    />
-                </div>
-                <Button onclick={handleSearch} disabled={searchLoading}>
-                    {#if searchLoading}
-                        <Loader2 class="mr-2 h-4 w-4 animate-spin" />
-                        Buscando...
-                    {:else}
-                        <Search class="mr-2 h-4 w-4" />
-                        Buscar
-                    {/if}
-                </Button>
-                
-                {#if isSearching || searchCode}
-                    <Button variant="ghost" onclick={clearSearch}>
-                        <Trash2 class="mr-2 h-4 w-4" />
-                        Limpiar
-                    </Button>
-                {/if}
-            </div>
-        </Card.Content>
-    </Card.Root>
+	<!-- Contenedor principal con grid y detalles -->
+	<div class="flex-1 flex gap-4 overflow-hidden">
+		<!-- Panel izquierdo: Grid/Tabla de partes -->
+		<div class="flex-1 flex flex-col gap-4 overflow-hidden">
+			<!-- Sección de Filtros -->
+			<div class="border rounded-lg bg-card">
+				<div class="p-4 space-y-4">
+					<div class="flex items-center justify-between">
+						<h2 class="text-sm font-semibold">Filtros</h2>
+						<span class="text-xs text-muted-foreground">
+							Filtra las partes por diferentes criterios (los filtros se aplican automáticamente)
+						</span>
+					</div>
+					<div class="grid grid-cols-4 gap-4">
+						<div class="space-y-2">
+							<Label class="text-xs">Número de Parte</Label>
+							<Input
+								bind:value={searchPartNumber}
+								placeholder="Ej: PART-001"
+								class="h-9"
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label class="text-xs">Descripción</Label>
+							<Input
+								bind:value={searchDescription}
+								placeholder="Buscar descripción..."
+								class="h-9"
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label class="text-xs">Cliente</Label>
+							<Input
+								bind:value={searchClient}
+								placeholder="Nombre o ID..."
+								class="h-9"
+							/>
+						</div>
+						<div class="space-y-2">
+							<Label class="text-xs">Clase</Label>
+							<Input
+								bind:value={searchClass}
+								placeholder="Clase..."
+								class="h-9"
+							/>
+						</div>
+					</div>
+				</div>
+			</div>
 
-    <Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-        <Card.Header>
-            <Card.Title>
-                {#if isSearching}
-                    Resultados de la búsqueda ({searchResults.length})
-                {:else}
-                    Listado General ({partsList.length} registros)
-                {/if}
-            </Card.Title>
-        </Card.Header>
-        <Card.Content>
-            {#if listError}
-                <div class="bg-destructive/10 text-destructive p-4 rounded-lg border border-destructive/20 mb-4">
-                    {listError}
-                </div>
-            {/if}
-            
-            <DataTable 
-                data={tableData} 
-                {columns} 
-                loading={listLoading || searchLoading}
-                hasMore={false}
-                loadMore={() => {}}
-            />
-        </Card.Content>
-    </Card.Root>
+			<!-- Tabla de partes -->
+			<div class="flex-1 flex flex-col border rounded-lg overflow-hidden">
+				<div class="flex items-center justify-between p-3 border-b bg-white dark:bg-muted/50">
+					<h2 class="text-sm font-semibold">Listado de Partes</h2>
+					<div class="flex items-center gap-2">
+						<span class="text-xs text-muted-foreground">
+							Mostrando {filteredParts.length} registros
+						</span>
+						<Button variant="outline" size="sm" onclick={handleRefresh}>
+							<RefreshCw class="h-4 w-4 mr-2" />
+							Actualizar
+						</Button>
+					</div>
+				</div>
+
+			<!-- Tabla de partes -->
+			<div class="flex-1 overflow-auto">
+				<table class="w-full text-sm">
+					<thead class="bg-white dark:bg-black text-gray-900 dark:text-white border-b">
+						<tr>
+							<th class="px-2 py-2 text-left w-8">
+								<input type="checkbox" class="h-4 w-4" />
+							</th>
+							<th class="px-2 py-2 text-left">Número de Parte</th>
+							<th class="px-2 py-2 text-left">Descripción</th>
+							<th class="px-2 py-2 text-left">Cliente</th>
+							<th class="px-2 py-2 text-left">Clase</th>
+							<th class="px-2 py-2 text-left">U.M.</th>
+							<th class="px-2 py-2 text-left">Fracción</th>
+						</tr>
+					</thead>
+					<tbody>
+						{#if isLoading}
+							<tr>
+								<td colspan="7" class="text-center py-8 text-muted-foreground">Cargando...</td>
+							</tr>
+						{:else if filteredParts.length === 0}
+							<tr>
+								<td colspan="7" class="text-center py-8 text-muted-foreground">
+									No hay partes registradas
+								</td>
+							</tr>
+						{:else}
+							{#each filteredParts as part (part.id)}
+								<tr
+									class="border-b cursor-pointer transition-colors {selectedPart?.id ===
+									part.id
+										? 'bg-gray-300 dark:bg-gray-600'
+										: 'hover:bg-gray-100 dark:hover:bg-gray-700'}"
+									onclick={() => selectPart(part)}
+								>
+									<td class="px-2 py-1">
+										<input
+											type="checkbox"
+											checked={selectedPart?.id === part.id}
+											class="h-4 w-4"
+										/>
+									</td>
+									<td class="px-2 py-1">
+										<span class="inline-flex items-center rounded-md bg-blue-50 dark:bg-blue-900/30 px-2 py-1 text-xs font-mono font-bold text-blue-700 dark:text-blue-400 border border-blue-200 dark:border-blue-800">
+											{part.part_number}
+										</span>
+									</td>
+									<td class="px-2 py-1 font-medium text-sm">{part.description_spanish || ''}</td>
+									<td class="px-2 py-1 text-muted-foreground">
+                                        <div class="flex flex-col">
+                                            <span class="font-medium text-xs">{clientsMap[part.client_id] || 'Cargando...'}</span>
+                                        </div>
+                                    </td>
+									<td class="px-2 py-1">
+										{#if part.part_class}
+											<span class="px-2 py-0.5 rounded-full text-[10px] font-bold uppercase tracking-wider bg-purple-100 dark:bg-purple-900/30 text-purple-700 dark:text-purple-400">
+												{part.part_class}
+											</span>
+										{:else}
+											<span class="text-muted-foreground">-</span>
+										{/if}
+									</td>
+									<td class="px-2 py-1 text-muted-foreground">{part.unit_of_measure || '-'}</td>
+									<td class="px-2 py-1 font-mono text-xs text-orange-600 dark:text-orange-400">{part.fraction || '-'}</td>
+								</tr>
+							{/each}
+						{/if}
+					</tbody>
+				</table>
+			</div>
+		</div>
+	</div>
+
+		<!-- Panel derecho: Detalles y edición -->
+			<div class="w-96 flex-none flex flex-col border rounded-xl bg-muted/30 shadow-sm overflow-hidden">
+				<div class="p-4 border-b">
+					<p class="text-[10px] uppercase tracking-widest opacity-80 text-muted-foreground">Número de Parte</p>
+					<h2 class="text-3xl font-black font-mono tracking-tighter">
+						{selectedPart?.part_number || '---'}
+					</h2>
+				</div>
+
+				<div class="flex-1 overflow-auto p-5 space-y-6 bg-card">
+					{#if selectedPart}
+						<div class="space-y-3">
+							<div>
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">Descripción ES</Label>
+								<p class="text-sm font-semibold leading-tight">{selectedPart.description_spanish || 'Sin descripción'}</p>
+							</div>
+							<div class="pt-2 border-t border-dashed">
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">Description EN</Label>
+								<p class="text-sm italic text-muted-foreground">{selectedPart.description_english || 'No translation available'}</p>
+							</div>
+						</div>
+
+						<div class="grid grid-cols-2 gap-4 pt-4 border-t">
+							<div class="space-y-1">
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">Cliente</Label>
+								<div class="flex items-center gap-2">
+									<Package class="h-3 w-3 text-blue-500" />
+									<span class="text-sm font-bold">{clientsMap[selectedPart.client_id] || selectedPart.client_id}</span>
+								</div>
+							</div>
+							<div class="space-y-1">
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">Clase</Label>
+								<span class="text-sm font-bold">{selectedPart.part_class || '-'}</span>
+							</div>
+						</div>
+
+						<div class="grid grid-cols-2 gap-4">
+							<div class="space-y-1">
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">U.M.</Label>
+								<span class="text-sm font-bold">{selectedPart.unit_of_measure || '-'}</span>
+							</div>
+							<div class="space-y-1">
+								<Label class="text-[10px] uppercase text-muted-foreground font-bold">Peso Unit.</Label>
+								<span class="text-sm font-bold">{selectedPart.unit_weight || '-'}</span>
+							</div>
+						</div>
+
+						<div class="p-3 bg-orange-50 dark:bg-orange-950/20 rounded-lg border border-orange-100 dark:border-orange-900">
+							<Label class="text-[10px] uppercase text-orange-600 dark:text-orange-400 font-bold">Fracción Arancelaria</Label>
+							<p class="text-lg font-mono font-bold text-orange-700 dark:text-orange-300">
+								{selectedPart.fraction || '0000.00.00'}
+							</p>
+						</div>
+
+						{#if selectedPart.unit_cost}
+							<div class="p-3 bg-green-50 dark:bg-green-950/20 rounded-lg border border-green-100 dark:border-green-900">
+								<Label class="text-[10px] uppercase text-green-600 dark:text-green-400 font-bold">Costo Unitario</Label>
+								<p class="text-lg font-bold text-green-700 dark:text-green-300">
+									${selectedPart.unit_cost} {selectedPart.currency_key || 'USD'}
+								</p>
+							</div>
+						{/if}
+					{:else}
+						<div class="flex flex-col items-center justify-center h-full text-center text-muted-foreground">
+							<Package class="h-12 w-12 mb-3 opacity-20" />
+							<p class="text-sm">Selecciona una parte para ver sus detalles</p>
+						</div>
+					{/if}
+				</div>
+			</div>
+	</div>
+</div>
+
+<!-- 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))]">
+	<div class="px-4 py-4 max-w-[1400px] mx-auto">
+		<!-- Botones de acción -->
+		<div class="flex justify-end gap-2">
+			<Button size="sm" href="/dashboard/goods/parts/edit">
+				<Plus class="h-4 w-4 mr-1" />
+				Nueva Parte
+			</Button>
+			<Button variant="outline" size="sm" href="/dashboard/goods/parts/edit/{selectedPart?.id}" disabled={!selectedPart}>Editar</Button>
+			<Button variant="outline" size="sm" onclick={handleDelete} disabled={!selectedPart}>Borrar</Button>
+		</div>
+	</div>
 </div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup b/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup
new file mode 100644
index 00000000..dae74cc6
--- /dev/null
+++ b/frontend/src/routes/dashboard/goods/parts/+page.svelte.backup
@@ -0,0 +1,184 @@
+<script lang="ts">
+    import { onMount } from 'svelte';
+    import { partsApi, type Part } from '$lib/api/dashboard/a76/parts';
+    import DataTable from '$lib/components/dashboard/goods/parts/data-table.svelte';
+    import { createColumns } from '$lib/components/dashboard/goods/parts/columns.js';
+    import * as Card from '$lib/components/ui/card';
+    import { Button } from '$lib/components/ui/button';
+    import { Input } from '$lib/components/ui/input';
+    import { companyStore } from '$lib/stores/company.svelte';
+    import { Plus, Search, RefreshCw, Loader2, Trash2 } from 'lucide-svelte';
+
+    // 1. ESTADOS
+    let partsList = $state<Part[]>([]); 
+    let listLoading = $state(false);
+    let listError = $state<string | null>(null);
+
+    // Estado Búsqueda
+    let searchCode = $state(''); 
+    let searchResults = $state<Part[]>([]); // Array para guardar los resultados
+    let searchLoading = $state(false);
+    let isSearching = $state(false); // Para saber si estamos viendo resultados de búsqueda
+
+    // 2. CARGA DE DATOS (Lista Completa)
+    async function loadParts() {
+        const companyId = companyStore.activeCompany?.id;
+        if (!companyId) return;
+
+        listLoading = true;
+        listError = null;
+        isSearching = false; // Reseteamos modo búsqueda
+        searchResults = [];
+
+        try {
+            const response = await partsApi.list({ 
+                company_id: companyId,
+                page: 1,
+                page_size: 100
+            });
+
+            if (response.data) {
+                partsList = response.data.items || []; 
+            } else if (response.error) {
+                listError = response.error;
+            }
+        } catch (e) {
+            listError = 'Error de conexión con el servidor';
+        } finally {
+            listLoading = false;
+        }
+    }
+
+    // 3. REACTIVIDAD DE COMPAÑÍA
+    $effect(() => {
+        if (companyStore.activeCompany) {
+            loadParts();
+        }
+    });
+
+    // 4. BÚSQUEDA MANUAL
+    async function handleSearch() {
+        if (!searchCode.trim()) return;
+        
+        searchLoading = true;
+        listError = null; // Limpiamos errores previos
+        const companyId = companyStore.activeCompany?.id;
+        
+        if (!companyId) return;
+
+        try {
+            const response = await partsApi.list({
+                company_id: companyId,
+                q: searchCode.trim()
+            });
+            
+            const results = response.data?.items || [];
+            
+            if (results.length > 0) {
+                searchResults = results; // Guardamos TODOS los resultados
+                isSearching = true; // Activamos modo búsqueda
+            } else {
+                listError = "No se encontraron partes con ese criterio";
+                searchResults = [];
+                isSearching = true; // Aún en modo búsqueda, pero vacía
+            }
+        } catch (e) {
+            listError = "Error en la búsqueda";
+        } finally {
+            searchLoading = false;
+        }
+    }
+
+    function clearSearch() {
+        searchCode = '';
+        searchResults = [];
+        isSearching = false;
+        listError = null;
+        loadParts(); // Recargamos la lista completa
+    }
+
+    const columns = createColumns(loadParts);
+    
+    // Si estamos buscando, mostramos searchResults, si no, la lista completa
+    const tableData = $derived(isSearching ? searchResults : partsList);
+</script>
+
+<div class="space-y-6 p-4">
+    <div class="flex items-center justify-between">
+        <div>
+            <h1 class="text-3xl font-bold tracking-tight">Catálogo de Partes</h1>
+            <p class="text-muted-foreground">Gestiona las partes y componentes del sistema.</p>
+        </div>
+        <div class="flex gap-2">
+            <Button variant="outline" onclick={loadParts} disabled={listLoading}>
+                <RefreshCw class="mr-2 h-4 w-4 {listLoading ? 'animate-spin' : ''}" />
+                Actualizar
+            </Button>
+            <Button href="/dashboard/goods/parts/edit">
+                <Plus class="mr-2 h-4 w-4" />
+                Nueva Parte
+            </Button>
+        </div>
+    </div>
+
+    <Card.Root>
+        <Card.Header>
+            <Card.Title>Búsqueda Rápida</Card.Title>
+            <Card.Description>Ingresa el número de parte o descripción para filtrar.</Card.Description>
+        </Card.Header>
+        <Card.Content>
+            <div class="flex gap-4">
+                <div class="flex-1 max-w-xl">
+                    <Input 
+                        bind:value={searchCode} 
+                        placeholder="Buscar por número de parte o descripción..." 
+                        onkeydown={(e) => e.key === 'Enter' && handleSearch()}
+                    />
+                </div>
+                <Button onclick={handleSearch} disabled={searchLoading}>
+                    {#if searchLoading}
+                        <Loader2 class="mr-2 h-4 w-4 animate-spin" />
+                        Buscando...
+                    {:else}
+                        <Search class="mr-2 h-4 w-4" />
+                        Buscar
+                    {/if}
+                </Button>
+                
+                {#if isSearching || searchCode}
+                    <Button variant="ghost" onclick={clearSearch}>
+                        <Trash2 class="mr-2 h-4 w-4" />
+                        Limpiar
+                    </Button>
+                {/if}
+            </div>
+        </Card.Content>
+    </Card.Root>
+
+    <Card.Root>
+        <Card.Header>
+            <Card.Title>
+                {#if isSearching}
+                    Resultados de la búsqueda ({searchResults.length})
+                {:else}
+                    Listado General ({partsList.length} registros)
+                {/if}
+            </Card.Title>
+        </Card.Header>
+        <Card.Content>
+            {#if listError}
+                <div class="bg-destructive/10 text-destructive p-4 rounded-lg border border-destructive/20 mb-4">
+                    {listError}
+                </div>
+            {/if}
+            
+            <DataTable 
+                data={tableData} 
+                {columns} 
+                loading={listLoading || searchLoading}
+                hasMore={false}
+                loadMore={() => {}}
+            />
+        </Card.Content>
+    </Card.Root>
+</div>
\ No newline at end of file
diff --git a/frontend/src/routes/dashboard/invoices/+page.svelte b/frontend/src/routes/dashboard/invoices/+page.svelte
index 7108c742..06086755 100644
--- a/frontend/src/routes/dashboard/invoices/+page.svelte
+++ b/frontend/src/routes/dashboard/invoices/+page.svelte
@@ -1,492 +1,639 @@
 <script lang="ts">
-	import { onMount } from 'svelte';
-	import { page } from '$app/stores';
-	import { invoicesApi, type Invoice, type OperationType } from '$lib/api/dashboard/a76/invoices';
-	import DataTable from '$lib/components/dashboard/invoices/data-table.svelte';
-	import { createColumns } from '$lib/components/dashboard/invoices/columns.js';
-	import * as Card from '$lib/components/ui/card';
-	import { Button } from '$lib/components/ui/button';
-	import { Input } from '$lib/components/ui/input';
-	import { Label } from '$lib/components/ui/label';
-	import type { PageData } from './$types';
-	import { browser } from '$app/environment';
-	import { companyStore } from '$lib/stores/company.svelte';
-	import { Plus, RefreshCw } from 'lucide-svelte';
+    import { onMount } from 'svelte';
+    import { page } from '$app/stores';
+    import { invoicesApi, type Invoice, type OperationType } from '$lib/api/dashboard/a76/invoices';
+    import { invoicesReportsApi } from '$lib/api/dashboard/a76/reports/reports-invoices';  
+    import { consolidatedReportsApi } from '$lib/api/dashboard/a76/reports/reports-consolidated';
+    import DataTable from '$lib/components/dashboard/invoices/data-table.svelte';
+    import { createColumns } from '$lib/components/dashboard/invoices/columns.js';
+    import * as Card from '$lib/components/ui/card';
+    import { Button } from '$lib/components/ui/button';
+    import { Input } from '$lib/components/ui/input';
+    import { Label } from '$lib/components/ui/label';
+    import type { PageData } from './$types';
+    import { browser } from '$app/environment';
+    import { companyStore } from '$lib/stores/company.svelte';
+    import { Plus, RefreshCw, FileText, RotateCcw, Boxes } from 'lucide-svelte';
+    
+    // IMPORTANTE: Asegúrate de tener instalada svelte-sonner para las notificaciones
+    import { toast } from "svelte-sonner"; 
+    import PdfProgressDialog from '$lib/components/dashboard/invoices/pdf-progress-dialog.svelte'; 
 
-	// Los datos iniciales vienen del servidor
-	let { data }: { data: PageData } = $props();
+    // Los datos iniciales vienen del servidor
+    let { data }: { data: PageData } = $props();
 
-	// Estado para filtros
-	// Nota: Los query parameters invoice_type y operation_type se pueden usar para filtrar
-	// Ejemplo: /dashboard/invoices?invoice_type=TEM&operation_type=imp
-	let filters = $state({
-		operation_type: (data.filters?.operation_type || '') as '' | OperationType,
-		invoice_type: data.filters?.invoice_type || '',
-		invoice_number: data.filters?.invoice_number || '',
-		project_number: data.filters?.project_number || '',
-		year: data.filters?.year || ''
-	});
+    // Estado para filtros
+    // Nota: Los query parameters invoice_type y operation_type se pueden usar para filtrar
+    // Ejemplo: /dashboard/invoices?invoice_type=TEM&operation_type=imp
+    let filters = $state({
+        operation_type: (data.filters?.operation_type || '') as '' | OperationType,
+        invoice_type: data.filters?.invoice_type || '',
+        invoice_number: data.filters?.invoice_number || '',
+        project_number: data.filters?.project_number || '',
+        year: data.filters?.year || ''
+    });
 
-	// Efecto reactivo para actualizar filtros cuando cambian los query parameters en la URL
-	$effect(() => {
-		if (browser) {
-			const searchParams = $page.url.searchParams;
-			const urlOperationType = searchParams.get('operation_type');
-			const urlInvoiceType = searchParams.get('invoice_type');
-			const urlInvoiceNumber = searchParams.get('invoice_number');
-			const urlProjectNumber = searchParams.get('project_number');
-			const urlYear = searchParams.get('year');
+    // Efecto reactivo para actualizar filtros cuando cambian los query parameters en la URL
+    $effect(() => {
+        if (browser) {
+            const searchParams = $page.url.searchParams;
+            const urlOperationType = searchParams.get('operation_type');
+            const urlInvoiceType = searchParams.get('invoice_type');
+            const urlInvoiceNumber = searchParams.get('invoice_number');
+            const urlProjectNumber = searchParams.get('project_number');
+            const urlYear = searchParams.get('year');
 
-			// Actualizar filtros si hay cambios en la URL
-			filters.operation_type = (urlOperationType || '') as '' | OperationType;
-			filters.invoice_type = urlInvoiceType || '';
-			filters.invoice_number = urlInvoiceNumber || '';
-			filters.project_number = urlProjectNumber || '';
-			filters.year = urlYear || '';
-		}
-	});
+            // Actualizar filtros si hay cambios en la URL
+            filters.operation_type = (urlOperationType || '') as '' | OperationType;
+            filters.invoice_type = urlInvoiceType || '';
+            filters.invoice_number = urlInvoiceNumber || '';
+            filters.project_number = urlProjectNumber || '';
+            filters.year = urlYear || '';
+        }
+    });
 
-	// Efecto para limpiar invoice_type si no es válido para el operation_type seleccionado
-	$effect(() => {
-		if (filters.invoice_type && filters.operation_type) {
-			const selectedOption = allInvoiceTypeOptions().find(opt => opt.value === filters.invoice_type);
-			if (selectedOption && selectedOption.operation !== 'both' && selectedOption.operation !== filters.operation_type) {
-				// El tipo de factura seleccionado no es válido para esta operación
-				filters.invoice_type = '';
-			}
-		}
-	});
+    // Efecto para limpiar invoice_type si no es válido para el operation_type seleccionado
+    $effect(() => {
+        if (filters.invoice_type && filters.operation_type) {
+            const selectedOption = allInvoiceTypeOptions().find(opt => opt.value === filters.invoice_type);
+            if (selectedOption && selectedOption.operation !== 'both' && selectedOption.operation !== filters.operation_type) {
+                // El tipo de factura seleccionado no es válido para esta operación
+                filters.invoice_type = '';
+            }
+        }
+    });
 
-	// Efecto para actualizar la URL cuando cambien los filtros
-	$effect(() => {
-		if (browser) {
-			const params = new URLSearchParams();
-			
-			if (filters.operation_type) params.set('operation_type', filters.operation_type);
-			if (filters.invoice_type) params.set('invoice_type', filters.invoice_type);
-			if (filters.invoice_number) params.set('invoice_number', filters.invoice_number);
-			if (filters.project_number) params.set('project_number', filters.project_number);
-			if (filters.year) params.set('year', filters.year);
-			
-			const queryString = params.toString();
-			const newUrl = queryString ? `?${queryString}` : window.location.pathname;
-			
-			// Solo actualizar si la URL es diferente (evitar loops infinitos)
-			if (window.location.search !== (queryString ? `?${queryString}` : '')) {
-				window.history.replaceState({}, '', newUrl);
-			}
-		}
-	});
+    // Efecto para actualizar la URL cuando cambien los filtros
+    $effect(() => {
+        if (browser) {
+            const params = new URLSearchParams();
+            
+            if (filters.operation_type) params.set('operation_type', filters.operation_type);
+            if (filters.invoice_type) params.set('invoice_type', filters.invoice_type);
+            if (filters.invoice_number) params.set('invoice_number', filters.invoice_number);
+            if (filters.project_number) params.set('project_number', filters.project_number);
+            if (filters.year) params.set('year', filters.year);
+            
+            const queryString = params.toString();
+            const newUrl = queryString ? `?${queryString}` : window.location.pathname;
+            
+            // Solo actualizar si la URL es diferente (evitar loops infinitos)
+            if (window.location.search !== (queryString ? `?${queryString}` : '')) {
+                window.history.replaceState({}, '', newUrl);
+            }
+        }
+    });
 
-	// Efecto para aplicar filtros automáticamente cuando cambian
-	let filterTimeout: ReturnType<typeof setTimeout> | null = null;
-	$effect(() => {
-		// Observar cambios en los filtros
-		const _ = {
-			operation_type: filters.operation_type,
-			invoice_type: filters.invoice_type,
-			invoice_number: filters.invoice_number,
-			project_number: filters.project_number,
-			year: filters.year
-		};
+    // Efecto para aplicar filtros automáticamente cuando cambian
+    let filterTimeout: ReturnType<typeof setTimeout> | null = null;
+    $effect(() => {
+        // Observar cambios en los filtros
+        const _ = {
+            operation_type: filters.operation_type,
+            invoice_type: filters.invoice_type,
+            invoice_number: filters.invoice_number,
+            project_number: filters.project_number,
+            year: filters.year
+        };
 
-		// Debounce para evitar múltiples llamadas rápidas
-		if (filterTimeout) clearTimeout(filterTimeout);
-		filterTimeout = setTimeout(() => {
-			applyFilters();
-		}, 300); // Esperar 300ms después del último cambio
-	});
+        // Debounce para evitar múltiples llamadas rápidas
+        if (filterTimeout) clearTimeout(filterTimeout);
+        filterTimeout = setTimeout(() => {
+            applyFilters();
+        }, 300); // Esperar 300ms después del último cambio
+    });
 
-	// Sincronizar token de cookies a localStorage al montar el componente
-	onMount(() => {
-		if (browser) {
-			// Función para obtener el valor de una cookie
-			const getCookie = (name: string): string | null => {
-				const value = `; ${document.cookie}`;
-				const parts = value.split(`; ${name}=`);
-				if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
-				return null;
-			};
+    // Sincronizar token de cookies a localStorage al montar el componente
+    onMount(() => {
+        if (browser) {
+            // Función para obtener el valor de una cookie
+            const getCookie = (name: string): string | null => {
+                const value = `; ${document.cookie}`;
+                const parts = value.split(`; ${name}=`);
+                if (parts.length === 2) return parts.pop()?.split(';').shift() || null;
+                return null;
+            };
 
-			// Verificar si hay token en las cookies
-			const cookieToken = getCookie('access_token');
-			const localToken = localStorage.getItem('access_token');
+            // Verificar si hay token en las cookies
+            const cookieToken = getCookie('access_token');
+            const localToken = localStorage.getItem('access_token');
 
-			if (cookieToken && cookieToken !== localToken) {
-				localStorage.setItem('access_token', cookieToken);
-			}
+            if (cookieToken && cookieToken !== localToken) {
+                localStorage.setItem('access_token', cookieToken);
+            }
 
-			// También sincronizar refresh_token si existe
-			const cookieRefreshToken = getCookie('refresh_token');
-			const localRefreshToken = localStorage.getItem('refresh_token');
+            // También sincronizar refresh_token si existe
+            const cookieRefreshToken = getCookie('refresh_token');
+            const localRefreshToken = localStorage.getItem('refresh_token');
 
-			if (cookieRefreshToken && cookieRefreshToken !== localRefreshToken) {
-				localStorage.setItem('refresh_token', cookieRefreshToken);
-			}
+            if (cookieRefreshToken && cookieRefreshToken !== localRefreshToken) {
+                localStorage.setItem('refresh_token', cookieRefreshToken);
+            }
 
-			// Escuchar cambios de compañía
-			const handleCompanyChange = (event: CustomEvent) => {				
-				// Recargar los datos sin recargar la página completa
-				reloadData();
-			};
+            // Escuchar cambios de compañía
+            const handleCompanyChange = (event: CustomEvent) => {               
+                // Recargar los datos sin recargar la página completa
+                reloadData();
+            };
 
-			window.addEventListener('companyChanged', handleCompanyChange as EventListener);
+            window.addEventListener('companyChanged', handleCompanyChange as EventListener);
 
-			// Cleanup
-			return () => {
-				window.removeEventListener('companyChanged', handleCompanyChange as EventListener);
-			};
-		}
-	});
+            // Cleanup
+            return () => {
+                window.removeEventListener('companyChanged', handleCompanyChange as EventListener);
+            };
+        }
+    });
 
-	// Estado para infinite scroll
-	let allItems = $state<Invoice[]>(data.items || []);
-	let currentPage = $state(data.page);
-	let pageSize = $state(50);
-	let totalItems = $state(data.total || 0);
-	let loading = $state(false);
-	let hasMore = $derived(allItems.length < totalItems);
-	let error = $state<string | null>(data.error || null);
+    // Estado para infinite scroll
+    let allItems = $state<Invoice[]>(data.items || []);
+    let currentPage = $state(data.page);
+    let pageSize = $state(50);
+    let totalItems = $state(data.total || 0);
+    let loading = $state(false);
+    let hasMore = $derived(allItems.length < totalItems);
+    let error = $state<string | null>(data.error || null);
+    
+    // Estado para selección de fila
+    let selectedInvoiceId = $state<number | null>(null);
 
-	async function loadMore() {
-		if (loading || !hasMore) return;
+    function handleRowClick(invoice: Invoice) {
+        // Si ya está seleccionado, lo deseleccionamos (opcional, si queremos permitir toggle)
+        // O simplemente lo seleccionamos. Aquí implemento toggle.
+        if (selectedInvoiceId === invoice.id) {
+            selectedInvoiceId = null;
+        } else {
+            selectedInvoiceId = invoice.id;
+        }
+        console.log('Selected Invoice ID:', selectedInvoiceId);
+    }
 
-		loading = true;
-		error = null;
+    const selectedInvoice = $derived(
+        selectedInvoiceId ? allItems.find(i => i.id === selectedInvoiceId) : null
+    );
 
-		try {
-			const companyId = companyStore.activeCompany?.id;
-			if (!companyId) {
-				error = 'No hay compañía seleccionada';
-				return;
-			}
-			
-			const filterParams = {
-				operation_type: filters.operation_type || undefined,
-				invoice_type: filters.invoice_type || undefined,
-				invoice_number: filters.invoice_number || undefined,
-				project_number: filters.project_number || undefined,
-				year: filters.year || undefined
-			};
-			
-			const response = await invoicesApi.list(companyId, currentPage + 1, pageSize, filterParams);
+    async function loadMore() {
+        if (loading || !hasMore) return;
 
-			if (response.error) {
-				console.error('📊 [Invoices] Error en loadMore:', response.error, 'Status:', response.status);
-				
-				if (response.status === 401 || response.status === 403) {
-					error = 'Sesión expirada. Recargando página...';
-					setTimeout(() => {
-						window.location.reload();
-					}, 2000);
-				} else {
-					error = response.error;
-				}
-				return;
-			}
+        loading = true;
+        error = null;
 
-			if (response.data?.items) {				
-				// Agregar los nuevos items al array existente
-				allItems = [...allItems, ...response.data.items];
-				currentPage++;
-				totalItems = response.data.total;
-			}
-		} catch (e) {
-			error = 'Error cargando más datos';
-			console.error('📊 [Invoices] Error loading more:', e);
-		} finally {
-			loading = false;
-		}
-	}
+        try {
+            const companyId = companyStore.activeCompany?.id;
+            if (!companyId) {
+                error = 'No hay compañía seleccionada';
+                return;
+            }
+            
+            const filterParams = {
+                operation_type: filters.operation_type || undefined,
+                invoice_type: filters.invoice_type || undefined,
+                invoice_number: filters.invoice_number || undefined,
+                project_number: filters.project_number || undefined,
+                year: filters.year || undefined
+            };
+            
+            const response = await invoicesApi.list(companyId, currentPage + 1, pageSize, filterParams);
 
-	async function applyFilters() {
-		// Reset y recargar con filtros
-		loading = true;
-		error = null;
-		
-		try {
-			const companyId = companyStore.activeCompany?.id;
-			if (!companyId) {
-				error = 'No hay compañía seleccionada';
-				return;
-			}
-			
-			// Construir query parameters para el endpoint
-			// Los filtros se mapean a los parámetros del API
-			const filterParams = {
-				operation_type: filters.operation_type || undefined,
-				invoice_type: filters.invoice_type || undefined,
-				invoice_number: filters.invoice_number || undefined,
-				project_number: filters.project_number || undefined,
-				year: filters.year || undefined
-			};
-			
-			const response = await invoicesApi.list(companyId, 1, pageSize, filterParams);
+            if (response.error) {
+                console.error('📊 [Invoices] Error en loadMore:', response.error, 'Status:', response.status);
+                
+                if (response.status === 401 || response.status === 403) {
+                    error = 'Sesión expirada. Recargando página...';
+                    setTimeout(() => {
+                        window.location.reload();
+                    }, 2000);
+                } else {
+                    error = response.error;
+                }
+                return;
+            }
 
-			if (response.error) {
-				console.error('📊 [Invoices] Error aplicando filtros:', response.error);
-				
-				if (response.status === 401 || response.status === 403) {
-					error = 'Sesión expirada. Recargando página...';
-					setTimeout(() => {
-						window.location.reload();
-					}, 2000);
-				} else {
-					error = response.error;
-				}
-				return;
-			}
+            if (response.data?.items) {             
+                // Agregar los nuevos items al array existente
+                allItems = [...allItems, ...response.data.items];
+                currentPage++;
+                totalItems = response.data.total;
+            }
+        } catch (e) {
+            error = 'Error cargando más datos';
+            console.error('📊 [Invoices] Error loading more:', e);
+        } finally {
+            loading = false;
+        }
+    }
 
-			if (response.data) {
-				allItems = response.data.items;
-				currentPage = 1;
-				totalItems = response.data.total;
-			}
-		} catch (e) {
-			error = 'Error aplicando filtros';
-			console.error('📊 [Invoices] Error applying filters:', e);
-		} finally {
-			loading = false;
-		}
-	}
+    async function applyFilters() {
+        // Reset y recargar con filtros
+        loading = true;
+        error = null;
+        
+        try {
+            const companyId = companyStore.activeCompany?.id;
+            if (!companyId) {
+                error = 'No hay compañía seleccionada';
+                return;
+            }
+            
+            // Construir query parameters para el endpoint
+            // Los filtros se mapean a los parámetros del API
+            const filterParams = {
+                operation_type: filters.operation_type || undefined,
+                invoice_type: filters.invoice_type || undefined,
+                invoice_number: filters.invoice_number || undefined,
+                project_number: filters.project_number || undefined,
+                year: filters.year || undefined
+            };
+            
+            const response = await invoicesApi.list(companyId, 1, pageSize, filterParams);
 
-	function clearFilters() {
-		filters = {
-			operation_type: '',
-			invoice_type: '',
-			invoice_number: '',
-			project_number: '',
-			year: ''
-		};
-		applyFilters();
-	}
+            if (response.error) {
+                console.error('📊 [Invoices] Error aplicando filtros:', response.error);
+                
+                if (response.status === 401 || response.status === 403) {
+                    error = 'Sesión expirada. Recargando página...';
+                    setTimeout(() => {
+                        window.location.reload();
+                    }, 2000);
+                } else {
+                    error = response.error;
+                }
+                return;
+            }
 
-	async function reloadData() {
-		// Reset y recargar desde el principio usando la API
-		if (!companyStore.activeCompany) return;
-		
-		loading = true;
-		error = null;
+            if (response.data) {
+                allItems = response.data.items;
+                currentPage = 1;
+                totalItems = response.data.total;
+            }
+        } catch (e) {
+            error = 'Error aplicando filtros';
+            console.error('📊 [Invoices] Error applying filters:', e);
+        } finally {
+            loading = false;
+        }
+    }
 
-		try {
-			const companyId = companyStore.activeCompany.id;
-			
-			const filterParams = {
-				operation_type: filters.operation_type || undefined,
-				invoice_type: filters.invoice_type || undefined,
-				invoice_number: filters.invoice_number || undefined,
-				project_number: filters.project_number || undefined,
-				year: filters.year || undefined
-			};
+    function clearFilters() {
+        filters = {
+            operation_type: '',
+            invoice_type: '',
+            invoice_number: '',
+            project_number: '',
+            year: ''
+        };
+        applyFilters();
+    }
 
-			const response = await invoicesApi.list(companyId, 1, pageSize, filterParams);
+    async function reloadData() {
+        // Reset y recargar desde el principio usando la API
+        if (!companyStore.activeCompany) return;
+        
+        loading = true;
+        error = null;
 
-			if (response.error) {
-				console.error('📊 [Invoices] Error en reloadData:', response.error);
-				if (response.status === 401 || response.status === 403) {
-					error = 'Sesión expirada. Recargando página...';
-					setTimeout(() => {
-						window.location.reload();
-					}, 2000);
-				} else {
-					error = response.error;
-				}
-				return;
-			}
+        try {
+            const companyId = companyStore.activeCompany.id;
+            
+            const filterParams = {
+                operation_type: filters.operation_type || undefined,
+                invoice_type: filters.invoice_type || undefined,
+                invoice_number: filters.invoice_number || undefined,
+                project_number: filters.project_number || undefined,
+                year: filters.year || undefined
+            };
 
-			if (response.data?.items) {
-				// Reemplazar todos los items con los nuevos datos
-				allItems = response.data.items;
-				currentPage = 1;
-				totalItems = response.data.total;
-			}
-		} catch (e) {
-			error = 'Error recargando datos';
-			console.error('📊 [Invoices] Error reloading:', e);
-		} finally {
-			loading = false;
-		}
-	}
+            const response = await invoicesApi.list(companyId, 1, pageSize, filterParams);
 
-	function handleCreateClick() {
-		// Leer los filtros actuales desde la URL (que ya se actualizó con el $effect)
-		const params = new URLSearchParams(window.location.search);
-		
-		// Mapear operation_type de 'imp'/'exp' a números 1/2
-		const operationType = params.get('operation_type');
-		if (operationType) {
-			const operationTypeNumber = operationType === 'exp' ? 1 : 2;
-			params.set('operation_type', operationTypeNumber.toString());
-		}
-		
-		const queryString = params.toString();
-		const url = queryString 
-			? `/dashboard/invoices/edit/new?${queryString}` 
-			: '/dashboard/invoices/edit/new';
-		
-		window.location.href = url;
-	}
+            if (response.error) {
+                console.error('📊 [Invoices] Error en reloadData:', response.error);
+                if (response.status === 401 || response.status === 403) {
+                    error = 'Sesión expirada. Recargando página...';
+                    setTimeout(() => {
+                        window.location.reload();
+                    }, 2000);
+                } else {
+                    error = response.error;
+                }
+                return;
+            }
 
-	function handleSuccess() {
-		// Recargar datos después de crear/editar/eliminar
-		reloadData();
-	}
+            if (response.data?.items) {
+                // Reemplazar todos los items con los nuevos datos
+                allItems = response.data.items;
+                currentPage = 1;
+                totalItems = response.data.total;
+            }
+        } catch (e) {
+            error = 'Error recargando datos';
+            console.error('📊 [Invoices] Error reloading:', e);
+        } finally {
+            loading = false;
+        }
+    }
 
-	// Opciones de tipo de operación para el filtro
-	const operationTypeOptions = [
-		{ value: "", label: "Todas" },
-		{ value: 'imp', label: 'Importación' },
-		{ value: 'exp', label: 'Exportación' }
-	];
+    // Estado para el diálogo de progreso
+    let showProgressDialog = $state(false);
+    let currentTaskId = $state<string | null>(null);
+    let currentStatusFunction = $state<((taskId: string) => Promise<any>) | null>(null);
 
-	// Todas las opciones de tipo de factura con su operación correspondiente
-	// Ahora se cargan desde el servidor en lugar de estar hardcodeadas
-	const allInvoiceTypeOptions = $derived(() => {
-		const options = [{ value: "", label: "Todas", operation: "both" }];
-		
-		// Agregar los tipos de factura del servidor
-		if (data.invoiceTypes) {
-			data.invoiceTypes.forEach((type: any) => {
-				options.push({
-					value: type.key,
-					label: type.description,
-					operation: type.operation
-				});
-			});
-		}
-		
-		return options;
-	});
+    // Utilidad para convertir Base64 a Blob
+    function base64ToBlob(base64: string, type: string) {
+        const binStr = atob(base64);
+        const len = binStr.length;
+        const arr = new Uint8Array(len);
+        for (let i = 0; i < len; i++) {
+            arr[i] = binStr.charCodeAt(i);
+        }
+        return new Blob([arr], { type: type });
+    }
 
-	// Opciones de tipo de factura filtradas según el tipo de operación seleccionado
-	const invoiceTypeOptions = $derived(() => {
-		const allOptions = allInvoiceTypeOptions();
-		
-		if (!filters.operation_type) {
-			return allOptions;
-		}
-		
-		return allOptions.filter(option => 
-			option.operation === 'both' || 
-			option.operation === filters.operation_type
-		);
-	});
+    async function handleDownloadPdf(invoice: any) {
+        if (!companyStore.activeCompany) {
+            toast.error("No hay empresa seleccionada");
+            return;
+        }
 
-	// Crear columnas con el callback onSuccess
-	const columns = createColumns(handleSuccess);
+        try {
+            // 1. Trigger: Iniciar la tarea en Celery
+            const { task_id } = await invoicesReportsApi.triggerPdfGeneration(
+                invoice.id, 
+                companyStore.activeCompany.id
+            );
+
+            // 2. Abrir diálogo de progreso
+            currentTaskId = task_id;
+            currentStatusFunction = invoicesReportsApi.getTaskStatus;
+            showProgressDialog = true;
+
+        } catch (error) {
+            console.error(error);
+            toast.error("No se pudo iniciar la descarga");
+        }
+    }
+
+    async function handleDownloadConsolidated(invoice: any) {
+        if (!companyStore.activeCompany) {
+            toast.error("No hay empresa seleccionada");
+            return;
+        }
+
+        try {
+            // 1. Trigger: Iniciar la tarea en Celery (Consolidado)
+            const { task_id } = await consolidatedReportsApi.triggerPdfGeneration(
+                invoice.id, 
+                companyStore.activeCompany.id
+            );
+
+            // 2. Abrir diálogo de progreso
+            currentTaskId = task_id;
+            currentStatusFunction = consolidatedReportsApi.getTaskStatus;
+            showProgressDialog = true;
+
+        } catch (error) {
+            console.error(error);
+            toast.error("No se pudo iniciar la descarga del consolidado");
+        }
+    }
+
+    function onPdfComplete(result: any) {
+        // Esta función se llama cuando el diálogo reporta SUCCESS
+        try {
+            if (result.status === 'success') {
+                const blob = base64ToBlob(result.content, result.media_type);
+                const url = window.URL.createObjectURL(blob);
+                const a = document.createElement('a');
+                a.href = url;
+                a.download = result.file_name;
+                document.body.appendChild(a);
+                a.click();
+                window.URL.revokeObjectURL(url);
+                document.body.removeChild(a);
+                toast.success("PDF Descargado exitosamente");
+            } else {
+                toast.error("El worker reportó un error: " + (result.message || "Desconocido"));
+            }
+        } catch (e) {
+            console.error("Error al procesar descarga:", e);
+            toast.error("Error al procesar el archivo descargado");
+        } finally {
+            // Cerrar diálogo después de un breve momento
+             setTimeout(() => {
+                showProgressDialog = false;
+                currentTaskId = null;
+            }, 1000);
+        }
+    }
+
+    function handleCreateClick() {
+        const params = new URLSearchParams(window.location.search);
+        const operationType = params.get('operation_type');
+        if (operationType) {
+            const operationTypeNumber = operationType === 'exp' ? 1 : 2;
+            params.set('operation_type', operationTypeNumber.toString());
+        }
+        
+        const queryString = params.toString();
+        const url = queryString 
+            ? `/dashboard/invoices/edit/new?${queryString}` 
+            : '/dashboard/invoices/edit/new';
+        
+        window.location.href = url;
+    }
+
+    function handleSuccess() {
+        reloadData();
+    }
+
+    // Opciones de tipo de operación para el filtro
+    const operationTypeOptions = [
+        { value: "", label: "Todas" },
+        { value: 'imp', label: 'Importación' },
+        { value: 'exp', label: 'Exportación' }
+    ];
+
+    // Todas las opciones de tipo de factura con su operación correspondiente
+    const allInvoiceTypeOptions = $derived(() => {
+        const options = [{ value: "", label: "Todas", operation: "both" }];
+        if (data.invoiceTypes) {
+            data.invoiceTypes.forEach((type: any) => {
+                options.push({
+                    value: type.key,
+                    label: type.description,
+                    operation: type.operation
+                });
+            });
+        }
+        return options;
+    });
+
+    const invoiceTypeOptions = $derived(() => {
+        const allOptions = allInvoiceTypeOptions();
+        if (!filters.operation_type) {
+            return allOptions;
+        }
+        return allOptions.filter(option => 
+            option.operation === 'both' || 
+            option.operation === filters.operation_type
+        );
+    });
+
+    function closeProgressDialog() {
+        showProgressDialog = false;
+        currentTaskId = null;
+        currentStatusFunction = null;
+    }
+
+    // --- AQUÍ PASAMOS LA FUNCIÓN DE DESCARGA A LAS COLUMNAS ---
+    const columns = createColumns(handleSuccess);
 </script>
 
 <div class="space-y-6">
-	<!-- Header -->
-	<div class="flex items-center justify-between">
-		<div>
-			<h1 class="text-3xl font-bold tracking-tight">Facturas</h1>
-			<p class="text-muted-foreground">
-				Gestiona las facturas del sistema
-			</p>
-		</div>
-		<Button onclick={handleCreateClick}>
-			<Plus class="mr-2" size={16} />
-			Nueva Factura
-		</Button>
-	</div>
+    <div class="flex items-center justify-between">
+        <div>
+            <h1 class="text-3xl font-bold tracking-tight">Facturas</h1>
+            <p class="text-muted-foreground">
+                Gestiona las facturas del sistema
+            </p>
+        </div>
+        <Button onclick={handleCreateClick}>
+            <Plus class="mr-2" size={16} />
+            Nueva Factura
+        </Button>
+    </div>
 
-	<!-- Filtros -->
-	<Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-		<Card.Content>
-			<div class="grid grid-cols-1 md:grid-cols-5 gap-4">
-				<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"
-					>
-						{#each operationTypeOptions as option}
-							<option value={option.value}>{option.label}</option>
-						{/each}
-					</select>
-				</div>
+    <Card.Root>
+        <Card.Header>
+            <Card.Title>Filtros</Card.Title>
+            <Card.Description>Filtra las facturas por diferentes criterios (los filtros se aplican automáticamente)</Card.Description>
+        </Card.Header>
+        <Card.Content>
+            <div class="grid grid-cols-1 md:grid-cols-5 gap-4">
+                <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"
+                    >
+                        {#each operationTypeOptions as option}
+                            <option value={option.value}>{option.label}</option>
+                        {/each}
+                    </select>
+                </div>
 
-				<div class="space-y-2">
-					<Label for="filter-invoice-type">Tipo de Factura</Label>
-					<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"
-					>
-						{#each invoiceTypeOptions() as option}
-							<option value={option.value}>{option.label}</option>
-						{/each}
-					</select>
-				</div>
+                <div class="space-y-2">
+                    <Label for="filter-invoice-type">Tipo de Factura</Label>
+                    <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"
+                    >
+                        {#each invoiceTypeOptions() as option}
+                            <option value={option.value}>{option.label}</option>
+                        {/each}
+                    </select>
+                </div>
 
-				<div class="space-y-2">
-					<Label for="filter-invoice-number">Número de Factura</Label>
-					<Input
-						id="filter-invoice-number"
-						bind:value={filters.invoice_number}
-						placeholder="Ej: INV-2024-001"
-					/>
-				</div>
+                <div class="space-y-2">
+                    <Label for="filter-invoice-number">Número de Factura</Label>
+                    <Input
+                        id="filter-invoice-number"
+                        bind:value={filters.invoice_number}
+                        placeholder="Ej: INV-2024-001"
+                    />
+                </div>
 
-				<div class="space-y-2">
-					<Label for="filter-project-number">Número de Proyecto</Label>
-					<Input
-						id="filter-project-number"
-						bind:value={filters.project_number}
-						placeholder="Ej: PROJ-001"
-					/>
-				</div>
+                <div class="space-y-2">
+                    <Label for="filter-project-number">Número de Proyecto</Label>
+                    <Input
+                        id="filter-project-number"
+                        bind:value={filters.project_number}
+                        placeholder="Ej: PROJ-001"
+                    />
+                </div>
 
-				<div class="space-y-2">
-					<Label for="filter-year">Año</Label>
-					<Input
-						id="filter-year"
-						bind:value={filters.year}
-						placeholder="Ej: 2024"
-						maxlength={4}
-					/>
-				</div>
-			</div>						
-		</Card.Content>
-	</Card.Root>
+                <div class="space-y-2">
+                    <Label for="filter-year">Año</Label>
+                    <Input
+                        id="filter-year"
+                        bind:value={filters.year}
+                        placeholder="Ej: 2024"
+                        maxlength={4}
+                    />
+                </div>
+            </div>                      
+        </Card.Content>
+    </Card.Root>
 
-	<!-- Error Message -->
-	{#if error}
-		<Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-destructive dark:border-red-800">
-			<Card.Header>
-				<Card.Title class="text-destructive">Error</Card.Title>
-				<Card.Description>{error}</Card.Description>
-			</Card.Header>
-		</Card.Root>
-	{/if}
+    {#if error}
+        <Card.Root class="border-destructive">
+            <Card.Header>
+                <Card.Title class="text-destructive">Error</Card.Title>
+                <Card.Description>{error}</Card.Description>
+            </Card.Header>
+        </Card.Root>
+    {/if}
 
-	<!-- Data Table -->
-	<Card.Root class="bg-card dark:bg-black text-card-foreground dark:text-white border-border dark:border-gray-800">
-		<Card.Header>
-			<div class="flex items-center justify-between">
-				<div>
-					<Card.Title>Listado de Facturas</Card.Title>
-					<Card.Description>
-						Mostrando {allItems.length} de {totalItems} registros
-					</Card.Description>
-				</div>
-				<Button variant="outline" onclick={reloadData}>
-					<RefreshCw class="mr-2" size={16} />
-					Actualizar
-				</Button>
-			</div>
-		</Card.Header>
-		<Card.Content>
-			<!-- TanStack DataTable con Infinite Scroll -->
-			<DataTable
-				data={allItems}
-				{columns}
-				{loading}
-				{hasMore}
-				{loadMore}
-			/>
-		</Card.Content>
-	</Card.Root>
-</div>
+    <Card.Root>
+        <Card.Header>
+            <div class="flex items-center justify-between">
+                <div>
+                    <Card.Title>Listado de Facturas</Card.Title>
+                    <Card.Description>
+                        Mostrando {allItems.length} de {totalItems} registros
+                    </Card.Description>
+                </div>
+                <Button variant="outline" onclick={reloadData}>
+                    <RefreshCw class="mr-2" size={16} />
+                    Actualizar
+                </Button>
+            </div>
+        </Card.Header>
+        <Card.Content>
+            <DataTable
+                data={allItems}
+                {columns}
+                {loading}
+                {hasMore}
+                {loadMore}
+                selectedId={selectedInvoiceId}
+                onRowClick={handleRowClick}
+            />
+        </Card.Content>
+    </Card.Root>
+
+
+    <PdfProgressDialog 
+        bind:open={showProgressDialog} 
+        taskId={currentTaskId}
+        getStatus={currentStatusFunction}
+        onComplete={onPdfComplete}
+        onClose={closeProgressDialog}
+    />
+
+    <!-- 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))]">
+        <div class="px-4 py-4 max-w-[1400px] mx-auto">
+            <!-- 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" />
+                    Actualizar
+                </Button>
+                <Button variant="outline" size="sm" disabled={!selectedInvoice}>
+                    <RotateCcw class="h-4 w-4 mr-2" />
+                    Desactualizar
+                </Button>
+                <Button variant="outline" size="sm" onclick={() => selectedInvoice && handleDownloadPdf(selectedInvoice)} disabled={!selectedInvoice}>
+                    <FileText class="h-4 w-4 mr-2" />
+                    Factura
+                </Button>
+                <Button variant="outline" size="sm" onclick={() => selectedInvoice && handleDownloadConsolidated(selectedInvoice)} disabled={!selectedInvoice}>
+                    <Boxes class="h-4 w-4 mr-2" />
+                    Consolidado
+                </Button>
+            </div>
+        </div>
+    </div>
+</div>
\ No newline at end of file
diff --git a/reinicio.sh b/reinicio.sh
new file mode 100755
index 00000000..4e886a29
--- /dev/null
+++ b/reinicio.sh
@@ -0,0 +1,5 @@
+#bin/bash
+
+docker compose down
+docker compose up -d --build
+