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
index 34cbc9ef..4836c0ad 100644
--- a/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py
+++ b/backend/api/v1/modules/a76/reports/importacion/consolidados/mex/service.py
@@ -67,12 +67,18 @@ class ConsolidadoImportacionMexService:
         return pdfkit.configuration(wkhtmltopdf=path)
 
     def formatear_numero(self, valor, decimales: int = 2):
+        """
+        Formatea un número con separadores de miles y decimales especificados.
+        Retorna una cadena formateada para mostrar en reportes.
+        """
         if valor is None:
-            return 0.0
+            valor = 0.0
         try:
-            return round(float(valor), decimales)
+            num = round(float(valor), decimales)
+            # Formatear con separadores de miles y decimales
+            return f"{num:,.{decimales}f}"
         except:
-            return 0.0
+            return f"0.{'0' * decimales}"
 
     def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
         if not fraccion_raw or len(fraccion_raw) < 8:
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
index 619ae2f5..a7163ed1 100644
--- a/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/mex/service.py
@@ -103,12 +103,18 @@ class FacturaImportacionMexService:
         return pdfkit.configuration(wkhtmltopdf=path)
 
     def formatear_numero(self, valor, decimales: int = 2):
+        """
+        Formatea un número con separadores de miles y decimales especificados.
+        Retorna una cadena formateada para mostrar en reportes.
+        """
         if valor is None:
-            return 0.0
+            valor = 0.0
         try:
-            return round(float(valor), decimales)
+            num = round(float(valor), decimales)
+            # Formatear con separadores de miles y decimales
+            return f"{num:,.{decimales}f}"
         except:
-            return 0.0
+            return f"0.{'0' * decimales}"
 
     def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
         if not fraccion_raw or len(fraccion_raw) < 8:
diff --git a/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py b/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py
index 324bb91a..12595fda 100644
--- a/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/routes.py
@@ -41,9 +41,10 @@ async def trigger_descarga_factura(
     invoice_id: int,
     company_id: int = Query(..., description="ID de la empresa"),
     invoice_type: str = Query('mexican', description="Tipo de factura: 'mexican' o 'american'"),
+    currency_code: str = Query('ORIGINAL', description="Moneda: 'MXN', 'USD', o 'ORIGINAL'"),
     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, invoice_type)
+    task = generar_pdf_factura_async.delay(invoice_id, company_id, invoice_type, currency_code)
     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/usa/service.py b/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py
index d5ec1d10..98eb0284 100644
--- a/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py
+++ b/backend/api/v1/modules/a76/reports/importacion/facturas/usa/service.py
@@ -95,10 +95,13 @@ class FacturaImportacionUsaService:
         return pdfkit.configuration(wkhtmltopdf=path)
 
     def formatear_numero(self, valor, decimales: int = 2):
-        if valor is None: return 0.0
+        if valor is None:
+            valor = 0.0
         try:
-            return round(float(valor), decimales)
-        except: return 0.0
+            num = round(float(valor), decimales)
+            return f"{num:,.{decimales}f}"
+        except:
+            return f"0.{'0' * decimales}"
 
     def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
         if not fraccion_raw or len(fraccion_raw) < 8:
diff --git a/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py b/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py
index a6163592..55e1a1dc 100644
--- a/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py
+++ b/backend/api/v1/modules/a76/reports/importacion/packing_list/service.py
@@ -67,10 +67,18 @@ class PackingListService:
         return pdfkit.configuration(wkhtmltopdf=path)
 
     def formatear_numero(self, valor, decimales: int = 2):
-        if valor is None: return 0.0
+        """
+        Formatea un número con separadores de miles y decimales especificados.
+        Retorna una cadena formateada para mostrar en reportes.
+        """
+        if valor is None:
+            valor = 0.0
         try:
-            return round(float(valor), decimales)
-        except: return 0.0
+            num = round(float(valor), decimales)
+            # Formatear con separadores de miles y decimales
+            return f"{num:,.{decimales}f}"
+        except:
+            return f"0.{'0' * decimales}"
 
     def _format_fraccion_fallback(self, fraccion_raw: str) -> str:
         if not fraccion_raw or len(fraccion_raw) < 8:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/movement_service.py b/backend/api/v1/modules/a76/reports/movements/invoices/movement_service.py
index 303dd6e8..1d3cc18b 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/movement_service.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/movement_service.py
@@ -15,7 +15,8 @@ from .schemas import (
     ExportRepairFilter,
     AllMovementsFilter,
     MovementItem,
-    MovementItemDetailed
+    MovementItemDetailed,
+    ReportType
 )
 from .services.temporary import TemporaryImportService
 from .services.definitive import DefinitiveImportService
@@ -163,7 +164,6 @@ class MovementService:
         
         # 1. Temporary Imports
         if should_fetch_imports:
-            try:
                 temp_filter = ImportTemporaryFilter(
                     range_type=filters.range_type,
                     start_date=filters.start_date,
@@ -172,121 +172,119 @@ class MovementService:
                     provider=filters.provider,
                     buyer=filters.buyer,
                     pedimento_code=filters.pedimento_code,
-                    report_type='Normal',  # Always use normal mode for combined report
+                    report_type=filters.report_type,  # Use filter's report_type
                     currency_type=filters.currency_type,
                     exchange_rate_type=filters.exchange_rate_type,
                     is_shelter=filters.is_shelter,
                     database_name='default'  # Required field
                 )
-                temp_movements = self.temporary_service.get_movements(db, temp_filter)
+                if filters.report_type == ReportType.DETAILED:
+                    temp_movements = self.temporary_service.get_movements_detailed(db, temp_filter)
+                else:
+                    temp_movements = self.temporary_service.get_movements(db, temp_filter)
                 all_movements.extend(temp_movements)
                 logger.info(f"Added {len(temp_movements)} temporary import movements")
-            except Exception as e:
-                db.rollback()  # Rollback failed transaction
-                logger.warning(f"Error fetching temporary imports: {e}")
         
         # 2. Definitive Imports
         if should_fetch_imports:
-            try:
-                def_filter = ImportDefinitiveFilter(
-                    range_type=filters.range_type,
-                    start_date=filters.start_date,
-                    end_date=filters.end_date,
-                    include_cancelled=filters.include_cancelled,
-                    provider=filters.provider,
-                    buyer=filters.buyer,
-                    pedimento_code=filters.pedimento_code,
-                    report_type='Normal',
-                    currency_type=filters.currency_type,
-                    exchange_rate_type=filters.exchange_rate_type,
-                    is_shelter=filters.is_shelter,
-                    database_name='default',
-                    movement_type='ALL'  # Required field - include all definitive types
-                )
+            def_filter = ImportDefinitiveFilter(
+                range_type=filters.range_type,
+                start_date=filters.start_date,
+                end_date=filters.end_date,
+                include_cancelled=filters.include_cancelled,
+                provider=filters.provider,
+                buyer=filters.buyer,
+                pedimento_code=filters.pedimento_code,
+                report_type=filters.report_type,
+                currency_type=filters.currency_type,
+                exchange_rate_type=filters.exchange_rate_type,
+                is_shelter=filters.is_shelter,
+                database_name='default',
+                movement_type='ALL',
+                use_transport_method=False
+            )
+            if filters.report_type == ReportType.DETAILED:
+                def_movements = self.definitive_service.get_movements_detailed(db, def_filter)
+            else:
                 def_movements = self.definitive_service.get_movements(db, def_filter)
-                all_movements.extend(def_movements)
-                logger.info(f"Added {len(def_movements)} definitive import movements")
-            except Exception as e:
-                db.rollback()  # Rollback failed transaction
-                logger.warning(f"Error fetching definitive imports: {e}")
+            all_movements.extend(def_movements)
+            logger.info(f"Added {len(def_movements)} definitive import movements")
         
         # 3. Repair Imports
         if should_fetch_imports:
-            try:
-                repair_filter = ImportRepairFilter(
-                    range_type=filters.range_type,
-                    start_date=filters.start_date,
-                    end_date=filters.end_date,
-                    include_cancelled=filters.include_cancelled,
-                    provider=filters.provider,
-                    buyer=filters.buyer,
-                    pedimento_code=filters.pedimento_code,
-                    report_type='Normal',
-                    currency_type=filters.currency_type,
-                    exchange_rate_type=filters.exchange_rate_type,
-                    is_shelter=filters.is_shelter,
-                    database_name='default',
-                    discharge_filter='ALL'  # Required field - include all discharge statuses
-                )
+            repair_filter = ImportRepairFilter(
+                range_type=filters.range_type,
+                start_date=filters.start_date,
+                end_date=filters.end_date,
+                include_cancelled=filters.include_cancelled,
+                provider=filters.provider,
+                buyer=filters.buyer,
+                pedimento_code=filters.pedimento_code,
+                report_type=filters.report_type,
+                currency_type=filters.currency_type,
+                exchange_rate_type=filters.exchange_rate_type,
+                is_shelter=filters.is_shelter,
+                database_name='default',
+                discharge_filter='ALL',
+                use_transport_method=False
+            )
+            if filters.report_type == ReportType.DETAILED:
+                repair_movements = self.repair_service.get_movements_detailed(db, repair_filter)
+            else:
                 repair_movements = self.repair_service.get_movements(db, repair_filter)
-                all_movements.extend(repair_movements)
-                logger.info(f"Added {len(repair_movements)} repair import movements")
-            except Exception as e:
-                db.rollback()  # Rollback failed transaction
-                logger.warning(f"Error fetching repair imports: {e}")
+            all_movements.extend(repair_movements)
+            logger.info(f"Added {len(repair_movements)} repair import movements")
         
         # 4. Exports (Definitive)
         if should_fetch_exports:
-            try:
-                export_filter = ExportFilter(
-                    range_type=filters.range_type,
-                    start_date=filters.start_date,
-                    end_date=filters.end_date,
-                    include_cancelled=filters.include_cancelled,
-                    provider=filters.provider,
-                    buyer=filters.buyer,
-                    pedimento_code=filters.pedimento_code,
-                    report_type='Normal',
-                    currency_type=filters.currency_type,
-                    exchange_rate_type=filters.exchange_rate_type,
-                    is_shelter=filters.is_shelter,
-                    database_name='default',
-                    movement_type='ALL',  # Required field
-                    discharge_filter='ALL',  # Required field
-                    use_transport_method=False  # Required field
-                )
+            export_filter = ExportFilter(
+                range_type=filters.range_type,
+                start_date=filters.start_date,
+                end_date=filters.end_date,
+                include_cancelled=filters.include_cancelled,
+                provider=filters.provider,
+                buyer=filters.buyer,
+                pedimento_code=filters.pedimento_code,
+                report_type=filters.report_type,
+                currency_type=filters.currency_type,
+                exchange_rate_type=filters.exchange_rate_type,
+                is_shelter=filters.is_shelter,
+                database_name='default',
+                movement_type='ALL',
+                discharge_filter='ALL',
+                use_transport_method=False
+            )
+            if filters.report_type == ReportType.DETAILED:
+                export_movements = self.export_service.get_movements_detailed(db, export_filter)
+            else:
                 export_movements = self.export_service.get_movements(db, export_filter)
-                all_movements.extend(export_movements)
-                logger.info(f"Added {len(export_movements)} export movements")
-            except Exception as e:
-                db.rollback()  # Rollback failed transaction
-                logger.warning(f"Error fetching exports: {e}")
+            all_movements.extend(export_movements)
+            logger.info(f"Added {len(export_movements)} export movements")
         
         # 5. Export Repairs
         if should_fetch_exports:
-            try:
-                export_repair_filter = ExportRepairFilter(
-                    range_type=filters.range_type,
-                    start_date=filters.start_date,
-                    end_date=filters.end_date,
-                    include_cancelled=filters.include_cancelled,
-                    provider=filters.provider,
-                    buyer=filters.buyer,
-                    pedimento_code=filters.pedimento_code,
-                    report_type='Normal',
-                    currency_type=filters.currency_type,
-                    exchange_rate_type=filters.exchange_rate_type,
-                    is_shelter=filters.is_shelter,
-                    database_name='default',
-                    movement_type='ALL',  # Required field
-                    discharge_filter='ALL'  # Required field
-                )
+            export_repair_filter = ExportRepairFilter(
+                range_type=filters.range_type,
+                start_date=filters.start_date,
+                end_date=filters.end_date,
+                include_cancelled=filters.include_cancelled,
+                provider=filters.provider,
+                buyer=filters.buyer,
+                pedimento_code=filters.pedimento_code,
+                report_type=filters.report_type,
+                currency_type=filters.currency_type,
+                exchange_rate_type=filters.exchange_rate_type,
+                is_shelter=filters.is_shelter,
+                database_name='default',
+                movement_type='ALL',
+                discharge_filter='ALL'
+            )
+            if filters.report_type == ReportType.DETAILED:
+                export_repair_movements = self.export_repair_service.get_movements_detailed(db, export_repair_filter)
+            else:
                 export_repair_movements = self.export_repair_service.get_movements(db, export_repair_filter)
-                all_movements.extend(export_repair_movements)
-                logger.info(f"Added {len(export_repair_movements)} export repair movements")
-            except Exception as e:
-                db.rollback()  # Rollback failed transaction
-                logger.warning(f"Error fetching export repairs: {e}")
+            all_movements.extend(export_repair_movements)
+            logger.info(f"Added {len(export_repair_movements)} export repair movements")
         
         # Sort all movements by date (Fecha field)
         # Handle mixed datetime and string types
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/routes.py b/backend/api/v1/modules/a76/reports/movements/invoices/routes.py
index e6b8a37e..21eff0cc 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/routes.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/routes.py
@@ -1,7 +1,7 @@
 import logging
 from fastapi import APIRouter, Depends, HTTPException, status
 from sqlalchemy.orm import Session
-from typing import List
+from typing import List, Union
 
 from core.database import get_core_db
 from core.security import get_current_user
@@ -65,6 +65,12 @@ def get_temporary_import_movements(
         )
         logger.info(f"Successfully retrieved {len(movements)} movements")
         return movements
+    except ValueError as e:
+        logger.warning(f"Validation error fetching movements: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e)
+        )
     except Exception as e:
         logger.error(f"Error fetching movements: {str(e)}", exc_info=True)
         raise HTTPException(
@@ -121,6 +127,12 @@ def get_temporary_import_movements_detailed(
         )
         logger.info(f"Successfully retrieved {len(movements)} detailed movements")
         return movements
+    except ValueError as e:
+        logger.warning(f"Validation error fetching detailed movements: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e)
+        )
     except Exception as e:
         logger.error(f"Error fetching detailed movements: {str(e)}", exc_info=True)
         raise HTTPException(
@@ -584,7 +596,7 @@ def get_export_repair_movements_detailed(
 
 @router.post(
     "/all", 
-    response_model=List[MovementItem],
+    response_model=Union[List[MovementItemDetailed], List[MovementItem]],
     summary="Get All Invoice Movements",
     description="""
     Retrieve all invoice movements (imports and exports of all types) from database.
@@ -624,6 +636,12 @@ def get_all_movements(
         )
         logger.info(f"Successfully retrieved {len(movements)} total movements")
         return movements
+    except ValueError as e:
+        logger.warning(f"Validation error fetching all movements: {str(e)}")
+        raise HTTPException(
+            status_code=status.HTTP_400_BAD_REQUEST,
+            detail=str(e)
+        )
     except Exception as e:
         logger.error(f"Error fetching all movements: {str(e)}", exc_info=True)
         raise HTTPException(
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/schemas.py b/backend/api/v1/modules/a76/reports/movements/invoices/schemas.py
index 966868ed..3f4ede62 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/schemas.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/schemas.py
@@ -83,6 +83,10 @@ class AllMovementsFilter(BaseModel):
         default=None,
         description="Filter by pedimento code (ClavePed)"
     )
+    report_type: ReportType = Field(
+        default=ReportType.NORMAL,
+        description="Report type: Normal (grouped by invoice) or Detailed (line by line)"
+    )
     currency_type: CurrencyType = Field(
         default=CurrencyType.FOREIGN,
         description="Currency type for value calculations"
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/base.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/base.py
index 14b62a88..e04262a8 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/base.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/base.py
@@ -40,6 +40,15 @@ class StringHelper:
         if not text:
             return text
         return text.replace(',', '')
+    
+    @staticmethod
+    def clean_text(text: Optional[str]) -> Optional[str]:
+        """Clean text by stripping whitespace and removing special characters."""
+        if not text:
+            return None
+        # Remove special characters and extra whitespace
+        cleaned = text.strip()
+        return cleaned if cleaned else None
 
 
 class DateHelper:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py
index cfe08acb..93954c4d 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/database_helpers.py
@@ -75,8 +75,8 @@ class DatabaseHelper:
                     fecha_str = fecha.strftime('%d/%m/%Y') if hasattr(fecha, 'strftime') else str(fecha)
                     ped_info = f" del Pedimento: {pedimento_number}" if pedimento_number else ""
                     raise ValueError(
-                        f"El Tipo de Cambio para la Fecha de Pago: {fecha_str}{ped_info} no está capturado. "
-                        f"Solución: Capturar el Tipo de Cambio para la Fecha: {fecha_str}."
+                        f"Falta el tipo de cambio del día {fecha_str}. "
+                        f"Por favor regístralo en el catálogo de Tipos de Cambio."
                     )
                 logger.warning(f"Exchange rate not found for date {fecha}")
                 return None
@@ -108,11 +108,11 @@ class DatabaseHelper:
         if not client_code:
             return {"name": None, "rfc": None, "tax_id": None}
         
-        client_type = 'provider' if is_supplier else 'client'
+        client_type = 'PROVIDER' if is_supplier else 'CLIENT'
         
         try:
             sql = text("""
-                SELECT name, rfc, tax_id 
+                SELECT name, rfc
                 FROM a76.clients_and_providers 
                 WHERE id = :client_code AND client_or_provider = :client_type
             """)
@@ -122,14 +122,14 @@ class DatabaseHelper:
                 return {
                     "name": result[0],
                     "rfc": result[1],
-                    "tax_id": result[2]
+                    "tax_id": None  # Column does not exist in this table
                 }
             else:
                 logger.debug(f"Client {client_code} not found as {client_type}")
                 return {"name": None, "rfc": None, "tax_id": None}
         except Exception as e:
             logger.error(f"Error fetching client info for {client_code}: {e}")
-            return {"name": None, "rfc": None, "tax_id": None}
+            raise
     
     @staticmethod
     def get_customs_agent_info(
@@ -170,7 +170,7 @@ class DatabaseHelper:
                 return {"name": None, "license": None}
         except Exception as e:
             logger.error(f"Error fetching customs agent info for {agent_code}: {e}")
-            return {"name": None, "license": None}
+            raise
     
     @staticmethod
     def get_aduana_seccion_nombre(
@@ -202,13 +202,13 @@ class DatabaseHelper:
             return result[0] if result else None
         except Exception as e:
             logger.error(f"Error fetching customs section name: {e}")
-            return None
+            raise
     
     @staticmethod
     def get_series_info(
         db: Session, 
         db_name: str, 
-        consecutivo: str, 
+        invoice_id: int, 
         linea: str, 
         is_shelter: bool
     ) -> Optional[str]:
@@ -217,30 +217,30 @@ class DatabaseHelper:
         
         Args:
             db: Database session
-            db_name: Legacy database name
-            consecutivo: Consecutivo value
-            linea: LineaImpo value
-            is_shelter: Shelter flag
+            db_name: Legacy database name (not used in PostgreSQL)
+            invoice_id: Invoice header ID
+            linea: Line number
+            is_shelter: Shelter flag (not used)
             
         Returns:
             Formatted series string or None
         """
-        if not consecutivo or not linea:
+        if not invoice_id or not linea:
             return None
             
         try:
             query = text("""
                 SELECT serial_numbers, model, brand
                 FROM a76.item_line_series ils
-                INNER JOIN a76.item_lines il ON ils.item_line_id = il.id
+                INNER JOIN a76.item_lines il ON ils.line_item_id = il.id
                 INNER JOIN a76.items i ON il.item_id = i.id
-                WHERE i.consecutivo = :consecutivo 
+                WHERE i.invoice_id = :invoice_id 
                 AND il.line_number = :linea
                 ORDER BY ils.id
                 LIMIT 1
             """)
             result = db.execute(query, {
-                "consecutivo": consecutivo,
+                "invoice_id": invoice_id,
                 "linea": linea
             }).fetchone()
             
@@ -257,13 +257,13 @@ class DatabaseHelper:
             return None
         except Exception as e:
             logger.error(f"Error fetching series info: {e}")
-            return None
+            raise
     
     @staticmethod
     def get_series_info_export(
         db: Session, 
         db_name: str, 
-        consecutivo: str, 
+        invoice_id: int, 
         linea: str, 
         is_shelter: bool
     ) -> Optional[str]:
@@ -273,29 +273,31 @@ class DatabaseHelper:
         Args:
             db: Database session
             db_name: Legacy database name
-            consecutivo: Consecutivo value
+            invoice_id: Invoice header ID
             linea: LineaExpo value
             is_shelter: Shelter flag
             
         Returns:
             Formatted series string or None
         """
-        if not consecutivo or not linea:
+        if not invoice_id or not linea:
             return None
             
         try:
+            # Note: Postgres items table calls it expo_brad (typo in DB schema)
+            # ItemLineSeries FK is line_item_id, not item_line_id
             query = text("""
-                SELECT serial_numbers, model, expo_brand
+                SELECT serial_numbers, model, expo_brad
                 FROM a76.item_line_series ils
-                INNER JOIN a76.item_lines il ON ils.item_line_id = il.id
+                INNER JOIN a76.item_lines il ON ils.line_item_id = il.id
                 INNER JOIN a76.items i ON il.item_id = i.id
-                WHERE i.consecutivo = :consecutivo 
+                WHERE i.invoice_id = :invoice_id 
                 AND il.line_number = :linea
                 ORDER BY ils.id
                 LIMIT 1
             """)
             result = db.execute(query, {
-                "consecutivo": consecutivo,
+                "invoice_id": invoice_id,
                 "linea": linea
             }).fetchone()
             
@@ -308,11 +310,11 @@ class DatabaseHelper:
                     parts.append(model)
                 if expo_brand:
                     parts.append(expo_brand)
-                return " / ".join(parts) if parts else None
+                return " | ".join(parts) if parts else None
             return None
         except Exception as e:
             logger.error(f"Error fetching export series info: {e}")
-            return None
+            raise
     
     @staticmethod
     def get_rectification_pedimento(
@@ -497,4 +499,39 @@ class DatabaseHelper:
             return result[0] if result else None
         except Exception as e:
             logger.error(f"Error fetching driver badge for invoice {factura}: {e}")
+            raise
+    
+    @staticmethod
+    def get_part_export_symbol(
+        db: Session,
+        db_name: str,
+        num_parte: str,
+        is_shelter: bool
+    ) -> Optional[str]:
+        """
+        Get export symbol/license for a part number.
+        
+        Args:
+            db: Database session
+            db_name: Database name (not used in PostgreSQL, kept for compatibility)
+            num_parte: Part number
+            is_shelter: Shelter flag (not used, kept for compatibility)
+            
+        Returns:
+            Export symbol/license or None
+        """
+        if not num_parte:
             return None
+        
+        try:
+            query = text("""
+                SELECT exclusion_symbol
+                FROM a76.parts
+                WHERE part_number = :num_parte
+                LIMIT 1
+            """)
+            result = db.execute(query, {"num_parte": num_parte}).fetchone()
+            return result[0] if result else None
+        except Exception as e:
+            logger.error(f"Error fetching export symbol for part {num_parte}: {e}")
+            raise
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/definitive.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/definitive.py
index 5a2c1ee3..442252b9 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/definitive.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/definitive.py
@@ -77,9 +77,18 @@ class DefinitiveImportService:
                 
                 invoice_id = row[16]  # C35 - invoice ID
                 
+                # Helper to safely convert to float
+                def to_float(val):
+                    if val is None or val == '':
+                        return 0.0
+                    try:
+                        return float(val)
+                    except (ValueError, TypeError):
+                        return 0.0
+
                 # Totals come directly from GROUP BY query (no N+1 problem)
-                total_me = row[28]  # total_me from SUM aggregation
-                total_mn = row[29]  # total_mn from SUM aggregation
+                total_me = to_float(row[28])  # total_me from SUM aggregation
+                total_mn = to_float(row[29])  # total_mn from SUM aggregation
                 
                 # Calculate exchange rate and value
                 valor_comercial, tipo_cambio = ExchangeRateCalculator.calculate_for_aggregated(
@@ -87,10 +96,10 @@ class DefinitiveImportService:
                     db_name=filters.database_name,
                     valor_me=total_me,
                     valor_mn=total_mn,
-                    tipo_cambio_db=row[20],  # C51 - TipoCambio
+                    tipo_cambio_db=to_float(row[20]),  # C51 - TipoCambio
                     fecha_pago=row[8],  # C13 - Fecha_Pago
                     fecha_inicio=row[6],  # C11 - Fecha_Inicio
-                    tipo_pedimento=row[27],  # C59 - TIPOPEDIMENTOTRANSPORTEE
+                    tipo_pedimento=row[4],  # C5 - ClavePed (Fix: using C5 instead of empty C59)
                     currency_type=filters.currency_type.value,
                     exchange_rate_type=filters.exchange_rate_type.value,
                     is_shelter=filters.is_shelter,
@@ -134,7 +143,7 @@ class DefinitiveImportService:
                     UsuarioAcr=row[23],  # C54 - UsuarioAct
                     Fecha_Pago=parse_yyyymmdd_date(row[8]),  # C13 - Fecha_Pago
                     NumCaja=row[24],  # C56 - Transporte + NumTrasporte
-                    tipo_pedimento=row[25],  # C57 - Pedimento18
+                    tipo_pedimento=row[25],  # C57 - Pedimento18 (Note: Schema doesn't have tipo_pedimento field, this might be extra)
                     AduanaCru=row[15],  # C39 - Aduana_Cruce
                     Lote=row[26]  # C58 - LOTE
                 )
@@ -186,7 +195,9 @@ class DefinitiveImportService:
                 if not filters.include_cancelled and row[3] != 'AC':  # C4 - Estatus
                     continue
                 
-                # Get all detailed information (same as temporary imports)
+                # Get additional detailed information
+                # Provider and client names now come directly from query (row[7], row[8])
+                # But we still need RFC and TaxID from the helper
                 proveedor_info = DatabaseHelper.get_client_info(
                     db, filters.database_name, row[15], is_supplier=True
                 )
@@ -225,13 +236,13 @@ class DefinitiveImportService:
                     peso_bruto = 0.0
                 
                 series_info = DatabaseHelper.get_series_info(
-                    db, filters.database_name, row[40], row[44], filters.is_shelter
+                    db, filters.database_name, row[34], row[44], filters.is_shelter
                 )
                 
                 simbolo_ex = None
-                if row[49]:
+                if row[19]:
                     simbolo_ex = DatabaseHelper.get_part_export_symbol(
-                        db, filters.database_name, row[49], filters.is_shelter
+                        db, filters.database_name, row[19], filters.is_shelter
                     )
                 
                 pedimento_r1 = DatabaseHelper.get_rectification_pedimento(
@@ -256,10 +267,10 @@ class DefinitiveImportService:
                     Fecha_Fin=row[11],
                     Fecha_Pago=row[12],
                     Remesa=row[13],
-                    Proveedor=proveedor_info.get('name'),
+                    Proveedor=row[7],  # C8 - Provider name (from JOIN)
                     RFCProveedor=proveedor_info.get('rfc'),
                     ProveedorTaxID=proveedor_info.get('tax_id'),
-                    VendidoA=vendido_info.get('name'),
+                    VendidoA=row[8],  # C9 - Client name (from JOIN)
                     VendidoARFC=vendido_info.get('rfc'),
                     VendidoATaxID=vendido_info.get('tax_id'),
                     AgenteAduanal=agente_info.get('name'),
@@ -276,7 +287,7 @@ class DefinitiveImportService:
                     OrdenCompraVenta=row[30],
                     FraccionArancelaria=row[31],
                     Preferencia=row[32],
-                    Sector=row[34],
+                    Sector=None,  # row[34] is invoice ID, Sector not in query
                     PaisOrigen=row[37],
                     Aduana=aduana_nombre,
                     Advalorem=row[39],
@@ -319,12 +330,8 @@ class DefinitiveImportService:
         where_conditions.append("ih.operation_type = 'imp'")
         
         # GOLDEN RULE: If movement_type is ALL, only filter by operation_type
-        if hasattr(filters, 'movement_type') and filters.movement_type == 'ALL':
-            # ALL mode: bring all imports without filtering by specific invoice_type
-            pass
-        else:
-            # Specific mode: Filter by definitive invoice types only
-            where_conditions.append("ih.invoice_type IN ('DEF', 'MATDE', 'EXDEF')")
+        # ALWAYS filter by specific invoice_type to avoid duplication with Temporary service
+        where_conditions.append("ih.invoice_type IN ('DEF', 'MATDE', 'EXDEF')")
         
         # Date range filter
         if filters.range_type.value == "FF":
@@ -337,11 +344,11 @@ class DefinitiveImportService:
         
         # Provider filter
         if filters.provider:
-            where_conditions.append(f"cmp.provider_id = {filters.provider}")
+            where_conditions.append(f"cmp.provider_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.provider}')")
         
         # Buyer filter
         if filters.buyer:
-            where_conditions.append(f"cmp.sold_to_id = {filters.buyer}")
+            where_conditions.append(f"cmp.sold_to_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.buyer}')")
         
         # Pedimento code filter
         if filters.pedimento_code:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/export.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/export.py
index cfb594f7..331f1858 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/export.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/export.py
@@ -226,8 +226,8 @@ class ExportService:
                 peso_bruto_final = row[25] if row[37] == 'P' else 0  # C26 - PesoBruto
                 
                 # Get series information
-                series_info = self._get_series_info(
-                    db, filters.database_name, row[34], row[41]  # C35 - Consecutivo, C42 - LineaExpo
+                series_info = DatabaseHelper.get_series_info_export(
+                    db, filters.database_name, row[34], row[41], filters.is_shelter
                 )
                 
                 # Get pedimento rectification
@@ -348,9 +348,9 @@ class ExportService:
         
         # Optional filters
         if filters.provider:
-            conditions.append(f"cmp.provider_id = {filters.provider}")
+            conditions.append(f"cmp.provider_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.provider}')")
         if filters.buyer:
-            conditions.append(f"cmp.sold_to_id = {filters.buyer}")
+            conditions.append(f"cmp.sold_to_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.buyer}')")
         if filters.pedimento_code:
             conditions.append(f"ped.pedimento_code = '{filters.pedimento_code}'")
         
@@ -383,44 +383,6 @@ class ExportService:
             logger.error(f"Error calculating export totals for consecutivo {consecutivo}: {e}")
             return (0, 0)
     
-    def _get_series_info(
-        self,
-        db: Session,
-        db_name: str,
-        consecutivo: int,
-        linea: int
-    ) -> str:
-        """Get series information for export partida."""
-        if not consecutivo or not linea:
-            return None
-        
-        try:
-            sql = text(ExportQueries.build_series_query(db_name))
-            results = db.execute(sql, {"consecutivo": consecutivo, "linea": linea}).fetchall()
-            
-            if not results:
-                return None
-            
-            series_list = []
-            for idx, row in enumerate(results, 1):
-                serie = row[0]
-                modelo = row[1]
-                parte = row[2]
-                
-                serie_str = f"{idx}) {serie}"
-                if modelo:
-                    serie_str += f". Modelo: {modelo}"
-                if parte:
-                    serie_str += f". Parte: {parte}"
-                
-                series_list.append(serie_str)
-            
-            return " | ".join(series_list) if series_list else None
-            
-        except Exception as e:
-            logger.debug(f"Error fetching export series info for consecutivo {consecutivo}, linea {linea}: {e}")
-            return None
-    
     def _get_driver_badge(self, db: Session, db_name: str, factura: str) -> str:
         """Get driver's unique badge number for an export invoice."""
         if not factura:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/export_repair.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/export_repair.py
index 13143ef6..8f8887f8 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/export_repair.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/export_repair.py
@@ -350,11 +350,11 @@ class ExportRepairService:
         
         # Provider filter
         if filters.provider:
-            where_conditions.append(f"cmp.provider_id = {filters.provider}")
+            where_conditions.append(f"cmp.provider_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.provider}')")
         
         # Buyer filter
         if filters.buyer:
-            where_conditions.append(f"cmp.sold_to_id = {filters.buyer}")
+            where_conditions.append(f"cmp.sold_to_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.buyer}')")
         
         # Pedimento code filter
         if filters.pedimento_code:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/query_builders.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/query_builders.py
index d4d2b765..23a9ae23 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/query_builders.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/query_builders.py
@@ -235,7 +235,10 @@ class DefinitiveImportQueries:
             ih.invoice_date AS C3,          -- [2]
             ped.status AS C4,               -- [3]
             ped.pedimento_code AS C5,       -- [4]
-            '' AS C6, '' AS C7, '' AS C8, '' AS C9, -- [5-8]
+            '' AS C6,                       -- [5]
+            '' AS C7,                       -- [6]
+            COALESCE(prov.name, '') AS C8,  -- [7] Provider name
+            COALESCE(client.name, '') AS C9, -- [8] Client name
             ped.regime AS C10,              -- [9]
             log.entry_exit_date AS C11,     -- [10]
             log.delivery_date AS C12,       -- [11]
@@ -290,6 +293,8 @@ class DefinitiveImportQueries:
         LEFT JOIN a76.invoice_financials fin ON fin.invoice_id = ih.id
         LEFT JOIN a76.invoice_logistics log ON log.invoice_id = ih.id
         LEFT JOIN a76.pedimentos ped ON ped.id = cmp.pedimento_id
+        LEFT JOIN a76.clients_and_providers prov ON prov.id = cmp.provider_id
+        LEFT JOIN a76.clients_and_providers client ON client.id = cmp.sold_to_id
         LEFT JOIN a76.items itm ON itm.invoice_id = ih.id
         LEFT JOIN a76.item_lines il ON il.item_id = itm.id
         LEFT JOIN a76.item_line_descriptions ld ON ld.item_line_id = il.id
@@ -653,7 +658,8 @@ class ExportQueries:
             COALESCE(SUM(CASE WHEN COALESCE(fil.is_subitem, false) THEN 0 ELSE lf.value_mxn END), 0) 
         FROM a76.item_line_financials lf
         INNER JOIN a76.item_lines il ON il.id = lf.item_line_id
-        LEFT JOIN a24.fa_item_lines fil ON il.id = lf.item_line_id
+        LEFT JOIN a24.fa_item_lines fil ON fil.id = il.id
+        INNER JOIN a76.items itm ON itm.id = il.item_id
         WHERE itm.invoice_id = :consecutivo
             {discharge_filter}
         """
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/repair.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/repair.py
index 889d3185..f462f8b1 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/repair.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/repair.py
@@ -81,9 +81,18 @@ class RepairImportService:
                 
                 consecutivo = row[14]  # C30 - Consecutivo
                 
+                # Helper to safely convert to float
+                def to_float(val):
+                    if val is None or val == '':
+                        return 0.0
+                    try:
+                        return float(val)
+                    except (ValueError, TypeError):
+                        return 0.0
+
                 # Totals come directly from GROUP BY query (no N+1 problem)
-                total_me = row[24]  # total_me from SUM aggregation
-                total_mn = row[25]  # total_mn from SUM aggregation
+                total_me = to_float(row[24])  # total_me from SUM aggregation
+                total_mn = to_float(row[25])  # total_mn from SUM aggregation
                 
                 # Calculate exchange rate and value
                 valor_comercial, tipo_cambio = ExchangeRateCalculator.calculate_for_aggregated(
@@ -91,7 +100,7 @@ class RepairImportService:
                     db_name=filters.database_name,
                     valor_me=total_me,
                     valor_mn=total_mn,
-                    tipo_cambio_db=row[17],  # C40 - TipoCambio
+                    tipo_cambio_db=to_float(row[17]),  # C40 - TipoCambio
                     fecha_pago=row[6],  # C9 - Fecha_Pago
                     fecha_inicio='',  # Not available in aggregated query
                     tipo_pedimento=row[23],  # C47 - pedimento_code (used as tipo_pedimento)
@@ -197,79 +206,79 @@ class RepairImportService:
             
             for row in results:
                 # Skip cancelled if not included
-                if not filters.include_cancelled and row[3] != 'AC':  # C4 - Estatus
+                if not filters.include_cancelled and row[4] != 'AC':  # C5 - Estatus
                     continue
                 
                 # Get all detailed information
                 proveedor_info = DatabaseHelper.get_client_info(
-                    db, filters.database_name, row[15], is_supplier=True
+                    db, filters.database_name, row[11], is_supplier=True
                 )
                 vendido_info = DatabaseHelper.get_client_info(
-                    db, filters.database_name, row[16], is_supplier=False
+                    db, filters.database_name, row[12], is_supplier=False
                 )
                 agente_info = DatabaseHelper.get_customs_agent_info(
-                    db, filters.database_name, row[17]
+                    db, filters.database_name, row[13]
                 )
                 aduana_nombre = DatabaseHelper.get_aduana_seccion_nombre(
-                    db, filters.database_name, row[38]
+                    db, filters.database_name, row[28]
                 )
                 
                 # Calculate values using unified method
                 valor_comercial, tipo_cambio = ExchangeRateCalculator.calculate_exchange_rate_and_value(
                     db=db,
                     db_name=filters.database_name,
-                    es_subpartida=row[39],  # EsSubPartida
-                    valor_me=row[26],
-                    valor_mn_direct=row[24],
-                    fecha_pago=row[12],
-                    fecha_inicio=row[10],
-                    clave_ped=row[58],
-                    tipo_cambio_partida=row[50],
+                    es_subpartida=row[30],  # 'P' or 'S'
+                    valor_me=row[20],
+                    valor_mn_direct=row[19],
+                    fecha_pago=row[8],
+                    fecha_inicio=row[7],
+                    clave_ped=row[45],
+                    tipo_cambio_partida=row[38],
                     currency_type=filters.currency_type.value,
                     exchange_rate_type=filters.exchange_rate_type.value,
                     met_trans=met_trans
                 )
                 
                 # Set peso values based on subpartida flag
-                if row[39] == 'P':
-                    peso_neto = float(row[28]) if row[28] else 0.0
-                    peso_bruto = float(row[29]) if row[29] else 0.0
+                if row[30] == 'P':
+                    peso_neto = float(row[21]) if row[21] else 0.0
+                    peso_bruto = float(row[22]) if row[22] else 0.0
                 else:
                     peso_neto = 0.0
                     peso_bruto = 0.0
                 
                 series_info = DatabaseHelper.get_series_info(
-                    db, filters.database_name, row[40], row[44], filters.is_shelter
+                    db, filters.database_name, row[29], row[0], filters.is_shelter
                 )
                 
                 simbolo_ex = None
-                if row[49]:
+                if row[14]:
                     simbolo_ex = DatabaseHelper.get_part_export_symbol(
-                        db, filters.database_name, row[49], filters.is_shelter
+                        db, filters.database_name, row[14], filters.is_shelter
                     )
                 
                 pedimento_r1 = DatabaseHelper.get_rectification_pedimento(
-                    db, row[1], row[41], filters.is_shelter
+                    db, row[2], row[41], filters.is_shelter
                 )
                 
                 num_gaf_uni = DatabaseHelper.get_driver_badge(
-                    db, filters.database_name, row[0]
+                    db, filters.database_name, row[1]
                 )
                 
                 movement = MovementItemDetailed(
-                    Linea=row[44],
-                    Factura=row[0],
-                    Pedimento=row[1],
-                    FechaFactura=row[2],
-                    Estatus=row[3],
-                    ClavePed=row[4],
+                    Linea=row[0],
+                    Factura=row[1],
+                    Pedimento=row[2],
+                    FechaFactura=row[3],
+                    Estatus=row[4],
+                    ClavePed=row[5],
                     TipoMovTemDef='IMPRE',
                     EsCambioRegimen='N',
-                    Regimen=row[9],
-                    Fecha_Inicio=row[10],
-                    Fecha_Fin=row[11],
-                    Fecha_Pago=row[12],
-                    Remesa=row[13],
+                    Regimen=row[6],
+                    Fecha_Inicio=row[7],
+                    Fecha_Fin=row[7],  # Using same valid column or empty
+                    Fecha_Pago=row[8],
+                    Remesa=row[9],
                     Proveedor=proveedor_info.get('name'),
                     RFCProveedor=proveedor_info.get('rfc'),
                     ProveedorTaxID=proveedor_info.get('tax_id'),
@@ -278,42 +287,42 @@ class RepairImportService:
                     VendidoATaxID=vendido_info.get('tax_id'),
                     AgenteAduanal=agente_info.get('name'),
                     Patente=agente_info.get('license'),
-                    NumParte=row[19],
-                    DescripcionE=StringHelper.clean_text(row[20]),
-                    DescripcionI=StringHelper.clean_text(row[21]),
-                    CantidadIE=float(row[22]) if row[22] else 0.0,
-                    UniMed=row[23],
+                    NumParte=row[14],
+                    DescripcionE=StringHelper.clean_text(row[15]),
+                    DescripcionI=StringHelper.clean_text(row[16]),
+                    CantidadIE=float(row[17]) if row[17] else 0.0,
+                    UniMed=row[18],
                     ValorComercialMN=valor_comercial,
                     TipoCambio=tipo_cambio,
                     PesoNeto=peso_neto,
                     PesoBruto=peso_bruto,
-                    OrdenCompraVenta=row[30],
-                    FraccionArancelaria=row[31],
-                    Preferencia=row[32],
-                    Sector=row[34],
-                    PaisOrigen=row[37],
+                    OrdenCompraVenta=row[23],
+                    FraccionArancelaria=row[24],
+                    Preferencia=row[25],
+                    Sector=row[26],
+                    PaisOrigen=row[27],
                     Aduana=aduana_nombre,
-                    Advalorem=row[39],
+                    Advalorem=row[30],
                     TipoExpo='',
                     PedimentoR1=pedimento_r1,
-                    EDocument=row[42],
-                    NumOperacionVU=row[43],
+                    EDocument=row[32],
+                    NumOperacionVU=row[33],
                     Series=series_info,
-                    Marca=StringHelper.clean_text(row[45]),
-                    Modelo=StringHelper.clean_text(row[46]),
-                    FraccionAmericana=row[47],
-                    ECCN=row[48],
+                    Marca=StringHelper.clean_text(row[34]),
+                    Modelo=StringHelper.clean_text(row[35]),
+                    FraccionAmericana=row[36],
+                    ECCN=row[37],
                     SimboloEx=simbolo_ex,
-                    FechaEmision=row[51],
+                    FechaEmision=row[39],
                     BaseDeDatos=filters.database_name,
                     NumGafUni=num_gaf_uni,
-                    UsuarioCap=row[52],
-                    UsuarioAcr=row[53],
-                    Transportista=row[54],
-                    NumCaja=row[55],
-                    Pedimento18=row[56],
-                    AduanaCru=row[38],
-                    Lote=row[57]
+                    UsuarioCap=row[40],
+                    UsuarioAcr=row[41],
+                    Transportista=row[42],
+                    NumCaja=row[43],
+                    Pedimento18=row[44],
+                    AduanaCru=row[28],
+                    Lote=''  # Not in query
                 )
                 
                 movements.append(movement)
@@ -345,11 +354,11 @@ class RepairImportService:
         
         # Provider filter
         if filters.provider:
-            where_conditions.append(f"cmp.provider_id = {filters.provider}")
+            where_conditions.append(f"cmp.provider_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.provider}')")
         
         # Buyer filter
         if filters.buyer:
-            where_conditions.append(f"cmp.sold_to_id = {filters.buyer}")
+            where_conditions.append(f"cmp.sold_to_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.buyer}')")
         
         # Pedimento code filter
         if filters.pedimento_code:
diff --git a/backend/api/v1/modules/a76/reports/movements/invoices/services/temporary.py b/backend/api/v1/modules/a76/reports/movements/invoices/services/temporary.py
index b249ebdf..70fa5ca5 100644
--- a/backend/api/v1/modules/a76/reports/movements/invoices/services/temporary.py
+++ b/backend/api/v1/modules/a76/reports/movements/invoices/services/temporary.py
@@ -77,9 +77,23 @@ class TemporaryImportService:
                 
                 consecutivo = row[15]  # C39 - Consecutivo
                 
+                # Helper to convert empty strings to None
+                def none_if_empty(val):
+                    return None if val == '' else val
+
+                # Helper to safely convert to float
+                def to_float(val):
+                    if val is None or val == '':
+                        return 0.0
+                    try:
+                        return float(val)
+                    except (ValueError, TypeError):
+                        return 0.0
+                
                 # Totals come directly from GROUP BY query (no N+1 problem)
-                total_me = row[27]  # total_me from SUM aggregation
-                total_mn = row[28]  # total_mn from SUM aggregation
+                # Correct indices based on TemporaryImportQueries.build_aggregated_query
+                total_me = to_float(row[28])  # total_me (index 28)
+                total_mn = to_float(row[29])  # total_mn (index 29)
                 
                 # Calculate exchange rate and value
                 valor_comercial, tipo_cambio = ExchangeRateCalculator.calculate_for_aggregated(
@@ -87,10 +101,10 @@ class TemporaryImportService:
                     db_name=filters.database_name,
                     valor_me=total_me,
                     valor_mn=total_mn,
-                    tipo_cambio_db=row[19],  # C50 - TipoCambio
+                    tipo_cambio_db=to_float(row[19]),  # C50 - TipoCambio
                     fecha_pago=row[8],  # C13 - Fecha_Pago
                     fecha_inicio=row[6],  # C11 - Fecha_Inicio
-                    tipo_pedimento=row[26],  # C58 - TIPOPEDIMENTOTRANSPORTEE
+                    tipo_pedimento=row[4],  # C5 - ClavePed (Using correct index)
                     currency_type=filters.currency_type.value,
                     exchange_rate_type=filters.exchange_rate_type.value,
                     is_shelter=filters.is_shelter,
@@ -111,10 +125,6 @@ class TemporaryImportService:
                     db, filters.database_name, factura
                 )
                 
-                # Helper to convert empty strings to None
-                def none_if_empty(val):
-                    return None if val == '' else val
-                
                 # Build movement item
                 movement = MovementItem(
                     Factura=factura,
@@ -138,9 +148,9 @@ class TemporaryImportService:
                     UsuarioAcr=row[22],  # C53 - UsuarioAct
                     Fecha_Pago=parse_yyyymmdd_date(none_if_empty(row[8])),  # C13 - Fecha_Pago
                     NumCaja=row[23],  # C55 - Transporte + NumTrasporte
-                    Pedimento18=row[24],  # C56 - Pedimento18
+                    Pedimento18=row[24],  # C56 - Pedimento18 (Actually empty in query, but safe to keep)
                     AduanaCru=row[14],  # C38 - Aduana_Cruce
-                    Lote=row[25]  # C57 - LOTE
+                    Lote=row[25]  # C57 - LOTE (Actually C55 is index 24. C56 is 25)
                 )
                 
                 movements.append(movement)
@@ -220,6 +230,14 @@ class TemporaryImportService:
                     met_trans=met_trans
                 )
                 
+                # ValorComercialMN should always be in MXN
+                # If currency_type is ME, valor_comercial is in USD, so multiply by tipo_cambio
+                if filters.currency_type.value == "ME" and tipo_cambio:
+                    valor_comercial_mn = valor_comercial * tipo_cambio
+                else:
+                    # If currency_type is MN, valor_comercial is already in MXN
+                    valor_comercial_mn = valor_comercial
+                
                 # Set peso values based on subpartida flag
                 if row[39] == 'P':  # C40 - EsSubPartida
                     peso_neto = float(row[28]) if row[28] else 0.0  # C29
@@ -253,21 +271,35 @@ class TemporaryImportService:
                     db, filters.database_name, row[0]  # C1 - FacturaImpo
                 )
                 
+                # Helper to convert empty strings to None for dates
+                def none_if_empty(val):
+                    if val == '' or val is None:
+                        return None
+                    return val
+                
+                # Helper to convert to string (for Remesa, Advalorem)
+                def to_str(val):
+                    if val is None or val == '':
+                        return None
+                    if isinstance(val, bool):
+                        return 'P' if val else 'S'  # Convert bool to P/S for Advalorem
+                    return str(val)
+                
                 # Build detailed movement item
                 movement = MovementItemDetailed(
                     Linea=row[43],  # C44 - LineaImpo
                     Factura=row[0],  # C1 - FacturaImpo
                     Pedimento=row[1],  # C2 - PedimentoImpo
-                    FechaFactura=row[2],  # C3 - FechaFactura
+                    FechaFactura=parse_yyyymmdd_date(row[2]),  # C3 - FechaFactura (convert to datetime)
                     Estatus=row[3],  # C4 - Estatus
                     ClavePed=row[4],  # C5 - ClavePed
                     TipoMovTemDef='IMTEM',
                     EsCambioRegimen='N',
                     Regimen=row[9],  # C10 - Regimen
-                    Fecha_Inicio=row[10],  # C11 - Fecha_Inicio
-                    Fecha_Fin=row[11],  # C12 - Fecha_Fin
-                    Fecha_Pago=row[12],  # C13 - Fecha_Pago
-                    Remesa=row[13],  # C14 - Remesa
+                    Fecha_Inicio=none_if_empty(row[10]),  # C11 - Fecha_Inicio
+                    Fecha_Fin=none_if_empty(row[11]),  # C12 - Fecha_Fin
+                    Fecha_Pago=none_if_empty(row[12]),  # C13 - Fecha_Pago
+                    Remesa=to_str(row[13]),  # C14 - Remesa
                     Proveedor=row[7],  # C8 - Provider name (from JOIN)
                     RFCProveedor=None,  # RFC not in detailed query
                     ProveedorTaxID=None,  # Tax ID not in detailed query
@@ -281,7 +313,7 @@ class TemporaryImportService:
                     DescripcionI=StringHelper.clean_text(row[21]),  # C22
                     CantidadIE=float(row[22]) if row[22] else 0.0,  # C23
                     UniMed=row[23],  # C24
-                    ValorComercialMN=valor_comercial,
+                    ValorComercialMN=valor_comercial_mn,
                     TipoCambio=tipo_cambio,
                     PesoNeto=peso_neto,
                     PesoBruto=peso_bruto,
@@ -291,7 +323,7 @@ class TemporaryImportService:
                     Sector=row[34],  # C35 - Sector
                     PaisOrigen=row[36],  # C37 - PaisOrigen
                     Aduana=aduana_nombre,
-                    Advalorem=row[39],  # C40 - EsSubPartida
+                    Advalorem=to_str(row[39]),  # C40 - EsSubPartida (convert bool to str)
                     TipoExpo='',
                     PedimentoR1=pedimento_r1,
                     EDocument=row[41],  # C42 - EDocument
@@ -302,7 +334,7 @@ class TemporaryImportService:
                     FraccionAmericana=row[46],  # C47 - FraccionAme
                     ECCN=row[47],  # C48 - ECCN
                     SimboloEx=simbolo_ex,
-                    FechaEmision=row[50],  # C51 - FechaEmision
+                    FechaEmision=parse_yyyymmdd_date(row[50]),  # C51 - FechaEmision (convert to datetime)
                     BaseDeDatos=filters.database_name,
                     NumGafUni=num_gaf_uni,
                     UsuarioCap=row[51],  # C52 - UsuarioCap
@@ -329,10 +361,8 @@ class TemporaryImportService:
         
         # STRICT SEPARATION: Only temporary imports
         where_conditions.append("ih.operation_type = 'imp'")
-        # GOLDEN RULE: If coming from /all, only filter by operation_type
-        # otherwise, apply specific invoice_type filter
-        if not hasattr(filters, 'from_all_endpoint') or not filters.from_all_endpoint:
-            where_conditions.append("ih.invoice_type IN ('TEM', 'MATTEM')")
+        # ALWAYS filter by specific invoice_type to avoid duplication with Definitive service
+        where_conditions.append("ih.invoice_type IN ('TEM', 'MATTEM')")
         
         # Date range filter
         if filters.range_type.value == "FF":
@@ -345,11 +375,11 @@ class TemporaryImportService:
         
         # Provider filter
         if filters.provider:
-            where_conditions.append(f"cmp.provider_id::text = '{filters.provider}'")
+            where_conditions.append(f"cmp.provider_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.provider}')")
         
         # Buyer filter
         if filters.buyer:
-            where_conditions.append(f"cmp.sold_to_id::text = '{filters.buyer}'")
+            where_conditions.append(f"cmp.sold_to_id IN (SELECT id FROM a76.clients_and_providers WHERE name = '{filters.buyer}')")
         
         # Pedimento code filter
         if filters.pedimento_code:
diff --git a/backend/api/v1/modules/a76/router.py b/backend/api/v1/modules/a76/router.py
index 01c8c57d..8a0ff1f8 100644
--- a/backend/api/v1/modules/a76/router.py
+++ b/backend/api/v1/modules/a76/router.py
@@ -53,6 +53,7 @@ from .reports.importacion.facturas.routes import router as invoices_reports_rout
 from .reports.importacion.consolidados.routes import router as consolidated_reports_router
 from .reports.importacion.packing_list.routes import router as packing_list_router
 from .reports.exportacion.aviso_consolidado.routes import router as aviso_consolidado_export_router
+from .reports.movements.invoices.routes import router as movement_invoices_router
 
 
 
@@ -145,4 +146,10 @@ router.include_router(
     aviso_consolidado_export_router, 
     prefix="/a76/reports/exportacion/aviso_consolidado", 
     tags=["a76 / reports"]
+)
+
+router.include_router(
+    movement_invoices_router, 
+    prefix="/a76/reports/movements/invoices", 
+    tags=["a76 / reports"]
 )
\ No newline at end of file
diff --git a/frontend/src/lib/api/dashboard/a76/invoice-movements.ts b/frontend/src/lib/api/dashboard/a76/invoice-movements.ts
index a5b7dafe..ce6daa22 100644
--- a/frontend/src/lib/api/dashboard/a76/invoice-movements.ts
+++ b/frontend/src/lib/api/dashboard/a76/invoice-movements.ts
@@ -28,7 +28,7 @@ export interface BaseFilter {
 	database_name: string;
 }
 
-export interface ImportTemporaryFilter extends BaseFilter {}
+export interface ImportTemporaryFilter extends BaseFilter { }
 
 export interface ImportDefinitiveFilter extends BaseFilter {
 	movement_type: MovementTypeFilter;
@@ -57,6 +57,7 @@ export interface AllMovementsFilter {
 	provider?: string | null;
 	buyer?: string | null;
 	pedimento_code?: string | null;
+	report_type: ReportType;
 	currency_type: CurrencyType;
 	exchange_rate_type: ExchangeRateType;
 	is_shelter: boolean;
diff --git a/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts
index 7041c3a6..313e31a7 100644
--- a/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts
+++ b/frontend/src/lib/api/dashboard/a76/reports/reports-invoices.ts
@@ -1,5 +1,4 @@
 
-const BASE_URL = import.meta.env.VITE_API_URL || '';
 const BASE_URL = import.meta.env.VITE_API_URL || '';
 
 export const invoicesReportsApi = {
@@ -15,7 +14,6 @@ export const invoicesReportsApi = {
 
         const token = localStorage.getItem('access_token');
         const response = await fetch(endpoint, {
-            method: 'POST',
             method: 'POST',
             headers: {
                 'Authorization': `Bearer ${token}`,
@@ -25,14 +23,11 @@ export const invoicesReportsApi = {
 
         if (!response.ok) throw new Error('Error al iniciar la generación');
         return await response.json();
-        return await response.json();
     },
 
     getTaskStatus: async (taskId: string) => {
         const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/tasks/${taskId}`;
 
-        const endpoint = `${BASE_URL}/v1/a76/reports/importacion/facturas/tasks/${taskId}`;
-
         const token = localStorage.getItem('access_token');
         const response = await fetch(endpoint, {
             method: 'GET',
diff --git a/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte b/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
index 8f113fc1..b3d22504 100644
--- a/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
+++ b/frontend/src/lib/components/dashboard/exchange_rate/exchange-rate-guard.svelte
@@ -1,59 +1,48 @@
 <script lang="ts">
-    import { onMount } from 'svelte';
-    import { companyStore } from '$lib/stores/company.svelte';
-    import { getExchangeRates } from '$lib/api/dashboard/a76/general_catalogs/exchange-rate';
-    import CreateEditDialog from './create-edit-dialog.svelte';
+	import { onMount } from 'svelte';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { getExchangeRates } from '$lib/api/dashboard/a76/general_catalogs/exchange-rate';
+	import CreateEditDialog from './create-edit-dialog.svelte';
 
-    let open = $state(false);
-    let checked = $state(false);
+	let open = $state(false);
+	let checked = $state(false);
 
-    async function checkExchangeRate() {
-        console.log('[ExchangeRateGuard] Checking...', companyStore.activeCompany);
-        if (!companyStore.activeCompany?.id) {
-            console.log('[ExchangeRateGuard] No active company');
-            return;
-        }
+	async function checkExchangeRate() {
+		if (!companyStore.activeCompany?.id) {
+			return;
+		}
 
-        // Use local date instead of UTC
-        const today = new Date().toLocaleDateString('fr-CA'); // YYYY-MM-DD
-        console.log('[ExchangeRateGuard] Date:', today);
-        
-        try {
-            const response = await getExchangeRates(companyStore.activeCompany.id, {
-                date: today,
-                page_size: 1
-            });
-            console.log('[ExchangeRateGuard] Response (stringified):', JSON.stringify(response, null, 2));
+		// Use local date instead of UTC
+		const today = new Date().toLocaleDateString('fr-CA'); // YYYY-MM-DD
 
-            // api.get returns { data: ..., status: ... } and types now reflect that
-            const items = response.data?.items || [];
-            
-            if (items.length === 0) {
-                console.log('[ExchangeRateGuard] No rate found, opening modal');
-                open = true;
-            }
-        } catch (error) {
-            console.error('[ExchangeRateGuard] Error checking exchange rate:', error);
-        } finally {
-            checked = true;
-        }
-    }
+		try {
+			const response = await getExchangeRates(companyStore.activeCompany.id, {
+				date: today,
+				page_size: 1
+			});
 
-    $effect(() => {
-        if (companyStore.activeCompany?.id && !checked) {
-            checkExchangeRate();
-        }
-    });
+			// api.get returns { data: ..., status: ... } and types now reflect that
+			const items = response.data?.items || [];
 
-    function handleSuccess() {
-        
-        console.log('Exchange rate created successfully via guard');
-        checked = true; 
-    }
+			if (items.length === 0) {
+				open = true;
+			}
+		} catch (error) {
+			console.error('[ExchangeRateGuard] Error checking exchange rate:', error);
+		} finally {
+			checked = true;
+		}
+	}
+
+	$effect(() => {
+		if (companyStore.activeCompany?.id && !checked) {
+			checkExchangeRate();
+		}
+	});
+
+	function handleSuccess() {
+		checked = true;
+	}
 </script>
 
-<CreateEditDialog 
-    bind:open 
-    onSuccess={handleSuccess}
-    overlayClass="bg-black/20"
-/>
+<CreateEditDialog bind:open onSuccess={handleSuccess} overlayClass="bg-black/20" />
diff --git a/frontend/src/routes/dashboard/reports/invoices/+page.svelte b/frontend/src/routes/dashboard/reports/invoices/+page.svelte
index a1f33b08..6c3083ad 100644
--- a/frontend/src/routes/dashboard/reports/invoices/+page.svelte
+++ b/frontend/src/routes/dashboard/reports/invoices/+page.svelte
@@ -1,1434 +1,1862 @@
 <script lang="ts">
-    import { onMount } from '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 * as RadioGroup from '$lib/components/ui/radio-group';
-    import { Checkbox } from '$lib/components/ui/checkbox';
-    import { Separator } from '$lib/components/ui/separator';
-    import { 
-        Printer, HelpCircle, X, Calendar, 
-        FileSearch, Filter, Globe, Search, Mail,
-        Info, ChevronRight, Book, MapPin, FileText, 
-        Settings, FileSpreadsheet, ArrowLeftRight, ShieldCheck,
-        Calculator, Download, Folder
-    } from 'lucide-svelte';
-    import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
-    import * as Dialog from '$lib/components/ui/dialog';
-    import { toast } from 'svelte-sonner';
-    import { invoiceMovementsApi, type MovementItem, type MovementItemDetailed, type AllMovementsFilter } from '$lib/api/dashboard/a76/invoice-movements';
-    import type { BaseFilter } from '$lib/api/dashboard/a76/invoice-movements';
-    import { api } from '$lib/api';
-    import { companyStore } from '$lib/stores/company.svelte';
-
-    // --- ESTADO CON RUNAS (SVELTE 5) ---
-    
-    const menuOptions = [
-        { label: 'Saldos Temporales', icon: Calculator, items: [] },
-        { label: 'Descargos', icon: FileSpreadsheet, items: [] },
-        { 
-            label: 'Catálogos', 
-            icon: Book,
-            items: [
-                'Agentes Aduanales', 'Clases', 'Partes', 'Clientes Proveedores', 
-                'Fracciones Americanas y de Canada', 'Pedimentos', 'Partidas', 
-                'Tipos de Cambio', 'Transportistas', 'Unidades de Medida', 
-                'Interfaz Impo-Expo', 'Carta Porte', 'Listado de Entradas'
-            ]
-        },
-        { label: 'Búsquedas', icon: Search, items: [] },
-        { label: 'Localizaciones', icon: MapPin, items: [] },
-        { 
-            label: 'Declaraciones', 
-            icon: FileText, 
-            items: ['Hoja de Cálculo', 'Manifestación al Valor', 'Importación vs Exportación'] 
-        },
-        { 
-            label: 'Generales', 
-            icon: Settings, 
-            items: ['Verificación de Pedimento', 'Reporte de Pedimentos por A. Aduanal'] 
-        },
-        { 
-            label: 'EXCEL', 
-            icon: FileSpreadsheet, 
-            items: ['Depreciación de Activo Fijo'] 
-        },
-        { 
-            label: 'Movimientos', 
-            icon: ArrowLeftRight, 
-            items: ['Facturas Impo/Expo', 'Partidas Impo/Expo', 'Reporte de lotes'] 
-        },
-        { label: 'Auditorias',
-         icon: ShieldCheck,
-         items: ['SCAF vs Almacén'] }
-    ];
-
-    let dates = $state({
-        from: '',
-        to: '',
-        type: 'invoice' as 'invoice' | 'payment'
-    });
-    
-    let types = $state({
-        import: { DEF: false, TEM: false, REP: false },
-        export: { 
-            // Tipo Principal (ahora checkboxes)
-            main: { DEF: false, CREG: false, REP: false },
-            // Opciones adicionales (Checkboxes)
-            additional: { AFIJO: false, REEXP: false, NODES: false, DONAC: false, SCRAP: false, TODAS: false }
-        },
-        other: { VEMEX: false, CREGEXP: false, COMEX: false, TODAS: false }
-    });
-
-    let filters = $state({
-        includeNA: false,
-        downloaded: 'all' as 'all' | 'downloaded' | 'not_downloaded'
-    });
-
-    let selectors = $state({
-        provider: '',
-        soldTo: '',
-        pedimentoKey: ''
-    });
-    
-    let config = $state({
-        currency: 'capture' as 'foreign' | 'national' | 'capture',
-        reportType: 'normal' as 'normal' | 'detailed',
-        exchangeRate: 'invoice_date' as 'invoice_date' | 'payment_date',
-        sendEmail: false,
-        julianDate: false,
-        shelter: false
-    });
-
-    let loading = $state(false);
-    let results = $state<MovementItem[] | MovementItemDetailed[]>([]);
-    let showResults = $state(false);
-    let reportTitle = $state('REPORTE DE FACTURAS');
-    let currencyLabel = $state('Moneda: Pesos');
-
-    // Diálogo de selección
-    let dialogOpen = $state(false);
-    let dialogType: 'provider' | 'soldTo' | 'pedimentoKey' | null = $state(null);
-    let clientsProviders = $state<any[]>([]);
-    let pedimentoCodes = $state<any[]>([]);
-    let dialogSearch = $state('');
-
-    function handleTodasChange(checked: boolean) {
-        if (checked) {
-            // Clarion: IF Loc:Todas = 1 THEN ...
-            // Solo marca los checkboxes específicos que marca Clarion
-            
-            // Importación: Definitiva, Temporal, Reparación
-            types.import.DEF = true;   // Loc:ImpoDef = 1
-            types.import.TEM = true;   // Loc:ImpoTemp = 1
-            types.import.REP = true;   // Loc:ImpoRep = 1
-            
-            // Exportación Principal: Solo Cambio de Régimen
-            types.export.main.CREG = true;  // Loc:CamRegimen = 1
-            // NO marca DEF ni REP según el código Clarion
-            
-            // Exportación Adicional: Todas las opciones
-            types.export.additional.AFIJO = true;  // Loc:ExpoAFijo = 1
-            types.export.additional.REEXP = true;  // Loc:ExpoReExp = 1
-            types.export.additional.NODES = true;  // Loc:ExpoNodes = 1
-            types.export.additional.DONAC = true;  // Loc:ExpoDonac = 1
-            types.export.additional.SCRAP = true;  // Loc:ExpoScrap = 1
-            
-            // Otras: VeMex y ComMex
-            types.other.VEMEX = true;   // Loc:VeMex = 1
-            types.other.COMEX = true;   // Loc:ComMex = 1
-            // NO marca CREGEXP según el código Clarion
-        } else {
-             // Clarion: ELSE ... = 0
-             // Desmarcar los mismos checkboxes
-            types.import.DEF = false;
-            types.import.TEM = false;
-            types.import.REP = false;
-            
-            types.export.main.CREG = false;
-
-            types.export.additional.AFIJO = false;
-            types.export.additional.REEXP = false;
-            types.export.additional.NODES = false;
-            types.export.additional.DONAC = false;
-            types.export.additional.SCRAP = false;
-            
-            types.other.VEMEX = false;
-            types.other.COMEX = false;
-        }
-    }
-
-    // --- VALIDACIONES ---
-
-    function formatDateToYYYYMMDD(dateStr: string): string {
-        if (!dateStr) return '';
-        // dateStr viene como YYYY-MM-DD del input type="date"
-        return dateStr.replace(/-/g, '');
-    }
-
-    function validateDates(): { valid: boolean; message?: string } {
-        if (!dates.from || !dates.to) {
-            return { valid: false, message: 'El rango de fechas es obligatorio' };
-        }
-
-        const fromDate = new Date(dates.from);
-        const toDate = new Date(dates.to);
-
-        if (fromDate > toDate) {
-            return { valid: false, message: 'La fecha inicial no puede ser mayor que la fecha final' };
-        }
-
-        // Validar que no sea más de 1 año de diferencia
-        const oneYearMs = 365 * 24 * 60 * 60 * 1000;
-        if (toDate.getTime() - fromDate.getTime() > oneYearMs) {
-            return { valid: false, message: 'El rango de fechas no puede ser mayor a 1 año' };
-        }
-
-        return { valid: true };
-    }
-
-    function validateMovementTypes(): { valid: boolean; message?: string } {
-        const hasImportSelected = Object.values(types.import).some(v => v);
-        const hasOtherSelected = Object.values(types.other).some(v => v);
-        const hasExportAdditional = Object.values(types.export.additional).some(v => v);
-        const hasExportMain = Object.values(types.export.main).some(v => v);
-
-        if (!hasImportSelected && !hasOtherSelected && !hasExportAdditional && !hasExportMain) {
-            return { valid: false, message: 'Debe seleccionar al menos un tipo de movimiento' };
-        }
-
-        return { valid: true };
-    }
-
-    function validateBusinessRules(): { valid: boolean; message?: string } {
-        // Validación 1: "Incluir Facturas NA" solo aplica a Importaciones de Reparación
-        if (filters.includeNA && !types.import.REP) {
-            return { valid: false, message: 'La opción "Incluir Facturas NA" solo aplica a Importaciones de Reparación' };
-        }
-
-        // Validación 2: Filtro de descargadas solo para Reparaciones y Exportaciones
-        if (filters.downloaded !== 'all') {
-            const hasRepairOrExport = types.import.REP || 
-                                     Object.values(types.export.main).some(v => v) || 
-                                     Object.values(types.export.additional).some(v => v);
-            
-            if (!hasRepairOrExport) {
-                return { valid: false, message: 'El filtro de descargadas solo aplica a Reparaciones y Exportaciones' };
-            }
-        }
-
-        // Si TODAS está marcado, saltar validaciones de combinaciones incompatibles
-        // ya que es una combinación especial permitida en Clarion
-        if (types.other.TODAS || types.export.additional.TODAS) {
-            return { valid: true };
-        }
-
-        // Validación 3: COMEX y IMPDF son mutuamente excluyentes
-        if (types.import.DEF && types.other.COMEX) {
-            return { valid: false, message: 'No puede seleccionar IMPDF (Definitiva) y COMEX al mismo tiempo' };
-        }
-
-        // Validación 4: Para Exportaciones de Reparación (solo AFIJO y NODES)
-        if (types.export.main.REP) {
-            const invalidExportTypes = types.export.additional.SCRAP || 
-                                      types.export.additional.REEXP || 
-                                      types.export.additional.DONAC;
-            
-            if (invalidExportTypes) {
-                return { valid: false, message: 'Exportaciones de Reparación solo permiten AFIJO y NODES' };
-            }
-        }
-
-        // Validación 5: Para Cambio de Régimen (solo AFIJO o SCRAP)
-        if (types.export.main.CREG) {
-            const invalidCRegTypes = types.export.additional.NODES ||
-                                    types.export.additional.REEXP || 
-                                    types.export.additional.DONAC;
-            
-            if (invalidCRegTypes) {
-                return { valid: false, message: 'Cambio de Régimen solo permite AFIJO o SCRAP' };
-            }
-
-            // No puede combinarse con otros tipos principales
-            if (types.export.main.DEF || types.export.main.REP) {
-                return { valid: false, message: 'Cambio de Régimen no puede combinarse con otros tipos de exportación principales' };
-            }
-        }
-
-        // Validación 6: VEMEX no puede combinarse con otros tipos de export
-        if (types.other.VEMEX) {
-            const hasOtherExports = types.export.additional.AFIJO ||
-                                   types.export.additional.NODES ||
-                                   types.export.additional.SCRAP ||
-                                   types.export.additional.REEXP ||
-                                   types.export.additional.DONAC ||
-                                   Object.values(types.export.main).some(v => v);
-            
-            if (hasOtherExports) {
-                return { valid: false, message: 'VEMEX no puede combinarse con otros tipos de exportación' };
-            }
-        }
-
-        // Validación 7: CREGEXP (Cambio Régimen Export) validaciones
-        if (types.other.CREGEXP) {
-            const hasOtherTypes = types.import.DEF || types.import.TEM || types.import.REP ||
-                                 Object.values(types.export.main).some(v => v) ||
-                                 Object.values(types.export.additional).some(v => v) ||
-                                 types.other.VEMEX || types.other.COMEX;
-            
-            if (hasOtherTypes) {
-                return { valid: false, message: 'Cambio Régimen Export no puede combinarse con otros tipos' };
-            }
-        }
-
-        // Validación 8: Tipo de fecha debe ser FF o FP
-        if (dates.type !== 'invoice' && dates.type !== 'payment') {
-            return { valid: false, message: 'Tipo de fecha debe ser Factura (FF) o Pago (FP)' };
-        }
-
-        return { valid: true };
-    }
-
-    // --- LÓGICA ---
-
-    async function handleGenerateReport() {
-        // Validar fechas
-        const dateValidation = validateDates();
-        if (!dateValidation.valid) {
-            toast.error(`Error: ${dateValidation.message}`);
-            return;
-        }
-
-        // Validar tipos de movimiento
-        const movementValidation = validateMovementTypes();
-        if (!movementValidation.valid) {
-            toast.error(`Error: ${movementValidation.message}`);
-            return;
-        }
-
-        // Validar reglas de negocio del Clarion
-        const businessValidation = validateBusinessRules();
-        if (!businessValidation.valid) {
-            toast.error(`Error: ${businessValidation.message}`);
-            return;
-        }
-
-        loading = true;
-        results = [];
-        showResults = false;
-
-        try {
-            // Si "TODAS" en otras opciones o exportaciones está marcado, usar el endpoint especial
-            if (types.other.TODAS || types.export.additional.TODAS) {
-                toast.info('Obteniendo todos los movimientos...');
-                
-                // Determinar el tipo de operación basado en cuál "TODAS" está marcado
-                let operation_type: 'imp' | 'exp' | null = null;
-                
-                if (types.other.TODAS) {
-                    // "TODAS" de la sección Otras = traer TODO (importaciones + exportaciones)
-                    operation_type = null;
-                } else if (types.export.additional.TODAS) {
-                    // "TODAS" de exportaciones = solo exportaciones
-                    operation_type = 'exp';
-                }
-                
-                const allMovementsFilter: AllMovementsFilter = {
-                    range_type: dates.type === 'invoice' ? 'FF' : 'FP',
-                    start_date: formatDateToYYYYMMDD(dates.from),
-                    end_date: formatDateToYYYYMMDD(dates.to),
-                    include_cancelled: filters.includeNA,
-                    provider: selectors.provider || null,
-                    buyer: selectors.soldTo || null,
-                    pedimento_code: selectors.pedimentoKey || null,
-                    currency_type: config.currency === 'foreign' ? 'ME' : 'MN',
-                    exchange_rate_type: config.exchangeRate === 'invoice_date' ? 'FF' : 'FP',
-                    is_shelter: config.shelter,
-                    operation_type
-                };
-                
-                const response = await invoiceMovementsApi.getAllMovements(allMovementsFilter);
-                if (response.data) {
-                    results = response.data;
-                    showResults = true;
-                }
-                
-                toast.success(`Se encontraron ${results.length} movimientos`);
-                return; // Salir temprano, no ejecutar la lógica individual
-            }
-            
-            const baseFilter: Omit<BaseFilter, 'database_name'> = {
-                range_type: dates.type === 'invoice' ? 'FF' : 'FP',
-                start_date: formatDateToYYYYMMDD(dates.from),
-                end_date: formatDateToYYYYMMDD(dates.to),
-                include_cancelled: filters.includeNA,
-                provider: selectors.provider || null,
-                buyer: selectors.soldTo || null,
-                pedimento_code: selectors.pedimentoKey || null,
-                report_type: config.reportType === 'normal' ? 'Normal' : 'Detallado',
-                currency_type: config.currency === 'foreign' ? 'ME' : 'MN',
-                exchange_rate_type: config.exchangeRate === 'invoice_date' ? 'FF' : 'FP',
-                is_shelter: config.shelter
-            };
-
-            const allResults: (MovementItem | MovementItemDetailed)[] = [];
-
-            // Importaciones Temporales (IMTEM)
-            if (types.import.TEM) {
-                toast.info('Obteniendo importaciones temporales...');
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getTemporaryImports({ ...baseFilter, database_name: 'default' })
-                    : await invoiceMovementsApi.getTemporaryImportsDetailed({ ...baseFilter, database_name: 'default' });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // Importaciones Definitivas (IMPDF) o COMEX
-            if (types.import.DEF) {
-                toast.info('Obteniendo importaciones definitivas...');
-                const movementType = types.other.COMEX ? 'COMEX' : 'IMPDF';
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getDefinitiveImports({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType
-                    })
-                    : await invoiceMovementsApi.getDefinitiveImportsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // Importaciones de Reparación (IMPRE)
-            if (types.import.REP) {
-                toast.info('Obteniendo importaciones de reparación...');
-                const dischargeFilter = filters.downloaded === 'downloaded' ? 'SiDes' : 
-                                       filters.downloaded === 'not_downloaded' ? 'NoDes' : 'ALL';
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getRepairImports({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        discharge_filter: dischargeFilter
-                    })
-                    : await invoiceMovementsApi.getRepairImportsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        discharge_filter: dischargeFilter
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // Exportaciones Definitivas (incluye VEMEX)
-            if (types.export.main.DEF || types.other.VEMEX || types.export.additional.TODAS || Object.values(types.export.additional).some(v => v)) {
-                toast.info('Obteniendo exportaciones...');
-                
-                // Determinar tipo de movimiento basado en checkboxes adicionales
-                let movementType: any = 'ALL';
-                if (types.export.additional.AFIJO) movementType = 'AFIJO';
-                else if (types.export.additional.NODES) movementType = 'NODES';
-                else if (types.export.additional.SCRAP) movementType = 'SCRAP';
-                else if (types.export.additional.REEXP) movementType = 'REEXP';
-                else if (types.export.additional.DONAC) movementType = 'DONAC';
-                else if (types.other.VEMEX) movementType = 'VEMEX';
-
-                const dischargeFilter = filters.downloaded === 'downloaded' ? 'SiDes' : 
-                                       filters.downloaded === 'not_downloaded' ? 'NoDes' : 'ALL';
-
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getExports({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    })
-                    : await invoiceMovementsApi.getExportsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // Exportaciones de Reparación
-            if (types.export.main.REP || types.export.additional.TODAS) {
-                toast.info('Obteniendo exportaciones de reparación...');
-                
-                // Para reparaciones solo aplican AFIJO y NODES
-                let movementType: any = 'ALL';
-                if (types.export.additional.AFIJO) movementType = 'AFIJO';
-                else if (types.export.additional.NODES) movementType = 'NODES';
-
-                const dischargeFilter = filters.downloaded === 'downloaded' ? 'SiDes' : 
-                                       filters.downloaded === 'not_downloaded' ? 'NoDes' : 'ALL';
-
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getExportRepairs({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter
-                    })
-                    : await invoiceMovementsApi.getExportRepairsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // Cambio de Régimen (CREG) - Exportaciones con cambio de régimen
-            if (types.export.main.CREG) {
-                toast.info('Obteniendo cambios de régimen...');
-                
-                // Para cambio de régimen solo aplican AFIJO y SCRAP
-                let movementType: any = 'ALL';
-                if (types.export.additional.AFIJO) movementType = 'AFIJO';
-                else if (types.export.additional.SCRAP) movementType = 'SCRAP';
-
-                const dischargeFilter = filters.downloaded === 'downloaded' ? 'SiDes' : 
-                                       filters.downloaded === 'not_downloaded' ? 'NoDes' : 'ALL';
-
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getExports({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    })
-                    : await invoiceMovementsApi.getExportsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: movementType,
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            // CREGEXP (Cambio Régimen Export) - Caso especial
-            if (types.other.CREGEXP) {
-                toast.info('Obteniendo cambios de régimen export...');
-                
-                const dischargeFilter = filters.downloaded === 'downloaded' ? 'SiDes' : 
-                                       filters.downloaded === 'not_downloaded' ? 'NoDes' : 'ALL';
-
-                const response = config.reportType === 'normal'
-                    ? await invoiceMovementsApi.getExports({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: 'ALL',
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    })
-                    : await invoiceMovementsApi.getExportsDetailed({ 
-                        ...baseFilter, 
-                        database_name: 'default',
-                        movement_type: 'ALL',
-                        discharge_filter: dischargeFilter,
-                        use_transport_method: false
-                    });
-                if (response.data) allResults.push(...response.data);
-            }
-
-            results = allResults;
-            showResults = true;
-
-            // Ordenar resultados según configuración y modo de reporte
-            if (config.reportType === 'normal') {
-                // LLENADOCSVNORMAL - SORT con 3 campos
-                if (config.shelter) {
-                    results.sort((a, b) => {
-                        if (a.BaseDeDatos !== b.BaseDeDatos) return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
-                        if (a.TipoMovTemDef !== b.TipoMovTemDef) return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
-                        return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
-                    });
-                } else {
-                    results.sort((a, b) => {
-                        if (a.TipoMovTemDef !== b.TipoMovTemDef) return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
-                        if ((a.FechaFactura || '') !== (b.FechaFactura || '')) return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
-                        return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
-                    });
-                }
-            } else {
-                // LLENADOCSVDETALLADO - SORT más simple
-                if (config.shelter) {
-                    results.sort((a, b) => {
-                        if (a.BaseDeDatos !== b.BaseDeDatos) return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
-                        if (a.TipoMovTemDef !== b.TipoMovTemDef) return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
-                        return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
-                    });
-                } else {
-                    results.sort((a, b) => {
-                        if (a.TipoMovTemDef !== b.TipoMovTemDef) return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
-                        return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
-                    });
-                }
-            }
-
-            // Configurar título del reporte
-            reportTitle = 'REPORTE DE FACTURAS';
-            
-            // Configurar etiqueta de moneda
-            if (config.currency === 'foreign') {
-                currencyLabel = 'Moneda: Dólares';
-            } else if (config.currency === 'national') {
-                currencyLabel = 'Moneda: Pesos';
-            } else {
-                currencyLabel = 'Moneda: Captura';
-            }
-
-            if (allResults.length === 0) {
-                toast.warning('No se encontraron resultados con los filtros seleccionados');
-            } else {
-                toast.success(`Reporte generado exitosamente: ${allResults.length} registros encontrados`);
-            }
-
-        } catch (error: any) {
-            console.error('Error generando reporte:', error);
-            toast.error(error.message || 'Error al generar el reporte');
-        } finally {
-            loading = false;
-        }
-    }
-
-    function downloadCSV() {
-        if (results.length === 0) {
-            toast.error('No hay resultados para exportar');
-            return;
-        }
-
-        const lines: string[] = [];
-
-        // Título del reporte
-        lines.push(reportTitle);
-        lines.push(''); // Línea vacía
-        
-        // Información de moneda
-        lines.push(currencyLabel);
-        lines.push(''); // Línea vacía
-        
-        // Total de registros
-        lines.push(`TOTAL DE REGISTROS:,${results.length}`);
-        lines.push(''); // Línea vacía
-
-        if (config.reportType === 'normal') {
-            // Headers modo NORMAL (22 columnas)
-            const headers = [
-                'PEDIMENTO', 'PEDIMENTO18', 'CLAVE', 'PEDIMENTO RECTIFICACION', 'FACTURA',
-                'FECHA FACT', 'VALOR TOTAL', 'TIPO DE CAMBIO', 'TIPO OPER.', 'TIPO EXPO.',
-                'CAMBIO REG.', 'ESTATUS', 'E-DOCUMENT', 'NUM. OPERACION',
-                'NÚMERO GAFETE ÚNICO', 'ADUANA CRUCE', 'PROYECTO',
-                'USUARIO QUE CAPTURÓ LA FACTURA', 'USUARIO QUE ACTUALIZÓ LA FACTURA',
-                'FECHA PAGO', 'NUM. CAJA', 'SECUENCIA'
-            ];
-            lines.push(headers.join(','));
-            lines.push(''); // Línea vacía
-
-            // Datos modo normal
-            results.forEach(row => {
-                const values = [
-                    row.Pedimento || '',
-                    row.Pedimento18 || '',
-                    row.ClavePed || '',
-                    row.PedimentoR1 || '',
-                    `"${row.Factura}"`,
-                    config.julianDate ? (row.FechaFactura || '') : formatDateFromYYYYMMDD(row.FechaFactura),
-                    row.ValorComercialMN || '0',
-                    row.TipoCambio || '0',
-                    row.TipoMovTemDef || '',
-                    row.TipoExpo || '',
-                    row.EsCambioRegimen || '',
-                    row.Estatus || '',
-                    row.EDocument || '',
-                    row.NumOperacionVU || '',
-                    row.NumGafUni || '',
-                    `"${row.AduanaCru || ''}"`,
-                    row.BaseDeDatos || '',
-                    row.UsuarioCap || '',
-                    row.UsuarioAcr || '',
-                    config.julianDate ? (row.Fecha_Pago || '') : formatDateFromYYYYMMDD(row.Fecha_Pago),
-                    row.NumCaja || '',
-                    row.Lote || ''
-                ];
-                lines.push(values.join(','));
-            });
-        } else {
-            // Headers modo DETALLADO (47 columnas - más columnas que el normal)
-            const headers = [
-                'PEDIMENTO', 'PEDIMENTO 18', 'CLAVE', 'REGIMEN', 'PEDIMENTO RECTIFICACION',
-                'FECHA INICIO', 'FECHA FINAL', 'FECHA PAGO', 'REMESA',
-                'FACTURA', 'FECHA FACT', 'FECHA EMISION', 'PROVEEDOR', 'RFC PROV.',
-                'TAX ID PROV.', 'CLIENTE', 'RFC CLI.', 'TAX ID CLI.', 
-                'AGENTE ADUANAL', 'PATENTE', 'ADUANA',
-                'CLASE', 'DESC ESPAÑOL', 'DESC INGLES',
-                'CANT. IMPO/EXPO', 'U.M.', 'VALOR COMERC', 'TIPO DE CAMBIO', 'PESO NETO',
-                'PESO BRUTO', 'ORDEN COMPRA/VENTA', 'FRACCION ARANC.',
-                'PREFERENCIA', 'SECTOR', 'PAIS ORIGEN',
-                'TIPO OPER.', 'TIPO EXPO.', 'PARTIDA/SUBPARTIDA',
-                'CAMBIO REG.', 'ESTATUS', 'E-DOCUMENT', 'NUM. OPERACION',
-                'MARCA', 'MODELO', 'SERIE(S)', 'NÚMERO GAFETE ÚNICO',
-                'FRACCION AMERICANA', 'ECCN', 'SIMBOLO DE LA EXCEPCION DE LICENCIA',
-                'ADUANA CRUCE', 'PROYECTO',
-                'USUARIO QUE CAPTURÓ LA FACTURA', 'USUARIO QUE ACTUALIZÓ LA FACTURA',
-                'NUM CAJA', 'TRANSPORTISTA', 'LOTE', 'LINEA PARTIDA'
-            ];
-            lines.push(headers.join(','));
-            lines.push(''); // Línea vacía
-
-            // Datos modo detallado
-            results.forEach((row: any) => {
-                const values = [
-                    row.Pedimento || '',
-                    row.Pedimento18 || '',
-                    row.ClavePed || '',
-                    row.Regimen || '',
-                    row.PedimentoR1 || '',
-                    config.julianDate ? (row.Fecha_Inicio || '') : formatDateFromYYYYMMDD(row.Fecha_Inicio),
-                    config.julianDate ? (row.Fecha_Fin || '') : formatDateFromYYYYMMDD(row.Fecha_Fin),
-                    config.julianDate ? (row.Fecha_Pago || '') : formatDateFromYYYYMMDD(row.Fecha_Pago),
-                    row.Remesa || '',
-                    `"${row.Factura}"`,
-                    config.julianDate ? (row.FechaFactura || '') : formatDateFromYYYYMMDD(row.FechaFactura),
-                    config.julianDate ? (row.FechaEmision || '') : formatDateFromYYYYMMDD(row.FechaEmision),
-                    row.Proveedor || '',
-                    row.RFCProveedor || '',
-                    row.ProveedorTaxID || '',
-                    row.VendidoA || '',
-                    row.VendidoARFC || '',
-                    row.VendidoATaxID || '',
-                    row.AgenteAduanal || '',
-                    row.Patente || '',
-                    row.Aduana || '',
-                    row.NumParte || '',
-                    row.DescripcionE || '',
-                    row.DescripcionI || '',
-                    row.CantidadIE || '0',
-                    row.UniMed || '',
-                    row.ValorComercialMN || '0',
-                    row.TipoCambio || '0',
-                    row.PesoNeto || '0',
-                    row.PesoBruto || '0',
-                    row.OrdenCompraVenta || '',
-                    row.FraccionArancelaria || '',
-                    row.Preferencia || '',
-                    row.Sector || '',
-                    row.PaisOrigen || '',
-                    row.TipoMovTemDef || '',
-                    row.TipoExpo || '',
-                    row.Advalorem || '',
-                    row.EsCambioRegimen || '',
-                    row.Estatus || '',
-                    row.EDocument || '',
-                    row.NumOperacionVU || '',
-                    row.Marca || '',
-                    row.Modelo || '',
-                    row.Series || '',
-                    row.NumGafUni || '',
-                    row.FraccionAmericana || '',
-                    row.ECCN || '',
-                    row.SimboloEx || '',
-                    `"${row.AduanaCru || ''}"`,
-                    row.BaseDeDatos || '',
-                    row.UsuarioCap || '',
-                    row.UsuarioAcr || '',
-                    row.NumCaja || '',
-                    row.Transportista || '',
-                    row.Lote || '',
-                    row.Linea || ''
-                ];
-                lines.push(values.join(','));
-            });
-        }
-
-        const csv = lines.join('\n');
-        const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
-        const url = URL.createObjectURL(blob);
-        const link = document.createElement('a');
-        link.href = url;
-        const mode = config.reportType === 'normal' ? 'normal' : 'detallado';
-        link.download = `reporte_facturas_${mode}_${formatDateToYYYYMMDD(dates.from)}_${formatDateToYYYYMMDD(dates.to)}.csv`;
-        link.click();
-        URL.revokeObjectURL(url);
-
-        toast.success('Reporte descargado exitosamente');
-    }
-
-    function formatDateFromYYYYMMDD(dateStr: string | null): string {
-        if (!dateStr || dateStr === '-' || dateStr === '0') return '-';
-        
-        // Si es un timestamp ISO (contiene 'T' o '-')
-        if (dateStr.includes('T') || (dateStr.includes('-') && dateStr.length > 8)) {
-            try {
-                const date = new Date(dateStr);
-                // Verificar si es una fecha válida
-                if (isNaN(date.getTime())) return '-';
-                // Si es 1970 o anterior, es una fecha inválida/vacía
-                if (date.getFullYear() <= 1970) return '-';
-                
-                const day = String(date.getDate()).padStart(2, '0');
-                const month = String(date.getMonth() + 1).padStart(2, '0');
-                const year = date.getFullYear();
-                return `${day}/${month}/${year}`;
-            } catch {
-                return '-';
-            }
-        }
-        
-        // YYYYMMDD -> DD/MM/YYYY
-        if (dateStr.length === 8 && /^\d{8}$/.test(dateStr)) {
-            const year = dateStr.substring(0, 4);
-            const month = dateStr.substring(4, 6);
-            const day = dateStr.substring(6, 8);
-            return `${day}/${month}/${year}`;
-        }
-        
-        return dateStr;
-    }
-
-    function formatCurrency(value: number | null | undefined): string {
-        if (value === null || value === undefined) return '-';
-        return new Intl.NumberFormat('en-US', {
-            minimumFractionDigits: 2,
-            maximumFractionDigits: 2
-        }).format(value);
-    }
-
-    function handleClose() {
-        // Reset form instead of navigating back
-        showResults = false;
-        results = [];
-        loading = false;
-    }
-
-    async function openSelectionDialog(type: 'provider' | 'soldTo' | 'pedimentoKey') {
-        dialogType = type;
-        dialogSearch = '';
-        
-        if (type === 'pedimentoKey') {
-            // Cargar claves de pedimento
-            try {
-                const response = await api.get('/v1/public/refrence_data/pedimento-codes?page=1&page_size=100');
-                pedimentoCodes = response.data?.items || [];
-                dialogOpen = true;
-            } catch (error: any) {
-                console.error('Error cargando claves de pedimento:', error);
-                toast.error('Error al cargar las claves de pedimento');
-            }
-            return;
-        }
-        
-        const companyId = companyStore.activeCompany?.id;
-        if (!companyId) {
-            toast.error('No hay compañía seleccionada');
-            return;
-        }
-        let isLoadingDialog = true;
-        try {
-            // No filtramos por tipo en el API para obtener todos los registros
-            // Filtraremos client-side para incluir 'both'
-            const response = await api.get(`/v1/a76/clients-providers?company_id=${companyId}&limit=1000`);
-            const allItems = response.data?.items || [];
-            
-            // Filtrar según el tipo solicitado, incluyendo 'both'
-            const searchType = type === 'provider' ? 'provider' : 'client';
-            clientsProviders = allItems.filter((item: any) => 
-                item.client_or_provider === searchType || item.client_or_provider === 'both'
-            );
-            
-            dialogOpen = true;
-        } catch (error: any) {
-            console.error('Error cargando datos:', error);
-            toast.error('Error al cargar la lista');
-        } finally {
-            isLoadingDialog = false;
-        }
-    }
-
-    function selectItem(item: any) {
-        if (dialogType === 'provider') {
-            selectors.provider = item.name || '';
-        } else if (dialogType === 'soldTo') {
-            selectors.soldTo = item.name || '';
-        } else if (dialogType === 'pedimentoKey') {
-            selectors.pedimentoKey = item.code || '';
-        }
-        dialogOpen = false;
-    }
-
-    const filteredItems = $derived(
-        dialogType === 'pedimentoKey'
-            ? pedimentoCodes.filter(item => {
-                if (!dialogSearch) return true;
-                const searchLower = dialogSearch.toLowerCase();
-                return (
-                    item.code?.toLowerCase().includes(searchLower) ||
-                    item.description?.toLowerCase().includes(searchLower)
-                );
-            })
-            : clientsProviders.filter(item => {
-                if (!dialogSearch) return true;
-                const searchLower = dialogSearch.toLowerCase();
-                return (
-                    item.name?.toLowerCase().includes(searchLower) ||
-                    item.rfc?.toLowerCase().includes(searchLower) ||
-                    item.tax_id?.toLowerCase().includes(searchLower)
-                );
-            })
-    );
+	import { onMount } from '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 * as RadioGroup from '$lib/components/ui/radio-group';
+	import { Checkbox } from '$lib/components/ui/checkbox';
+	import { Separator } from '$lib/components/ui/separator';
+	import {
+		Printer,
+		HelpCircle,
+		X,
+		Calendar,
+		FileSearch,
+		Filter,
+		Globe,
+		Search,
+		Mail,
+		Info,
+		ChevronRight,
+		Book,
+		MapPin,
+		FileText,
+		Settings,
+		FileSpreadsheet,
+		ArrowLeftRight,
+		ShieldCheck,
+		Calculator,
+		Download,
+		Folder
+	} from 'lucide-svelte';
+	import * as DropdownMenu from '$lib/components/ui/dropdown-menu';
+	import * as Dialog from '$lib/components/ui/dialog';
+	import { toast } from 'svelte-sonner';
+	import {
+		invoiceMovementsApi,
+		type MovementItem,
+		type MovementItemDetailed,
+		type AllMovementsFilter
+	} from '$lib/api/dashboard/a76/invoice-movements';
+	import type { BaseFilter } from '$lib/api/dashboard/a76/invoice-movements';
+	import { api } from '$lib/api';
+	import { companyStore } from '$lib/stores/company.svelte';
+
+	// --- ESTADO CON RUNAS (SVELTE 5) ---
+
+	const menuOptions = [
+		{ label: 'Saldos Temporales', icon: Calculator, items: [] },
+		{ label: 'Descargos', icon: FileSpreadsheet, items: [] },
+		{
+			label: 'Catálogos',
+			icon: Book,
+			items: [
+				'Agentes Aduanales',
+				'Clases',
+				'Partes',
+				'Clientes Proveedores',
+				'Fracciones Americanas y de Canada',
+				'Pedimentos',
+				'Partidas',
+				'Tipos de Cambio',
+				'Transportistas',
+				'Unidades de Medida',
+				'Interfaz Impo-Expo',
+				'Carta Porte',
+				'Listado de Entradas'
+			]
+		},
+		{ label: 'Búsquedas', icon: Search, items: [] },
+		{ label: 'Localizaciones', icon: MapPin, items: [] },
+		{
+			label: 'Declaraciones',
+			icon: FileText,
+			items: ['Hoja de Cálculo', 'Manifestación al Valor', 'Importación vs Exportación']
+		},
+		{
+			label: 'Generales',
+			icon: Settings,
+			items: ['Verificación de Pedimento', 'Reporte de Pedimentos por A. Aduanal']
+		},
+		{
+			label: 'EXCEL',
+			icon: FileSpreadsheet,
+			items: ['Depreciación de Activo Fijo']
+		},
+		{
+			label: 'Movimientos',
+			icon: ArrowLeftRight,
+			items: ['Facturas Impo/Expo', 'Partidas Impo/Expo', 'Reporte de lotes']
+		},
+		{ label: 'Auditorias', icon: ShieldCheck, items: ['SCAF vs Almacén'] }
+	];
+
+	let dates = $state({
+		from: '',
+		to: '',
+		type: 'invoice' as 'invoice' | 'payment'
+	});
+
+	let types = $state({
+		import: { DEF: false, TEM: false, REP: false },
+		export: {
+			// Tipo Principal (ahora checkboxes)
+			main: { DEF: false, CREG: false, REP: false },
+			// Opciones adicionales (Checkboxes)
+			additional: {
+				AFIJO: false,
+				REEXP: false,
+				NODES: false,
+				DONAC: false,
+				SCRAP: false,
+				TODAS: false
+			}
+		},
+		other: { VEMEX: false, CREGEXP: false, COMEX: false, TODAS: false }
+	});
+
+	let filters = $state({
+		includeNA: false,
+		downloaded: 'all' as 'all' | 'downloaded' | 'not_downloaded'
+	});
+
+	let selectors = $state({
+		provider: '',
+		soldTo: '',
+		pedimentoKey: ''
+	});
+
+	let config = $state({
+		currency: 'capture' as 'foreign' | 'national' | 'capture',
+		reportType: 'normal' as 'normal' | 'detailed',
+		exchangeRate: 'invoice_date' as 'invoice_date' | 'payment_date',
+		sendEmail: false,
+		julianDate: false,
+		shelter: false
+	});
+
+	let loading = $state(false);
+	let results = $state<MovementItem[] | MovementItemDetailed[]>([]);
+	let showResults = $state(false);
+	let reportTitle = $state('REPORTE DE FACTURAS');
+	let currencyLabel = $state('Moneda: Pesos');
+
+	// Diálogo de selección
+	let dialogOpen = $state(false);
+	let dialogType: 'provider' | 'soldTo' | 'pedimentoKey' | null = $state(null);
+	let clientsProviders = $state<any[]>([]);
+	let pedimentoCodes = $state<any[]>([]);
+	let dialogSearch = $state('');
+
+	function handleTodasChange(checked: boolean) {
+		if (checked) {
+			// Clarion: IF Loc:Todas = 1 THEN ...
+			// Solo marca los checkboxes específicos que marca Clarion
+
+			// Importación: Definitiva, Temporal, Reparación
+			types.import.DEF = true; // Loc:ImpoDef = 1
+			types.import.TEM = true; // Loc:ImpoTemp = 1
+			types.import.REP = true; // Loc:ImpoRep = 1
+
+			// Exportación Principal: Solo Cambio de Régimen
+			types.export.main.CREG = true; // Loc:CamRegimen = 1
+			// NO marca DEF ni REP según el código Clarion
+
+			// Exportación Adicional: Todas las opciones
+			types.export.additional.AFIJO = true; // Loc:ExpoAFijo = 1
+			types.export.additional.REEXP = true; // Loc:ExpoReExp = 1
+			types.export.additional.NODES = true; // Loc:ExpoNodes = 1
+			types.export.additional.DONAC = true; // Loc:ExpoDonac = 1
+			types.export.additional.SCRAP = true; // Loc:ExpoScrap = 1
+
+			// Otras: VeMex y ComMex
+			types.other.VEMEX = true; // Loc:VeMex = 1
+			types.other.COMEX = true; // Loc:ComMex = 1
+			// NO marca CREGEXP según el código Clarion
+		} else {
+			// Clarion: ELSE ... = 0
+			// Desmarcar los mismos checkboxes
+			types.import.DEF = false;
+			types.import.TEM = false;
+			types.import.REP = false;
+
+			types.export.main.CREG = false;
+
+			types.export.additional.AFIJO = false;
+			types.export.additional.REEXP = false;
+			types.export.additional.NODES = false;
+			types.export.additional.DONAC = false;
+			types.export.additional.SCRAP = false;
+
+			types.other.VEMEX = false;
+			types.other.COMEX = false;
+		}
+	}
+
+	// --- VALIDACIONES ---
+
+	function formatDateToYYYYMMDD(dateStr: string): string {
+		if (!dateStr) return '';
+		// dateStr viene como YYYY-MM-DD del input type="date"
+		return dateStr.replace(/-/g, '');
+	}
+
+	function validateDates(): { valid: boolean; message?: string } {
+		if (!dates.from || !dates.to) {
+			return { valid: false, message: 'El rango de fechas es obligatorio' };
+		}
+
+		const fromDate = new Date(dates.from);
+		const toDate = new Date(dates.to);
+
+		if (fromDate > toDate) {
+			return { valid: false, message: 'La fecha inicial no puede ser mayor que la fecha final' };
+		}
+
+		// Validar que no sea más de 1 año de diferencia
+		const oneYearMs = 365 * 24 * 60 * 60 * 1000;
+		if (toDate.getTime() - fromDate.getTime() > oneYearMs) {
+			return { valid: false, message: 'El rango de fechas no puede ser mayor a 1 año' };
+		}
+
+		return { valid: true };
+	}
+
+	function validateMovementTypes(): { valid: boolean; message?: string } {
+		const hasImportSelected = Object.values(types.import).some((v) => v);
+		const hasOtherSelected = Object.values(types.other).some((v) => v);
+		const hasExportAdditional = Object.values(types.export.additional).some((v) => v);
+		const hasExportMain = Object.values(types.export.main).some((v) => v);
+
+		if (!hasImportSelected && !hasOtherSelected && !hasExportAdditional && !hasExportMain) {
+			return { valid: false, message: 'Debe seleccionar al menos un tipo de movimiento' };
+		}
+
+		return { valid: true };
+	}
+
+	function validateBusinessRules(): { valid: boolean; message?: string } {
+		// Validación: Filtro de descargadas solo para Reparaciones y Exportaciones
+		if (filters.downloaded !== 'all') {
+			const hasRepairOrExport =
+				types.import.REP ||
+				Object.values(types.export.main).some((v) => v) ||
+				Object.values(types.export.additional).some((v) => v);
+
+			if (!hasRepairOrExport) {
+				return {
+					valid: false,
+					message: 'El filtro de descargadas solo aplica a Reparaciones y Exportaciones'
+				};
+			}
+		}
+
+		// Si TODAS está marcado, saltar validaciones de combinaciones incompatibles
+		// ya que es una combinación especial permitida en Clarion
+		if (types.other.TODAS || types.export.additional.TODAS) {
+			return { valid: true };
+		}
+
+		// Validación 3: COMEX y IMPDF son mutuamente excluyentes
+		if (types.import.DEF && types.other.COMEX) {
+			return {
+				valid: false,
+				message: 'No puede seleccionar IMPDF (Definitiva) y COMEX al mismo tiempo'
+			};
+		}
+
+		// Validación 4: Para Exportaciones de Reparación (solo AFIJO y NODES)
+		if (types.export.main.REP) {
+			const invalidExportTypes =
+				types.export.additional.SCRAP ||
+				types.export.additional.REEXP ||
+				types.export.additional.DONAC;
+
+			if (invalidExportTypes) {
+				return { valid: false, message: 'Exportaciones de Reparación solo permiten AFIJO y NODES' };
+			}
+		}
+
+		// Validación 5: Para Cambio de Régimen (solo AFIJO o SCRAP)
+		if (types.export.main.CREG) {
+			const invalidCRegTypes =
+				types.export.additional.NODES ||
+				types.export.additional.REEXP ||
+				types.export.additional.DONAC;
+
+			if (invalidCRegTypes) {
+				return { valid: false, message: 'Cambio de Régimen solo permite AFIJO o SCRAP' };
+			}
+
+			// No puede combinarse con otros tipos principales
+			if (types.export.main.DEF || types.export.main.REP) {
+				return {
+					valid: false,
+					message:
+						'Cambio de Régimen no puede combinarse con otros tipos de exportación principales'
+				};
+			}
+		}
+
+		// Validación 6: VEMEX no puede combinarse con otros tipos de export
+		if (types.other.VEMEX) {
+			const hasOtherExports =
+				types.export.additional.AFIJO ||
+				types.export.additional.NODES ||
+				types.export.additional.SCRAP ||
+				types.export.additional.REEXP ||
+				types.export.additional.DONAC ||
+				Object.values(types.export.main).some((v) => v);
+
+			if (hasOtherExports) {
+				return {
+					valid: false,
+					message: 'VEMEX no puede combinarse con otros tipos de exportación'
+				};
+			}
+		}
+
+		// Validación 7: CREGEXP (Cambio Régimen Export) validaciones
+		if (types.other.CREGEXP) {
+			const hasOtherTypes =
+				types.import.DEF ||
+				types.import.TEM ||
+				types.import.REP ||
+				Object.values(types.export.main).some((v) => v) ||
+				Object.values(types.export.additional).some((v) => v) ||
+				types.other.VEMEX ||
+				types.other.COMEX;
+
+			if (hasOtherTypes) {
+				return {
+					valid: false,
+					message: 'Cambio Régimen Export no puede combinarse con otros tipos'
+				};
+			}
+		}
+
+		// Validación 8: Tipo de fecha debe ser FF o FP
+		if (dates.type !== 'invoice' && dates.type !== 'payment') {
+			return { valid: false, message: 'Tipo de fecha debe ser Factura (FF) o Pago (FP)' };
+		}
+
+		return { valid: true };
+	}
+
+	// --- LÓGICA ---
+
+	async function handleGenerateReport() {
+		// Validar fechas
+		const dateValidation = validateDates();
+		if (!dateValidation.valid) {
+			toast.error(`Error: ${dateValidation.message}`);
+			return;
+		}
+
+		// Validar tipos de movimiento
+		const movementValidation = validateMovementTypes();
+		if (!movementValidation.valid) {
+			toast.error(`Error: ${movementValidation.message}`);
+			return;
+		}
+
+		// Validar reglas de negocio del Clarion
+		const businessValidation = validateBusinessRules();
+		if (!businessValidation.valid) {
+			toast.error(`Error: ${businessValidation.message}`);
+			return;
+		}
+
+		loading = true;
+		results = [];
+		showResults = false;
+
+		try {
+			// Si "TODAS" en otras opciones o exportaciones está marcado, usar el endpoint especial
+			if (types.other.TODAS || types.export.additional.TODAS) {
+				toast.info('Obteniendo todos los movimientos...');
+
+				// Determinar el tipo de operación basado en cuál "TODAS" está marcado
+				let operation_type: 'imp' | 'exp' | null = null;
+
+				if (types.other.TODAS) {
+					// "TODAS" de la sección Otras = traer TODO (importaciones + exportaciones)
+					operation_type = null;
+				} else if (types.export.additional.TODAS) {
+					// "TODAS" de exportaciones = solo exportaciones
+					operation_type = 'exp';
+				}
+
+				const allMovementsFilter: AllMovementsFilter = {
+					range_type: dates.type === 'invoice' ? 'FF' : 'FP',
+					start_date: formatDateToYYYYMMDD(dates.from),
+					end_date: formatDateToYYYYMMDD(dates.to),
+					include_cancelled: filters.includeNA,
+					provider: selectors.provider || null,
+					buyer: selectors.soldTo || null,
+					pedimento_code: selectors.pedimentoKey || null,
+					report_type: config.reportType === 'normal' ? 'Normal' : 'Detallado',
+					currency_type: config.currency === 'foreign' ? 'ME' : 'MN',
+					exchange_rate_type: config.exchangeRate === 'invoice_date' ? 'FF' : 'FP',
+					is_shelter: config.shelter,
+					operation_type
+				};
+
+				const response = await invoiceMovementsApi.getAllMovements(allMovementsFilter);
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) {
+					results = response.data;
+					showResults = true;
+				}
+
+				toast.success(`Se encontraron ${results.length} movimientos`);
+				return; // Salir temprano, no ejecutar la lógica individual
+			}
+
+			const baseFilter: Omit<BaseFilter, 'database_name'> = {
+				range_type: dates.type === 'invoice' ? 'FF' : 'FP',
+				start_date: formatDateToYYYYMMDD(dates.from),
+				end_date: formatDateToYYYYMMDD(dates.to),
+				include_cancelled: filters.includeNA,
+				provider: selectors.provider || null,
+				buyer: selectors.soldTo || null,
+				pedimento_code: selectors.pedimentoKey || null,
+				report_type: config.reportType === 'normal' ? 'Normal' : 'Detallado',
+				currency_type: config.currency === 'foreign' ? 'ME' : 'MN',
+				exchange_rate_type: config.exchangeRate === 'invoice_date' ? 'FF' : 'FP',
+				is_shelter: config.shelter
+			};
+
+			const allResults: (MovementItem | MovementItemDetailed)[] = [];
+
+			// Importaciones Temporales (IMTEM)
+			if (types.import.TEM) {
+				toast.info('Obteniendo importaciones temporales...');
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getTemporaryImports({
+								...baseFilter,
+								database_name: 'default'
+							})
+						: await invoiceMovementsApi.getTemporaryImportsDetailed({
+								...baseFilter,
+								database_name: 'default'
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// Importaciones Definitivas (IMPDF) o COMEX
+			if (types.import.DEF) {
+				toast.info('Obteniendo importaciones definitivas...');
+				const movementType = types.other.COMEX ? 'COMEX' : 'IMPDF';
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getDefinitiveImports({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType
+							})
+						: await invoiceMovementsApi.getDefinitiveImportsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// Importaciones de Reparación (IMPRE)
+			if (types.import.REP) {
+				toast.info('Obteniendo importaciones de reparación...');
+				const dischargeFilter =
+					filters.downloaded === 'downloaded'
+						? 'SiDes'
+						: filters.downloaded === 'not_downloaded'
+							? 'NoDes'
+							: 'ALL';
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getRepairImports({
+								...baseFilter,
+								database_name: 'default',
+								discharge_filter: dischargeFilter
+							})
+						: await invoiceMovementsApi.getRepairImportsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								discharge_filter: dischargeFilter
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// Exportaciones Definitivas (incluye VEMEX)
+			if (
+				types.export.main.DEF ||
+				types.other.VEMEX ||
+				types.export.additional.TODAS ||
+				Object.values(types.export.additional).some((v) => v)
+			) {
+				toast.info('Obteniendo exportaciones...');
+
+				// Determinar tipo de movimiento basado en checkboxes adicionales
+				let movementType: any = 'ALL';
+				if (types.export.additional.AFIJO) movementType = 'AFIJO';
+				else if (types.export.additional.NODES) movementType = 'NODES';
+				else if (types.export.additional.SCRAP) movementType = 'SCRAP';
+				else if (types.export.additional.REEXP) movementType = 'REEXP';
+				else if (types.export.additional.DONAC) movementType = 'DONAC';
+				else if (types.other.VEMEX) movementType = 'VEMEX';
+
+				const dischargeFilter =
+					filters.downloaded === 'downloaded'
+						? 'SiDes'
+						: filters.downloaded === 'not_downloaded'
+							? 'NoDes'
+							: 'ALL';
+
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getExports({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							})
+						: await invoiceMovementsApi.getExportsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// Exportaciones de Reparación
+			if (types.export.main.REP || types.export.additional.TODAS) {
+				toast.info('Obteniendo exportaciones de reparación...');
+
+				// Para reparaciones solo aplican AFIJO y NODES
+				let movementType: any = 'ALL';
+				if (types.export.additional.AFIJO) movementType = 'AFIJO';
+				else if (types.export.additional.NODES) movementType = 'NODES';
+
+				const dischargeFilter =
+					filters.downloaded === 'downloaded'
+						? 'SiDes'
+						: filters.downloaded === 'not_downloaded'
+							? 'NoDes'
+							: 'ALL';
+
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getExportRepairs({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter
+							})
+						: await invoiceMovementsApi.getExportRepairsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// Cambio de Régimen (CREG) - Exportaciones con cambio de régimen
+			if (types.export.main.CREG) {
+				toast.info('Obteniendo cambios de régimen...');
+
+				// Para cambio de régimen solo aplican AFIJO y SCRAP
+				let movementType: any = 'ALL';
+				if (types.export.additional.AFIJO) movementType = 'AFIJO';
+				else if (types.export.additional.SCRAP) movementType = 'SCRAP';
+
+				const dischargeFilter =
+					filters.downloaded === 'downloaded'
+						? 'SiDes'
+						: filters.downloaded === 'not_downloaded'
+							? 'NoDes'
+							: 'ALL';
+
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getExports({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							})
+						: await invoiceMovementsApi.getExportsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: movementType,
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							});
+				if (response.data) allResults.push(...response.data);
+			}
+
+			// CREGEXP (Cambio Régimen Export) - Caso especial
+			if (types.other.CREGEXP) {
+				toast.info('Obteniendo cambios de régimen export...');
+
+				const dischargeFilter =
+					filters.downloaded === 'downloaded'
+						? 'SiDes'
+						: filters.downloaded === 'not_downloaded'
+							? 'NoDes'
+							: 'ALL';
+
+				const response =
+					config.reportType === 'normal'
+						? await invoiceMovementsApi.getExports({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: 'ALL',
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							})
+						: await invoiceMovementsApi.getExportsDetailed({
+								...baseFilter,
+								database_name: 'default',
+								movement_type: 'ALL',
+								discharge_filter: dischargeFilter,
+								use_transport_method: false
+							});
+
+				if (response.error) {
+					toast.error(response.error);
+					return;
+				}
+
+				if (response.data) allResults.push(...response.data);
+			}
+
+			results = allResults;
+			showResults = true;
+
+			// Ordenar resultados según configuración y modo de reporte
+			if (config.reportType === 'normal') {
+				// LLENADOCSVNORMAL - SORT con 3 campos
+				if (config.shelter) {
+					results.sort((a, b) => {
+						if (a.BaseDeDatos !== b.BaseDeDatos) return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
+						if (a.TipoMovTemDef !== b.TipoMovTemDef)
+							return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
+						return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
+					});
+				} else {
+					results.sort((a, b) => {
+						if (a.TipoMovTemDef !== b.TipoMovTemDef)
+							return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
+						if ((a.FechaFactura || '') !== (b.FechaFactura || ''))
+							return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
+						return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
+					});
+				}
+			} else {
+				// LLENADOCSVDETALLADO - SORT más simple
+				if (config.shelter) {
+					results.sort((a, b) => {
+						if (a.BaseDeDatos !== b.BaseDeDatos) return a.BaseDeDatos.localeCompare(b.BaseDeDatos);
+						if (a.TipoMovTemDef !== b.TipoMovTemDef)
+							return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
+						return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
+					});
+				} else {
+					results.sort((a, b) => {
+						if (a.TipoMovTemDef !== b.TipoMovTemDef)
+							return a.TipoMovTemDef.localeCompare(b.TipoMovTemDef);
+						return (a.FechaFactura || '').localeCompare(b.FechaFactura || '');
+					});
+				}
+			}
+
+			// Configurar título del reporte
+			reportTitle = 'REPORTE DE FACTURAS';
+
+			// Configurar etiqueta de moneda
+			if (config.currency === 'foreign') {
+				currencyLabel = 'Moneda: Dólares';
+			} else if (config.currency === 'national') {
+				currencyLabel = 'Moneda: Pesos';
+			} else {
+				currencyLabel = 'Moneda: Captura';
+			}
+
+			if (allResults.length === 0) {
+				toast.warning('No se encontraron resultados con los filtros seleccionados');
+			} else {
+				toast.success(`Reporte generado exitosamente: ${allResults.length} registros encontrados`);
+			}
+		} catch (error: any) {
+			console.error('Error generando reporte:', error);
+			toast.error(error.message || 'Error al generar el reporte');
+		} finally {
+			loading = false;
+		}
+	}
+
+	function downloadCSV() {
+		if (results.length === 0) {
+			toast.error('No hay resultados para exportar');
+			return;
+		}
+
+		const lines: string[] = [];
+
+		// Título del reporte
+		lines.push(reportTitle);
+		lines.push(''); // Línea vacía
+
+		// Información de moneda
+		lines.push(currencyLabel);
+		lines.push(''); // Línea vacía
+
+		// Total de registros
+		lines.push(`TOTAL DE REGISTROS:,${results.length}`);
+		lines.push(''); // Línea vacía
+
+		if (config.reportType === 'normal') {
+			// Headers modo NORMAL (22 columnas)
+			const headers = [
+				'PEDIMENTO',
+				'PEDIMENTO18',
+				'CLAVE',
+				'PEDIMENTO RECTIFICACION',
+				'FACTURA',
+				'FECHA FACT',
+				'VALOR TOTAL',
+				'TIPO DE CAMBIO',
+				'TIPO OPER.',
+				'TIPO EXPO.',
+				'CAMBIO REG.',
+				'ESTATUS',
+				'E-DOCUMENT',
+				'NUM. OPERACION',
+				'NÚMERO GAFETE ÚNICO',
+				'ADUANA CRUCE',
+				'PROYECTO',
+				'USUARIO QUE CAPTURÓ LA FACTURA',
+				'USUARIO QUE ACTUALIZÓ LA FACTURA',
+				'FECHA PAGO',
+				'NUM. CAJA',
+				'SECUENCIA'
+			];
+			lines.push(headers.join(','));
+			lines.push(''); // Línea vacía
+
+			// Datos modo normal
+			results.forEach((row) => {
+				const values = [
+					row.Pedimento || '',
+					row.Pedimento18 || '',
+					row.ClavePed || '',
+					row.PedimentoR1 || '',
+					`"${row.Factura}"`,
+					config.julianDate ? row.FechaFactura || '' : formatDateFromYYYYMMDD(row.FechaFactura),
+					row.ValorComercialMN || '0',
+					row.TipoCambio || '0',
+					row.TipoMovTemDef || '',
+					row.TipoExpo || '',
+					row.EsCambioRegimen || '',
+					row.Estatus || '',
+					row.EDocument || '',
+					row.NumOperacionVU || '',
+					row.NumGafUni || '',
+					`"${row.AduanaCru || ''}"`,
+					row.BaseDeDatos || '',
+					row.UsuarioCap || '',
+					row.UsuarioAcr || '',
+					config.julianDate ? row.Fecha_Pago || '' : formatDateFromYYYYMMDD(row.Fecha_Pago),
+					row.NumCaja || '',
+					row.Lote || ''
+				];
+				lines.push(values.join(','));
+			});
+		} else {
+			// Headers modo DETALLADO (47 columnas - más columnas que el normal)
+			const headers = [
+				'PEDIMENTO',
+				'PEDIMENTO 18',
+				'CLAVE',
+				'REGIMEN',
+				'PEDIMENTO RECTIFICACION',
+				'FECHA INICIO',
+				'FECHA FINAL',
+				'FECHA PAGO',
+				'REMESA',
+				'FACTURA',
+				'FECHA FACT',
+				'FECHA EMISION',
+				'PROVEEDOR',
+				'RFC PROV.',
+				'TAX ID PROV.',
+				'CLIENTE',
+				'RFC CLI.',
+				'TAX ID CLI.',
+				'AGENTE ADUANAL',
+				'PATENTE',
+				'ADUANA',
+				'CLASE',
+				'DESC ESPAÑOL',
+				'DESC INGLES',
+				'CANT. IMPO/EXPO',
+				'U.M.',
+				'VALOR COMERC',
+				'TIPO DE CAMBIO',
+				'PESO NETO',
+				'PESO BRUTO',
+				'ORDEN COMPRA/VENTA',
+				'FRACCION ARANC.',
+				'PREFERENCIA',
+				'SECTOR',
+				'PAIS ORIGEN',
+				'TIPO OPER.',
+				'TIPO EXPO.',
+				'PARTIDA/SUBPARTIDA',
+				'CAMBIO REG.',
+				'ESTATUS',
+				'E-DOCUMENT',
+				'NUM. OPERACION',
+				'MARCA',
+				'MODELO',
+				'SERIE(S)',
+				'NÚMERO GAFETE ÚNICO',
+				'FRACCION AMERICANA',
+				'ECCN',
+				'SIMBOLO DE LA EXCEPCION DE LICENCIA',
+				'ADUANA CRUCE',
+				'PROYECTO',
+				'USUARIO QUE CAPTURÓ LA FACTURA',
+				'USUARIO QUE ACTUALIZÓ LA FACTURA',
+				'NUM CAJA',
+				'TRANSPORTISTA',
+				'LOTE',
+				'LINEA PARTIDA'
+			];
+			lines.push(headers.join(','));
+			lines.push(''); // Línea vacía
+
+			// Datos modo detallado
+			results.forEach((row: any) => {
+				const values = [
+					row.Pedimento || '',
+					row.Pedimento18 || '',
+					row.ClavePed || '',
+					row.Regimen || '',
+					row.PedimentoR1 || '',
+					config.julianDate ? row.Fecha_Inicio || '' : formatDateFromYYYYMMDD(row.Fecha_Inicio),
+					config.julianDate ? row.Fecha_Fin || '' : formatDateFromYYYYMMDD(row.Fecha_Fin),
+					config.julianDate ? row.Fecha_Pago || '' : formatDateFromYYYYMMDD(row.Fecha_Pago),
+					row.Remesa || '',
+					`"${row.Factura}"`,
+					config.julianDate ? row.FechaFactura || '' : formatDateFromYYYYMMDD(row.FechaFactura),
+					config.julianDate ? row.FechaEmision || '' : formatDateFromYYYYMMDD(row.FechaEmision),
+					row.Proveedor || '',
+					row.RFCProveedor || '',
+					row.ProveedorTaxID || '',
+					row.VendidoA || '',
+					row.VendidoARFC || '',
+					row.VendidoATaxID || '',
+					row.AgenteAduanal || '',
+					row.Patente || '',
+					row.Aduana || '',
+					row.NumParte || '',
+					row.DescripcionE || '',
+					row.DescripcionI || '',
+					row.CantidadIE || '0',
+					row.UniMed || '',
+					row.ValorComercialMN || '0',
+					row.TipoCambio || '0',
+					row.PesoNeto || '0',
+					row.PesoBruto || '0',
+					row.OrdenCompraVenta || '',
+					row.FraccionArancelaria || '',
+					row.Preferencia || '',
+					row.Sector || '',
+					row.PaisOrigen || '',
+					row.TipoMovTemDef || '',
+					row.TipoExpo || '',
+					row.Advalorem || '',
+					row.EsCambioRegimen || '',
+					row.Estatus || '',
+					row.EDocument || '',
+					row.NumOperacionVU || '',
+					row.Marca || '',
+					row.Modelo || '',
+					row.Series || '',
+					row.NumGafUni || '',
+					row.FraccionAmericana || '',
+					row.ECCN || '',
+					row.SimboloEx || '',
+					`"${row.AduanaCru || ''}"`,
+					row.BaseDeDatos || '',
+					row.UsuarioCap || '',
+					row.UsuarioAcr || '',
+					row.NumCaja || '',
+					row.Transportista || '',
+					row.Lote || '',
+					row.Linea || ''
+				];
+				lines.push(values.join(','));
+			});
+		}
+
+		const csv = lines.join('\n');
+		const blob = new Blob([csv], { type: 'text/csv;charset=utf-8;' });
+		const url = URL.createObjectURL(blob);
+		const link = document.createElement('a');
+		link.href = url;
+		const mode = config.reportType === 'normal' ? 'normal' : 'detallado';
+		link.download = `reporte_facturas_${mode}_${formatDateToYYYYMMDD(dates.from)}_${formatDateToYYYYMMDD(dates.to)}.csv`;
+		link.click();
+		URL.revokeObjectURL(url);
+
+		toast.success('Reporte descargado exitosamente');
+	}
+
+	function formatDateFromYYYYMMDD(dateStr: string | null): string {
+		if (!dateStr || dateStr === '-' || dateStr === '0') return '-';
+
+		// Si es un timestamp ISO (contiene 'T' o '-')
+		if (dateStr.includes('T') || (dateStr.includes('-') && dateStr.length > 8)) {
+			try {
+				const date = new Date(dateStr);
+				// Verificar si es una fecha válida
+				if (isNaN(date.getTime())) return '-';
+				// Si es 1970 o anterior, es una fecha inválida/vacía
+				if (date.getFullYear() <= 1970) return '-';
+
+				const day = String(date.getDate()).padStart(2, '0');
+				const month = String(date.getMonth() + 1).padStart(2, '0');
+				const year = date.getFullYear();
+				return `${day}/${month}/${year}`;
+			} catch {
+				return '-';
+			}
+		}
+
+		// YYYYMMDD -> DD/MM/YYYY
+		if (dateStr.length === 8 && /^\d{8}$/.test(dateStr)) {
+			const year = dateStr.substring(0, 4);
+			const month = dateStr.substring(4, 6);
+			const day = dateStr.substring(6, 8);
+			return `${day}/${month}/${year}`;
+		}
+
+		return dateStr;
+	}
+
+	function formatCurrency(value: number | null | undefined): string {
+		if (value === null || value === undefined) return '-';
+		return new Intl.NumberFormat('en-US', {
+			minimumFractionDigits: 2,
+			maximumFractionDigits: 2
+		}).format(value);
+	}
+
+	function handleClose() {
+		// Reset form instead of navigating back
+		showResults = false;
+		results = [];
+		loading = false;
+	}
+
+	async function openSelectionDialog(type: 'provider' | 'soldTo' | 'pedimentoKey') {
+		dialogType = type;
+		dialogSearch = '';
+
+		if (type === 'pedimentoKey') {
+			// Cargar claves de pedimento
+			try {
+				const response = await api.get(
+					'/v1/public/refrence_data/pedimento-codes?page=1&page_size=100'
+				);
+				pedimentoCodes = response.data?.items || [];
+				dialogOpen = true;
+			} catch (error: any) {
+				console.error('Error cargando claves de pedimento:', error);
+				toast.error('Error al cargar las claves de pedimento');
+			}
+			return;
+		}
+
+		const companyId = companyStore.activeCompany?.id;
+		if (!companyId) {
+			toast.error('No hay compañía seleccionada');
+			return;
+		}
+		let isLoadingDialog = true;
+		try {
+			// No filtramos por tipo en el API para obtener todos los registros
+			// Filtraremos client-side para incluir 'both'
+			const response = await api.get(
+				`/v1/a76/clients-providers?company_id=${companyId}&limit=1000`
+			);
+			const allItems = response.data?.items || [];
+
+			// Filtrar según el tipo solicitado, incluyendo 'both'
+			const searchType = type === 'provider' ? 'provider' : 'client';
+			clientsProviders = allItems.filter(
+				(item: any) => item.client_or_provider === searchType || item.client_or_provider === 'both'
+			);
+
+			dialogOpen = true;
+		} catch (error: any) {
+			console.error('Error cargando datos:', error);
+			toast.error('Error al cargar la lista');
+		} finally {
+			isLoadingDialog = false;
+		}
+	}
+
+	function selectItem(item: any) {
+		if (dialogType === 'provider') {
+			selectors.provider = item.name || '';
+		} else if (dialogType === 'soldTo') {
+			selectors.soldTo = item.name || '';
+		} else if (dialogType === 'pedimentoKey') {
+			selectors.pedimentoKey = item.code || '';
+		}
+		dialogOpen = false;
+	}
+
+	const filteredItems = $derived(
+		dialogType === 'pedimentoKey'
+			? pedimentoCodes.filter((item) => {
+					if (!dialogSearch) return true;
+					const searchLower = dialogSearch.toLowerCase();
+					return (
+						item.code?.toLowerCase().includes(searchLower) ||
+						item.description?.toLowerCase().includes(searchLower)
+					);
+				})
+			: clientsProviders.filter((item) => {
+					if (!dialogSearch) return true;
+					const searchLower = dialogSearch.toLowerCase();
+					return (
+						item.name?.toLowerCase().includes(searchLower) ||
+						item.rfc?.toLowerCase().includes(searchLower) ||
+						item.tax_id?.toLowerCase().includes(searchLower)
+					);
+				})
+	);
 </script>
 
-<div class="h-[calc(100vh-3.5rem)] flex flex-col gap-1.5 animate-in fade-in slide-in-from-bottom-4 duration-500 overflow-hidden">
-    
-    <!-- Encabezado de Página Compacto -->
-    <div class="flex items-center justify-between shrink-0 px-1">
-        <div class="flex items-center gap-3">
-            <h1 class="text-xl font-bold tracking-tight text-foreground flex items-center gap-2">
-                <FileSearch class="h-6 w-6 text-primary" />
-                Reporte de Facturas
-            </h1>
-            <span class="bg-muted text-muted-foreground px-2 py-0.5 rounded-full text-[10px] font-medium border">
-                V2.0
-            </span>
-        </div>
-        <div class="text-xs text-muted-foreground">
-            Sistema Fiscal
-        </div>
-    </div>
+<div
+	class="animate-in fade-in slide-in-from-bottom-4 flex h-[calc(100vh-3.5rem)] flex-col gap-1.5 overflow-hidden duration-500"
+>
+	<!-- Encabezado de Página Compacto -->
+	<div class="flex shrink-0 items-center justify-between px-1">
+		<div class="flex items-center gap-3">
+			<h1 class="flex items-center gap-2 text-xl font-bold tracking-tight text-foreground">
+				<FileSearch class="h-6 w-6 text-primary" />
+				Reporte de Facturas
+			</h1>
+			<span
+				class="rounded-full border bg-muted px-2 py-0.5 text-[10px] font-medium text-muted-foreground"
+			>
+				V2.0
+			</span>
+		</div>
+		<div class="text-xs text-muted-foreground">Sistema Fiscal</div>
+	</div>
 
-    <Separator />
+	<Separator />
 
-    <!-- Sección de Acceso Rápido (Gestión de Pedimentos) Compacta -->
-    <div class="grid grid-cols-10 gap-2 shrink-0">
-        {#each menuOptions as item}
-            {#if item.items.length > 0}
-                <DropdownMenu.Root>
-                    <DropdownMenu.Trigger class="w-full">
-                        {#snippet child({ props })}
-                            <Button {...props} variant="outline" size="sm" class="w-full h-10 flex gap-2 items-center justify-center border-dashed hover:border-solid hover:bg-primary/5 transition-all text-muted-foreground hover:text-primary hover:border-primary/50">
-                                <item.icon class="w-4 h-4" />
-                                <span class="text-xs uppercase font-bold tracking-wider hidden xl:inline-block">{item.label}</span>
-                            </Button>
-                        {/snippet}
-                    </DropdownMenu.Trigger>
-                    <DropdownMenu.Content class="w-56">
-                        <DropdownMenu.Label class="text-xs font-bold text-muted-foreground uppercase tracking-wider">{item.label}</DropdownMenu.Label>
-                        <DropdownMenu.Separator />
-                        <div class="max-h-[300px] overflow-y-auto">
-                            {#each item.items as subItem}
-                                <DropdownMenu.Item onclick={() => toast.info(`Seleccionado: ${subItem}`)}>
-                                    {subItem}
-                                </DropdownMenu.Item>
-                            {/each}
-                        </div>
-                    </DropdownMenu.Content>
-                </DropdownMenu.Root>
-            {:else}
-                <Button variant="outline" size="sm" class="w-full h-10 flex gap-2 items-center justify-center border-dashed hover:border-solid hover:bg-primary/5 transition-all text-muted-foreground hover:text-primary hover:border-primary/50" onclick={() => toast.info(`Acción rápida: ${item.label}`)}>
-                    <item.icon class="w-4 h-4" />
-                    <span class="text-xs uppercase font-bold tracking-wider hidden xl:inline-block">{item.label}</span>
-                </Button>
-            {/if}
-        {/each}
-    </div>
-    
-    <Separator />
+	<!-- Sección de Acceso Rápido (Gestión de Pedimentos) Compacta -->
+	<div class="grid shrink-0 grid-cols-10 gap-2">
+		{#each menuOptions as item}
+			{#if item.items.length > 0}
+				<DropdownMenu.Root>
+					<DropdownMenu.Trigger class="w-full">
+						{#snippet child({ props })}
+							<Button
+								{...props}
+								variant="outline"
+								size="sm"
+								class="flex h-10 w-full items-center justify-center gap-2 border-dashed text-muted-foreground transition-all hover:border-solid hover:border-primary/50 hover:bg-primary/5 hover:text-primary"
+							>
+								<item.icon class="h-4 w-4" />
+								<span class="hidden text-xs font-bold tracking-wider uppercase xl:inline-block"
+									>{item.label}</span
+								>
+							</Button>
+						{/snippet}
+					</DropdownMenu.Trigger>
+					<DropdownMenu.Content class="w-56">
+						<DropdownMenu.Label
+							class="text-xs font-bold tracking-wider text-muted-foreground uppercase"
+							>{item.label}</DropdownMenu.Label
+						>
+						<DropdownMenu.Separator />
+						<div class="max-h-[300px] overflow-y-auto">
+							{#each item.items as subItem}
+								<DropdownMenu.Item onclick={() => toast.info(`Seleccionado: ${subItem}`)}>
+									{subItem}
+								</DropdownMenu.Item>
+							{/each}
+						</div>
+					</DropdownMenu.Content>
+				</DropdownMenu.Root>
+			{:else}
+				<Button
+					variant="outline"
+					size="sm"
+					class="flex h-10 w-full items-center justify-center gap-2 border-dashed text-muted-foreground transition-all hover:border-solid hover:border-primary/50 hover:bg-primary/5 hover:text-primary"
+					onclick={() => toast.info(`Acción rápida: ${item.label}`)}
+				>
+					<item.icon class="h-4 w-4" />
+					<span class="hidden text-xs font-bold tracking-wider uppercase xl:inline-block"
+						>{item.label}</span
+					>
+				</Button>
+			{/if}
+		{/each}
+	</div>
 
-    <!-- Contenido Principal - Layout Normal -->
-    <div class="grid grid-cols-3 gap-2 min-h-0 flex-1 items-start content-start">
+	<Separator />
 
-        <!-- Columna 1: Fechas y Clasificación -->
-        <Card.Root class="flex flex-col h-full">
-            <Card.Header class="py-2 px-3 shrink-0 bg-muted/20 border-b">
-                <Card.Title class="flex items-center gap-2 text-primary text-sm font-semibold">
-                    <Calendar class="w-4 h-4" /> Periodo y Clasificación
-                </Card.Title>
-            </Card.Header>
-            <Card.Content class="p-3 space-y-3 flex-1">
-                <div class="flex items-center gap-3">
-                    <div class="flex-1 space-y-1">
-                        <Label class="text-xs uppercase text-muted-foreground font-bold">Fecha Inicio</Label>
-                        <Input type="date" class="h-8" bind:value={dates.from} />
-                    </div>
-                    <div class="flex-1 space-y-1">
-                        <Label class="text-xs uppercase text-muted-foreground font-bold">Fecha Fin</Label>
-                        <Input type="date" class="h-8" bind:value={dates.to} />
-                    </div>
-                </div>
+	<!-- Contenido Principal - Layout Normal -->
+	<div class="grid min-h-0 flex-1 grid-cols-3 content-start items-start gap-2">
+		<!-- Columna 1: Fechas y Clasificación -->
+		<Card.Root class="flex h-full flex-col">
+			<Card.Header class="shrink-0 border-b bg-muted/20 px-3 py-2">
+				<Card.Title class="flex items-center gap-2 text-sm font-semibold text-primary">
+					<Calendar class="h-4 w-4" /> Periodo y Clasificación
+				</Card.Title>
+			</Card.Header>
+			<Card.Content class="flex-1 space-y-3 p-3">
+				<div class="flex items-center gap-3">
+					<div class="flex-1 space-y-1">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Fecha Inicio</Label>
+						<Input type="date" class="h-8" bind:value={dates.from} />
+					</div>
+					<div class="flex-1 space-y-1">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Fecha Fin</Label>
+						<Input type="date" class="h-8" bind:value={dates.to} />
+					</div>
+				</div>
 
-                <Separator />
+				<Separator />
 
-                <div class="grid grid-cols-2 gap-4">
-                    <!-- Importación -->
-                    <div>
-                        <Label class="text-xs font-bold text-muted-foreground uppercase mb-2 block border-b pb-1">Importación</Label>
-                        <div class="flex flex-col gap-2">
-                            {#each Object.keys(types.import) as key}
-                                <div class="flex items-center space-x-2">
-                                    <Checkbox 
-                                        id="imp-{key}" 
-                                        class="w-3.5 h-3.5" 
-                                        disabled={types.other.TODAS} 
-                                        bind:checked={types.import[key as keyof typeof types.import]} 
-                                    />
-                                    <Label for="imp-{key}" class="font-medium cursor-pointer text-xs">
-                                        {key === 'DEF' ? 'Definitiva' : key === 'TEM' ? 'Temporal' : 'Reparación'}
-                                    </Label>
-                                </div>
-                            {/each}
-                        </div>
-                    </div>
+				<div class="grid grid-cols-2 gap-4">
+					<!-- Importación -->
+					<div>
+						<Label
+							class="mb-2 block border-b pb-1 text-xs font-bold text-muted-foreground uppercase"
+							>Importación</Label
+						>
+						<div class="flex flex-col gap-2">
+							{#each Object.keys(types.import) as key}
+								<div class="flex items-center space-x-2">
+									<Checkbox
+										id="imp-{key}"
+										class="h-3.5 w-3.5"
+										disabled={types.other.TODAS}
+										bind:checked={types.import[key as keyof typeof types.import]}
+									/>
+									<Label for="imp-{key}" class="cursor-pointer text-xs font-medium">
+										{key === 'DEF' ? 'Definitiva' : key === 'TEM' ? 'Temporal' : 'Reparación'}
+									</Label>
+								</div>
+							{/each}
+						</div>
+					</div>
 
-                    <!-- Otras -->
-                    <div>
-                        <Label class="text-xs font-bold text-muted-foreground uppercase mb-2 block border-b pb-1">Otras</Label>
-                         <div class="flex flex-col gap-2">
-                            {#each Object.keys(types.other) as key}
-                                <div class="flex items-center space-x-2">
-                                    <Checkbox 
-                                        id="other-{key}" 
-                                        class="w-3.5 h-3.5" 
-                                        disabled={types.other.TODAS && key !== 'TODAS'} 
-                                        bind:checked={types.other[key as keyof typeof types.other]} 
-                                        onCheckedChange={(v) => { if (key === 'TODAS') handleTodasChange(v as boolean); }}
-                                    />
-                                    <Label for="other-{key}" class="cursor-pointer text-xs font-normal">
-                                        {key === 'CREGEXP' ? 'C. REG. EXP.' : key}
-                                    </Label>
-                                </div>
-                            {/each}
-                        </div>
-                    </div>
-                </div>
-                
-                <!-- Exportación -->
-                <div class="pt-1">
-                    <Label class="text-xs font-bold text-muted-foreground uppercase mb-2 block border-b pb-1">Exportación</Label>
-                    
-                    <div class="space-y-3">
-                        <!-- Main Types (Checkboxes ahora) -->
-                        <div>
-                             <Label class="text-[10px] uppercase text-muted-foreground font-bold mb-1.5 block">Tipo Principal</Label>
-                             <div class="grid grid-cols-3 gap-2">
-                                <div class="flex items-center space-x-2">
-                                    <Checkbox id="exp-m-def" class="w-3.5 h-3.5" disabled={types.other.TODAS} bind:checked={types.export.main.DEF} />
-                                    <Label for="exp-m-def" class="cursor-pointer text-xs font-medium">Definitiva</Label>
-                                </div>
-                                <div class="flex items-center space-x-2">
-                                    <Checkbox id="exp-m-creg" class="w-3.5 h-3.5" disabled={types.other.TODAS} bind:checked={types.export.main.CREG} />
-                                    <Label for="exp-m-creg" class="cursor-pointer text-xs font-medium">C. Régimen</Label>
-                                </div>
-                                <div class="flex items-center space-x-2">
-                                    <Checkbox id="exp-m-rep" class="w-3.5 h-3.5" disabled={types.other.TODAS} bind:checked={types.export.main.REP} />
-                                    <Label for="exp-m-rep" class="cursor-pointer text-xs font-medium">Reparación</Label>
-                                </div>
-                            </div>
-                        </div>
-                        
-                        <!-- Additional (Checkboxes) -->
-                        <div>
-                            <Label class="text-[10px] uppercase text-muted-foreground font-bold mb-1.5 block">Opciones Adicionales</Label>
-                            <div class="grid grid-cols-3 gap-2">
-                                {#each Object.keys(types.export.additional) as key}
-                                    <div class="flex items-center space-x-2">
-                                        <Checkbox 
-                                            id="exp-add-{key}" 
-                                            class="w-3.5 h-3.5" 
-                                            disabled={types.other.TODAS && key !== 'TODAS'} 
-                                            bind:checked={types.export.additional[key as keyof typeof types.export.additional]} 
-                                        />
-                                        <Label for="exp-add-{key}" class="cursor-pointer text-[10px] font-normal">{key}</Label>
-                                    </div>
-                                {/each}
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </Card.Content>
-        </Card.Root>
+					<!-- Otras -->
+					<div>
+						<Label
+							class="mb-2 block border-b pb-1 text-xs font-bold text-muted-foreground uppercase"
+							>Otras</Label
+						>
+						<div class="flex flex-col gap-2">
+							{#each Object.keys(types.other) as key}
+								<div class="flex items-center space-x-2">
+									<Checkbox
+										id="other-{key}"
+										class="h-3.5 w-3.5"
+										disabled={types.other.TODAS && key !== 'TODAS'}
+										bind:checked={types.other[key as keyof typeof types.other]}
+										onCheckedChange={(v) => {
+											if (key === 'TODAS') handleTodasChange(v as boolean);
+										}}
+									/>
+									<Label for="other-{key}" class="cursor-pointer text-xs font-normal">
+										{key === 'CREGEXP' ? 'C. REG. EXP.' : key}
+									</Label>
+								</div>
+							{/each}
+						</div>
+					</div>
+				</div>
 
-        <!-- Columna 2: Filtros e Identificadores -->
-        <Card.Root class="flex flex-col h-full">
-            <Card.Header class="py-2 px-3 shrink-0 bg-muted/20 border-b">
-                <Card.Title class="flex items-center gap-2 text-primary text-sm font-semibold">
-                    <Search class="w-4 h-4" /> Filtros e Identificadores
-                </Card.Title>
-            </Card.Header>
-            <Card.Content class="p-3 space-y-3 flex-1">
-                <div class="space-y-2">
-                    {#each [
-                        { label: 'Proveedor', key: 'provider' as const },
-                        { label: 'Vendido a', key: 'soldTo' as const },
-                        { label: 'Clave de Pedimento', key: 'pedimentoKey' as const }
-                    ] as item}
-                        <div class="space-y-1">
-                            <Label class="text-xs font-bold text-muted-foreground uppercase">{item.label}</Label>
-                            <div class="flex items-center gap-2">
-                                <Input bind:value={selectors[item.key]} class="h-8 text-sm flex-1" placeholder={`Buscar ${item.label.split('/')[0]}...`} />
-                                <Button variant="outline" size="icon" class="h-8 w-8 shrink-0" onclick={() => openSelectionDialog(item.key)}>
-                                    <Folder class="h-4 w-4" />
-                                </Button>
-                            </div>
-                        </div>
-                    {/each}
-                </div>
+				<!-- Exportación -->
+				<div class="pt-1">
+					<Label class="mb-2 block border-b pb-1 text-xs font-bold text-muted-foreground uppercase"
+						>Exportación</Label
+					>
 
-                <div class="py-1">
-                    <Separator />
-                </div>
+					<div class="space-y-3">
+						<!-- Main Types (Checkboxes ahora) -->
+						<div>
+							<Label class="mb-1.5 block text-[10px] font-bold text-muted-foreground uppercase"
+								>Tipo Principal</Label
+							>
+							<div class="grid grid-cols-3 gap-2">
+								<div class="flex items-center space-x-2">
+									<Checkbox
+										id="exp-m-def"
+										class="h-3.5 w-3.5"
+										disabled={types.other.TODAS}
+										bind:checked={types.export.main.DEF}
+									/>
+									<Label for="exp-m-def" class="cursor-pointer text-xs font-medium"
+										>Definitiva</Label
+									>
+								</div>
+								<div class="flex items-center space-x-2">
+									<Checkbox
+										id="exp-m-creg"
+										class="h-3.5 w-3.5"
+										disabled={types.other.TODAS}
+										bind:checked={types.export.main.CREG}
+									/>
+									<Label for="exp-m-creg" class="cursor-pointer text-xs font-medium"
+										>C. Régimen</Label
+									>
+								</div>
+								<div class="flex items-center space-x-2">
+									<Checkbox
+										id="exp-m-rep"
+										class="h-3.5 w-3.5"
+										disabled={types.other.TODAS}
+										bind:checked={types.export.main.REP}
+									/>
+									<Label for="exp-m-rep" class="cursor-pointer text-xs font-medium"
+										>Reparación</Label
+									>
+								</div>
+							</div>
+						</div>
 
-                <div class="space-y-2">
-                    <Label class="text-xs font-bold text-muted-foreground uppercase">Filtros por Partida</Label>
-                    
-                     <div class="flex items-center space-x-2 border p-2 rounded-md bg-muted/10 hover:bg-muted/20 transition-colors">
-                        <Checkbox id="filter-na" class="w-4 h-4" bind:checked={filters.includeNA} />
-                        <Label for="filter-na" class="font-medium cursor-pointer text-sm">Incluir Facturas NA</Label>
-                    </div>
-                    
-                    <div class="space-y-1.5 pt-1">
-                         <RadioGroup.Root bind:value={filters.downloaded} class="flex flex-col gap-1.5">
-                            <div class="flex items-center space-x-3 rounded-md border px-3 py-2 hover:bg-muted/50 transition-colors">
-                                <RadioGroup.Item value="all" id="d1" class="w-4 h-4" />
-                                <Label for="d1" class="font-medium cursor-pointer flex-1 text-sm">Todas las Partidas</Label>
-                            </div>
-                            <div class="flex items-center space-x-3 rounded-md border px-3 py-2 hover:bg-muted/50 transition-colors">
-                                <RadioGroup.Item value="downloaded" id="d2" class="w-4 h-4" />
-                                <Label for="d2" class="font-medium cursor-pointer flex-1 text-sm">Solo Descargadas</Label>
-                            </div>
-                            <div class="flex items-center space-x-3 rounded-md border px-3 py-2 hover:bg-muted/50 transition-colors">
-                                <RadioGroup.Item value="not_downloaded" id="d3" class="w-4 h-4" />
-                                <Label for="d3" class="font-medium cursor-pointer flex-1 text-sm">Solo No Descargadas</Label>
-                            </div>
-                        </RadioGroup.Root>
-                    </div>
-                </div>
-            </Card.Content>
-        </Card.Root>
+						<!-- Additional (Checkboxes) -->
+						<div>
+							<Label class="mb-1.5 block text-[10px] font-bold text-muted-foreground uppercase"
+								>Opciones Adicionales</Label
+							>
+							<div class="grid grid-cols-3 gap-2">
+								{#each Object.keys(types.export.additional) as key}
+									<div class="flex items-center space-x-2">
+										<Checkbox
+											id="exp-add-{key}"
+											class="h-3.5 w-3.5"
+											disabled={types.other.TODAS && key !== 'TODAS'}
+											bind:checked={
+												types.export.additional[key as keyof typeof types.export.additional]
+											}
+										/>
+										<Label for="exp-add-{key}" class="cursor-pointer text-[10px] font-normal"
+											>{key}</Label
+										>
+									</div>
+								{/each}
+							</div>
+						</div>
+					</div>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-        <!-- Columna 3: Configuración y Acciones -->
-        <Card.Root class="flex flex-col h-full">
-            <Card.Header class="py-2 px-3 shrink-0 bg-muted/20 border-b">
-                <Card.Title class="flex items-center gap-2 text-primary text-sm font-semibold">
-                    <Globe class="w-4 h-4" /> Configuración Final
-                </Card.Title>
-            </Card.Header>
-            <Card.Content class="p-3 space-y-4 flex-1">
-                
-                <div class="grid grid-cols-2 gap-3">
-                    <div class="space-y-1.5">
-                        <Label class="text-xs uppercase text-muted-foreground font-bold">Tipo de Fecha</Label>
-                        <RadioGroup.Root bind:value={dates.type} class="flex flex-col gap-1">
-                             <div class="flex items-center space-x-2 border rounded-md px-2 py-1.5 hover:bg-muted transition-colors">
-                                <RadioGroup.Item value="invoice" id="dt-inv" class="w-4 h-4" />
-                                <Label for="dt-inv" class="cursor-pointer flex-1 text-sm font-medium">Factura</Label>
-                            </div>
-                            <div class="flex items-center space-x-2 border rounded-md px-2 py-1.5 hover:bg-muted transition-colors">
-                                <RadioGroup.Item value="payment" id="dt-pay" class="w-4 h-4" />
-                                <Label for="dt-pay" class="cursor-pointer flex-1 text-sm font-medium">Pago</Label>
-                            </div>
-                        </RadioGroup.Root>
-                    </div>
+		<!-- Columna 2: Filtros e Identificadores -->
+		<Card.Root class="flex h-full flex-col">
+			<Card.Header class="shrink-0 border-b bg-muted/20 px-3 py-2">
+				<Card.Title class="flex items-center gap-2 text-sm font-semibold text-primary">
+					<Search class="h-4 w-4" /> Filtros e Identificadores
+				</Card.Title>
+			</Card.Header>
+			<Card.Content class="flex-1 space-y-3 p-3">
+				<div class="space-y-2">
+					{#each [{ label: 'Proveedor', key: 'provider' as const }, { label: 'Vendido a', key: 'soldTo' as const }, { label: 'Clave de Pedimento', key: 'pedimentoKey' as const }] as item}
+						<div class="space-y-1">
+							<Label class="text-xs font-bold text-muted-foreground uppercase">{item.label}</Label>
+							<div class="flex items-center gap-2">
+								<Input
+									bind:value={selectors[item.key]}
+									class="h-8 flex-1 text-sm"
+									placeholder={`Buscar ${item.label.split('/')[0]}...`}
+								/>
+								<Button
+									variant="outline"
+									size="icon"
+									class="h-8 w-8 shrink-0"
+									onclick={() => openSelectionDialog(item.key)}
+								>
+									<Folder class="h-4 w-4" />
+								</Button>
+							</div>
+						</div>
+					{/each}
+				</div>
 
-                    <div class="space-y-1.5">
-                        <Label class="text-xs uppercase text-muted-foreground font-bold">Tipo de Moneda</Label>
-                        <RadioGroup.Root bind:value={config.currency} class="flex flex-col gap-1">
-                            <div class="flex items-center space-x-2 border rounded-md px-2 py-1.5 hover:bg-muted transition-colors">
-                                <RadioGroup.Item value="foreign" id="curr-usd" class="w-4 h-4" />
-                                <Label for="curr-usd" class="cursor-pointer flex-1 text-sm font-medium">Extranjera</Label>
-                            </div>
-                             <div class="flex items-center space-x-2 border rounded-md px-2 py-1.5 hover:bg-muted transition-colors">
-                                <RadioGroup.Item value="national" id="curr-mxn" class="w-4 h-4" />
-                                <Label for="curr-mxn" class="cursor-pointer flex-1 text-sm font-medium">Nacional</Label>
-                            </div>
-                            <div class="flex items-center space-x-2 border rounded-md px-2 py-1.5 hover:bg-muted transition-colors">
-                                <RadioGroup.Item value="capture" id="curr-cap" class="w-4 h-4" />
-                                <Label for="curr-cap" class="cursor-pointer flex-1 text-sm font-medium">Captura</Label>
-                            </div>
-                        </RadioGroup.Root>
-                    </div>
-                </div>
+				<div class="py-1">
+					<Separator />
+				</div>
 
-                <div class="py-1">
-                    <Separator />
-                </div>
+				<div class="space-y-2">
+					<Label class="text-xs font-bold text-muted-foreground uppercase"
+						>Filtros por Partida</Label
+					>
 
-                <div class="grid grid-cols-2 gap-3">
-                    <div class="space-y-1.5">
-                        <Label class="text-xs uppercase text-muted-foreground font-bold">Reporte</Label>
-                        <RadioGroup.Root bind:value={config.reportType} class="flex flex-col gap-1.5">
-                            <div class="flex items-center space-x-2">
-                                <RadioGroup.Item value="normal" id="rt-norm" class="w-4 h-4" />
-                                <Label for="rt-norm" class="font-medium cursor-pointer text-sm">Normal</Label>
-                            </div>
-                            <div class="flex items-center space-x-2">
-                                <RadioGroup.Item value="detailed" id="rt-det" class="w-4 h-4" />
-                                <Label for="rt-det" class="font-medium cursor-pointer text-sm">Detallado</Label>
-                            </div>
-                        </RadioGroup.Root>
-                    </div>
-                    <div class="space-y-1.5">
-                         <Label class="text-xs uppercase text-muted-foreground font-bold">Tipo de Cambio</Label>
-                        <RadioGroup.Root bind:value={config.exchangeRate} class="flex flex-col gap-1.5">
-                            <div class="flex items-center space-x-2">
-                                <RadioGroup.Item value="invoice_date" id="er-inv" class="w-4 h-4" />
-                                <Label for="er-inv" class="font-medium cursor-pointer text-sm">Fecha Factura</Label>
-                            </div>
-                            <div class="flex items-center space-x-2">
-                                <RadioGroup.Item value="payment_date" id="er-pay" class="w-4 h-4" />
-                                <Label for="er-pay" class="font-medium cursor-pointer text-sm">Fecha Pago</Label>
-                            </div>
-                        </RadioGroup.Root>
-                    </div>
-                </div>
+					<div
+						class="flex items-center space-x-2 rounded-md border bg-muted/10 p-2 transition-colors hover:bg-muted/20"
+					>
+						<Checkbox id="filter-na" class="h-4 w-4" bind:checked={filters.includeNA} />
+						<Label for="filter-na" class="cursor-pointer text-sm font-medium"
+							>Incluir Facturas NA</Label
+						>
+					</div>
 
-                <div class="space-y-2 pt-1 border-t">
-                    <Label class="text-xs uppercase text-muted-foreground font-bold">Opciones Avanzadas</Label>
-                    <div class="flex flex-col gap-1.5">
-                        <div class="flex items-center justify-between border rounded p-2 hover:bg-muted/10 transition-colors">
-                            <Label for="opt-email" class="cursor-pointer text-sm">Enviar por Correo Electrónico</Label>
-                            <Checkbox id="opt-email" class="w-4 h-4" bind:checked={config.sendEmail} />
-                        </div>
-                        <div class="flex items-center justify-between border rounded p-2 hover:bg-muted/10 transition-colors">
-                            <Label for="opt-julian" class="cursor-pointer flex-1 text-sm">Usar Fecha Juliana (Excel)</Label>
-                            <Checkbox id="opt-julian" class="w-4 h-4" bind:checked={config.julianDate} />
-                        </div>
-                        <div class="flex items-center justify-between border rounded p-2 hover:bg-muted/10 transition-colors">
-                            <Label for="opt-shelter" class="cursor-pointer flex-1 text-sm">Generar Reporte Shelter</Label>
-                            <Checkbox id="opt-shelter" class="w-4 h-4" bind:checked={config.shelter} />
-                        </div>
-                    </div>
-                </div>
+					<div class="space-y-1.5 pt-1">
+						<RadioGroup.Root bind:value={filters.downloaded} class="flex flex-col gap-1.5">
+							<div
+								class="flex items-center space-x-3 rounded-md border px-3 py-2 transition-colors hover:bg-muted/50"
+							>
+								<RadioGroup.Item value="all" id="d1" class="h-4 w-4" />
+								<Label for="d1" class="flex-1 cursor-pointer text-sm font-medium"
+									>Todas las Partidas</Label
+								>
+							</div>
+							<div
+								class="flex items-center space-x-3 rounded-md border px-3 py-2 transition-colors hover:bg-muted/50"
+							>
+								<RadioGroup.Item value="downloaded" id="d2" class="h-4 w-4" />
+								<Label for="d2" class="flex-1 cursor-pointer text-sm font-medium"
+									>Solo Descargadas</Label
+								>
+							</div>
+							<div
+								class="flex items-center space-x-3 rounded-md border px-3 py-2 transition-colors hover:bg-muted/50"
+							>
+								<RadioGroup.Item value="not_downloaded" id="d3" class="h-4 w-4" />
+								<Label for="d3" class="flex-1 cursor-pointer text-sm font-medium"
+									>Solo No Descargadas</Label
+								>
+							</div>
+						</RadioGroup.Root>
+					</div>
+				</div>
+			</Card.Content>
+		</Card.Root>
 
-            </Card.Content>
-            <Card.Footer class="p-2.5 bg-muted/10 border-t mt-auto gap-2">
-                    <Button 
-                        class="flex-1 h-9 text-sm shadow-sm" 
-                        size="default"
-                        onclick={handleGenerateReport}
-                        disabled={loading}
-                    >
-                        {#if loading}
-                            <div class="w-3.5 h-3.5 border-2 border-primary-foreground/30 border-t-primary-foreground rounded-full animate-spin mr-2"></div>
-                             Generando...
-                        {:else}
-                            <Printer class="w-3.5 h-3.5 mr-2" />
-                            Imprimir Reporte
-                        {/if}
-                    </Button>
-                    <Button variant="ghost" size="icon" class="h-9 w-9 text-muted-foreground hover:text-destructive" onclick={handleClose}>
-                        <X class="w-4 h-4" />
-                    </Button>
-            </Card.Footer>
-        </Card.Root>
-    </div>
+		<!-- Columna 3: Configuración y Acciones -->
+		<Card.Root class="flex h-full flex-col">
+			<Card.Header class="shrink-0 border-b bg-muted/20 px-3 py-2">
+				<Card.Title class="flex items-center gap-2 text-sm font-semibold text-primary">
+					<Globe class="h-4 w-4" /> Configuración Final
+				</Card.Title>
+			</Card.Header>
+			<Card.Content class="flex-1 space-y-4 p-3">
+				<div class="grid grid-cols-2 gap-3">
+					<div class="space-y-1.5">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Tipo de Fecha</Label>
+						<RadioGroup.Root bind:value={dates.type} class="flex flex-col gap-1">
+							<div
+								class="flex items-center space-x-2 rounded-md border px-2 py-1.5 transition-colors hover:bg-muted"
+							>
+								<RadioGroup.Item value="invoice" id="dt-inv" class="h-4 w-4" />
+								<Label for="dt-inv" class="flex-1 cursor-pointer text-sm font-medium">Factura</Label
+								>
+							</div>
+							<div
+								class="flex items-center space-x-2 rounded-md border px-2 py-1.5 transition-colors hover:bg-muted"
+							>
+								<RadioGroup.Item value="payment" id="dt-pay" class="h-4 w-4" />
+								<Label for="dt-pay" class="flex-1 cursor-pointer text-sm font-medium">Pago</Label>
+							</div>
+						</RadioGroup.Root>
+					</div>
 
-    <!-- Tabla de Resultados (Dialog Modal) -->
-    <Dialog.Root open={showResults} onOpenChange={(v) => { if (!v) showResults = false; }}>
-        <Dialog.Content showCloseButton={false} class="!max-w-[95vw] h-[90vh] flex flex-col p-0 gap-0">
-            <Dialog.Header class="px-6 py-4 border-b bg-muted/40 shrink-0">
-                <div class="flex items-center justify-between">
-                    <div>
-                        <Dialog.Title class="text-xl flex items-center gap-2">
-                            <FileText class="h-5 w-5 text-primary" />
-                            {reportTitle}
-                        </Dialog.Title>
-                        <Dialog.Description class="mt-1.5">
-                            {results.length} registros encontrados • {currencyLabel}
-                        </Dialog.Description>
-                    </div>
-                    <div class="flex gap-2">
-                        <Button variant="outline" size="sm" onclick={downloadCSV} class="gap-2 shadow-sm">
-                            <Download class="h-4 w-4" />
-                            Exportar CSV
-                        </Button>
-                        <Dialog.Close class="inline-flex h-9 w-9 items-center justify-center whitespace-nowrap rounded-md ring-offset-background transition-colors hover:bg-muted hover:text-muted-foreground focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 border border-input bg-background shadow-sm hover:bg-accent hover:text-accent-foreground">
-                            <X class="h-4 w-4" />
-                            <span class="sr-only">Cerrar</span>
-                        </Dialog.Close>
-                    </div>
-                </div>
-            </Dialog.Header>
-            
-            <div class="flex-1 overflow-auto bg-muted/20 p-4">
-                <div class="rounded-md border bg-card text-card-foreground shadow-sm overflow-hidden">
-                    <table class="w-full text-sm text-left border-collapse">
-                        <thead class="bg-muted/80 sticky top-0 z-10 backdrop-blur-sm border-b border-border shadow-sm text-muted-foreground">
-                            <tr>
-                                {#each (config.reportType === 'normal' ? 
-                                    ['PEDIMENTO', 'CLAVE', 'FACTURA', 'FECHA FACT', 'VALOR COM.', 'TIPO OPER.', 'ESTATUS', 'PROYECTO'] : 
-                                    ['PEDIMENTO', 'FACTURA', 'FECHA FACT', 'PROVEEDOR', 'CLIENTE', 'CANTIDAD', 'DESC. ESPAÑOL', 'TIPO OPER.']) as header}
-                                    <th class="px-4 py-3 font-semibold whitespace-nowrap text-xs uppercase tracking-wider">
-                                        {header}
-                                    </th>
-                                {/each}
-                            </tr>
-                        </thead>
-                        <tbody class="divide-y divide-border">
-                            {#each results as row}
-                                <tr class="hover:bg-muted/50 transition-colors bg-card">
-                                    {#if config.reportType === 'normal'}
-                                        <td class="px-4 py-2.5 font-medium text-primary border-r border-r-dashed border-border/50">{row.Pedimento || '-'}</td>
-                                        <td class="px-4 py-2.5 border-r border-r-dashed border-border/50">{row.ClavePed || '-'}</td>
-                                        <td class="px-4 py-2.5 whitespace-nowrap border-r border-r-dashed border-border/50 font-mono">{row.Factura}</td>
-                                        <td class="px-4 py-2.5 border-r border-r-dashed border-border/50 text-muted-foreground text-xs">{formatDateFromYYYYMMDD(row.FechaFactura)}</td>
-                                        <td class="px-4 py-2.5 text-right font-mono border-r border-r-dashed border-border/50">${formatCurrency(row.ValorComercialMN)}</td>
-                                        <td class="px-4 py-2.5 border-r border-r-dashed border-border/50">
-                                            <span class="px-2 py-0.5 rounded-full text-[10px] font-bold bg-blue-100 text-blue-700 dark:bg-blue-900/30 dark:text-blue-400 border border-blue-200 dark:border-blue-800">
-                                                {row.TipoMovTemDef}
-                                            </span>
-                                        </td>
-                                        <td class="px-4 py-2.5 border-r border-r-dashed border-border/50">
-                                            <span class="px-2 py-0.5 rounded-full text-[10px] font-bold {row.Estatus === 'C' ? 'bg-destructive/10 text-destructive border border-destructive/20' : 'bg-green-100 text-green-700 dark:bg-green-900/30 dark:text-green-400 border border-green-200 dark:border-green-800'}">
-                                                {row.Estatus || 'A'}
-                                            </span>
-                                        </td>
-                                        <td class="px-4 py-2.5 text-xs text-muted-foreground">{row.BaseDeDatos}</td>
-                                    {:else}
-                                        {@const detailRow = row as MovementItemDetailed}
-                                        <td class="px-4 py-2.5 font-medium text-primary border-r border-r-dashed border-border/50">{detailRow.Pedimento || '-'}</td>
-                                        <td class="px-4 py-2.5 whitespace-nowrap font-medium border-r border-r-dashed border-border/50 font-mono">{detailRow.Factura}</td>
-                                        <td class="px-4 py-2.5 border-r border-r-dashed border-border/50 text-muted-foreground text-xs">{formatDateFromYYYYMMDD(detailRow.FechaFactura)}</td>
-                                        <td class="px-4 py-2.5 max-w-[150px] truncate border-r border-r-dashed border-border/50 text-xs" title={detailRow.Proveedor}>{detailRow.Proveedor || '-'}</td>
-                                        <td class="px-4 py-2.5 max-w-[150px] truncate border-r border-r-dashed border-border/50 text-xs" title={detailRow.VendidoA}>{detailRow.VendidoA || '-'}</td>
-                                        <td class="px-4 py-2.5 text-right font-mono border-r border-r-dashed border-border/50">{detailRow.CantidadIE || '0'}</td>
-                                        <td class="px-4 py-2.5 max-w-[200px] truncate border-r border-r-dashed border-border/50 text-xs" title={detailRow.DescripcionE}>{detailRow.DescripcionE || '-'}</td>
-                                        <td class="px-4 py-2.5">
-                                            <span class="px-2 py-0.5 rounded-full text-[10px] font-bold bg-purple-100 text-purple-700 dark:bg-purple-900/30 dark:text-purple-400 border border-purple-200 dark:border-purple-800">
-                                                {detailRow.TipoMovTemDef}
-                                            </span>
-                                        </td>
-                                    {/if}
-                                </tr>
-                            {/each}
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-        </Dialog.Content>
-    </Dialog.Root>
+					<div class="space-y-1.5">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Tipo de Moneda</Label>
+						<RadioGroup.Root bind:value={config.currency} class="flex flex-col gap-1">
+							<div
+								class="flex items-center space-x-2 rounded-md border px-2 py-1.5 transition-colors hover:bg-muted"
+							>
+								<RadioGroup.Item value="foreign" id="curr-usd" class="h-4 w-4" />
+								<Label for="curr-usd" class="flex-1 cursor-pointer text-sm font-medium"
+									>Extranjera</Label
+								>
+							</div>
+							<div
+								class="flex items-center space-x-2 rounded-md border px-2 py-1.5 transition-colors hover:bg-muted"
+							>
+								<RadioGroup.Item value="national" id="curr-mxn" class="h-4 w-4" />
+								<Label for="curr-mxn" class="flex-1 cursor-pointer text-sm font-medium"
+									>Nacional</Label
+								>
+							</div>
+							<div
+								class="flex items-center space-x-2 rounded-md border px-2 py-1.5 transition-colors hover:bg-muted"
+							>
+								<RadioGroup.Item value="capture" id="curr-cap" class="h-4 w-4" />
+								<Label for="curr-cap" class="flex-1 cursor-pointer text-sm font-medium"
+									>Captura</Label
+								>
+							</div>
+						</RadioGroup.Root>
+					</div>
+				</div>
+
+				<div class="py-1">
+					<Separator />
+				</div>
+
+				<div class="grid grid-cols-2 gap-3">
+					<div class="space-y-1.5">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Reporte</Label>
+						<RadioGroup.Root bind:value={config.reportType} class="flex flex-col gap-1.5">
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="normal" id="rt-norm" class="h-4 w-4" />
+								<Label for="rt-norm" class="cursor-pointer text-sm font-medium">Normal</Label>
+							</div>
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="detailed" id="rt-det" class="h-4 w-4" />
+								<Label for="rt-det" class="cursor-pointer text-sm font-medium">Detallado</Label>
+							</div>
+						</RadioGroup.Root>
+					</div>
+					<div class="space-y-1.5">
+						<Label class="text-xs font-bold text-muted-foreground uppercase">Tipo de Cambio</Label>
+						<RadioGroup.Root bind:value={config.exchangeRate} class="flex flex-col gap-1.5">
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="invoice_date" id="er-inv" class="h-4 w-4" />
+								<Label for="er-inv" class="cursor-pointer text-sm font-medium">Fecha Factura</Label>
+							</div>
+							<div class="flex items-center space-x-2">
+								<RadioGroup.Item value="payment_date" id="er-pay" class="h-4 w-4" />
+								<Label for="er-pay" class="cursor-pointer text-sm font-medium">Fecha Pago</Label>
+							</div>
+						</RadioGroup.Root>
+					</div>
+				</div>
+
+				<div class="space-y-2 border-t pt-1">
+					<Label class="text-xs font-bold text-muted-foreground uppercase">Opciones Avanzadas</Label
+					>
+					<div class="flex flex-col gap-1.5">
+						<div
+							class="flex items-center justify-between rounded border p-2 transition-colors hover:bg-muted/10"
+						>
+							<Label for="opt-email" class="cursor-pointer text-sm"
+								>Enviar por Correo Electrónico</Label
+							>
+							<Checkbox id="opt-email" class="h-4 w-4" bind:checked={config.sendEmail} />
+						</div>
+						<div
+							class="flex items-center justify-between rounded border p-2 transition-colors hover:bg-muted/10"
+						>
+							<Label for="opt-julian" class="flex-1 cursor-pointer text-sm"
+								>Usar Fecha Juliana (Excel)</Label
+							>
+							<Checkbox id="opt-julian" class="h-4 w-4" bind:checked={config.julianDate} />
+						</div>
+						<div
+							class="flex items-center justify-between rounded border p-2 transition-colors hover:bg-muted/10"
+						>
+							<Label for="opt-shelter" class="flex-1 cursor-pointer text-sm"
+								>Generar Reporte Shelter</Label
+							>
+							<Checkbox id="opt-shelter" class="h-4 w-4" bind:checked={config.shelter} />
+						</div>
+					</div>
+				</div>
+			</Card.Content>
+			<Card.Footer class="mt-auto gap-2 border-t bg-muted/10 p-2.5">
+				<Button
+					class="h-9 flex-1 text-sm shadow-sm"
+					size="default"
+					onclick={handleGenerateReport}
+					disabled={loading}
+				>
+					{#if loading}
+						<div
+							class="mr-2 h-3.5 w-3.5 animate-spin rounded-full border-2 border-primary-foreground/30 border-t-primary-foreground"
+						></div>
+						Generando...
+					{:else}
+						<Printer class="mr-2 h-3.5 w-3.5" />
+						Imprimir Reporte
+					{/if}
+				</Button>
+				<Button
+					variant="ghost"
+					size="icon"
+					class="h-9 w-9 text-muted-foreground hover:text-destructive"
+					onclick={handleClose}
+				>
+					<X class="h-4 w-4" />
+				</Button>
+			</Card.Footer>
+		</Card.Root>
+	</div>
+
+	<!-- Tabla de Resultados (Dialog Modal) -->
+	<Dialog.Root
+		open={showResults}
+		onOpenChange={(v) => {
+			if (!v) showResults = false;
+		}}
+	>
+		<Dialog.Content showCloseButton={false} class="flex h-[90vh] !max-w-[95vw] flex-col gap-0 p-0">
+			<Dialog.Header class="shrink-0 border-b bg-muted/40 px-6 py-4">
+				<div class="flex items-center justify-between">
+					<div>
+						<Dialog.Title class="flex items-center gap-2 text-xl">
+							<FileText class="h-5 w-5 text-primary" />
+							{reportTitle}
+						</Dialog.Title>
+						<Dialog.Description class="mt-1.5">
+							{results.length} registros encontrados • {currencyLabel}
+						</Dialog.Description>
+					</div>
+					<div class="flex gap-2">
+						<Button variant="outline" size="sm" onclick={downloadCSV} class="gap-2 shadow-sm">
+							<Download class="h-4 w-4" />
+							Exportar CSV
+						</Button>
+						<Dialog.Close
+							class="inline-flex h-9 w-9 items-center justify-center rounded-md border border-input bg-background whitespace-nowrap shadow-sm ring-offset-background transition-colors hover:bg-accent hover:bg-muted hover:text-accent-foreground hover:text-muted-foreground focus-visible:ring-2 focus-visible:ring-ring focus-visible:ring-offset-2 focus-visible:outline-none disabled:pointer-events-none disabled:opacity-50"
+						>
+							<X class="h-4 w-4" />
+							<span class="sr-only">Cerrar</span>
+						</Dialog.Close>
+					</div>
+				</div>
+			</Dialog.Header>
+
+			<div class="flex-1 overflow-auto bg-muted/20 p-4">
+				<div class="overflow-hidden rounded-md border bg-card text-card-foreground shadow-sm">
+					<table class="w-full border-collapse text-left text-sm">
+						<thead
+							class="sticky top-0 z-10 border-b border-border bg-muted/80 text-muted-foreground shadow-sm backdrop-blur-sm"
+						>
+							<tr>
+								{#each config.reportType === 'normal' ? ['PEDIMENTO', 'CLAVE', 'FACTURA', 'FECHA FACT', 'VALOR COM.', 'TIPO OPER.', 'ESTATUS', 'PROYECTO'] : ['PEDIMENTO', 'FACTURA', 'FECHA FACT', 'PROVEEDOR', 'CLIENTE', 'CANTIDAD', 'DESC. ESPAÑOL', 'TIPO OPER.'] as header}
+									<th
+										class="px-4 py-3 text-xs font-semibold tracking-wider whitespace-nowrap uppercase"
+									>
+										{header}
+									</th>
+								{/each}
+							</tr>
+						</thead>
+						<tbody class="divide-y divide-border">
+							{#each results as row}
+								<tr class="bg-card transition-colors hover:bg-muted/50">
+									{#if config.reportType === 'normal'}
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 font-medium text-primary"
+											>{row.Pedimento || '-'}</td
+										>
+										<td class="border-r-dashed border-r border-border/50 px-4 py-2.5"
+											>{row.ClavePed || '-'}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 font-mono whitespace-nowrap"
+											>{row.Factura}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 text-xs text-muted-foreground"
+											>{formatDateFromYYYYMMDD(row.FechaFactura)}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 text-right font-mono"
+											>${formatCurrency(row.ValorComercialMN)}</td
+										>
+										<td class="border-r-dashed border-r border-border/50 px-4 py-2.5">
+											<span
+												class="rounded-full border border-blue-200 bg-blue-100 px-2 py-0.5 text-[10px] font-bold text-blue-700 dark:border-blue-800 dark:bg-blue-900/30 dark:text-blue-400"
+											>
+												{row.TipoMovTemDef}
+											</span>
+										</td>
+										<td class="border-r-dashed border-r border-border/50 px-4 py-2.5">
+											<span
+												class="rounded-full px-2 py-0.5 text-[10px] font-bold {row.Estatus === 'C'
+													? 'border border-destructive/20 bg-destructive/10 text-destructive'
+													: 'border border-green-200 bg-green-100 text-green-700 dark:border-green-800 dark:bg-green-900/30 dark:text-green-400'}"
+											>
+												{row.Estatus || 'A'}
+											</span>
+										</td>
+										<td class="px-4 py-2.5 text-xs text-muted-foreground">{row.BaseDeDatos}</td>
+									{:else}
+										{@const detailRow = row as MovementItemDetailed}
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 font-medium text-primary"
+											>{detailRow.Pedimento || '-'}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 font-mono font-medium whitespace-nowrap"
+											>{detailRow.Factura}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 text-xs text-muted-foreground"
+											>{formatDateFromYYYYMMDD(detailRow.FechaFactura)}</td
+										>
+										<td
+											class="border-r-dashed max-w-[150px] truncate border-r border-border/50 px-4 py-2.5 text-xs"
+											title={detailRow.Proveedor}>{detailRow.Proveedor || '-'}</td
+										>
+										<td
+											class="border-r-dashed max-w-[150px] truncate border-r border-border/50 px-4 py-2.5 text-xs"
+											title={detailRow.VendidoA}>{detailRow.VendidoA || '-'}</td
+										>
+										<td
+											class="border-r-dashed border-r border-border/50 px-4 py-2.5 text-right font-mono"
+											>{detailRow.CantidadIE || '0'}</td
+										>
+										<td
+											class="border-r-dashed max-w-[200px] truncate border-r border-border/50 px-4 py-2.5 text-xs"
+											title={detailRow.DescripcionE}>{detailRow.DescripcionE || '-'}</td
+										>
+										<td class="px-4 py-2.5">
+											<span
+												class="rounded-full border border-purple-200 bg-purple-100 px-2 py-0.5 text-[10px] font-bold text-purple-700 dark:border-purple-800 dark:bg-purple-900/30 dark:text-purple-400"
+											>
+												{detailRow.TipoMovTemDef}
+											</span>
+										</td>
+									{/if}
+								</tr>
+							{/each}
+						</tbody>
+					</table>
+				</div>
+			</div>
+		</Dialog.Content>
+	</Dialog.Root>
 </div>
 
 <!-- Diálogo de Selección -->
 <Dialog.Root bind:open={dialogOpen}>
-    <Dialog.Content class="!max-w-[90vw] sm:!max-w-[90vw] p-6">
-        <Dialog.Header>
-            <Dialog.Title>
-                Seleccionar {dialogType === 'pedimentoKey' ? 'Clave de Pedimento' : dialogType === 'provider' ? 'Proveedor' : 'Cliente'}
-            </Dialog.Title>
-            <Dialog.Description>
-                Busca y selecciona {dialogType === 'pedimentoKey' ? 'una clave de pedimento' : dialogType === 'provider' ? 'un proveedor' : 'un cliente'} de la lista
-            </Dialog.Description>
-        </Dialog.Header>
-        
-        <div class="mt-4">
-            <div class="flex items-center gap-2 mb-3">
-                <Search class="w-4 h-4 text-muted-foreground" />
-                <Input 
-                    bind:value={dialogSearch} 
-                    placeholder={dialogType === 'pedimentoKey' ? 'Buscar por código o descripción...' : 'Buscar por nombre, RFC, calle, ciudad...'} 
-                    class="flex-1"
-                />
-            </div>
-            
-            <div class="border rounded-lg overflow-x-auto max-h-[55vh]">
-                {#if dialogType === 'pedimentoKey'}
-                    <table class="w-full text-sm">
-                        <thead class="bg-muted">
-                            <tr>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Código</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Descripción</th>
-                                <th class="px-3 py-2 text-center font-semibold whitespace-nowrap sticky top-0 bg-muted">Acción</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {#if filteredItems.length === 0}
-                                <tr>
-                                    <td colspan="3" class="px-4 py-8 text-center text-muted-foreground">
-                                        No se encontraron resultados
-                                    </td>
-                                </tr>
-                            {:else}
-                                {#each filteredItems as item}
-                                    <tr class="hover:bg-muted/50 transition-colors border-b cursor-pointer" onclick={() => selectItem(item)}>
-                                        <td class="px-3 py-2.5 font-medium">{item.code || '-'}</td>
-                                        <td class="px-3 py-2.5">{item.description || '-'}</td>
-                                        <td class="px-3 py-2.5 text-center">
-                                            <Button size="sm" variant="ghost" class="h-8">
-                                                Seleccionar
-                                            </Button>
-                                        </td>
-                                    </tr>
-                                {/each}
-                            {/if}
-                        </tbody>
-                    </table>
-                {:else}
-                    <table class="w-full text-sm">
-                        <thead class="bg-muted">
-                            <tr>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Clave</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Nombre</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Tipo</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">RFC</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Calles</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Núm. Ext</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">CP</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Colonia</th>
-                                <th class="px-3 py-2 text-left font-semibold whitespace-nowrap sticky top-0 bg-muted">Ciudad</th>
-                                <th class="px-3 py-2 text-center font-semibold whitespace-nowrap sticky top-0 bg-muted">Acción</th>
-                            </tr>
-                        </thead>
-                        <tbody>
-                            {#if filteredItems.length === 0}
-                                <tr>
-                                    <td colspan="10" class="px-4 py-8 text-center text-muted-foreground">
-                                        No se encontraron resultados
-                                    </td>
-                                </tr>
-                            {:else}
-                                {#each filteredItems as item}
-                                    <tr class="hover:bg-muted/50 transition-colors border-b cursor-pointer" onclick={() => selectItem(item)}>
-                                        <td class="px-3 py-2.5 text-muted-foreground">{item.id || '-'}</td>
-                                        <td class="px-3 py-2.5 font-medium whitespace-nowrap">{item.name || '-'}</td>
-                                        <td class="px-3 py-2.5 text-center">
-                                            <span class="inline-flex items-center justify-center w-7 h-7 rounded-full text-xs font-semibold {
-                                                item.client_or_provider === 'provider' ? 'bg-purple-100 text-purple-700' : 
-                                                item.client_or_provider === 'client' ? 'bg-blue-100 text-blue-700' : 
-                                                'bg-green-100 text-green-700'
-                                            }">
-                                                {item.client_or_provider === 'provider' ? 'P' : 
-                                                 item.client_or_provider === 'client' ? 'C' : 
-                                                 'A'}
-                                            </span>
-                                        </td>
-                                        <td class="px-3 py-2.5 whitespace-nowrap">{item.rfc || '-'}</td>
-                                        <td class="px-3 py-2.5 whitespace-nowrap">{item.address?.streets || '-'}</td>
-                                        <td class="px-3 py-2.5 text-center whitespace-nowrap">{item.address?.exterior_number || '-'}</td>
-                                        <td class="px-3 py-2.5 text-center whitespace-nowrap">{item.address?.postal_code || '-'}</td>
-                                        <td class="px-3 py-2.5 whitespace-nowrap">{item.address?.neighborhood || '-'}</td>
-                                        <td class="px-3 py-2.5 whitespace-nowrap">{item.address?.city || '-'}</td>
-                                        <td class="px-3 py-2.5 text-center whitespace-nowrap">
-                                            <Button size="sm" variant="ghost" class="h-8">
-                                                Seleccionar
-                                            </Button>
-                                        </td>
-                                    </tr>
-                                {/each}
-                            {/if}
-                        </tbody>
-                    </table>
-                {/if}
-            </div>
-        </div>
-        
-        <Dialog.Footer class="mt-4">
-            <Button variant="outline" onclick={() => dialogOpen = false}>Cancelar</Button>
-        </Dialog.Footer>
-    </Dialog.Content>
+	<Dialog.Content class="!max-w-[90vw] p-6 sm:!max-w-[90vw]">
+		<Dialog.Header>
+			<Dialog.Title>
+				Seleccionar {dialogType === 'pedimentoKey'
+					? 'Clave de Pedimento'
+					: dialogType === 'provider'
+						? 'Proveedor'
+						: 'Cliente'}
+			</Dialog.Title>
+			<Dialog.Description>
+				Busca y selecciona {dialogType === 'pedimentoKey'
+					? 'una clave de pedimento'
+					: dialogType === 'provider'
+						? 'un proveedor'
+						: 'un cliente'} de la lista
+			</Dialog.Description>
+		</Dialog.Header>
+
+		<div class="mt-4">
+			<div class="mb-3 flex items-center gap-2">
+				<Search class="h-4 w-4 text-muted-foreground" />
+				<Input
+					bind:value={dialogSearch}
+					placeholder={dialogType === 'pedimentoKey'
+						? 'Buscar por código o descripción...'
+						: 'Buscar por nombre, RFC, calle, ciudad...'}
+					class="flex-1"
+				/>
+			</div>
+
+			<div class="max-h-[55vh] overflow-x-auto rounded-lg border">
+				{#if dialogType === 'pedimentoKey'}
+					<table class="w-full text-sm">
+						<thead class="bg-muted">
+							<tr>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Código</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Descripción</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-center font-semibold whitespace-nowrap"
+									>Acción</th
+								>
+							</tr>
+						</thead>
+						<tbody>
+							{#if filteredItems.length === 0}
+								<tr>
+									<td colspan="3" class="px-4 py-8 text-center text-muted-foreground">
+										No se encontraron resultados
+									</td>
+								</tr>
+							{:else}
+								{#each filteredItems as item}
+									<tr
+										class="cursor-pointer border-b transition-colors hover:bg-muted/50"
+										onclick={() => selectItem(item)}
+									>
+										<td class="px-3 py-2.5 font-medium">{item.code || '-'}</td>
+										<td class="px-3 py-2.5">{item.description || '-'}</td>
+										<td class="px-3 py-2.5 text-center">
+											<Button size="sm" variant="ghost" class="h-8">Seleccionar</Button>
+										</td>
+									</tr>
+								{/each}
+							{/if}
+						</tbody>
+					</table>
+				{:else}
+					<table class="w-full text-sm">
+						<thead class="bg-muted">
+							<tr>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Clave</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Nombre</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Tipo</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>RFC</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Calles</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Núm. Ext</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>CP</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Colonia</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-left font-semibold whitespace-nowrap"
+									>Ciudad</th
+								>
+								<th
+									class="sticky top-0 bg-muted px-3 py-2 text-center font-semibold whitespace-nowrap"
+									>Acción</th
+								>
+							</tr>
+						</thead>
+						<tbody>
+							{#if filteredItems.length === 0}
+								<tr>
+									<td colspan="10" class="px-4 py-8 text-center text-muted-foreground">
+										No se encontraron resultados
+									</td>
+								</tr>
+							{:else}
+								{#each filteredItems as item}
+									<tr
+										class="cursor-pointer border-b transition-colors hover:bg-muted/50"
+										onclick={() => selectItem(item)}
+									>
+										<td class="px-3 py-2.5 text-muted-foreground">{item.id || '-'}</td>
+										<td class="px-3 py-2.5 font-medium whitespace-nowrap">{item.name || '-'}</td>
+										<td class="px-3 py-2.5 text-center">
+											<span
+												class="inline-flex h-7 w-7 items-center justify-center rounded-full text-xs font-semibold {item.client_or_provider ===
+												'provider'
+													? 'bg-purple-100 text-purple-700'
+													: item.client_or_provider === 'client'
+														? 'bg-blue-100 text-blue-700'
+														: 'bg-green-100 text-green-700'}"
+											>
+												{item.client_or_provider === 'provider'
+													? 'P'
+													: item.client_or_provider === 'client'
+														? 'C'
+														: 'A'}
+											</span>
+										</td>
+										<td class="px-3 py-2.5 whitespace-nowrap">{item.rfc || '-'}</td>
+										<td class="px-3 py-2.5 whitespace-nowrap">{item.address?.streets || '-'}</td>
+										<td class="px-3 py-2.5 text-center whitespace-nowrap"
+											>{item.address?.exterior_number || '-'}</td
+										>
+										<td class="px-3 py-2.5 text-center whitespace-nowrap"
+											>{item.address?.postal_code || '-'}</td
+										>
+										<td class="px-3 py-2.5 whitespace-nowrap"
+											>{item.address?.neighborhood || '-'}</td
+										>
+										<td class="px-3 py-2.5 whitespace-nowrap">{item.address?.city || '-'}</td>
+										<td class="px-3 py-2.5 text-center whitespace-nowrap">
+											<Button size="sm" variant="ghost" class="h-8">Seleccionar</Button>
+										</td>
+									</tr>
+								{/each}
+							{/if}
+						</tbody>
+					</table>
+				{/if}
+			</div>
+		</div>
+
+		<Dialog.Footer class="mt-4">
+			<Button variant="outline" onclick={() => (dialogOpen = false)}>Cancelar</Button>
+		</Dialog.Footer>
+	</Dialog.Content>
 </Dialog.Root>