feat(crm): Expediente — referencia única de trazabilidad del trámite (Fase D)

- Tabla crm.cases (expediente) con folio EXP2026-08-001 (next_folio entidad EXP,
  sin dirección). Nace al crear la Oportunidad y se hereda vía case_id a
  solicitud → cotización → operación → factura. advance_stage solo avanza.
- case_id (FK a crm.cases) en crm.opportunities/service_requests/quotes,
  ops.shipments y fin.invoices; propagación en sus create_*. Migración
  d4e5f6a7b8c9 reversible.
- Endpoints GET /v1/crm/cases, /cases/{id}, /cases/by-ref/{ref} con timeline
  (historia completa para UI y otros sistemas).
- Frontend: casesAPI, ruta /dashboard/crm/expedientes (lista + timeline vertical),
  chip "📁 Expediente" en solicitud/cotización, "Expedientes" en el sidebar.
- Consecutivo de folios sin tope (soporta >10,000,000/mes).
- 4 pruebas de expediente (minteo, propagación, timeline, no-retroceso). Suite en verde (113).

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

backend/alembic/versions/d3e4f5a6b7c8_session_fixes_accounts_forma_pago.py

@@ -0,0 +1,56 @@
+"""Ajustes de sesión: país ISO-3 en accounts, giro "otro" y formas de pago SAT a 2 dígitos
+
+Revision ID: d3e4f5a6b7c8
+Revises: c2d3e4f5a6b7
+Create Date: 2026-08-04 01:00:00.000000
+
+- crm.accounts.country String(2)→String(3) (ISO alfa-3, alineado a catálogo pais).
+- crm.accounts.industry_other (especificar cuando el giro es "otro").
+- Normaliza formas de pago SAT de 1 dígito a 2 (01, 02, …) en el catálogo y en
+  los valores guardados en accounts/suppliers; y país 'MX'→'MEX'.
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "d3e4f5a6b7c8"
+down_revision: Union[str, None] = "c2d3e4f5a6b7"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+SCHEMA = "crm"
+
+
+def upgrade() -> None:
+    # País a ISO alfa-3 en accounts (addresses ya es String(3)).
+    # Primero se amplía la columna; luego se normaliza el dato (evita truncamiento).
+    op.alter_column(
+        "accounts", "country", schema=SCHEMA,
+        existing_type=sa.String(length=2), type_=sa.String(length=3),
+        existing_nullable=True, server_default=sa.text("'MEX'"),
+    )
+    op.execute("UPDATE crm.accounts SET country = 'MEX' WHERE country = 'MX'")
+    op.execute("UPDATE crm.addresses SET country = 'MEX' WHERE country = 'MX'")
+    # Giro "otro" — campo para especificar
+    op.add_column("accounts", sa.Column("industry_other", sa.String(length=120), nullable=True), schema=SCHEMA)
+
+    # Formas de pago SAT: 1 dígito → 2 dígitos (catálogo + valores guardados)
+    op.execute(
+        "UPDATE crm.catalog_items SET code = lpad(code, 2, '0') "
+        "WHERE catalog = 'forma_pago' AND char_length(code) = 1"
+    )
+    op.execute("UPDATE crm.accounts SET payment_form = lpad(payment_form, 2, '0') WHERE char_length(payment_form) = 1")
+    op.execute("UPDATE crm.suppliers SET payment_form = lpad(payment_form, 2, '0') WHERE char_length(payment_form) = 1")
+
+
+def downgrade() -> None:
+    op.drop_column("accounts", "industry_other", schema=SCHEMA)
+    # Regresar país a String(2) sin truncar filas existentes
+    op.execute("UPDATE crm.accounts SET country = 'MX' WHERE country = 'MEX'")
+    op.alter_column(
+        "accounts", "country", schema=SCHEMA,
+        existing_type=sa.String(length=3), type_=sa.String(length=2),
+        existing_nullable=True, server_default=sa.text("'MX'"),
+    )
+    # La normalización de formas de pago no se revierte (evita romper códigos multi-dígito).

backend/alembic/versions/d4e5f6a7b8c9_case_expediente.py

@@ -0,0 +1,75 @@
+"""Expediente (crm.cases) + case_id en el ciclo comercial
+
+Revision ID: d4e5f6a7b8c9
+Revises: f0a1b2c3d4e5
+Create Date: 2026-08-07 02:00:00.000000
+
+Crea crm.cases (expediente, hilo maestro con folio EXP...) y agrega case_id a
+crm.opportunities/service_requests/quotes, ops.shipments y fin.invoices.
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "d4e5f6a7b8c9"
+down_revision: Union[str, None] = "f0a1b2c3d4e5"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+# (schema, tabla) donde se agrega case_id
+_CASE_FK_TABLES = [
+    ("crm", "opportunities"),
+    ("crm", "service_requests"),
+    ("crm", "quotes"),
+    ("ops", "shipments"),
+    ("fin", "invoices"),
+]
+
+
+def upgrade() -> None:
+    op.create_table(
+        "cases",
+        sa.Column("id", sa.Integer(), nullable=False),
+        sa.Column("reference", sa.String(length=40), nullable=True),
+        sa.Column("account_id", sa.Integer(), nullable=True),
+        sa.Column("title", sa.String(length=255), nullable=True),
+        sa.Column("stage", sa.String(length=20), nullable=False, server_default=sa.text("'oportunidad'")),
+        sa.Column("status", sa.String(length=20), nullable=False, server_default=sa.text("'abierto'")),
+        sa.Column("created_by", sa.String(length=64), nullable=True),
+        sa.Column("updated_by", sa.String(length=64), nullable=True),
+        sa.Column("tenant_id", sa.Integer(), nullable=False),
+        sa.Column("company_id", sa.Integer(), nullable=False),
+        sa.Column("created_at", sa.DateTime(), nullable=False, server_default=sa.text("now()")),
+        sa.Column("updated_at", sa.DateTime(), nullable=False, server_default=sa.text("now()")),
+        sa.Column("deleted_at", sa.DateTime(), nullable=True),
+        sa.PrimaryKeyConstraint("id"),
+        sa.ForeignKeyConstraint(["tenant_id"], ["core.tenants.id"]),
+        sa.ForeignKeyConstraint(["account_id"], ["crm.accounts.id"]),
+        schema="crm",
+    )
+    op.create_index("ix_crm_cases_id", "cases", ["id"], schema="crm")
+    op.create_index("ix_crm_cases_reference", "cases", ["reference"], schema="crm")
+    op.create_index("ix_crm_cases_tenant_id", "cases", ["tenant_id"], schema="crm")
+    op.create_index("ix_crm_cases_company_id", "cases", ["company_id"], schema="crm")
+    op.create_index("ix_crm_cases_account_id", "cases", ["account_id"], schema="crm")
+    op.create_index("ix_crm_cases_status", "cases", ["status"], schema="crm")
+
+    for schema, table in _CASE_FK_TABLES:
+        op.add_column(table, sa.Column("case_id", sa.Integer(), nullable=True), schema=schema)
+        op.create_index(f"ix_{schema}_{table}_case_id", table, ["case_id"], schema=schema)
+        op.create_foreign_key(
+            f"fk_{schema}_{table}_case_id", table, "cases",
+            ["case_id"], ["id"], source_schema=schema, referent_schema="crm",
+        )
+
+
+def downgrade() -> None:
+    for schema, table in _CASE_FK_TABLES:
+        op.drop_constraint(f"fk_{schema}_{table}_case_id", table, schema=schema, type_="foreignkey")
+        op.drop_index(f"ix_{schema}_{table}_case_id", table_name=table, schema=schema)
+        op.drop_column(table, "case_id", schema=schema)
+
+    for idx in ("status", "account_id", "company_id", "tenant_id", "reference", "id"):
+        op.drop_index(f"ix_crm_cases_{idx}", table_name="cases", schema="crm")
+    op.drop_table("cases", schema="crm")

backend/alembic/versions/e4f5a6b7c8d9_opportunity_won_lost_dates.py

@@ -0,0 +1,30 @@
+"""Fechas separadas de ganada/perdida en la oportunidad
+
+Revision ID: e4f5a6b7c8d9
+Revises: d3e4f5a6b7c8
+Create Date: 2026-08-04 02:00:00.000000
+
+Agrega crm.opportunities.won_date y lost_date (fechas de cierre separadas,
+editables) además de closed_at y lost_reason ya existentes.
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "e4f5a6b7c8d9"
+down_revision: Union[str, None] = "d3e4f5a6b7c8"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+SCHEMA = "crm"
+
+
+def upgrade() -> None:
+    op.add_column("opportunities", sa.Column("won_date", sa.Date(), nullable=True), schema=SCHEMA)
+    op.add_column("opportunities", sa.Column("lost_date", sa.Date(), nullable=True), schema=SCHEMA)
+
+
+def downgrade() -> None:
+    op.drop_column("opportunities", "lost_date", schema=SCHEMA)
+    op.drop_column("opportunities", "won_date", schema=SCHEMA)

backend/alembic/versions/f0a1b2c3d4e5_lead_preferred_contact_method.py

@@ -0,0 +1,25 @@
+"""Medio de contacto preferido en el prospecto (lead)
+
+Revision ID: f0a1b2c3d4e5
+Revises: e4f5a6b7c8d9
+Create Date: 2026-08-07 01:00:00.000000
+"""
+from typing import Sequence, Union
+
+import sqlalchemy as sa
+from alembic import op
+
+revision: str = "f0a1b2c3d4e5"
+down_revision: Union[str, None] = "e4f5a6b7c8d9"
+branch_labels: Union[str, Sequence[str], None] = None
+depends_on: Union[str, Sequence[str], None] = None
+
+SCHEMA = "crm"
+
+
+def upgrade() -> None:
+    op.add_column("leads", sa.Column("preferred_contact_method", sa.String(length=20), nullable=True), schema=SCHEMA)
+
+
+def downgrade() -> None:
+    op.drop_column("leads", "preferred_contact_method", schema=SCHEMA)

backend/api/v1/modules/crm/accounts/dto.py

@@ -13,6 +13,7 @@ class AccountBase(BaseModel):
     record_type: str = Field("cliente", max_length=20)  # cliente | prospecto
     person_type: str | None = Field(None, max_length=10)  # fisica | moral
     industry: str | None = Field(None, max_length=120)
+    industry_other: str | None = Field(None, max_length=120)
     account_type: str | None = Field(None, max_length=40)
     status: str = Field("active", max_length=20)  # active | inactive
     # Comercial
@@ -38,7 +39,7 @@ class AccountBase(BaseModel):
     address: str | None = None
     city: str | None = Field(None, max_length=120)
     state: str | None = Field(None, max_length=120)
-    country: str | None = Field("MX", max_length=2)
+    country: str | None = Field("MEX", max_length=3)
     # Observaciones
     notes: str | None = None
     internal_notes: str | None = None
@@ -57,6 +58,7 @@ class AccountUpdate(BaseModel):
     record_type: str | None = Field(None, max_length=20)
     person_type: str | None = Field(None, max_length=10)
     industry: str | None = Field(None, max_length=120)
+    industry_other: str | None = Field(None, max_length=120)
     account_type: str | None = Field(None, max_length=40)
     status: str | None = Field(None, max_length=20)
     commercial_classification: str | None = Field(None, max_length=20)
@@ -79,7 +81,7 @@ class AccountUpdate(BaseModel):
     address: str | None = None
     city: str | None = Field(None, max_length=120)
     state: str | None = Field(None, max_length=120)
-    country: str | None = Field(None, max_length=2)
+    country: str | None = Field(None, max_length=3)
     notes: str | None = None
     internal_notes: str | None = None
     owner_user_id: str | None = Field(None, max_length=64)

backend/api/v1/modules/crm/accounts/models.py

@@ -31,6 +31,7 @@ class Account(Base, TenantScopedMixin, TimestampMixin):
     # Tipo de persona: fisica | moral
     person_type: Mapped[str | None] = mapped_column(String(10), nullable=True)
     industry: Mapped[str | None] = mapped_column(String(120), nullable=True)  # giro / industria
+    industry_other: Mapped[str | None] = mapped_column(String(120), nullable=True)  # especificar cuando giro = "otro"
     # Tipo operativo (immex | agencia_aduanal | importador | exportador | transportista | otro)
     account_type: Mapped[str | None] = mapped_column(String(40), nullable=True)
     # Estatus: active | inactive
@@ -65,7 +66,7 @@ class Account(Base, TenantScopedMixin, TimestampMixin):
     address: Mapped[str | None] = mapped_column(Text, nullable=True)
     city: Mapped[str | None] = mapped_column(String(120), nullable=True)
     state: Mapped[str | None] = mapped_column(String(120), nullable=True)
-    country: Mapped[str | None] = mapped_column(String(2), nullable=True, server_default=text("'MX'"))
+    country: Mapped[str | None] = mapped_column(String(3), nullable=True, server_default=text("'MEX'"))
 
     # ----- Observaciones y auditoría -----
     notes: Mapped[str | None] = mapped_column(Text, nullable=True)  # comentarios generales

backend/api/v1/modules/crm/addresses/dto.py

@@ -14,7 +14,7 @@ class AddressBase(BaseModel):
     postal_code: str | None = Field(None, max_length=10)
     city: str | None = Field(None, max_length=120)
     state: str | None = Field(None, max_length=120)
-    country: str | None = Field("MX", max_length=2)
+    country: str | None = Field("MEX", max_length=3)  # ISO 3166-1 alfa-3 (alineado a catálogo pais)
     reference_notes: str | None = None
     is_primary: bool = False
 
@@ -32,7 +32,7 @@ class AddressUpdate(BaseModel):
     postal_code: str | None = Field(None, max_length=10)
     city: str | None = Field(None, max_length=120)
     state: str | None = Field(None, max_length=120)
-    country: str | None = Field(None, max_length=2)
+    country: str | None = Field(None, max_length=3)
     reference_notes: str | None = None
     is_primary: bool | None = None
 

backend/api/v1/modules/crm/cases/dto.py

@@ -0,0 +1,31 @@
+from datetime import datetime
+
+from pydantic import BaseModel, ConfigDict
+
+
+class CaseResponse(BaseModel):
+    model_config = ConfigDict(from_attributes=True)
+
+    id: int
+    reference: str | None
+    account_id: int | None
+    title: str | None
+    stage: str
+    status: str
+    tenant_id: int
+    company_id: int
+    created_at: datetime
+    updated_at: datetime
+
+
+class CaseTimelineEvent(BaseModel):
+    kind: str            # oportunidad | solicitud | cotizacion | operacion | factura
+    id: int
+    reference: str | None = None
+    status: str | None = None
+    created_at: datetime
+    url: str
+
+
+class CaseWithTimeline(CaseResponse):
+    timeline: list[CaseTimelineEvent] = []

backend/api/v1/modules/crm/cases/models.py

@@ -0,0 +1,28 @@
+from sqlalchemy import ForeignKey, Integer, String, text
+from sqlalchemy.orm import Mapped, mapped_column
+
+from api.v1.common.base_models import TenantScopedMixin, TimestampMixin
+from core.database import Base
+
+
+class Case(Base, TenantScopedMixin, TimestampMixin):
+    """Expediente: hilo maestro de un trámite (Oportunidad → Solicitud → Cotización →
+    Operación → Factura). Una sola referencia (``EXP…``) que agrupa toda la historia.
+    Nace al crear la Oportunidad y se hereda a las entidades siguientes vía ``case_id``.
+    """
+
+    __tablename__ = "cases"
+    __table_args__ = {"schema": "crm"}
+
+    id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
+    reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)  # folio EXP...
+    account_id: Mapped[int | None] = mapped_column(
+        Integer, ForeignKey("crm.accounts.id"), nullable=True, index=True
+    )
+    title: Mapped[str | None] = mapped_column(String(255), nullable=True)
+    # Etapa más avanzada alcanzada: oportunidad|solicitud|cotizacion|operacion|facturacion|cerrado
+    stage: Mapped[str] = mapped_column(String(20), nullable=False, server_default=text("'oportunidad'"))
+    # abierto | cerrado
+    status: Mapped[str] = mapped_column(String(20), nullable=False, server_default=text("'abierto'"), index=True)
+    created_by: Mapped[str | None] = mapped_column(String(64), nullable=True)
+    updated_by: Mapped[str | None] = mapped_column(String(64), nullable=True)

backend/api/v1/modules/crm/cases/routes.py

@@ -0,0 +1,51 @@
+from fastapi import APIRouter, Depends, Query
+from sqlalchemy.orm import Session
+
+from core.database import get_core_db
+from core.security import get_current_user
+
+from . import service
+from .dto import CaseResponse, CaseWithTimeline
+
+router = APIRouter()
+
+
+def _with_timeline(db, case) -> CaseWithTimeline:
+    data = CaseWithTimeline.model_validate(case)
+    data.timeline = service.build_timeline(db, case)  # type: ignore[assignment]
+    return data
+
+
+@router.get("/cases", response_model=list[CaseResponse])
+def list_cases(
+    company_id: int = Query(..., description="Company ID"),
+    search: str | None = Query(None),
+    account_id: int | None = Query(None),
+    stage: str | None = Query(None),
+    current_user: dict = Depends(get_current_user),
+    db: Session = Depends(get_core_db),
+):
+    return service.get_cases(db, current_user["tenant_id"], company_id, search, account_id, stage)
+
+
+@router.get("/cases/by-ref/{reference}", response_model=CaseWithTimeline)
+def get_case_by_ref(
+    reference: str,
+    company_id: int = Query(..., description="Company ID"),
+    current_user: dict = Depends(get_current_user),
+    db: Session = Depends(get_core_db),
+):
+    """Expediente + historia completa por su referencia (para UI y otros sistemas)."""
+    case = service.get_case_by_reference(db, reference, current_user["tenant_id"], company_id)
+    return _with_timeline(db, case)
+
+
+@router.get("/cases/{case_id}", response_model=CaseWithTimeline)
+def get_case(
+    case_id: int,
+    company_id: int = Query(..., description="Company ID"),
+    current_user: dict = Depends(get_current_user),
+    db: Session = Depends(get_core_db),
+):
+    case = service.get_case(db, case_id, current_user["tenant_id"], company_id)
+    return _with_timeline(db, case)

backend/api/v1/modules/crm/cases/service.py

@@ -0,0 +1,109 @@
+"""Lógica del Expediente: minteo del folio, avance de etapa y armado del timeline."""
+
+from fastapi import HTTPException, status
+from sqlalchemy.orm import Session
+
+from ..common.folios import next_folio
+from .models import Case
+
+# Orden de etapas (solo se avanza, nunca retrocede)
+STAGE_ORDER = ["oportunidad", "solicitud", "cotizacion", "operacion", "facturacion", "cerrado"]
+
+
+def create_case(
+    db: Session, tenant_id: int, company_id: int, *, account_id: int | None = None,
+    title: str | None = None, stage: str = "oportunidad", user_id: str | None = None,
+) -> Case:
+    """Mintea un expediente con folio EXP... (sin commit; lo confirma quien lo invoca)."""
+    case = Case(
+        reference=next_folio(db, tenant_id, company_id, "EXP", None, with_direction=False),
+        account_id=account_id, title=title, stage=stage, status="abierto",
+        tenant_id=tenant_id, company_id=company_id, created_by=user_id, updated_by=user_id,
+    )
+    db.add(case)
+    db.flush()
+    return case
+
+
+def advance_stage(db: Session, case_id: int | None, stage: str) -> None:
+    """Avanza la etapa del expediente si la nueva es posterior a la actual."""
+    if not case_id or stage not in STAGE_ORDER:
+        return
+    case = db.query(Case).filter(Case.id == case_id).first()
+    if not case:
+        return
+    current = case.stage if case.stage in STAGE_ORDER else "oportunidad"
+    if STAGE_ORDER.index(stage) > STAGE_ORDER.index(current):
+        case.stage = stage
+
+
+def get_cases(
+    db: Session, tenant_id: int, company_id: int, search: str | None = None,
+    account_id: int | None = None, stage: str | None = None,
+) -> list[Case]:
+    q = db.query(Case).filter(
+        Case.tenant_id == tenant_id, Case.company_id == company_id, Case.deleted_at.is_(None),
+    )
+    if account_id is not None:
+        q = q.filter(Case.account_id == account_id)
+    if stage:
+        q = q.filter(Case.stage == stage)
+    if search:
+        q = q.filter(Case.reference.ilike(f"%{search}%"))
+    return q.order_by(Case.created_at.desc()).all()
+
+
+def get_case(db: Session, case_id: int, tenant_id: int, company_id: int) -> Case:
+    obj = (
+        db.query(Case)
+        .filter(Case.id == case_id, Case.tenant_id == tenant_id, Case.company_id == company_id, Case.deleted_at.is_(None))
+        .first()
+    )
+    if not obj:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Expediente no encontrado")
+    return obj
+
+
+def get_case_by_reference(db: Session, reference: str, tenant_id: int, company_id: int) -> Case:
+    obj = (
+        db.query(Case)
+        .filter(Case.reference == reference, Case.tenant_id == tenant_id, Case.company_id == company_id,
+                Case.deleted_at.is_(None))
+        .first()
+    )
+    if not obj:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Expediente no encontrado")
+    return obj
+
+
+def build_timeline(db: Session, case: Case) -> list[dict]:
+    """Devuelve la historia del expediente: todas las entidades ligadas por case_id,
+    en orden cronológico. Un único lookup para la UI y para otros sistemas."""
+    # Import local para evitar ciclos de importación entre módulos.
+    from ..opportunities.models import Opportunity
+    from ..quotes.models import Quote
+    from ..service_requests.models import ServiceRequest
+    from api.v1.modules.fin.invoices.models import Invoice
+    from api.v1.modules.ops.shipments.models import Shipment
+
+    events: list[dict] = []
+    specs = [
+        ("oportunidad", Opportunity, "/dashboard/crm/oportunidades"),
+        ("solicitud", ServiceRequest, "/dashboard/crm/solicitudes"),
+        ("cotizacion", Quote, "/dashboard/crm/cotizaciones"),
+        ("operacion", Shipment, "/dashboard/ops/embarques"),
+        ("factura", Invoice, "/dashboard/fin/facturas"),
+    ]
+    for kind, model, base_url in specs:
+        rows = db.query(model).filter(model.case_id == case.id, model.deleted_at.is_(None)).all()
+        for r in rows:
+            events.append({
+                "kind": kind,
+                "id": r.id,
+                "reference": getattr(r, "reference", None),
+                "status": getattr(r, "status", None),
+                "created_at": r.created_at,
+                "url": f"{base_url}/{r.id}",
+            })
+    events.sort(key=lambda e: e["created_at"])
+    return events

backend/api/v1/modules/crm/catalogs/seed_data.py

@@ -847,4 +847,28 @@ GLOBAL_CATALOGS.update({
                                  {'code': 'ficha_tecnica', 'label': 'Ficha técnica'},
                                  {'code': 'carta_instrucciones', 'label': 'Carta de instrucciones'},
                                  {'code': 'otro', 'label': 'Otro'}]},
+    'incoterm': {'label': 'Incoterm (2020)',
+                 'is_system': True,
+                 'items': [{'code': 'EXW', 'label': 'EXW — Ex Works (en fábrica)'},
+                           {'code': 'FCA', 'label': 'FCA — Free Carrier (franco transportista)'},
+                           {'code': 'FAS', 'label': 'FAS — Free Alongside Ship (franco al costado del buque)'},
+                           {'code': 'FOB', 'label': 'FOB — Free On Board (franco a bordo)'},
+                           {'code': 'CFR', 'label': 'CFR — Cost and Freight (costo y flete)'},
+                           {'code': 'CIF', 'label': 'CIF — Cost, Insurance and Freight (costo, seguro y flete)'},
+                           {'code': 'CPT', 'label': 'CPT — Carriage Paid To (transporte pagado hasta)'},
+                           {'code': 'CIP', 'label': 'CIP — Carriage and Insurance Paid To (transporte y seguro pagados hasta)'},
+                           {'code': 'DAP', 'label': 'DAP — Delivered At Place (entregado en lugar)'},
+                           {'code': 'DPU', 'label': 'DPU — Delivered At Place Unloaded (entregado en lugar descargado)'},
+                           {'code': 'DDP', 'label': 'DDP — Delivered Duty Paid (entregado con derechos pagados)'}]},
 })
+
+# Formas de pago SAT de un dígito → dos dígitos (01, 02, 03, 04, 05, 06, 08).
+# El SAT exige dos posiciones; se corrige el catálogo base.
+for _fp in GLOBAL_CATALOGS.get('forma_pago', {}).get('items', []):
+    if len(_fp['code']) == 1:
+        _fp['code'] = _fp['code'].zfill(2)
+
+# Ubicaciones por país (ciudad/puerto/aeropuerto), dependientes de `pais`.
+from .seed_locations import LOCATION_CATALOGS  # noqa: E402
+
+GLOBAL_CATALOGS.update(LOCATION_CATALOGS)

backend/api/v1/modules/crm/catalogs/seed_locations.py

@@ -0,0 +1,79 @@
+"""Catálogos de ubicaciones por país: ciudad, puerto (UN/LOCODE), aeropuerto (IATA).
+
+Dependientes de `pais` (`parent_catalog='pais'`, `parent_code=<ISO3>`). Curado a las
+rutas de comercio más usadas (extensible: agregar países/nodos según tarifarios).
+Los códigos de puerto/aeropuerto se alinean con los que usan las lanes del tarifario
+para que el Cotizador encuentre ruta.
+"""
+
+# (ISO3, ciudades[(code,label)], puertos[(code,label)], aeropuertos[(code,label)])
+_LOC = [
+    ("MEX",
+     [("MX-CDMX", "Ciudad de México"), ("MX-GDL", "Guadalajara"), ("MX-MTY", "Monterrey"),
+      ("MX-QRO", "Querétaro"), ("MX-TIJ", "Tijuana"), ("MX-VER", "Veracruz")],
+     [("MXZLO", "Manzanillo"), ("MXVER", "Veracruz"), ("MXATM", "Altamira"),
+      ("MXLZC", "Lázaro Cárdenas"), ("MXPGO", "Progreso"), ("MXESE", "Ensenada")],
+     [("MEX", "AICM Ciudad de México"), ("NLU", "AIFA Santa Lucía"), ("GDL", "Guadalajara"),
+      ("MTY", "Monterrey"), ("TIJ", "Tijuana"), ("CUN", "Cancún")]),
+    ("USA",
+     [("US-LAX", "Los Ángeles"), ("US-NYC", "Nueva York"), ("US-HOU", "Houston"),
+      ("US-CHI", "Chicago"), ("US-MIA", "Miami"), ("US-LRD", "Laredo")],
+     [("USLAX", "Los Angeles"), ("USLGB", "Long Beach"), ("USNYC", "Nueva York/NJ"),
+      ("USHOU", "Houston"), ("USSAV", "Savannah"), ("USSEA", "Seattle"), ("USOAK", "Oakland")],
+     [("LAX", "Los Ángeles"), ("JFK", "Nueva York JFK"), ("ORD", "Chicago O'Hare"),
+      ("MIA", "Miami"), ("DFW", "Dallas Fort Worth"), ("ATL", "Atlanta")]),
+    ("CHN",
+     [("CN-SHA", "Shanghái"), ("CN-SZX", "Shenzhen"), ("CN-CAN", "Guangzhou"),
+      ("CN-NGB", "Ningbo"), ("CN-TAO", "Qingdao"), ("CN-PEK", "Pekín")],
+     [("CNSHA", "Shanghái"), ("CNNGB", "Ningbo"), ("CNSZX", "Shenzhen"),
+      ("CNTAO", "Qingdao"), ("CNCAN", "Guangzhou"), ("CNXMN", "Xiamen"), ("CNTXG", "Tianjin")],
+     [("PVG", "Shanghái Pudong"), ("PEK", "Pekín Capital"), ("CAN", "Guangzhou"),
+      ("SZX", "Shenzhen"), ("HKG", "Hong Kong")]),
+    ("DEU",
+     [("DE-HAM", "Hamburgo"), ("DE-FRA", "Fráncfort"), ("DE-MUC", "Múnich"), ("DE-BER", "Berlín")],
+     [("DEHAM", "Hamburgo"), ("DEBRV", "Bremerhaven")],
+     [("FRA", "Fráncfort"), ("MUC", "Múnich"), ("HAM", "Hamburgo")]),
+    ("ESP",
+     [("ES-MAD", "Madrid"), ("ES-BCN", "Barcelona"), ("ES-VLC", "Valencia")],
+     [("ESVLC", "Valencia"), ("ESBCN", "Barcelona"), ("ESALG", "Algeciras")],
+     [("MAD", "Madrid Barajas"), ("BCN", "Barcelona")]),
+    ("NLD",
+     [("NL-RTM", "Róterdam"), ("NL-AMS", "Ámsterdam")],
+     [("NLRTM", "Róterdam")],
+     [("AMS", "Ámsterdam Schiphol")]),
+    ("BRA",
+     [("BR-SAO", "São Paulo"), ("BR-SSZ", "Santos"), ("BR-RIO", "Río de Janeiro")],
+     [("BRSSZ", "Santos"), ("BRPNG", "Paranaguá"), ("BRRIG", "Rio Grande")],
+     [("GRU", "São Paulo Guarulhos"), ("GIG", "Río de Janeiro")]),
+    ("CAN",
+     [("CA-YVR", "Vancouver"), ("CA-YYZ", "Toronto"), ("CA-YMQ", "Montreal")],
+     [("CAVAN", "Vancouver"), ("CAMTR", "Montreal"), ("CAHAL", "Halifax")],
+     [("YVR", "Vancouver"), ("YYZ", "Toronto Pearson")]),
+    ("JPN",
+     [("JP-TYO", "Tokio"), ("JP-OSA", "Osaka"), ("JP-YOK", "Yokohama")],
+     [("JPYOK", "Yokohama"), ("JPTYO", "Tokio"), ("JPNGO", "Nagoya"), ("JPKOB", "Kobe")],
+     [("NRT", "Tokio Narita"), ("HND", "Tokio Haneda"), ("KIX", "Osaka Kansai")]),
+    ("KOR",
+     [("KR-SEL", "Seúl"), ("KR-PUS", "Busan")],
+     [("KRPUS", "Busan"), ("KRINC", "Incheon")],
+     [("ICN", "Seúl Incheon")]),
+]
+
+
+def _build() -> dict:
+    ciudad, puerto, aeropuerto = [], [], []
+    for iso3, cities, ports, airports in _LOC:
+        for code, label in cities:
+            ciudad.append({"code": code, "label": label, "parent_catalog": "pais", "parent_code": iso3})
+        for code, label in ports:
+            puerto.append({"code": code, "label": f"{label} ({code})", "parent_catalog": "pais", "parent_code": iso3})
+        for code, label in airports:
+            aeropuerto.append({"code": code, "label": f"{label} ({code})", "parent_catalog": "pais", "parent_code": iso3})
+    return {
+        "ciudad": {"label": "Ciudad", "is_system": True, "items": ciudad},
+        "puerto": {"label": "Puerto", "is_system": True, "items": puerto},
+        "aeropuerto": {"label": "Aeropuerto", "is_system": True, "items": aeropuerto},
+    }
+
+
+LOCATION_CATALOGS = _build()

backend/api/v1/modules/crm/common/folios.py

@@ -21,8 +21,8 @@ from sqlalchemy.orm import Mapped, mapped_column
 from api.v1.common.base_models import BaseTimestampMixin, TenantScopedMixin
 from core.database import Base
 
-# Entidades válidas y su letra de folio.
-ENTITIES = ("O", "S", "C", "OP")
+# Entidades válidas y su letra de folio (F = factura, EXP = expediente; sin dirección).
+ENTITIES = ("O", "S", "C", "OP", "F", "EXP")
 # Mapa dirección de operación → sufijo del folio.
 _DIRECTION_SUFFIX = {"importacion": "I", "exportacion": "E"}
 
@@ -56,11 +56,13 @@ def next_folio(
     entity: str,
     direction: str | None,
     on_date: date | None = None,
+    with_direction: bool = True,
 ) -> str:
     """Genera el siguiente folio de una entidad, incrementando su consecutivo mensual.
 
     Reserva el número dentro de la transacción activa (no hace commit): el ``create_*``
-    que lo invoca es quien confirma junto con la fila recién creada.
+    que lo invoca es quien confirma junto con la fila recién creada. ``with_direction=False``
+    omite el sufijo I/E (p. ej. facturas → ``F2026-08-001``).
     """
     if entity not in ENTITIES:
         raise ValueError(f"Entidad de folio inválida: {entity!r}")
@@ -89,4 +91,6 @@ def next_folio(
     db.flush()
 
     sequence = f"{counter.last_number:03d}"
+    if not with_direction:
+        return f"{entity}{period}-{sequence}"
     return f"{entity}{period}-{sequence}-{direction_suffix(direction)}"

backend/api/v1/modules/crm/common/pricing.py

@@ -0,0 +1,37 @@
+"""Cálculos de precio compartidos del proceso comercial.
+
+Peso volumétrico / a cobrar de carga aérea (doc maestro de cotización):
+    P/Vol = (Largo_cm × Ancho_cm × Alto_cm × cantidad) / 6000
+El peso a cobrar es el mayor entre el peso bruto y el P/Vol (estándar aéreo).
+6000 cm³/kg es el factor internacional (equivale a ~167 kg/m³).
+"""
+
+from __future__ import annotations
+
+from decimal import Decimal
+
+# Factor internacional de peso volumétrico aéreo (cm³ por kg).
+AIR_VOLUMETRIC_DIVISOR = Decimal("6000")
+
+
+def _d(value) -> Decimal:
+    if value is None:
+        return Decimal(0)
+    return value if isinstance(value, Decimal) else Decimal(str(value))
+
+
+def air_volumetric_kg(length_cm, width_cm, height_cm, qty=1) -> Decimal:
+    """Peso volumétrico aéreo a partir de dimensiones (cm) y cantidad de bultos.
+
+    Devuelve 0 si falta alguna dimensión (no se puede calcular).
+    """
+    length, width, height = _d(length_cm), _d(width_cm), _d(height_cm)
+    if length <= 0 or width <= 0 or height <= 0:
+        return Decimal(0)
+    quantity = _d(qty) if _d(qty) > 0 else Decimal(1)
+    return (length * width * height * quantity) / AIR_VOLUMETRIC_DIVISOR
+
+
+def air_chargeable_kg(gross_kg, length_cm, width_cm, height_cm, qty=1) -> Decimal:
+    """Peso a cobrar aéreo: max(peso bruto, peso volumétrico por dimensiones)."""
+    return max(_d(gross_kg), air_volumetric_kg(length_cm, width_cm, height_cm, qty))

backend/api/v1/modules/crm/leads/dto.py

@@ -11,6 +11,7 @@ class LeadCreate(BaseModel):
     phone: str | None = Field(None, max_length=40)
     company_name: str | None = Field(None, max_length=255)
     source: str | None = Field(None, max_length=60)
+    preferred_contact_method: str | None = Field(None, max_length=20)
     status: str = Field("new", max_length=20)
     estimated_value: Decimal | None = Field(None, ge=0, max_digits=14, decimal_places=2)
     owner_user_id: str | None = Field(None, max_length=64)
@@ -24,6 +25,7 @@ class LeadUpdate(BaseModel):
     phone: str | None = Field(None, max_length=40)
     company_name: str | None = Field(None, max_length=255)
     source: str | None = Field(None, max_length=60)
+    preferred_contact_method: str | None = Field(None, max_length=20)
     status: str | None = Field(None, max_length=20)
     estimated_value: Decimal | None = Field(None, ge=0, max_digits=14, decimal_places=2)
     owner_user_id: str | None = Field(None, max_length=64)
@@ -50,6 +52,7 @@ class LeadResponse(BaseModel):
     phone: str | None
     company_name: str | None
     source: str | None
+    preferred_contact_method: str | None = None
     status: str
     estimated_value: Decimal | None
     owner_user_id: str | None

backend/api/v1/modules/crm/leads/models.py

@@ -19,6 +19,8 @@ class Lead(Base, TenantScopedMixin, TimestampMixin):
     company_name: Mapped[str | None] = mapped_column(String(255), nullable=True)
     # Origen: web | referido | evento | llamada | email | otro
     source: Mapped[str | None] = mapped_column(String(60), nullable=True)
+    # Medio de contacto preferido (catálogo medio_contacto): llamada|correo|whatsapp|…
+    preferred_contact_method: Mapped[str | None] = mapped_column(String(20), nullable=True)
     # Estado: new | contacted | qualified | unqualified | converted
     status: Mapped[str] = mapped_column(String(20), nullable=False, server_default=text("'new'"), index=True)
     estimated_value: Mapped[float | None] = mapped_column(Numeric(14, 2), nullable=True)

backend/api/v1/modules/crm/opportunities/dto.py

@@ -31,6 +31,8 @@ class OpportunityUpdate(BaseModel):
     probability: int | None = Field(None, ge=0, le=100)
     status: str | None = Field(None, max_length=20)
     expected_close_date: date | None = None
+    won_date: date | None = None
+    lost_date: date | None = None
     lost_reason: str | None = Field(None, max_length=255)
     source: str | None = Field(None, max_length=60)
     owner_user_id: str | None = Field(None, max_length=64)
@@ -59,12 +61,15 @@ class OpportunityResponse(BaseModel):
     status: str
     expected_close_date: date | None
     closed_at: datetime | None
+    won_date: date | None = None
+    lost_date: date | None = None
     lost_reason: str | None
     source: str | None
     owner_user_id: str | None
     notes: str | None
     operation_type: str | None = None
     reference: str | None = None
+    case_id: int | None = None
     converted_service_request_id: int | None = None
     tenant_id: int
     company_id: int

backend/api/v1/modules/crm/opportunities/models.py

@@ -34,6 +34,8 @@ class Opportunity(Base, TenantScopedMixin, TimestampMixin):
     status: Mapped[str] = mapped_column(String(20), nullable=False, server_default=text("'open'"), index=True)
     expected_close_date: Mapped[date | None] = mapped_column(Date, nullable=True)
     closed_at: Mapped[datetime | None] = mapped_column(DateTime, nullable=True)
+    won_date: Mapped[date | None] = mapped_column(Date, nullable=True)   # fecha en que se ganó
+    lost_date: Mapped[date | None] = mapped_column(Date, nullable=True)  # fecha en que se perdió
     lost_reason: Mapped[str | None] = mapped_column(String(255), nullable=True)
     source: Mapped[str | None] = mapped_column(String(60), nullable=True)
     owner_user_id: Mapped[str | None] = mapped_column(String(64), nullable=True, index=True)
@@ -41,6 +43,8 @@ class Opportunity(Base, TenantScopedMixin, TimestampMixin):
     # Dirección de la operación (importacion|exportacion): se hereda a Solicitud→Cotización→Embarque
     operation_type: Mapped[str | None] = mapped_column(String(20), nullable=True)
     reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)  # folio O...
+    # Expediente (hilo maestro del trámite); nace aquí y se hereda hacia abajo
+    case_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("crm.cases.id"), nullable=True, index=True)
     # Solicitud generada al convertir la oportunidad (back-link idempotente)
     converted_service_request_id: Mapped[int | None] = mapped_column(
         Integer, ForeignKey("crm.service_requests.id"), nullable=True

backend/api/v1/modules/crm/opportunities/service.py

@@ -1,9 +1,10 @@
-from datetime import datetime, timezone
+from datetime import date, datetime, timezone
 
 from fastapi import HTTPException, status
 from sqlalchemy.orm import Session
 
 from ..accounts.models import Account
+from ..cases import service as cases_service
 from ..common.folios import next_folio
 from ..contacts.models import Contact
 from ..pipelines.models import Pipeline, PipelineStage
@@ -47,14 +48,20 @@ def _apply_stage_state(opportunity: Opportunity, stage: PipelineStage) -> None:
         opportunity.status = "won"
         opportunity.probability = 100
         opportunity.closed_at = datetime.now(timezone.utc)
+        opportunity.won_date = opportunity.won_date or date.today()
+        opportunity.lost_date = None
     elif stage.is_lost:
         opportunity.status = "lost"
         opportunity.probability = 0
         opportunity.closed_at = datetime.now(timezone.utc)
+        opportunity.lost_date = opportunity.lost_date or date.today()
+        opportunity.won_date = None
     else:
         opportunity.status = "open"
         opportunity.probability = stage.probability
         opportunity.closed_at = None
+        opportunity.won_date = None
+        opportunity.lost_date = None
 
 
 def _validate_refs(db: Session, data: dict, tenant_id: int, company_id: int) -> None:
@@ -153,6 +160,12 @@ def create_opportunity(
     # Folio O... auto-generado (mensual). La dirección impo/expo se hereda al ciclo.
     if not opportunity.reference:
         opportunity.reference = next_folio(db, tenant_id, company_id, "O", opportunity.operation_type)
+    # Expediente: nace con la oportunidad y se hereda a solicitud/cotización/operación/factura
+    if not opportunity.case_id:
+        case = cases_service.create_case(
+            db, tenant_id, company_id, account_id=opportunity.account_id, title=opportunity.name, stage="oportunidad",
+        )
+        opportunity.case_id = case.id
     db.add(opportunity)
     db.commit()
     db.refresh(opportunity)

backend/api/v1/modules/crm/quotes/dto.py

@@ -85,6 +85,8 @@ class QuoteResponse(QuoteBase):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    service_request_reference: str | None = None  # folio de la solicitud referenciada
+    case_id: int | None = None
     status: str
     total_cost: Decimal
     total_sale: Decimal

backend/api/v1/modules/crm/quotes/models.py

@@ -15,6 +15,7 @@ class Quote(Base, TenantScopedMixin, TimestampMixin):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)
+    case_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("crm.cases.id"), nullable=True, index=True)  # expediente
     service_request_id: Mapped[int | None] = mapped_column(
         Integer, ForeignKey("crm.service_requests.id"), nullable=True, index=True
     )

backend/api/v1/modules/crm/quotes/service.py

@@ -6,8 +6,10 @@ from sqlalchemy import func
 from sqlalchemy.orm import Session
 
 from ..accounts.models import Account
+from ..cases import service as cases_service
 from ..catalogs.models import CatalogItem
 from ..common.folios import next_folio
+from ..common.pricing import air_chargeable_kg
 from ..service_requests.models import RateRequest, ServiceRequest
 from ..suppliers.models import Supplier
 from .dto import QuoteCreate, QuoteItemCreate, QuoteItemUpdate, QuoteUpdate
@@ -72,7 +74,18 @@ def get_quotes(
         query = query.filter(Quote.account_id == account_id)
     if search:
         query = query.filter(Quote.reference.ilike(f"%{search}%"))
-    return query.order_by(Quote.created_at.desc()).all()
+    quotes = query.order_by(Quote.created_at.desc()).all()
+    # Enriquecer con el folio de la solicitud referenciada (para verlo en la lista)
+    sr_ids = {q.service_request_id for q in quotes if q.service_request_id}
+    if sr_ids:
+        refs = dict(
+            db.query(ServiceRequest.id, ServiceRequest.reference)
+            .filter(ServiceRequest.id.in_(sr_ids))
+            .all()
+        )
+        for q in quotes:
+            q.service_request_reference = refs.get(q.service_request_id)
+    return quotes
 
 
 def get_quote(db: Session, quote_id: int, tenant_id: int, company_id: int) -> Quote:
@@ -111,6 +124,12 @@ def create_quote(
     # Folio C... auto-generado (mensual), con la dirección heredada de la solicitud
     if not obj.reference:
         obj.reference = next_folio(db, tenant_id, company_id, "C", _sr_direction(db, obj.service_request_id))
+    # Expediente heredado de la solicitud
+    if obj.service_request_id and not obj.case_id:
+        sr = db.query(ServiceRequest).filter(ServiceRequest.id == obj.service_request_id).first()
+        if sr:
+            obj.case_id = sr.case_id
+    cases_service.advance_stage(db, obj.case_id, "cotizacion")
     db.add(obj)
     db.commit()
     db.refresh(obj)
@@ -172,6 +191,7 @@ def create_quotes_from_service_request(
             notes=sr.client_notes or sr.notes,
             owner_user_id=sr.owner_user_id,
             reference=next_folio(db, tenant_id, company_id, "C", sr.operation_type),
+            case_id=sr.case_id,
             tenant_id=tenant_id,
             company_id=company_id,
             created_by=user_id,
@@ -196,10 +216,24 @@ def create_quotes_from_service_request(
                 quantity=Decimal(1), unit_cost=amount, unit_sale=amount,
                 currency=sr.currency, tenant_id=tenant_id, company_id=company_id,
             ))
+        # Carga aérea: concepto de flete con el peso a cobrar (P/Vol) como cantidad,
+        # para que el ejecutivo capture la tarifa por kg.
+        if (variant or "").upper() == "AEREO":
+            chargeable = air_chargeable_kg(
+                sr.weight, sr.length_cm, sr.width_cm, sr.height_cm,
+                sr.pallets_count or sr.pieces_count or 1,
+            )
+            db.add(QuoteItem(
+                quote_id=quote.id, concept="flete_internacional",
+                description=f"Flete aéreo — peso a cobrar {chargeable.quantize(Decimal('0.01'))} kg (P/Vol)",
+                quantity=chargeable, unit_cost=Decimal(0), unit_sale=Decimal(0),
+                currency=sr.currency, tenant_id=tenant_id, company_id=company_id,
+            ))
         db.flush()
         _recompute_totals(db, quote)
         created.append(quote)
 
+    cases_service.advance_stage(db, sr.case_id, "cotizacion")
     db.commit()
     for quote in created:
         db.refresh(quote)

backend/api/v1/modules/crm/rates/dto.py

@@ -146,6 +146,10 @@ class CostRequest(BaseModel):
     on_date: date | None = None
     gross_weight_kg: Decimal | None = None
     volume_m3: Decimal | None = None
+    # Dimensiones (cm) para el peso volumétrico aéreo (P/Vol = L×A×H×cant / 6000)
+    length_cm: Decimal | None = None
+    width_cm: Decimal | None = None
+    height_cm: Decimal | None = None
     equipment_type: str | None = None
     quantity: int = 1
     dangerous: bool = False

backend/api/v1/modules/crm/rates/routes.py

@@ -255,3 +255,15 @@ def rate_quote(
     tenant_id, _ = _ctx(current_user)
     options = service.quote_cost(db, tenant_id, company_id, req)
     return CostResult(request=req, options=options)
+
+
+@cost_router.get("/rate-locations")
+def rate_locations(
+    mode: str = Query(...),
+    company_id: int = Query(...),
+    current_user: dict = Depends(get_current_user),
+    db: Session = Depends(get_core_db),
+):
+    """Orígenes/destinos cotizables (de los tarifarios activos) para alinear el cotizador."""
+    tenant_id, _ = _ctx(current_user)
+    return service.lane_locations(db, tenant_id, company_id, mode)

backend/api/v1/modules/crm/rates/service.py

@@ -20,9 +20,11 @@ from .dto import (
     RateSheetCreate,
     RateSheetUpdate,
 )
+from ..common.pricing import air_volumetric_kg
 from .models import RateBreak, RateCharge, RateLane, RateSheet
 
 # Factor volumétrico aéreo: 1 m³ = 167 kg (equivale a 6000 cm³/kg).
+# Respaldo cuando solo se conoce el volumen en m³ (sin dimensiones cm).
 AIR_VOLUMETRIC_FACTOR = Decimal("167")
 
 
@@ -477,6 +479,30 @@ def _apply_charges(db: Session, sheet: RateSheet, lane: RateLane, base: Decimal,
     return lines
 
 
+def lane_locations(db: Session, tenant_id: int, company_id: int, mode: str) -> dict[str, list[str]]:
+    """Orígenes/destinos existentes en los tarifarios activos de un modo.
+
+    Alinea el cotizador con las rutas realmente cotizables (los códigos provienen
+    de las lanes, por lo que el costeo siempre encontrará ruta).
+    """
+    sheets = _sheet_query(db, tenant_id, company_id).filter(
+        RateSheet.mode == mode, RateSheet.status == "activo",
+    ).all()
+    origins: set[str] = set()
+    destinations: set[str] = set()
+    for sheet in sheets:
+        lanes = db.query(RateLane).filter(
+            RateLane.rate_sheet_id == sheet.id, RateLane.deleted_at.is_(None),
+        ).all()
+        for lane in lanes:
+            origin = lane.origin or sheet.default_origin
+            if origin:
+                origins.add(origin)
+            if lane.destination:
+                destinations.add(lane.destination)
+    return {"origins": sorted(origins), "destinations": sorted(destinations)}
+
+
 def quote_cost(db: Session, tenant_id: int, company_id: int, req: CostRequest) -> list[CostOption]:
     on_date = req.on_date or date.today()
     sheets = _sheet_query(db, tenant_id, company_id).filter(
@@ -518,11 +544,15 @@ def quote_cost(db: Session, tenant_id: int, company_id: int, req: CostRequest) -
                 base = max(base, lane.min_charge or Decimal(0))
                 detail = f"W/M {wm.quantize(Decimal('0.01'))}"
             else:  # aereo
-                chargeable = max(gross, _volumetric_kg(req.volume_m3))
+                # P/Vol por dimensiones (L×A×H×cant / 6000); si no hay dimensiones,
+                # respaldo con el volumen en m³ × 167.
+                vol_by_dims = air_volumetric_kg(req.length_cm, req.width_cm, req.height_cm, req.quantity)
+                volumetric = vol_by_dims if vol_by_dims > 0 else _volumetric_kg(req.volume_m3)
+                chargeable = max(gross, volumetric)
                 brks = breaks_of(db, lane.id)
                 base = _best_break_cost(brks, chargeable)
                 base = max(base, lane.min_charge or Decimal(0))
-                detail = f"facturable {chargeable.quantize(Decimal('0.01'))} kg"
+                detail = f"facturable {chargeable.quantize(Decimal('0.01'))} kg (P/Vol)"
 
             charge_lines = _apply_charges(db, sheet, lane, base, chargeable, req.quantity, req.dangerous)
             total = base + sum((c.amount for c in charge_lines), Decimal(0))

backend/api/v1/modules/crm/router.py

@@ -13,6 +13,7 @@ from . import permissions  # noqa: F401  (side-effect: registra permisos del CRM
 from .accounts.routes import router as accounts_router
 from .activities.routes import router as activities_router
 from .addresses.routes import router as addresses_router
+from .cases.routes import router as cases_router
 from .catalogs.routes import router as catalogs_router
 from .contacts.routes import router as contacts_router
 from .documents.routes import router as documents_router
@@ -43,6 +44,7 @@ router.include_router(leads_router)
 router.include_router(pipelines_router)
 router.include_router(opportunities_router)
 router.include_router(activities_router)
+router.include_router(cases_router)
 router.include_router(metrics_router)
 router.include_router(catalogs_router)
 router.include_router(uploads_router)

backend/api/v1/modules/crm/service_requests/dto.py

@@ -162,6 +162,7 @@ class ServiceRequestResponse(ServiceRequestBase):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    case_id: int | None = None
     first_contact_at: datetime | None = None
     first_contact_notes: str | None = None
     tenant_id: int

backend/api/v1/modules/crm/service_requests/models.py

@@ -19,6 +19,7 @@ class ServiceRequest(Base, TenantScopedMixin, TimestampMixin):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)  # folio
+    case_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("crm.cases.id"), nullable=True, index=True)  # expediente
     account_id: Mapped[int | None] = mapped_column(
         Integer, ForeignKey("crm.accounts.id"), nullable=True, index=True
     )

backend/api/v1/modules/crm/service_requests/service.py

@@ -4,6 +4,7 @@ from fastapi import HTTPException, status
 from sqlalchemy.orm import Session
 
 from ..accounts.models import Account
+from ..cases import service as cases_service
 from ..catalogs.data import INCOTERM_CODES
 from ..common.folios import next_folio
 from ..contacts.models import Contact
@@ -110,6 +111,12 @@ def create_service_request(
     # Folio S... auto-generado (mensual) si no viene uno explícito
     if not obj.reference:
         obj.reference = next_folio(db, tenant_id, company_id, "S", obj.operation_type)
+    # Expediente: normalmente nace en la oportunidad; si la solicitud es directa, se mintea aquí
+    if not obj.case_id:
+        case = cases_service.create_case(
+            db, tenant_id, company_id, account_id=obj.account_id, title=obj.reference, stage="solicitud", user_id=user_id,
+        )
+        obj.case_id = case.id
     db.add(obj)
     db.commit()
     db.refresh(obj)
@@ -200,6 +207,7 @@ def create_from_opportunity(
         notes=payload.notes,
         owner_user_id=opp.owner_user_id,
         reference=next_folio(db, tenant_id, company_id, "S", operation_type),
+        case_id=opp.case_id,
         tenant_id=tenant_id,
         company_id=company_id,
         created_by=user_id,
@@ -207,6 +215,13 @@ def create_from_opportunity(
     )
     db.add(obj)
     db.flush()
+    # Expediente heredado de la oportunidad (fallback si la oportunidad es antigua sin expediente)
+    if not obj.case_id:
+        obj.case_id = cases_service.create_case(
+            db, tenant_id, company_id, account_id=opp.account_id, title=obj.reference, stage="solicitud", user_id=user_id,
+        ).id
+        opp.case_id = obj.case_id
+    cases_service.advance_stage(db, obj.case_id, "solicitud")
     # Back-link para cerrar el ciclo Oportunidad→Solicitud (y garantizar idempotencia)
     opp.converted_service_request_id = obj.id
     db.commit()

backend/api/v1/modules/crm/uploads/routes.py

@@ -7,10 +7,10 @@ pide una URL firmada fresca en ``/uploads/url`` (las presignadas expiran).
 import re
 import uuid
 
-from fastapi import APIRouter, Depends, File, HTTPException, Query, UploadFile, status
+from fastapi import APIRouter, Depends, File, HTTPException, Query, Response, UploadFile, status
 
 from core.security import get_current_user
-from core.storage_s3 import presigned_get_url, put_object_bytes
+from core.storage_s3 import get_object_bytes, presigned_get_url, put_object_bytes
 
 router = APIRouter()
 
@@ -61,3 +61,29 @@ def get_upload_url(
     if not key.startswith(prefix):
         raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Archivo fuera de tu alcance")
     return {"url": presigned_get_url(key)}
+
+
+@router.get("/uploads/download")
+def download_file(
+    key: str = Query(..., description="Object key del archivo en el almacén"),
+    company_id: int = Query(..., description="Company ID"),
+    current_user: dict = Depends(get_current_user),
+):
+    """Transmite el archivo por el backend (sin exponer MinIO al navegador).
+
+    Evita el bug de la URL prefirmada que apunta al host interno ``minio:9000``.
+    """
+    tenant_id = current_user["tenant_id"]
+    prefix = f"tenants/{tenant_id}/companies/{company_id}/"
+    if not key.startswith(prefix):
+        raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Archivo fuera de tu alcance")
+    try:
+        data = get_object_bytes(key)
+    except Exception:
+        raise HTTPException(status_code=status.HTTP_404_NOT_FOUND, detail="Archivo no encontrado")
+    filename = key.rsplit("/", 1)[-1]
+    return Response(
+        content=data,
+        media_type="application/octet-stream",
+        headers={"Content-Disposition": f'inline; filename="{filename}"'},
+    )

backend/api/v1/modules/fin/invoices/dto.py

@@ -100,6 +100,7 @@ class InvoiceResponse(InvoiceBase):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    case_id: int | None = None
     status: str
     subtotal: Decimal
     tax_amount: Decimal

backend/api/v1/modules/fin/invoices/models.py

@@ -15,6 +15,7 @@ class Invoice(Base, TenantScopedMixin, TimestampMixin):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)  # folio
+    case_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("crm.cases.id"), nullable=True, index=True)  # expediente
     shipment_id: Mapped[int | None] = mapped_column(
         Integer, ForeignKey("ops.shipments.id"), nullable=True, index=True
     )

backend/api/v1/modules/fin/invoices/service.py

@@ -6,6 +6,8 @@ from sqlalchemy import func
 from sqlalchemy.orm import Session
 
 from api.v1.modules.crm.accounts.models import Account
+from api.v1.modules.crm.cases import service as cases_service
+from api.v1.modules.crm.common.folios import next_folio
 from api.v1.modules.crm.quotes.models import Quote, QuoteItem
 from api.v1.modules.ops.shipments.models import Shipment
 
@@ -95,6 +97,15 @@ def create_invoice(db, payload: InvoiceCreate, tenant_id, company_id, user_id=No
     data = payload.model_dump()
     _validate_refs(db, data, tenant_id, company_id)
     obj = Invoice(**data, tenant_id=tenant_id, company_id=company_id, created_by=user_id, updated_by=user_id)
+    # Folio F... auto-generado (mensual) si no viene uno explícito
+    if not obj.reference:
+        obj.reference = next_folio(db, tenant_id, company_id, "F", None, with_direction=False)
+    # Expediente heredado del embarque (si la factura se genera de uno)
+    if obj.shipment_id and not obj.case_id:
+        sh = db.query(Shipment).filter(Shipment.id == obj.shipment_id).first()
+        if sh:
+            obj.case_id = sh.case_id
+    cases_service.advance_stage(db, obj.case_id, "facturacion")
     db.add(obj)
     db.flush()
     _recompute(db, obj)
@@ -281,6 +292,7 @@ def generate_from_shipment(db, shipment_id, tenant_id, company_id, user_id=None)
 
     invoice = Invoice(
         reference=shipment.reference,
+        case_id=shipment.case_id,
         shipment_id=shipment.id,
         quote_id=shipment.quote_id,
         account_id=shipment.account_id,
@@ -294,6 +306,7 @@ def generate_from_shipment(db, shipment_id, tenant_id, company_id, user_id=None)
     )
     db.add(invoice)
     db.flush()
+    cases_service.advance_stage(db, shipment.case_id, "facturacion")
 
     if quote:
         q_items = db.query(QuoteItem).filter(QuoteItem.quote_id == quote.id, QuoteItem.deleted_at.is_(None)).all()

backend/api/v1/modules/ops/shipments/dto.py

@@ -82,6 +82,7 @@ class ShipmentResponse(ShipmentBase):
     model_config = ConfigDict(from_attributes=True)
 
     id: int
+    case_id: int | None = None
     closed_at: datetime | None = None
     closed_by: str | None = None
     created_by: str | None = None

backend/api/v1/modules/ops/shipments/models.py

@@ -15,6 +15,7 @@ class Shipment(Base, TenantScopedMixin, TimestampMixin):
 
     id: Mapped[int] = mapped_column(Integer, primary_key=True, index=True)
     reference: Mapped[str | None] = mapped_column(String(40), nullable=True, index=True)  # folio de embarque
+    case_id: Mapped[int | None] = mapped_column(Integer, ForeignKey("crm.cases.id"), nullable=True, index=True)  # expediente
     quote_id: Mapped[int | None] = mapped_column(
         Integer, ForeignKey("crm.quotes.id"), nullable=True, index=True
     )

backend/api/v1/modules/ops/shipments/service.py

@@ -5,6 +5,7 @@ from sqlalchemy import func
 from sqlalchemy.orm import Session
 
 from api.v1.modules.crm.accounts.models import Account
+from api.v1.modules.crm.cases import service as cases_service
 from api.v1.modules.crm.common.folios import next_folio
 from api.v1.modules.crm.quotes.models import Quote
 from api.v1.modules.crm.service_requests.models import ServiceRequest
@@ -218,6 +219,7 @@ def create_shipment_from_quote(
 
     shipment = Shipment(
         reference=next_folio(db, tenant_id, company_id, "OP", resolved),
+        case_id=quote.case_id,
         quote_id=quote.id,
         service_request_id=quote.service_request_id,
         account_id=quote.account_id,
@@ -238,6 +240,7 @@ def create_shipment_from_quote(
     db.add(shipment)
     if sr:
         sr.status = "liberada"
+    cases_service.advance_stage(db, quote.case_id, "operacion")
     db.flush()
     # Siembra automática de hitos si ya se conoce la dirección de la operación
     for position, (event_type, title, kind) in enumerate(_DEFAULT_MILESTONES.get(resolved or "", [])):

backend/tests/conftest.py

@@ -28,6 +28,7 @@ from core.database import Base  # noqa: E402
 import api.v1.modules.crm.accounts.models  # noqa: E402,F401
 import api.v1.modules.crm.activities.models  # noqa: E402,F401
 import api.v1.modules.crm.addresses.models  # noqa: E402,F401
+import api.v1.modules.crm.cases.models  # noqa: E402,F401
 import api.v1.modules.crm.catalogs.models  # noqa: E402,F401
 import api.v1.modules.crm.common.folios  # noqa: E402,F401
 import api.v1.modules.crm.contacts.models  # noqa: E402,F401

backend/tests/test_accounts.py

@@ -15,7 +15,7 @@ def test_create_and_get_account(db):
     )
     assert acc.id is not None
     assert acc.status == "active"
-    assert acc.country == "MX"
+    assert acc.country == "MEX"  # ISO 3166-1 alfa-3 (alineado al catálogo pais)
     got = service.get_account(db, acc.id, T, C)
     assert got.name == "Importadora Demo"
     assert got.rfc == "XAXX010101000"

backend/tests/test_cases.py

@@ -0,0 +1,48 @@
+"""Pruebas del Expediente (crm.cases): minteo, propagación y timeline."""
+
+from api.v1.modules.crm.cases import service as cases_service
+from api.v1.modules.crm.opportunities import service as opp_service
+from api.v1.modules.crm.opportunities.dto import OpportunityCreate
+from api.v1.modules.crm.quotes import service as q_service
+from api.v1.modules.crm.service_requests import service as sr_service
+from api.v1.modules.crm.service_requests.dto import ServiceRequestCreate, ServiceRequestFromOpportunityInput
+
+T, C = 1, 1
+
+
+def test_opportunity_mints_expediente(db):
+    opp = opp_service.create_opportunity(db, OpportunityCreate(name="Negocio", operation_type="exportacion"), T, C)
+    assert opp.case_id is not None
+    case = cases_service.get_case(db, opp.case_id, T, C)
+    assert (case.reference or "").startswith("EXP")
+    assert case.stage == "oportunidad"
+
+
+def test_case_propagates_and_advances(db):
+    opp = opp_service.create_opportunity(db, OpportunityCreate(name="Negocio", operation_type="importacion"), T, C)
+    sr = sr_service.create_from_opportunity(db, opp.id, ServiceRequestFromOpportunityInput(), T, C)
+    assert sr.case_id == opp.case_id
+    assert cases_service.get_case(db, opp.case_id, T, C).stage == "solicitud"
+
+    quotes = q_service.create_quotes_from_service_request(db, sr.id, T, C)
+    assert quotes[0].case_id == opp.case_id
+    case = cases_service.get_case(db, opp.case_id, T, C)
+    assert case.stage == "cotizacion"
+
+    # El timeline reúne toda la historia ligada al expediente
+    kinds = {e["kind"] for e in cases_service.build_timeline(db, case)}
+    assert {"oportunidad", "solicitud", "cotizacion"} <= kinds
+
+
+def test_direct_service_request_mints_expediente(db):
+    # Solicitud directa (sin oportunidad) también obtiene expediente (fallback)
+    sr = sr_service.create_service_request(db, ServiceRequestCreate(operation_type="exportacion"), T, C)
+    assert sr.case_id is not None
+    assert cases_service.get_case(db, sr.case_id, T, C).stage == "solicitud"
+
+
+def test_advance_stage_never_regresses(db):
+    opp = opp_service.create_opportunity(db, OpportunityCreate(name="N", operation_type="exportacion"), T, C)
+    cases_service.advance_stage(db, opp.case_id, "facturacion")
+    cases_service.advance_stage(db, opp.case_id, "solicitud")  # no debe retroceder
+    assert cases_service.get_case(db, opp.case_id, T, C).stage == "facturacion"

backend/tests/test_folios.py

@@ -38,6 +38,12 @@ def test_folio_entities_do_not_share_counter(db):
     assert op == "OP2025-08-001-I"
 
 
+def test_folio_invoice_without_direction(db):
+    # Facturas: entidad F sin sufijo de dirección (F2025-08-001)
+    folio = next_folio(db, T, C, "F", None, on_date=date(2025, 8, 3), with_direction=False)
+    assert folio == "F2025-08-001"
+
+
 def test_folio_unique_across_many(db):
     folios = {next_folio(db, T, C, "C", "importacion", on_date=date(2025, 8, 10)) for _ in range(25)}
     assert len(folios) == 25  # sin duplicados

backend/tests/test_opportunities.py

@@ -41,6 +41,8 @@ def test_move_to_won_closes_and_sets_probability(db):
     assert moved.status == "won"
     assert moved.probability == 100
     assert moved.closed_at is not None
+    assert moved.won_date is not None  # fecha de ganada
+    assert moved.lost_date is None
     assert moved.stage_id == s_won.id
 
 
@@ -51,6 +53,8 @@ def test_move_to_lost(db):
     assert moved.status == "lost"
     assert moved.probability == 0
     assert moved.closed_at is not None
+    assert moved.lost_date is not None  # fecha de perdida
+    assert moved.won_date is None
 
 
 def test_move_back_to_open_reopens(db):

backend/tests/test_pricing.py

@@ -0,0 +1,29 @@
+"""Pruebas del cálculo de peso/volumen (P/Vol) aéreo."""
+
+from decimal import Decimal
+
+from api.v1.modules.crm.common.pricing import air_chargeable_kg, air_volumetric_kg
+
+
+def test_air_volumetric_doc_example():
+    # 3 pallets 120×120×100 cm → (120*120*100*3)/6000 = 720 (ejemplo del documento)
+    assert air_volumetric_kg(120, 120, 100, 3) == Decimal(720)
+
+
+def test_air_volumetric_zero_without_dimensions():
+    assert air_volumetric_kg(None, 120, 100, 3) == Decimal(0)
+    assert air_volumetric_kg(0, 120, 100, 3) == Decimal(0)
+
+
+def test_air_qty_defaults_to_one():
+    assert air_volumetric_kg(100, 100, 100, 0) == air_volumetric_kg(100, 100, 100, 1)
+
+
+def test_air_chargeable_takes_gross_when_larger():
+    # bruto 800 > volumétrico 720 → se cobra 800
+    assert air_chargeable_kg(800, 120, 120, 100, 3) == Decimal(800)
+
+
+def test_air_chargeable_takes_volumetric_when_larger():
+    # bruto 200 < volumétrico 720 → se cobra 720
+    assert air_chargeable_kg(200, 120, 120, 100, 3) == Decimal(720)

backend/tests/test_quotes.py

@@ -125,6 +125,24 @@ def test_quote_from_service_request_seeds_additional_services(db):
     assert float(quotes[0].total_sale) == 800.0
 
 
+def test_quote_from_service_request_aereo_seeds_pvol_concept(db):
+    sr = sr_service.create_service_request(
+        db,
+        ServiceRequestCreate(
+            operation_type="exportacion", load_type="AEREO", currency="USD",
+            weight=200, length_cm=120, width_cm=120, height_cm=100, pallets_count=3,
+        ),
+        T, C,
+    )
+    quotes = service.create_quotes_from_service_request(db, sr.id, T, C)
+    assert len(quotes) == 1
+    assert quotes[0].load_type == "AEREO"
+    flete = [i for i in service.get_quote_items(db, quotes[0].id, T, C) if i.concept == "flete_internacional"]
+    assert len(flete) == 1
+    # cantidad del flete = peso a cobrar (P/Vol 720 > bruto 200)
+    assert float(flete[0].quantity) == 720.0
+
+
 def test_quote_from_service_request_sets_issue_date_today(db):
     sr = _sr_with_rates(db)
     quotes = service.create_quotes_from_service_request(db, sr.id, T, C)

frontend/src/app.css

@@ -143,6 +143,14 @@
 		filter: invert(1) brightness(1.15);
 		opacity: 0.9;
 	}
+
+	/* Las opciones de los <select> (catálogos) deben ser legibles en modo oscuro:
+	   el control es transparente y el popup nativo hereda colores del sistema. */
+	select option,
+	select optgroup {
+		background-color: var(--color-popover);
+		color: var(--color-popover-foreground);
+	}
 }
 
 @layer components {

frontend/src/lib/api/crm/cases.ts

@@ -0,0 +1,50 @@
+/**
+ * Cliente API — Expedientes (referencia única de trazabilidad del trámite).
+ */
+import { api } from '$lib/api';
+
+export interface Case {
+	id: number;
+	reference: string | null;
+	account_id: number | null;
+	title: string | null;
+	stage: string;
+	status: string;
+	tenant_id: number;
+	company_id: number;
+	created_at: string;
+	updated_at: string;
+}
+
+export interface CaseTimelineEvent {
+	kind: string; // oportunidad | solicitud | cotizacion | operacion | factura
+	id: number;
+	reference: string | null;
+	status: string | null;
+	created_at: string;
+	url: string;
+}
+
+export interface CaseWithTimeline extends Case {
+	timeline: CaseTimelineEvent[];
+}
+
+function qp(companyId: number, extra?: Record<string, string | number | undefined>) {
+	const qs = new URLSearchParams({ company_id: String(companyId) });
+	for (const [k, v] of Object.entries(extra ?? {})) if (v !== undefined && v !== '') qs.set(k, String(v));
+	return qs.toString();
+}
+async function unwrap<T>(p: Promise<{ data?: T; error?: string }>): Promise<T> {
+	const res = await p;
+	if (res.error) throw new Error(res.error);
+	return res.data as T;
+}
+
+export const casesAPI = {
+	list: (companyId: number, params?: { search?: string; account_id?: number; stage?: string }) =>
+		unwrap<Case[]>(api.get(`/v1/crm/cases?${qp(companyId, params)}`)),
+	get: (id: number, companyId: number) =>
+		unwrap<CaseWithTimeline>(api.get(`/v1/crm/cases/${id}?${qp(companyId)}`)),
+	byRef: (reference: string, companyId: number) =>
+		unwrap<CaseWithTimeline>(api.get(`/v1/crm/cases/by-ref/${encodeURIComponent(reference)}?${qp(companyId)}`))
+};

frontend/src/lib/api/crm/commercial.ts

@@ -10,6 +10,7 @@ export type QuoteStatus = 'borrador' | 'enviada' | 'aceptada' | 'rechazada';
 export interface ServiceRequest {
 	id: number;
 	reference: string | null;
+	case_id: number | null;
 	account_id: number | null;
 	contact_id: number | null;
 	opportunity_id: number | null;
@@ -106,6 +107,8 @@ export interface Quote {
 	id: number;
 	reference: string | null;
 	service_request_id: number | null;
+	service_request_reference: string | null;
+	case_id: number | null;
 	account_id: number | null;
 	currency: string;
 	load_type: string | null;

frontend/src/lib/api/crm/contacts.ts

@@ -7,11 +7,12 @@ import type { Contact, ContactInput } from './types';
 export const contactsAPI = {
 	async list(
 		companyId: number,
-		params?: { search?: string; account_id?: number }
+		params?: { search?: string; account_id?: number; supplier_id?: number }
 	): Promise<Contact[]> {
 		const qs = new URLSearchParams({ company_id: String(companyId) });
 		if (params?.search) qs.set('search', params.search);
 		if (params?.account_id) qs.set('account_id', String(params.account_id));
+		if (params?.supplier_id) qs.set('supplier_id', String(params.supplier_id));
 		const res = await api.get<Contact[]>(`/v1/crm/contacts?${qs}`);
 		if (res.error) throw new Error(res.error);
 		return res.data!;

frontend/src/lib/api/crm/index.ts

@@ -13,3 +13,4 @@ export { opportunitiesAPI } from './opportunities';
 export { activitiesAPI } from './activities';
 export { metricsAPI } from './metrics';
 export * from './commercial';
+export * from './cases';

frontend/src/lib/api/crm/rates.ts

@@ -35,8 +35,9 @@ export interface ImportPreview { mode: RateMode; total: number; valid: number; r
 
 export interface CostRequest {
 	mode: RateMode; origin?: string | null; destination?: string | null; on_date?: string | null;
-	gross_weight_kg?: number | null; volume_m3?: number | null; equipment_type?: string | null;
-	quantity?: number; dangerous?: boolean;
+	gross_weight_kg?: number | null; volume_m3?: number | null;
+	length_cm?: number | null; width_cm?: number | null; height_cm?: number | null;
+	equipment_type?: string | null; quantity?: number; dangerous?: boolean;
 }
 export interface CostChargeLine { concept: string; amount: number; }
 export interface CostOption {
@@ -103,5 +104,9 @@ export const rateSheetsAPI = {
 		return res.data as RateSheet;
 	},
 
-	quote: (req: CostRequest, companyId: number) => unwrap<CostResult>(api.post(`/v1/crm/rate-quote?${qp(companyId)}`, req))
+	quote: (req: CostRequest, companyId: number) => unwrap<CostResult>(api.post(`/v1/crm/rate-quote?${qp(companyId)}`, req)),
+
+	/** Orígenes/destinos que existen en los tarifarios activos (para alinear el cotizador con las rutas cotizables). */
+	locations: (companyId: number, mode: RateMode) =>
+		unwrap<{ origins: string[]; destinations: string[] }>(api.get(`/v1/crm/rate-locations?${qp(companyId, { mode })}`))
 };

frontend/src/lib/api/crm/types.ts

@@ -20,6 +20,7 @@ export interface Account {
 	record_type: RecordType;
 	person_type: string | null;
 	industry: string | null;
+	industry_other: string | null;
 	account_type: string | null;
 	status: AccountStatus;
 	commercial_classification: string | null;
@@ -191,6 +192,7 @@ export interface Lead {
 	phone: string | null;
 	company_name: string | null;
 	source: string | null;
+	preferred_contact_method: string | null;
 	status: LeadStatus;
 	estimated_value: number | null;
 	owner_user_id: string | null;
@@ -261,6 +263,8 @@ export interface Opportunity {
 	status: OpportunityStatus;
 	expected_close_date: string | null;
 	closed_at: string | null;
+	won_date: string | null;
+	lost_date: string | null;
 	lost_reason: string | null;
 	source: string | null;
 	owner_user_id: string | null;

frontend/src/lib/api/uploads.ts

@@ -31,3 +31,10 @@ export async function uploadUrl(fileKey: string, companyId: number): Promise<str
 	if (res.error) throw new Error(res.error);
 	return res.data!.url;
 }
+
+/** Descarga el archivo por el backend (sin exponer MinIO) y devuelve un blob. */
+export async function downloadBlob(fileKey: string, companyId: number): Promise<Blob> {
+	return (api as any).getBlob(
+		`/v1/crm/uploads/download?key=${encodeURIComponent(fileKey)}&company_id=${companyId}`
+	) as Promise<Blob>;
+}

frontend/src/lib/components/crm/AccountFields.svelte

@@ -29,6 +29,9 @@
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de registro</span><select class={inputCls} bind:value={form.record_type}>{#each crmCatalogs.options('tipo_registro') as r (r.value)}<option value={r.value}>{r.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de persona</span><select class={inputCls} bind:value={form.person_type}><option value={undefined}>—</option>{#each crmCatalogs.options('tipo_persona') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Giro / Industria</span><select class={inputCls} bind:value={form.industry}><option value={undefined}>—</option>{#each crmCatalogs.options('giro') as g (g.value)}<option value={g.value}>{g.label}</option>{/each}</select></label>
+		{#if form.industry === 'otro'}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Especifica el giro</span><input class={inputCls} bind:value={form.industry_other} placeholder="Indica cuál" /></label>
+		{/if}
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo operativo</span><select class={inputCls} bind:value={form.account_type}><option value={undefined}>—</option>{#each ACCOUNT_TYPES as t (t.value)}<option value={t.value}>{t.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Estatus</span><select class={inputCls} bind:value={form.status}>{#each crmCatalogs.options('estatus') as s (s.value)}<option value={s.value}>{s.label}</option>{/each}</select></label>
 	</div>

frontend/src/lib/components/crm/RelatedManager.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { MapPin, Users, FileText, Plus, Trash2 } from '@lucide/svelte';
+	import { MapPin, Users, FileText, Plus, Trash2, Pencil } from '@lucide/svelte';
 	import * as Card from '$lib/components/ui/card';
 	import * as Table from '$lib/components/ui/table';
 	import { Button } from '$lib/components/ui/button';
@@ -11,7 +11,7 @@
 	import { DOC_TYPES, labelOf } from '$lib/components/crm/format';
 	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { onMount } from 'svelte';
-	import { uploadFile, uploadUrl } from '$lib/api/uploads';
+	import { uploadFile, downloadBlob } from '$lib/api/uploads';
 	import { toast } from 'svelte-sonner';
 
 	onMount(() => {
@@ -35,6 +35,7 @@
 	let contacts = $state<Contact[]>([]);
 	let documents = $state<Document[]>([]);
 	let activeModal = $state<'address' | 'contact' | 'document' | null>(null);
+	let editingId = $state<number | null>(null); // null = alta; con valor = edición
 	let saving = $state(false);
 
 	let addressForm = $state<AddressInput>({ address_type: 'fiscal', country: 'MEX', is_primary: false });
@@ -61,9 +62,17 @@
 	async function openDoc(d: Document) {
 		if (!companyId) return;
 		try {
-			const url = d.file_key ? await uploadUrl(d.file_key, companyId) : d.file_url;
-			if (url) window.open(url, '_blank', 'noopener');
-			else toast.error('El documento no tiene archivo');
+			if (d.file_key) {
+				// Descarga por el backend (evita exponer MinIO / host interno)
+				const blob = await downloadBlob(d.file_key, companyId);
+				const url = URL.createObjectURL(blob);
+				window.open(url, '_blank', 'noopener');
+				setTimeout(() => URL.revokeObjectURL(url), 60000);
+			} else if (d.file_url) {
+				window.open(d.file_url, '_blank', 'noopener');
+			} else {
+				toast.error('El documento no tiene archivo');
+			}
 		} catch (e) {
 			toast.error(e instanceof Error ? e.message : 'No se pudo abrir el archivo');
 		}
@@ -94,19 +103,37 @@
 	}
 
 	function openModal(kind: 'address' | 'contact' | 'document') {
+		editingId = null;
 		if (kind === 'address') addressForm = { address_type: 'fiscal', country: 'MEX', is_primary: false };
 		if (kind === 'contact') contactForm = { first_name: '' };
 		if (kind === 'document') documentForm = { doc_type: 'constancia_fiscal', name: '' };
 		activeModal = kind;
 	}
 
+	function editAddress(a: Address) {
+		editingId = a.id;
+		addressForm = { ...a };
+		activeModal = 'address';
+	}
+	function editContact(c: Contact) {
+		editingId = c.id;
+		contactForm = { ...c };
+		activeModal = 'contact';
+	}
+	function editDocument(d: Document) {
+		editingId = d.id;
+		documentForm = { ...d };
+		activeModal = 'document';
+	}
+
 	async function saveAddress(e: SubmitEvent) {
 		e.preventDefault();
 		if (!companyId) return;
 		saving = true;
 		try {
-			await addressesAPI.create({ ...addressForm, ...ownerParam }, companyId);
-			toast.success('Dirección agregada');
+			if (editingId) await addressesAPI.update(editingId, addressForm, companyId);
+			else await addressesAPI.create({ ...addressForm, ...ownerParam }, companyId);
+			toast.success(editingId ? 'Dirección actualizada' : 'Dirección agregada');
 			activeModal = null;
 			await load(companyId);
 		} catch (err) {
@@ -122,8 +149,9 @@
 		if (!contactForm.first_name?.trim()) { toast.error('El nombre es obligatorio'); return; }
 		saving = true;
 		try {
-			await contactsAPI.create({ ...contactForm, ...ownerParam }, companyId);
-			toast.success('Contacto agregado');
+			if (editingId) await contactsAPI.update(editingId, contactForm, companyId);
+			else await contactsAPI.create({ ...contactForm, ...ownerParam }, companyId);
+			toast.success(editingId ? 'Contacto actualizado' : 'Contacto agregado');
 			activeModal = null;
 			await load(companyId);
 		} catch (err) {
@@ -139,8 +167,9 @@
 		if (!documentForm.name?.trim()) { toast.error('El nombre es obligatorio'); return; }
 		saving = true;
 		try {
-			await documentsAPI.create({ ...documentForm, ...ownerParam }, companyId);
-			toast.success('Documento agregado');
+			if (editingId) await documentsAPI.update(editingId, documentForm, companyId);
+			else await documentsAPI.create({ ...documentForm, ...ownerParam }, companyId);
+			toast.success(editingId ? 'Documento actualizado' : 'Documento agregado');
 			activeModal = null;
 			await load(companyId);
 		} catch (err) {
@@ -189,7 +218,7 @@
 									<Table.Cell class="text-sm">{[a.street, a.ext_number, a.neighborhood].filter(Boolean).join(' ') || '—'}</Table.Cell>
 									<Table.Cell>{a.postal_code ?? '—'}</Table.Cell>
 									<Table.Cell>{[a.city, a.state].filter(Boolean).join(', ') || '—'}</Table.Cell>
-									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => removeAddress(a)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
+									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => editAddress(a)} aria-label="Editar"><Pencil class="h-4 w-4" /></Button><Button variant="ghost" size="sm" onclick={() => removeAddress(a)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
 								</Table.Row>
 							{/each}
 						</Table.Body>
@@ -218,7 +247,7 @@
 									<Table.Cell class="text-sm">{[c.job_title, c.area ? crmCatalogs.label('area', c.area) : null].filter(Boolean).join(' · ') || '—'}</Table.Cell>
 									<Table.Cell>{c.email ?? '—'}</Table.Cell>
 									<Table.Cell>{c.phone ?? c.mobile ?? '—'}</Table.Cell>
-									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => removeContact(c)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
+									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => editContact(c)} aria-label="Editar"><Pencil class="h-4 w-4" /></Button><Button variant="ghost" size="sm" onclick={() => removeContact(c)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
 								</Table.Row>
 							{/each}
 						</Table.Body>
@@ -246,7 +275,7 @@
 									<Table.Cell>{labelOf(DOC_TYPES, d.doc_type)}</Table.Cell>
 									<Table.Cell class="font-medium">{d.name}</Table.Cell>
 									<Table.Cell>{#if d.file_key || d.file_url}<button type="button" class="text-primary hover:underline" onclick={() => openDoc(d)}>Ver</button>{:else}—{/if}</Table.Cell>
-									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => removeDocument(d)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
+									<Table.Cell class="text-right"><Button variant="ghost" size="sm" onclick={() => editDocument(d)} aria-label="Editar"><Pencil class="h-4 w-4" /></Button><Button variant="ghost" size="sm" onclick={() => removeDocument(d)} aria-label="Eliminar"><Trash2 class="h-4 w-4 text-destructive" /></Button></Table.Cell>
 								</Table.Row>
 							{/each}
 						</Table.Body>
@@ -261,7 +290,7 @@
 	<div class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" role="presentation" onclick={() => (activeModal = null)}>
 		<div class="max-h-[90vh] w-full max-w-lg overflow-y-auto rounded-lg border bg-card p-6 shadow-lg" role="dialog" aria-modal="true" tabindex="-1" onclick={(e) => e.stopPropagation()}>
 			{#if activeModal === 'address'}
-				<h3 class="mb-4 text-base font-semibold">Nueva dirección</h3>
+				<h3 class="mb-4 text-base font-semibold">{editingId ? 'Editar dirección' : 'Nueva dirección'}</h3>
 				<form class="grid gap-3 sm:grid-cols-2" onsubmit={saveAddress}>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de domicilio</span><select class={inputCls} bind:value={addressForm.address_type}>{#each crmCatalogs.options('tipo_domicilio') as t (t.value)}<option value={t.value}>{t.label}</option>{/each}</select></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Código Postal</span><input class={inputCls} maxlength="10" bind:value={addressForm.postal_code} /></label>
@@ -270,14 +299,14 @@
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Núm. interior</span><input class={inputCls} bind:value={addressForm.int_number} /></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Colonia</span><input class={inputCls} bind:value={addressForm.neighborhood} /></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Municipio / Ciudad</span><input class={inputCls} bind:value={addressForm.city} /></label>
-					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Estado</span>{#if crmCatalogs.options('estado', addressForm.country).length > 0}<select class={inputCls} bind:value={addressForm.state}><option value={undefined}>—</option>{#each crmCatalogs.options('estado', addressForm.country) as s (s.value)}<option value={s.value}>{s.label}</option>{/each}</select>{:else}<input class={inputCls} bind:value={addressForm.state} placeholder="Estado / provincia" />{/if}</label>
+					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Estado</span>{#if crmCatalogs.options('estado', addressForm.country ?? undefined).length > 0}<select class={inputCls} bind:value={addressForm.state}><option value={undefined}>—</option>{#each crmCatalogs.options('estado', addressForm.country ?? undefined) as s (s.value)}<option value={s.value}>{s.label}</option>{/each}</select>{:else}<input class={inputCls} bind:value={addressForm.state} placeholder="Estado / provincia" />{/if}</label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">País</span><select class={inputCls} bind:value={addressForm.country}><option value={undefined}>—</option>{#each crmCatalogs.options('pais') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
 					<label class="flex flex-col gap-1 text-sm sm:col-span-2"><span class="font-medium">Referencias</span><textarea rows="2" class={inputCls} bind:value={addressForm.reference_notes}></textarea></label>
 					<label class="flex items-center gap-2 text-sm sm:col-span-2"><input type="checkbox" class="h-4 w-4 rounded border" bind:checked={addressForm.is_primary} /><span>Domicilio principal</span></label>
 					<div class="flex justify-end gap-2 sm:col-span-2"><Button type="button" variant="outline" onclick={() => (activeModal = null)}>Cancelar</Button><Button type="submit" disabled={saving}>Guardar</Button></div>
 				</form>
 			{:else if activeModal === 'contact'}
-				<h3 class="mb-4 text-base font-semibold">Nuevo contacto</h3>
+				<h3 class="mb-4 text-base font-semibold">{editingId ? 'Editar contacto' : 'Nuevo contacto'}</h3>
 				<form class="grid gap-3 sm:grid-cols-2" onsubmit={saveContact}>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Nombre *</span><input class={inputCls} bind:value={contactForm.first_name} required /></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Apellidos</span><input class={inputCls} bind:value={contactForm.last_name} /></label>
@@ -297,7 +326,7 @@
 					<div class="flex justify-end gap-2 sm:col-span-2"><Button type="button" variant="outline" onclick={() => (activeModal = null)}>Cancelar</Button><Button type="submit" disabled={saving}>Guardar</Button></div>
 				</form>
 			{:else if activeModal === 'document'}
-				<h3 class="mb-4 text-base font-semibold">Nuevo documento</h3>
+				<h3 class="mb-4 text-base font-semibold">{editingId ? 'Editar documento' : 'Nuevo documento'}</h3>
 				<form class="grid gap-3" onsubmit={saveDocument}>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo</span><select class={inputCls} bind:value={documentForm.doc_type}>{#each DOC_TYPES as t (t.value)}<option value={t.value}>{t.label}</option>{/each}</select></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Nombre *</span><input class={inputCls} bind:value={documentForm.name} required /></label>

frontend/src/lib/components/crm/ServiceRequestFields.svelte

@@ -21,9 +21,84 @@
 	const inputCls =
 		'rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring';
 
-	// FCL/LCL condicionales; "AMBAS" muestra ambas secciones
+	// Modalidad de carga según el tipo de transporte (solo se habilita lo que corresponde)
+	const MODALIDAD_BY_TRANSPORT: Record<string, string[]> = {
+		maritimo: ['FCL', 'LCL', 'AMBAS'],
+		aereo: ['AEREO'],
+		terrestre: ['FTL', 'LTL']
+		// ferroviario / multimodal: sin modalidad
+	};
+	const modalidadOptions = $derived(
+		LOAD_TYPES.filter((l) => (MODALIDAD_BY_TRANSPORT[form.transport_mode ?? ''] ?? []).includes(l.value))
+	);
+	const showModalidad = $derived(modalidadOptions.length > 0);
+
+	// Reglas: al cambiar el transporte, la modalidad inválida se limpia; si solo hay una (aéreo), se autoselecciona
+	$effect(() => {
+		const allowed = MODALIDAD_BY_TRANSPORT[form.transport_mode ?? ''] ?? [];
+		if (allowed.length === 0) {
+			if (form.load_type) form.load_type = undefined;
+			return;
+		}
+		if (form.load_type && !allowed.includes(form.load_type)) form.load_type = undefined;
+		if (!form.load_type && allowed.length === 1) form.load_type = allowed[0];
+	});
+	// La modalidad aérea fija el medio de transporte en "aéreo"
+	$effect(() => {
+		if (form.load_type === 'AEREO' && form.transport_mode !== 'aereo') form.transport_mode = 'aereo';
+	});
+
 	const isFcl = $derived(form.load_type === 'FCL' || form.load_type === 'AMBAS');
 	const isLcl = $derived(form.load_type === 'LCL' || form.load_type === 'AMBAS');
+	const isAir = $derived(form.load_type === 'AEREO');
+
+	// Conversión de dimensiones a cm según la unidad de medida (para volumen m³ y P/Vol)
+	const UNIT_TO_CM: Record<string, number> = { cm: 1, m: 100, in: 2.54, ft: 30.48 };
+	const unitCm = $derived(UNIT_TO_CM[form.measurement_unit ?? 'cm'] ?? 1);
+	const airQty = $derived(Number(form.pallets_count) || Number(form.pieces_count) || 1);
+	const dimL = $derived((Number(form.length_cm) || 0) * unitCm);
+	const dimW = $derived((Number(form.width_cm) || 0) * unitCm);
+	const dimH = $derived((Number(form.height_cm) || 0) * unitCm);
+	const hasDims = $derived(dimL > 0 && dimW > 0 && dimH > 0);
+	// Volumen SIEMPRE en m³ (cm³ / 1,000,000)
+	const volumeM3 = $derived(hasDims ? (dimL * dimW * dimH * airQty) / 1_000_000 : 0);
+	// P/Vol aéreo (kg) = (L×A×H cm × bultos) / 6000; a cobrar = max(bruto, P/Vol)
+	const airVolumetric = $derived(hasDims ? (dimL * dimW * dimH * airQty) / 6000 : 0);
+	const airChargeable = $derived(Math.max(Number(form.weight) || 0, airVolumetric));
+
+	// Autocompletar el volumen en m³ a partir de las dimensiones/unidad
+	$effect(() => {
+		if (hasDims) form.volume = Math.round(volumeM3 * 1000) / 1000;
+	});
+
+	// Ciudad y puerto/aeropuerto dependen del país (catálogos dependientes, como estado←país)
+	$effect(() => {
+		if (form.origin_country) {
+			void crmCatalogs.ensure('ciudad', form.origin_country);
+			void crmCatalogs.ensure('puerto', form.origin_country);
+			void crmCatalogs.ensure('aeropuerto', form.origin_country);
+		}
+	});
+	$effect(() => {
+		if (form.destination_country) {
+			void crmCatalogs.ensure('ciudad', form.destination_country);
+			void crmCatalogs.ensure('puerto', form.destination_country);
+			void crmCatalogs.ensure('aeropuerto', form.destination_country);
+		}
+	});
+	// Campo "Puerto/Aeropuerto": une puertos + aeropuertos del país
+	function portOptions(country: string | null | undefined) {
+		return [
+			...crmCatalogs.options('puerto', country ?? undefined),
+			...crmCatalogs.options('aeropuerto', country ?? undefined)
+		];
+	}
+
+	// Agente en destino: solo proveedores clasificados como corresponsal/aduanal (fallback: todos)
+	const destinationAgents = $derived(
+		suppliers.filter((s) => (s.classifications ?? []).some((c) => c === 'agente_corresponsal' || c === 'agente_aduanal'))
+	);
+	const agentList = $derived(destinationAgents.length ? destinationAgents : suppliers);
 
 	// Contactos del cliente seleccionado (o todos si no hay cliente)
 	const clientContacts = $derived(
@@ -50,7 +125,7 @@
 		void crmCatalogs.preload([
 			'pais', 'moneda', 'prioridad', 'tipo_mercancia', 'unidad_medida',
 			'tipo_embalaje', 'servicio_adicional', 'forma_pago', 'tipo_equipo',
-			'puerto', 'aeropuerto'
+			'puerto', 'aeropuerto', 'incoterm', 'medio_transporte'
 		]);
 		if (!form.additional_services) form.additional_services = [];
 		if (!form.additional_service_costs) form.additional_service_costs = {};
@@ -73,16 +148,22 @@
 	</div>
 {:else if tab === 'ruta'}
 	<div class="grid gap-4 sm:grid-cols-2">
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Medio de transporte</span><select class={inputCls} bind:value={form.transport_mode}><option value={undefined}>—</option>{#each TRANSPORT_MODES as m (m.value)}<option value={m.value}>{m.label}</option>{/each}</select></label>
+		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de transporte</span><select class={inputCls} bind:value={form.transport_mode}><option value={undefined}>—</option>{#each (crmCatalogs.options('medio_transporte').length ? crmCatalogs.options('medio_transporte') : TRANSPORT_MODES) as m (m.value)}<option value={m.value}>{m.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de servicio</span><select class={inputCls} bind:value={form.service_type}><option value={undefined}>—</option>{#each SERVICE_TYPES as s (s.value)}<option value={s.value}>{s.label}</option>{/each}</select></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Incoterm</span><input class={inputCls} maxlength="10" bind:value={form.incoterm} placeholder="FOB, CIF…" /></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Modalidad de carga</span><select class={inputCls} bind:value={form.load_type}><option value={undefined}>—</option>{#each LOAD_TYPES as l (l.value)}<option value={l.value}>{l.label}</option>{/each}</select></label>
+		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Incoterm</span><select class={inputCls} bind:value={form.incoterm}><option value={undefined}>—</option>{#each crmCatalogs.options('incoterm') as i (i.value)}<option value={i.value}>{i.label}</option>{/each}</select></label>
+		{#if showModalidad}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Modalidad de carga</span><select class={inputCls} bind:value={form.load_type}><option value={undefined}>—</option>{#each modalidadOptions as l (l.value)}<option value={l.value}>{l.label}</option>{/each}</select></label>
+		{/if}
 
 		<p class="mt-1 text-xs font-semibold uppercase text-muted-foreground sm:col-span-2">Origen</p>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">País de origen</span><select class={inputCls} bind:value={form.origin_country}><option value={undefined}>—</option>{#each crmCatalogs.options('pais') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de origen</span><input class={inputCls} bind:value={form.origin_city} /></label>
-		{#if crmCatalogs.options('puerto').length}
-			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de origen</span><select class={inputCls} bind:value={form.origin_port}><option value={undefined}>—</option>{#each crmCatalogs.options('puerto') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
+		{#if crmCatalogs.options('ciudad', form.origin_country ?? undefined).length}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de origen</span><select class={inputCls} bind:value={form.origin_city}><option value={undefined}>—</option>{#each crmCatalogs.options('ciudad', form.origin_country ?? undefined) as c (c.value)}<option value={c.value}>{c.label}</option>{/each}</select></label>
+		{:else}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de origen</span><input class={inputCls} bind:value={form.origin_city} /></label>
+		{/if}
+		{#if portOptions(form.origin_country).length}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de origen</span><select class={inputCls} bind:value={form.origin_port}><option value={undefined}>—</option>{#each portOptions(form.origin_country) as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
 		{:else}
 			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de origen</span><input class={inputCls} bind:value={form.origin_port} /></label>
 		{/if}
@@ -90,9 +171,13 @@
 
 		<p class="mt-1 text-xs font-semibold uppercase text-muted-foreground sm:col-span-2">Destino</p>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">País de destino</span><select class={inputCls} bind:value={form.destination_country}><option value={undefined}>—</option>{#each crmCatalogs.options('pais') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de destino</span><input class={inputCls} bind:value={form.destination_city} /></label>
-		{#if crmCatalogs.options('puerto').length}
-			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de destino</span><select class={inputCls} bind:value={form.destination_port}><option value={undefined}>—</option>{#each crmCatalogs.options('puerto') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
+		{#if crmCatalogs.options('ciudad', form.destination_country ?? undefined).length}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de destino</span><select class={inputCls} bind:value={form.destination_city}><option value={undefined}>—</option>{#each crmCatalogs.options('ciudad', form.destination_country ?? undefined) as c (c.value)}<option value={c.value}>{c.label}</option>{/each}</select></label>
+		{:else}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ciudad de destino</span><input class={inputCls} bind:value={form.destination_city} /></label>
+		{/if}
+		{#if portOptions(form.destination_country).length}
+			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de destino</span><select class={inputCls} bind:value={form.destination_port}><option value={undefined}>—</option>{#each portOptions(form.destination_country) as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
 		{:else}
 			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puerto/Aeropuerto de destino</span><input class={inputCls} bind:value={form.destination_port} /></label>
 		{/if}
@@ -100,14 +185,14 @@
 
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fecha estimada de embarque</span><input type="date" class={inputCls} bind:value={form.estimated_shipment_date} /></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fecha requerida</span><input type="date" class={inputCls} bind:value={form.required_date} /></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Agente en destino</span><select class={inputCls} bind:value={form.destination_agent_id}><option value={undefined}>—</option>{#each suppliers as s (s.id)}<option value={s.id}>{s.name}</option>{/each}</select></label>
+		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Agente en destino</span><select class={inputCls} bind:value={form.destination_agent_id}><option value={undefined}>—</option>{#each agentList as s (s.id)}<option value={s.id}>{s.name}</option>{/each}</select></label>
 	</div>
 {:else if tab === 'mercancia'}
 	<div class="grid gap-4 sm:grid-cols-2">
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de mercancía</span><select class={inputCls} bind:value={form.cargo_type}><option value={undefined}>—</option>{#each crmCatalogs.options('tipo_mercancia') as t (t.value)}<option value={t.value}>{t.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fracción arancelaria (HS)</span><input class="font-mono {inputCls}" maxlength="20" bind:value={form.hs_code} /></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">País de origen de la mercancía</span><select class={inputCls} bind:value={form.goods_origin_country}><option value={undefined}>—</option>{#each crmCatalogs.options('pais') as p (p.value)}<option value={p.value}>{p.label}</option>{/each}</select></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Valor de la mercancía</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={form.cargo_value} /></label>
+		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Valor de la mercancía</span><div class="flex items-center gap-1"><input type="number" min="0" step="0.01" class="{inputCls} w-full" bind:value={form.cargo_value} /><span class="text-xs text-muted-foreground">{form.currency ?? 'moneda'}</span></div></label>
 		<label class="flex flex-col gap-1 text-sm sm:col-span-2"><span class="font-medium">Descripción de la mercancía</span><textarea rows="2" class={inputCls} bind:value={form.commodity}></textarea></label>
 		<div class="flex flex-wrap gap-5 sm:col-span-2">
 			<label class="flex items-center gap-2 text-sm"><input type="checkbox" class="h-4 w-4 rounded border" bind:checked={form.insurance_required} /><span>Requiere seguro</span></label>
@@ -151,6 +236,18 @@
 			<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Volumen por pallet (m³)</span><input type="number" min="0" step="0.001" class={inputCls} bind:value={form.volume_per_pallet} /></label>
 		</div>
 	{/if}
+	{#if isAir}
+		<div class="mt-4 grid gap-3 rounded-md border p-4 sm:grid-cols-2">
+			<p class="text-sm font-semibold sm:col-span-2">Aéreo — Peso / Volumen (P/Vol)</p>
+			<p class="text-xs text-muted-foreground sm:col-span-2">P/Vol = (Largo × Ancho × Alto en cm) × cantidad de bultos ÷ 6000 (factor internacional). Se cobra el mayor entre el peso bruto y el P/Vol. Captura Largo/Ancho/Alto y piezas/pallets arriba; el resultado se recalcula solo.</p>
+			<div class="rounded-md bg-muted/40 p-3 text-sm sm:col-span-2">
+				<div class="flex justify-between"><span class="text-muted-foreground">Cantidad de bultos</span><span class="font-medium">{airQty}</span></div>
+				<div class="flex justify-between"><span class="text-muted-foreground">Peso volumétrico (P/Vol)</span><span class="font-medium">{airVolumetric.toFixed(2)} kg</span></div>
+				<div class="flex justify-between"><span class="text-muted-foreground">Peso bruto</span><span class="font-medium">{(Number(form.weight) || 0).toFixed(2)} kg</span></div>
+				<div class="mt-1 flex justify-between border-t pt-1"><span class="font-medium">Peso a cobrar (P/Vol)</span><span class="font-semibold">{airChargeable.toFixed(2)} kg</span></div>
+			</div>
+		</div>
+	{/if}
 {:else if tab === 'servicios'}
 	<p class="mb-1 text-sm font-medium">Servicios adicionales</p>
 	<p class="mb-3 text-xs text-muted-foreground">Marca los servicios requeridos e indica su costo estimado (opcional). Al cotizar, cada servicio marcado se agrega como concepto de la cotización con ese costo de partida.</p>

frontend/src/lib/components/crm/SupplierFields.svelte

@@ -25,14 +25,47 @@
 
 	const hasOtro = $derived((form.classifications ?? []).includes('otro'));
 
+	// Utilidades para editar listas separadas por coma desde un catálogo (select + chips)
+	function csvArr(s: string | undefined): string[] {
+		return (s || '').split(',').map((x) => x.trim()).filter(Boolean);
+	}
+	function csvToggle(s: string | undefined, code: string): string {
+		const arr = csvArr(s);
+		const i = arr.indexOf(code);
+		if (i >= 0) arr.splice(i, 1);
+		else arr.push(code);
+		return arr.join(', ');
+	}
+
 	onMount(() => {
 		void crmCatalogs.preload([
 			'tipo_persona', 'estatus', 'clasificacion_proveedor', 'cobertura', 'moneda',
-			'regimen_fiscal', 'metodo_pago', 'forma_pago'
+			'regimen_fiscal', 'metodo_pago', 'forma_pago', 'pais', 'puerto', 'aeropuerto', 'aduana'
 		]);
 	});
 </script>
 
+{#snippet catCsv(labelText: string, catalog: string, value: string, set: (v: string) => void, placeholder: string)}
+	<label class="flex flex-col gap-1 text-sm">
+		<span class="font-medium">{labelText}</span>
+		{#if crmCatalogs.options(catalog).length}
+			<select class={inputCls} onchange={(e) => { set(csvToggle(value, e.currentTarget.value)); e.currentTarget.value = ''; }}>
+				<option value="">+ Agregar…</option>
+				{#each crmCatalogs.options(catalog) as o (o.value)}<option value={o.value}>{o.label}</option>{/each}
+			</select>
+			{#if csvArr(value).length}
+				<div class="mt-1 flex flex-wrap gap-1">
+					{#each csvArr(value) as code (code)}
+						<span class="inline-flex items-center gap-1 rounded-full bg-muted px-2 py-0.5 text-xs">{crmCatalogs.label(catalog, code)}<button type="button" class="text-muted-foreground hover:text-destructive" onclick={() => set(csvToggle(value, code))} aria-label="Quitar">×</button></span>
+					{/each}
+				</div>
+			{/if}
+		{:else}
+			<input class={inputCls} value={value} oninput={(e) => set(e.currentTarget.value)} {placeholder} />
+		{/if}
+	</label>
+{/snippet}
+
 {#if tab === 'generales'}
 	<div class="grid gap-4 sm:grid-cols-2">
 		<label class="flex flex-col gap-1 text-sm sm:col-span-2"><span class="font-medium">Razón social *</span><input class={inputCls} bind:value={form.name} required /></label>
@@ -56,10 +89,10 @@
 	<div class="grid gap-4 sm:grid-cols-2">
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Cobertura</span><select class={inputCls} bind:value={form.coverage}><option value={undefined}>—</option>{#each crmCatalogs.options('cobertura') as c (c.value)}<option value={c.value}>{c.label}</option>{/each}</select></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda de cotización</span><select class={inputCls} bind:value={form.quote_currency}><option value={undefined}>—</option>{#each crmCatalogs.options('moneda') as m (m.value)}<option value={m.value}>{m.value} — {m.label}</option>{/each}</select></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Países donde opera (separados por coma)</span><input class={inputCls} bind:value={countriesStr} placeholder="México, Estados Unidos" /></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Puertos donde opera</span><input class={inputCls} bind:value={portsStr} placeholder="Veracruz, Manzanillo" /></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Aeropuertos donde opera</span><input class={inputCls} bind:value={airportsStr} /></label>
-		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Aduanas donde opera</span><input class={inputCls} bind:value={customsStr} placeholder="Nuevo Laredo, Colombia" /></label>
+		{@render catCsv('Países donde opera', 'pais', countriesStr, (v) => (countriesStr = v), 'México, Estados Unidos')}
+		{@render catCsv('Puertos donde opera', 'puerto', portsStr, (v) => (portsStr = v), 'Veracruz, Manzanillo')}
+		{@render catCsv('Aeropuertos donde opera', 'aeropuerto', airportsStr, (v) => (airportsStr = v), 'MEX, GDL')}
+		{@render catCsv('Aduanas donde opera', 'aduana', customsStr, (v) => (customsStr = v), 'Nuevo Laredo, Colombia')}
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Horario de atención</span><input class={inputCls} bind:value={form.business_hours} /></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tiempo prom. de respuesta</span><input class={inputCls} bind:value={form.avg_response_time} /></label>
 		<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Email</span><input type="email" class={inputCls} bind:value={form.email} /></label>

frontend/src/lib/components/crm/format.ts

@@ -182,7 +182,8 @@ export const SERVICE_TYPES: Option[] = [
 export const LOAD_TYPES: Option[] = [
 	{ value: 'FCL', label: 'FCL (contenedor completo)' },
 	{ value: 'LCL', label: 'LCL (carga consolidada)' },
-	{ value: 'AMBAS', label: 'Ambas (comparar FCL y LCL)' }
+	{ value: 'AMBAS', label: 'Ambas (comparar FCL y LCL)' },
+	{ value: 'AEREO', label: 'Aéreo (carga aérea)' }
 ];
 
 export const PRIORITIES: Option[] = [

frontend/src/lib/components/sidebar/modules.ts

@@ -45,6 +45,7 @@ export function getNavMain(): NavMainItem[] {
 			// Orden por flujo comercial: captación → embudo → solicitud → cotización → apoyo
 			items: [
 				{ title: 'Panel', url: '/dashboard/crm' },
+				{ title: 'Expedientes', url: '/dashboard/crm/expedientes' },
 				{ title: 'Clientes / Prospectos', url: '/dashboard/crm/cuentas' },
 				{ title: 'Contactos', url: '/dashboard/crm/contactos' },
 				{ title: 'Prospectos (embudo)', url: '/dashboard/crm/prospectos' },

frontend/src/routes/dashboard/crm/contactos/+page.svelte

@@ -4,11 +4,12 @@
 	import * as Table from '$lib/components/ui/table';
 	import { Button } from '$lib/components/ui/button';
 	import { companyStore } from '$lib/stores/company.svelte';
-	import { contactsAPI, accountsAPI, type Contact, type ContactInput, type Account } from '$lib/api/crm';
+	import { contactsAPI, accountsAPI, suppliersAPI, type Contact, type ContactInput, type Account, type Supplier } from '$lib/api/crm';
 	import { toast } from 'svelte-sonner';
 
 	let items = $state<Contact[]>([]);
 	let accounts = $state<Account[]>([]);
+	let suppliers = $state<Supplier[]>([]);
 	let loading = $state(false);
 	let search = $state('');
 	let modalOpen = $state(false);
@@ -18,8 +19,18 @@
 
 	const companyId = $derived(companyStore.activeCompany?.id ?? null);
 
-	function accountName(id: number | null): string {
-		return accounts.find((a) => a.id === id)?.name ?? '—';
+	// A quién pertenece el contacto: cliente/prospecto (cuenta) o proveedor
+	function ownerLabel(c: Contact): { kind: string; name: string } | null {
+		if (c.account_id) {
+			const a = accounts.find((x) => x.id === c.account_id);
+			const kind = a?.record_type === 'prospecto' ? 'Prospecto' : 'Cliente';
+			return { kind, name: a?.name ?? `#${c.account_id}` };
+		}
+		if (c.supplier_id) {
+			const s = suppliers.find((x) => x.id === c.supplier_id);
+			return { kind: 'Proveedor', name: s?.name ?? `#${c.supplier_id}` };
+		}
+		return null;
 	}
 
 	const filtered = $derived(
@@ -41,7 +52,7 @@
 	async function load(cid: number) {
 		loading = true;
 		try {
-			[items, accounts] = await Promise.all([contactsAPI.list(cid), accountsAPI.list(cid)]);
+			[items, accounts, suppliers] = await Promise.all([contactsAPI.list(cid), accountsAPI.list(cid), suppliersAPI.list(cid)]);
 		} catch (e) {
 			toast.error(e instanceof Error ? e.message : 'No se pudieron cargar los contactos');
 		} finally {
@@ -136,7 +147,7 @@
 						<Table.Header>
 							<Table.Row>
 								<Table.Head>Nombre</Table.Head>
-								<Table.Head>Cuenta</Table.Head>
+								<Table.Head>Pertenece a</Table.Head>
 								<Table.Head>Puesto</Table.Head>
 								<Table.Head>Email</Table.Head>
 								<Table.Head>Teléfono</Table.Head>
@@ -150,7 +161,7 @@
 										{c.first_name} {c.last_name ?? ''}
 										{#if c.is_primary}<span class="ml-1 rounded-full bg-primary/10 px-1.5 py-0.5 text-[10px] text-primary">Principal</span>{/if}
 									</Table.Cell>
-									<Table.Cell>{accountName(c.account_id)}</Table.Cell>
+									<Table.Cell>{#if ownerLabel(c)}{@const o = ownerLabel(c)}<span class="rounded-full bg-muted px-1.5 py-0.5 text-[10px] text-muted-foreground">{o?.kind}</span> <span>{o?.name}</span>{:else}—{/if}</Table.Cell>
 									<Table.Cell>{c.job_title ?? '—'}</Table.Cell>
 									<Table.Cell>{c.email ?? '—'}</Table.Cell>
 									<Table.Cell>{c.phone ?? c.mobile ?? '—'}</Table.Cell>

frontend/src/routes/dashboard/crm/cotizaciones/+page.svelte

@@ -93,6 +93,7 @@
 						<Table.Header>
 							<Table.Row>
 								<Table.Head>Folio</Table.Head>
+								<Table.Head>Solicitud</Table.Head>
 								<Table.Head>Estatus</Table.Head>
 								<Table.Head class="text-right">Total venta</Table.Head>
 								<Table.Head class="text-right">Margen</Table.Head>
@@ -103,6 +104,7 @@
 							{#each filtered as q (q.id)}
 								<Table.Row>
 									<Table.Cell class="font-medium"><a class="hover:underline" href={`/dashboard/crm/cotizaciones/${q.id}`}>{q.reference ?? `#${q.id}`}</a></Table.Cell>
+									<Table.Cell>{#if q.service_request_id}<a class="text-sm hover:underline" href={`/dashboard/crm/solicitudes/${q.service_request_id}`}>{q.service_request_reference ?? `#${q.service_request_id}`}</a>{:else}<span class="text-sm text-muted-foreground">—</span>{/if}</Table.Cell>
 									<Table.Cell><span class="inline-flex rounded-full px-2 py-0.5 text-xs font-medium {statusClass[q.status] ?? ''}">{labelOf(QUOTE_STATUS, q.status)}</span></Table.Cell>
 									<Table.Cell class="text-right">{formatMoney(q.total_sale, q.currency)}</Table.Cell>
 									<Table.Cell class="text-right">{formatMoney(q.margin, q.currency)}</Table.Cell>

frontend/src/routes/dashboard/crm/cotizaciones/[id]/+page.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-	import { ArrowLeft, Receipt, Plus, Trash2, Send, Check, X, Ship, FileText, Mail } from '@lucide/svelte';
+	import { ArrowLeft, Receipt, Plus, Trash2, Send, Check, X, Ship, FileText, Mail, Calculator } from '@lucide/svelte';
 	import { page } from '$app/state';
 	import { goto } from '$app/navigation';
 	import * as Card from '$lib/components/ui/card';
@@ -12,6 +12,7 @@
 	} from '$lib/api/crm';
 	import { shipmentsAPI } from '$lib/api/ops';
 	import { QUOTE_STATUS, QUOTE_CONCEPTS, labelOf, formatMoney } from '$lib/components/crm/format';
+	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { toast } from 'svelte-sonner';
 
 	const quoteId = $derived(Number(page.params.id));
@@ -39,6 +40,7 @@
 
 	async function load(cid: number, id: number) {
 		loading = true;
+		void crmCatalogs.preload(['moneda']);
 		try {
 			[quote, items, accounts, requests, suppliers] = await Promise.all([
 				quotesAPI.get(id, cid),
@@ -218,11 +220,13 @@
 		<div class="flex flex-wrap items-start justify-between gap-3">
 			<div>
 				<h1 class="flex items-center gap-2 text-2xl font-bold tracking-tight"><Receipt class="h-6 w-6" /> {quote.reference ?? `Cotización #${quote.id}`}</h1>
-				<p class="mt-1 text-sm">
+				<p class="mt-1 flex items-center gap-2 text-sm">
 					<span class="inline-flex rounded-full px-2 py-0.5 text-xs font-medium {statusClass[quote.status] ?? ''}">{labelOf(QUOTE_STATUS, quote.status)}</span>
+					{#if quote.case_id}<a class="inline-flex items-center gap-1 rounded-full bg-muted px-2 py-0.5 font-mono text-[11px] hover:underline" href={`/dashboard/crm/expedientes/${quote.case_id}`}>📁 Expediente</a>{/if}
 				</p>
 			</div>
 			<div class="flex flex-wrap gap-2">
+				<Button size="sm" variant="outline" href={`/dashboard/crm/cotizador?quote_id=${quote.id}${quote.service_request_id ? `&service_request_id=${quote.service_request_id}` : ''}`}><Calculator class="mr-1 h-4 w-4" /> Cotizador</Button>
 				<Button size="sm" variant="outline" onclick={openPdf} disabled={busy}><FileText class="mr-1 h-4 w-4" /> Ver PDF</Button>
 				<Button size="sm" variant="outline" onclick={openEmail} disabled={busy}><Mail class="mr-1 h-4 w-4" /> Enviar por correo</Button>
 				{#if quote.status === 'borrador'}
@@ -294,7 +298,7 @@
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Folio</span><input class={inputCls} bind:value={form.reference} /></label>
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Cliente</span><select class={inputCls} bind:value={form.account_id}><option value={undefined}>—</option>{#each accounts as a (a.id)}<option value={a.id}>{a.name}</option>{/each}</select></label>
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Solicitud (RFQ)</span><select class={inputCls} bind:value={form.service_request_id}><option value={undefined}>—</option>{#each requests as r (r.id)}<option value={r.id}>{r.reference ?? `#${r.id}`}</option>{/each}</select></label>
-						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><input class={inputCls} maxlength="3" bind:value={form.currency} /></label>
+						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><select class={inputCls} bind:value={form.currency}>{#each crmCatalogs.options('moneda') as m (m.value)}<option value={m.value}>{m.value} — {m.label}</option>{/each}</select></label>
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fecha de la cotización</span><input type="date" class={inputCls} bind:value={form.issue_date} /></label>
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Vigencia</span><input type="date" class={inputCls} bind:value={form.valid_until} /></label>
 						{#if quote.load_type}<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Variante</span><input class="{inputCls} bg-muted/40" value={quote.load_type} readonly /></label>{/if}

frontend/src/routes/dashboard/crm/cotizaciones/nuevo/+page.svelte

@@ -5,6 +5,7 @@
 	import { Button } from '$lib/components/ui/button';
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { quotesAPI, accountsAPI, serviceRequestsAPI, type QuoteInput, type Account, type ServiceRequest } from '$lib/api/crm';
+	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { toast } from 'svelte-sonner';
 
 	let form = $state<QuoteInput>({ currency: 'USD', issue_date: new Date().toISOString().slice(0, 10) });
@@ -17,6 +18,7 @@
 	$effect(() => {
 		const cid = companyId;
 		if (!cid) return;
+		void crmCatalogs.preload(['moneda']);
 		void (async () => {
 			[accounts, requests] = await Promise.all([accountsAPI.list(cid), serviceRequestsAPI.list(cid)]);
 		})();
@@ -49,7 +51,7 @@
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Folio</span><input class={inputCls} bind:value={form.reference} placeholder="COT-0001" /></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Cliente</span><select class={inputCls} bind:value={form.account_id}><option value={undefined}>—</option>{#each accounts as a (a.id)}<option value={a.id}>{a.name}</option>{/each}</select></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Solicitud (RFQ)</span><select class={inputCls} bind:value={form.service_request_id}><option value={undefined}>—</option>{#each requests as r (r.id)}<option value={r.id}>{r.reference ?? `#${r.id}`}</option>{/each}</select></label>
-				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><input class={inputCls} maxlength="3" bind:value={form.currency} /></label>
+				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><select class={inputCls} bind:value={form.currency}>{#each crmCatalogs.options('moneda') as m (m.value)}<option value={m.value}>{m.value} — {m.label}</option>{/each}</select></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fecha de la cotización</span><input type="date" class={inputCls} bind:value={form.issue_date} /></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Vigencia</span><input type="date" class={inputCls} bind:value={form.valid_until} /></label>
 				<label class="flex flex-col gap-1 text-sm sm:col-span-2"><span class="font-medium">Notas</span><textarea rows="2" class={inputCls} bind:value={form.notes}></textarea></label>

frontend/src/routes/dashboard/crm/cotizador/+page.svelte

@@ -1,31 +1,123 @@
 <script lang="ts">
 	import { onMount } from 'svelte';
-	import { Calculator } from '@lucide/svelte';
+	import { Calculator, Plus } from '@lucide/svelte';
+	import { page } from '$app/state';
+	import { goto } from '$app/navigation';
 	import * as Card from '$lib/components/ui/card';
 	import * as Table from '$lib/components/ui/table';
 	import { Button } from '$lib/components/ui/button';
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { rateSheetsAPI, type CostOption, type RateMode } from '$lib/api/crm/rates';
+	import { serviceRequestsAPI, quoteItemsAPI } from '$lib/api/crm';
 	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { formatMoney } from '$lib/components/crm/format';
 	import { toast } from 'svelte-sonner';
 
 	const companyId = $derived(companyStore.activeCompany?.id ?? null);
+	// Vinculación: ?service_request_id= (prellenar) y ?quote_id= (enviar resultado a concepto)
+	const srId = $derived(Number(page.url.searchParams.get('service_request_id')) || null);
+	const quoteId = $derived(Number(page.url.searchParams.get('quote_id')) || null);
+
+	// transport_mode + load_type de la solicitud → modo del tarifario
+	function transportModeToRateMode(transport: string | null, load: string | null): RateMode {
+		if (transport === 'aereo') return 'aereo';
+		if (transport === 'terrestre') return 'terrestre';
+		if (transport === 'maritimo') return load === 'LCL' ? 'maritimo_lcl' : 'maritimo_fcl';
+		return 'aereo';
+	}
 	const inputCls = 'rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring';
 
 	let f = $state({
 		mode: 'aereo' as RateMode, origin: '', destination: '', on_date: '',
 		gross_weight_kg: null as number | null, volume_m3: null as number | null,
+		length_cm: null as number | null, width_cm: null as number | null, height_cm: null as number | null,
 		equipment_type: '', quantity: 1, dangerous: false
 	});
 	let options = $state<CostOption[]>([]);
 	let calculated = $state(false);
 	let working = $state(false);
+	// Orígenes/destinos alineados a las rutas de los tarifarios activos del modo
+	let locs = $state<{ origins: string[]; destinations: string[] }>({ origins: [], destinations: [] });
+
+	$effect(() => {
+		const cid = companyId;
+		const mode = f.mode;
+		if (!cid) return;
+		void (async () => {
+			try { locs = await rateSheetsAPI.locations(cid, mode); }
+			catch { locs = { origins: [], destinations: [] }; }
+		})();
+	});
 
 	const isFcl = $derived(f.mode === 'maritimo_fcl' || f.mode === 'terrestre');
+	const isAir = $derived(f.mode === 'aereo');
+
+	// P/Vol aéreo en vivo: (L×A×H cm × cantidad) / 6000; a cobrar = max(bruto, P/Vol)
+	const airVolumetric = $derived(
+		Number(f.length_cm) > 0 && Number(f.width_cm) > 0 && Number(f.height_cm) > 0
+			? (Number(f.length_cm) * Number(f.width_cm) * Number(f.height_cm) * (Number(f.quantity) || 1)) / 6000
+			: 0
+	);
+	const airChargeable = $derived(Math.max(Number(f.gross_weight_kg) || 0, airVolumetric));
 
 	onMount(() => void crmCatalogs.preload(['modo_tarifario', 'tipo_equipo']));
 
+	// Prellenar desde la solicitud vinculada (si viene ?service_request_id=)
+	$effect(() => {
+		const cid = companyId;
+		const id = srId;
+		if (!cid || !id) return;
+		void (async () => {
+			try {
+				const sr = await serviceRequestsAPI.get(id, cid);
+				f = {
+					...f,
+					mode: transportModeToRateMode(sr.transport_mode, sr.load_type),
+					origin: sr.origin_port || sr.origin || '',
+					destination: sr.destination_port || sr.destination || '',
+					on_date: sr.estimated_shipment_date || sr.required_date || '',
+					gross_weight_kg: sr.weight ?? null,
+					volume_m3: sr.volume ?? null,
+					length_cm: sr.length_cm ?? null,
+					width_cm: sr.width_cm ?? null,
+					height_cm: sr.height_cm ?? null,
+					equipment_type: sr.container_equipment || '',
+					quantity: sr.container_count || sr.pallets_count || sr.pieces_count || 1,
+					dangerous: !!sr.hazardous_imo
+				};
+			} catch (e) {
+				toast.error(e instanceof Error ? e.message : 'No se pudo cargar la solicitud');
+			}
+		})();
+	});
+
+	// Enviar una opción del cotizador como concepto(s) de la cotización vinculada
+	async function addToQuote(o: CostOption) {
+		if (!companyId || !quoteId) return;
+		working = true;
+		try {
+			// Línea base (flete) + una línea por cada cargo adicional
+			await quoteItemsAPI.create({
+				quote_id: quoteId, concept: 'flete_internacional',
+				description: `${o.rate_sheet_name}${o.detail ? ' — ' + o.detail : ''}`,
+				supplier_id: o.supplier_id ?? undefined, quantity: 1,
+				unit_cost: o.base_cost, unit_sale: o.base_cost, currency: o.currency ?? undefined
+			}, companyId);
+			for (const c of o.charges) {
+				await quoteItemsAPI.create({
+					quote_id: quoteId, concept: 'otros', description: c.concept,
+					quantity: 1, unit_cost: c.amount, unit_sale: c.amount, currency: o.currency ?? undefined
+				}, companyId);
+			}
+			toast.success('Concepto(s) agregado(s) a la cotización');
+			await goto(`/dashboard/crm/cotizaciones/${quoteId}`);
+		} catch (e) {
+			toast.error(e instanceof Error ? e.message : 'No se pudo agregar a la cotización');
+		} finally {
+			working = false;
+		}
+	}
+
 	async function calc() {
 		if (!companyId) return;
 		if (!f.destination.trim()) { toast.error('Indica el destino'); return; }
@@ -34,6 +126,7 @@
 			const res = await rateSheetsAPI.quote({
 				mode: f.mode, origin: f.origin || null, destination: f.destination || null,
 				on_date: f.on_date || null, gross_weight_kg: f.gross_weight_kg, volume_m3: f.volume_m3,
+				length_cm: f.length_cm, width_cm: f.width_cm, height_cm: f.height_cm,
 				equipment_type: f.equipment_type || null, quantity: f.quantity || 1, dangerous: f.dangerous
 			}, companyId);
 			options = res.options; calculated = true;
@@ -59,8 +152,20 @@
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Modo *</span>
 						<select class={inputCls} bind:value={f.mode}>{#each crmCatalogs.options('modo_tarifario') as m (m.value)}<option value={m.value}>{m.label}</option>{/each}</select>
 					</label>
-					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Origen</span><input class={inputCls} bind:value={f.origin} placeholder="NLU / MXZLO" /></label>
-					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Destino *</span><input class={inputCls} bind:value={f.destination} placeholder="FRA / CNSHA" /></label>
+					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Origen</span>
+						{#if locs.origins.length}
+							<select class={inputCls} bind:value={f.origin}><option value="">—</option>{#each locs.origins as o (o)}<option value={o}>{o}</option>{/each}</select>
+						{:else}
+							<input class={inputCls} bind:value={f.origin} placeholder="NLU / MXZLO" />
+						{/if}
+					</label>
+					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Destino *</span>
+						{#if locs.destinations.length}
+							<select class={inputCls} bind:value={f.destination}><option value="">—</option>{#each locs.destinations as d (d)}<option value={d}>{d}</option>{/each}</select>
+						{:else}
+							<input class={inputCls} bind:value={f.destination} placeholder="FRA / CNSHA" />
+						{/if}
+					</label>
 
 					{#if isFcl}
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tipo de equipo</span>
@@ -70,11 +175,25 @@
 					{:else}
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Peso bruto (kg)</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={f.gross_weight_kg} /></label>
 						<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Volumen (m³)</span><input type="number" min="0" step="0.001" class={inputCls} bind:value={f.volume_m3} /></label>
+						{#if isAir}
+							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Largo (cm)</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={f.length_cm} /></label>
+							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Ancho (cm)</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={f.width_cm} /></label>
+							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Alto (cm)</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={f.height_cm} /></label>
+							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Cantidad de bultos</span><input type="number" min="1" class={inputCls} bind:value={f.quantity} /></label>
+						{/if}
 					{/if}
 
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Fecha embarque</span><input type="date" class={inputCls} bind:value={f.on_date} /></label>
 					<label class="flex items-center gap-2 pt-6 text-sm"><input type="checkbox" class="h-4 w-4 rounded border" bind:checked={f.dangerous} /><span>Mercancía peligrosa (DGR)</span></label>
 				</div>
+				{#if isAir && airVolumetric > 0}
+					<div class="mt-3 flex flex-wrap gap-6 rounded-md bg-muted/40 p-3 text-sm">
+						<span>P/Vol (volumétrico): <b>{airVolumetric.toFixed(2)}</b></span>
+						<span>Peso bruto: <b>{(Number(f.gross_weight_kg) || 0).toFixed(2)} kg</b></span>
+						<span>Peso a cobrar: <b>{airChargeable.toFixed(2)} kg</b></span>
+						<span class="text-xs text-muted-foreground">P/Vol = (L×A×H) × bultos ÷ 6000</span>
+					</div>
+				{/if}
 				<div class="mt-4 flex justify-end"><Button onclick={calc} disabled={working}>{working ? 'Calculando…' : 'Calcular costo'}</Button></div>
 			</Card.Content>
 		</Card.Root>
@@ -90,7 +209,7 @@
 					{:else}
 						<div class="overflow-x-auto">
 							<Table.Root>
-								<Table.Header><Table.Row><Table.Head>Tarifario</Table.Head><Table.Head>Base</Table.Head><Table.Head>Cargos</Table.Head><Table.Head>Total</Table.Head><Table.Head>Detalle</Table.Head><Table.Head>Tránsito</Table.Head></Table.Row></Table.Header>
+								<Table.Header><Table.Row><Table.Head>Tarifario</Table.Head><Table.Head>Base</Table.Head><Table.Head>Cargos</Table.Head><Table.Head>Total</Table.Head><Table.Head>Detalle</Table.Head><Table.Head>Tránsito</Table.Head>{#if quoteId}<Table.Head></Table.Head>{/if}</Table.Row></Table.Header>
 								<Table.Body>
 									{#each options as o, i (o.rate_sheet_id + '-' + i)}
 										<Table.Row class={i === 0 ? 'bg-emerald-50/60 dark:bg-emerald-950/20' : ''}>
@@ -100,6 +219,7 @@
 											<Table.Cell class="font-semibold">{money(o.total_cost, o.currency)}</Table.Cell>
 											<Table.Cell class="text-xs text-muted-foreground">{o.detail ?? '—'}</Table.Cell>
 											<Table.Cell>{o.transit_days ?? '—'}</Table.Cell>
+											{#if quoteId}<Table.Cell class="text-right"><Button size="sm" variant="outline" onclick={() => addToQuote(o)} disabled={working}><Plus class="mr-1 h-4 w-4" /> Agregar</Button></Table.Cell>{/if}
 										</Table.Row>
 									{/each}
 								</Table.Body>

frontend/src/routes/dashboard/crm/expedientes/+page.svelte

@@ -0,0 +1,98 @@
+<script lang="ts">
+	import { FolderKanban, Search, ChevronRight } from '@lucide/svelte';
+	import * as Card from '$lib/components/ui/card';
+	import * as Table from '$lib/components/ui/table';
+	import { Button } from '$lib/components/ui/button';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { casesAPI, accountsAPI, type Case, type Account } from '$lib/api/crm';
+	import { formatDate } from '$lib/components/crm/format';
+	import { toast } from 'svelte-sonner';
+
+	const STAGE_LABEL: Record<string, string> = {
+		oportunidad: 'Oportunidad', solicitud: 'Solicitud', cotizacion: 'Cotización',
+		operacion: 'Operación', facturacion: 'Facturación', cerrado: 'Cerrado'
+	};
+
+	let items = $state<Case[]>([]);
+	let accounts = $state<Account[]>([]);
+	let loading = $state(false);
+	let search = $state('');
+
+	const companyId = $derived(companyStore.activeCompany?.id ?? null);
+	function accountName(id: number | null): string {
+		return accounts.find((a) => a.id === id)?.name ?? '—';
+	}
+	const filtered = $derived(
+		search.trim()
+			? items.filter((c) => `${c.reference ?? ''} ${c.title ?? ''} ${accountName(c.account_id)}`.toLowerCase().includes(search.trim().toLowerCase()))
+			: items
+	);
+
+	$effect(() => {
+		const cid = companyId;
+		if (!cid) return;
+		void load(cid);
+	});
+
+	async function load(cid: number) {
+		loading = true;
+		try {
+			[items, accounts] = await Promise.all([casesAPI.list(cid), accountsAPI.list(cid)]);
+		} catch (e) {
+			toast.error(e instanceof Error ? e.message : 'No se pudieron cargar los expedientes');
+		} finally {
+			loading = false;
+		}
+	}
+	const inputCls = 'rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring';
+</script>
+
+<div class="space-y-6">
+	<div>
+		<h1 class="flex items-center gap-2 text-2xl font-bold tracking-tight"><FolderKanban class="h-6 w-6" /> Expedientes</h1>
+		<p class="mt-1 text-sm text-muted-foreground">Referencia única que hila todo el trámite (oportunidad → solicitud → cotización → operación → factura).</p>
+	</div>
+
+	<Card.Root>
+		<Card.Header>
+			<div class="relative max-w-sm">
+				<Search class="absolute left-2.5 top-2.5 h-4 w-4 text-muted-foreground" />
+				<input class="w-full py-2 pl-8 pr-3 {inputCls}" placeholder="Buscar por folio o cliente…" bind:value={search} />
+			</div>
+		</Card.Header>
+		<Card.Content>
+			{#if loading}
+				<p class="py-6 text-center text-sm text-muted-foreground">Cargando…</p>
+			{:else if filtered.length === 0}
+				<p class="py-6 text-center text-sm text-muted-foreground">Sin expedientes. Se crean automáticamente al generar una oportunidad.</p>
+			{:else}
+				<div class="overflow-x-auto">
+					<Table.Root>
+						<Table.Header>
+							<Table.Row>
+								<Table.Head>Expediente</Table.Head>
+								<Table.Head>Cliente</Table.Head>
+								<Table.Head>Etapa</Table.Head>
+								<Table.Head>Estatus</Table.Head>
+								<Table.Head>Creado</Table.Head>
+								<Table.Head></Table.Head>
+							</Table.Row>
+						</Table.Header>
+						<Table.Body>
+							{#each filtered as c (c.id)}
+								<Table.Row>
+									<Table.Cell class="font-mono font-medium"><a class="hover:underline" href={`/dashboard/crm/expedientes/${c.id}`}>{c.reference ?? `#${c.id}`}</a></Table.Cell>
+									<Table.Cell>{accountName(c.account_id)}</Table.Cell>
+									<Table.Cell>{STAGE_LABEL[c.stage] ?? c.stage}</Table.Cell>
+									<Table.Cell>{c.status}</Table.Cell>
+									<Table.Cell>{formatDate(c.created_at)}</Table.Cell>
+									<Table.Cell class="text-right"><Button variant="ghost" size="sm" href={`/dashboard/crm/expedientes/${c.id}`} aria-label="Abrir"><ChevronRight class="h-4 w-4" /></Button></Table.Cell>
+								</Table.Row>
+							{/each}
+						</Table.Body>
+					</Table.Root>
+				</div>
+			{/if}
+		</Card.Content>
+	</Card.Root>
+</div>

frontend/src/routes/dashboard/crm/expedientes/[id]/+page.svelte

@@ -0,0 +1,81 @@
+<script lang="ts">
+	import { ArrowLeft, FolderKanban, Target, FileText, Receipt, Ship, DollarSign } from '@lucide/svelte';
+	import { page } from '$app/state';
+	import * as Card from '$lib/components/ui/card';
+	import { Button } from '$lib/components/ui/button';
+	import { companyStore } from '$lib/stores/company.svelte';
+	import { casesAPI, type CaseWithTimeline } from '$lib/api/crm';
+	import { formatDate } from '$lib/components/crm/format';
+	import { toast } from 'svelte-sonner';
+
+	const caseId = $derived(Number(page.params.id));
+	const companyId = $derived(companyStore.activeCompany?.id ?? null);
+
+	let data = $state<CaseWithTimeline | null>(null);
+	let loading = $state(false);
+
+	const STAGE_LABEL: Record<string, string> = {
+		oportunidad: 'Oportunidad', solicitud: 'Solicitud', cotizacion: 'Cotización',
+		operacion: 'Operación', facturacion: 'Facturación', cerrado: 'Cerrado'
+	};
+	const KIND: Record<string, { label: string; icon: any }> = {
+		oportunidad: { label: 'Oportunidad', icon: Target },
+		solicitud: { label: 'Solicitud', icon: FileText },
+		cotizacion: { label: 'Cotización', icon: Receipt },
+		operacion: { label: 'Operación / Embarque', icon: Ship },
+		factura: { label: 'Factura', icon: DollarSign }
+	};
+
+	$effect(() => {
+		const cid = companyId;
+		const id = caseId;
+		if (!cid || !id) return;
+		void (async () => {
+			loading = true;
+			try { data = await casesAPI.get(id, cid); }
+			catch (e) { toast.error(e instanceof Error ? e.message : 'No se pudo cargar el expediente'); }
+			finally { loading = false; }
+		})();
+	});
+</script>
+
+<div class="space-y-6">
+	<Button variant="ghost" size="sm" href="/dashboard/crm/expedientes"><ArrowLeft class="mr-1 h-4 w-4" /> Expedientes</Button>
+
+	{#if loading && !data}
+		<p class="text-sm text-muted-foreground">Cargando…</p>
+	{:else if data}
+		<div>
+			<h1 class="flex items-center gap-2 text-2xl font-bold tracking-tight"><FolderKanban class="h-6 w-6" /> <span class="font-mono">{data.reference ?? `Expediente #${data.id}`}</span></h1>
+			<p class="mt-1 text-sm text-muted-foreground">Etapa: <b>{STAGE_LABEL[data.stage] ?? data.stage}</b> · {data.status}{#if data.title} · {data.title}{/if}</p>
+		</div>
+
+		<Card.Root>
+			<Card.Header><Card.Title class="text-base">Historia del trámite</Card.Title>
+				<Card.Description>Todos los documentos ligados a este expediente, en orden cronológico.</Card.Description>
+			</Card.Header>
+			<Card.Content>
+				{#if data.timeline.length === 0}
+					<p class="text-sm text-muted-foreground">Sin movimientos aún.</p>
+				{:else}
+					<ol class="relative ml-3 border-l pl-6">
+						{#each data.timeline as ev (ev.kind + '-' + ev.id)}
+							{@const K = KIND[ev.kind] ?? { label: ev.kind, icon: FileText }}
+							<li class="mb-5">
+								<span class="absolute -left-3 flex h-6 w-6 items-center justify-center rounded-full border bg-background">
+									<K.icon class="h-3.5 w-3.5" />
+								</span>
+								<div class="flex flex-wrap items-center gap-2">
+									<span class="text-xs uppercase text-muted-foreground">{K.label}</span>
+									<a class="font-mono text-sm font-medium hover:underline" href={ev.url}>{ev.reference ?? `#${ev.id}`}</a>
+									{#if ev.status}<span class="rounded-full bg-muted px-2 py-0.5 text-[10px]">{ev.status}</span>{/if}
+									<span class="text-xs text-muted-foreground">{formatDate(ev.created_at)}</span>
+								</div>
+							</li>
+						{/each}
+					</ol>
+				{/if}
+			</Card.Content>
+		</Card.Root>
+	{/if}
+</div>

frontend/src/routes/dashboard/crm/oportunidades/+page.svelte

@@ -17,6 +17,7 @@
 		type Account
 	} from '$lib/api/crm';
 	import { formatMoney, OPERATION_TYPES, TRANSPORT_MODES } from '$lib/components/crm/format';
+	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { toast } from 'svelte-sonner';
 
 	let pipelines = $state<Pipeline[]>([]);
@@ -38,6 +39,12 @@
 	let convertOpp = $state<Opportunity | null>(null);
 	let convertForm = $state<{ operation_type: string; transport_mode?: string; incoterm?: string; origin?: string; destination?: string; notes?: string }>({ operation_type: 'exportacion' });
 
+	// Cierre de oportunidad (ganada/perdida) con fecha y, si se pierde, motivo
+	let closeOpen = $state(false);
+	let closing = $state(false);
+	let closeCtx = $state<{ opp: Opportunity; stageId: number; isWon: boolean } | null>(null);
+	let closeForm = $state<{ date: string; reason: string }>({ date: '', reason: '' });
+
 	const companyId = $derived(companyStore.activeCompany?.id ?? null);
 
 	const currentStages = $derived(
@@ -62,6 +69,7 @@
 	$effect(() => {
 		const cid = companyId;
 		if (!cid) return;
+		void crmCatalogs.preload(['incoterm']);
 		void load(cid);
 	});
 
@@ -102,8 +110,6 @@
 				companyId
 			);
 			const defs: [string, number, boolean, boolean][] = [
-				['Prospecto', 10, false, false],
-				['Contactado', 25, false, false],
 				['Propuesta', 50, false, false],
 				['Negociación', 75, false, false],
 				['Ganada', 100, true, false],
@@ -204,6 +210,14 @@
 		if (!id || !companyId) return;
 		const opp = opps.find((o) => o.id === id);
 		if (!opp || opp.stage_id === stageId) return;
+		// Al mover a Ganada/Perdida, pedir fecha (y motivo si se pierde) antes de cerrar
+		const stage = currentStages.find((s) => s.id === stageId);
+		if (stage && (stage.is_won || stage.is_lost)) {
+			closeCtx = { opp, stageId, isWon: !!stage.is_won };
+			closeForm = { date: new Date().toISOString().slice(0, 10), reason: '' };
+			closeOpen = true;
+			return;
+		}
 		try {
 			const updated = await opportunitiesAPI.move(id, stageId, companyId);
 			opps = opps.map((o) => (o.id === id ? updated : o));
@@ -211,6 +225,24 @@
 			toast.error(e instanceof Error ? e.message : 'No se pudo mover la oportunidad');
 		}
 	}
+
+	async function confirmClose() {
+		if (!companyId || !closeCtx) return;
+		closing = true;
+		try {
+			await opportunitiesAPI.move(closeCtx.opp.id, closeCtx.stageId, companyId);
+			const patch = closeCtx.isWon
+				? { won_date: closeForm.date || undefined }
+				: { lost_date: closeForm.date || undefined, lost_reason: closeForm.reason || undefined };
+			const updated = await opportunitiesAPI.update(closeCtx.opp.id, patch, companyId);
+			opps = opps.map((o) => (o.id === closeCtx!.opp.id ? updated : o));
+			closeOpen = false;
+		} catch (e) {
+			toast.error(e instanceof Error ? e.message : 'No se pudo cerrar la oportunidad');
+		} finally {
+			closing = false;
+		}
+	}
 </script>
 
 <div class="space-y-6">
@@ -292,6 +324,11 @@
 										<span class="text-[10px] text-muted-foreground">{opp.probability}%</span>
 									{/if}
 								</div>
+								{#if opp.won_date}
+									<p class="mt-1 text-[10px] text-emerald-600 dark:text-emerald-400">Ganada: {opp.won_date}</p>
+								{:else if opp.lost_date}
+									<p class="mt-1 text-[10px] text-red-600 dark:text-red-400">Perdida: {opp.lost_date}{#if opp.lost_reason} — {opp.lost_reason}{/if}</p>
+								{/if}
 								<button type="button" class="mt-2 inline-flex items-center gap-1 text-[11px] text-primary hover:underline" onclick={() => openConvert(opp)}>
 									<FileOutput class="h-3 w-3" /> Convertir a solicitud
 								</button>
@@ -371,7 +408,7 @@
 							<option value={undefined}>—</option>{#each TRANSPORT_MODES as m (m.value)}<option value={m.value}>{m.label}</option>{/each}
 						</select>
 					</label>
-					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Incoterm</span><input class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" maxlength="10" bind:value={convertForm.incoterm} placeholder="FOB, CIF…" /></label>
+					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Incoterm</span><select class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={convertForm.incoterm}><option value={undefined}>—</option>{#each crmCatalogs.options('incoterm') as i (i.value)}<option value={i.value}>{i.label}</option>{/each}</select></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Origen</span><input class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={convertForm.origin} /></label>
 					<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Destino</span><input class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={convertForm.destination} /></label>
 				</div>
@@ -384,3 +421,28 @@
 		</div>
 	</div>
 {/if}
+
+{#if closeOpen && closeCtx}
+	<div class="fixed inset-0 z-50 flex items-center justify-center bg-black/50 p-4" role="presentation" onclick={() => (closeOpen = false)}>
+		<div class="w-full max-w-md rounded-lg border bg-card p-6 shadow-lg" role="dialog" aria-modal="true" tabindex="-1" onclick={(e) => e.stopPropagation()}>
+			<h2 class="mb-1 text-lg font-semibold">{closeCtx.isWon ? 'Marcar como ganada' : 'Marcar como perdida'}</h2>
+			<p class="mb-4 text-sm text-muted-foreground">{closeCtx.opp.name}</p>
+			<div class="grid gap-4">
+				<label class="flex flex-col gap-1 text-sm">
+					<span class="font-medium">{closeCtx.isWon ? 'Fecha de ganada' : 'Fecha de perdida'}</span>
+					<input type="date" class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={closeForm.date} />
+				</label>
+				{#if !closeCtx.isWon}
+					<label class="flex flex-col gap-1 text-sm">
+						<span class="font-medium">Motivo de la pérdida</span>
+						<textarea rows="3" class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={closeForm.reason} placeholder="¿Por qué se perdió esta oportunidad?"></textarea>
+					</label>
+				{/if}
+			</div>
+			<div class="mt-5 flex justify-end gap-2 border-t pt-4">
+				<Button variant="outline" onclick={() => (closeOpen = false)}>Cancelar</Button>
+				<Button onclick={confirmClose} disabled={closing}>{closing ? 'Guardando…' : (closeCtx.isWon ? 'Marcar ganada' : 'Marcar perdida')}</Button>
+			</div>
+		</div>
+	</div>
+{/if}

frontend/src/routes/dashboard/crm/prospectos/+page.svelte

@@ -4,10 +4,14 @@
 	import * as Table from '$lib/components/ui/table';
 	import { Button } from '$lib/components/ui/button';
 	import { companyStore } from '$lib/stores/company.svelte';
+	import { onMount } from 'svelte';
 	import { leadsAPI, type Lead, type LeadInput } from '$lib/api/crm';
 	import { LEAD_SOURCES, LEAD_STATUS, labelOf, formatMoney } from '$lib/components/crm/format';
+	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { toast } from 'svelte-sonner';
 
+	onMount(() => void crmCatalogs.ensure('medio_contacto'));
+
 	let items = $state<Lead[]>([]);
 	let loading = $state(false);
 	let search = $state('');
@@ -233,6 +237,13 @@
 						{#each LEAD_SOURCES as s (s.value)}<option value={s.value}>{s.label}</option>{/each}
 					</select>
 				</label>
+				<label class="flex flex-col gap-1 text-sm">
+					<span class="font-medium">Medio de contacto preferido</span>
+					<select class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={form.preferred_contact_method}>
+						<option value={undefined}>—</option>
+						{#each crmCatalogs.options('medio_contacto') as m (m.value)}<option value={m.value}>{m.label}</option>{/each}
+					</select>
+				</label>
 				<label class="flex flex-col gap-1 text-sm">
 					<span class="font-medium">Estado</span>
 					<select class="rounded-md border bg-transparent px-3 py-2 text-sm outline-none focus-visible:ring-2 focus-visible:ring-ring" bind:value={form.status}>

frontend/src/routes/dashboard/crm/solicitudes/+page.svelte

@@ -4,22 +4,28 @@
 	import * as Table from '$lib/components/ui/table';
 	import { Button } from '$lib/components/ui/button';
 	import { companyStore } from '$lib/stores/company.svelte';
-	import { serviceRequestsAPI, type ServiceRequest } from '$lib/api/crm';
+	import { serviceRequestsAPI, accountsAPI, type ServiceRequest, type Account } from '$lib/api/crm';
 	import { OPERATION_TYPES, SR_STATUS, TRANSPORT_MODES, labelOf } from '$lib/components/crm/format';
 	import { toast } from 'svelte-sonner';
 
 	let items = $state<ServiceRequest[]>([]);
+	let accounts = $state<Account[]>([]);
 	let loading = $state(false);
 	let search = $state('');
 	let statusFilter = $state('');
+	let clientFilter = $state('');
 
 	const companyId = $derived(companyStore.activeCompany?.id ?? null);
+	function accountName(id: number | null): string {
+		return accounts.find((a) => a.id === id)?.name ?? '—';
+	}
 	const filtered = $derived(
 		items.filter((r) => {
 			if (statusFilter && r.status !== statusFilter) return false;
+			if (clientFilter && String(r.account_id ?? '') !== clientFilter) return false;
 			if (search.trim()) {
 				const q = search.trim().toLowerCase();
-				return `${r.reference ?? ''} ${r.origin ?? ''} ${r.destination ?? ''}`.toLowerCase().includes(q);
+				return `${r.reference ?? ''} ${r.origin ?? ''} ${r.destination ?? ''} ${accountName(r.account_id)}`.toLowerCase().includes(q);
 			}
 			return true;
 		})
@@ -34,7 +40,7 @@
 	async function load(cid: number) {
 		loading = true;
 		try {
-			items = await serviceRequestsAPI.list(cid);
+			[items, accounts] = await Promise.all([serviceRequestsAPI.list(cid), accountsAPI.list(cid)]);
 		} catch (e) {
 			toast.error(e instanceof Error ? e.message : 'No se pudieron cargar las solicitudes');
 		} finally {
@@ -76,6 +82,10 @@
 					<option value="">Todos los estatus</option>
 					{#each SR_STATUS as s (s.value)}<option value={s.value}>{s.label}</option>{/each}
 				</select>
+				<select class={inputCls} bind:value={clientFilter}>
+					<option value="">Todos los clientes</option>
+					{#each accounts as a (a.id)}<option value={String(a.id)}>{a.name}</option>{/each}
+				</select>
 			</div>
 		</Card.Header>
 		<Card.Content>
@@ -89,6 +99,7 @@
 						<Table.Header>
 							<Table.Row>
 								<Table.Head>Folio</Table.Head>
+								<Table.Head>Cliente</Table.Head>
 								<Table.Head>Operación</Table.Head>
 								<Table.Head>Medio</Table.Head>
 								<Table.Head>Ruta</Table.Head>
@@ -100,6 +111,7 @@
 							{#each filtered as r (r.id)}
 								<Table.Row>
 									<Table.Cell class="font-medium"><a class="hover:underline" href={`/dashboard/crm/solicitudes/${r.id}`}>{r.reference ?? `#${r.id}`}</a></Table.Cell>
+									<Table.Cell>{accountName(r.account_id)}</Table.Cell>
 									<Table.Cell>{labelOf(OPERATION_TYPES, r.operation_type)}</Table.Cell>
 									<Table.Cell>{labelOf(TRANSPORT_MODES, r.transport_mode)}</Table.Cell>
 									<Table.Cell class="text-sm">{[r.origin, r.destination].filter(Boolean).join(' → ') || '—'}</Table.Cell>

frontend/src/routes/dashboard/crm/solicitudes/[id]/+page.svelte

@@ -160,6 +160,7 @@
 			<div>
 				<h1 class="flex items-center gap-2 text-2xl font-bold tracking-tight"><FileText class="h-6 w-6" /> {sr.reference ?? `Solicitud #${sr.id}`}</h1>
 				<p class="mt-1 text-sm text-muted-foreground">{labelOf(OPERATION_TYPES, sr.operation_type)} · {labelOf(SR_STATUS, sr.status)}</p>
+				{#if sr.case_id}<a class="mt-1 inline-flex items-center gap-1 rounded-full bg-muted px-2 py-0.5 font-mono text-[11px] hover:underline" href={`/dashboard/crm/expedientes/${sr.case_id}`}>📁 Expediente</a>{/if}
 			</div>
 			<div class="flex flex-wrap gap-2">
 				{#if sr.status === 'nueva' || sr.status === 'contacto'}<Button size="sm" variant="outline" onclick={registerContact} disabled={busy}>Registrar contacto</Button>{/if}
@@ -186,6 +187,7 @@
 							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Tarifa</span><input type="number" min="0" step="0.01" class={inputCls} bind:value={newRate.rate_amount} /></label>
 							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><input class={inputCls} maxlength="3" bind:value={newRate.currency} /></label>
 							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Estatus</span><select class={inputCls} bind:value={newRate.status}>{#each RATE_STATUS as s (s.value)}<option value={s.value}>{s.label}</option>{/each}</select></label>
+							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Válida hasta</span><input type="date" class={inputCls} bind:value={newRate.valid_until} /></label>
 							<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Descripción</span><input class={inputCls} bind:value={newRate.description} /></label>
 							<div class="flex justify-end gap-2 sm:col-span-2"><Button variant="outline" size="sm" onclick={() => (adding = false)}>Cancelar</Button><Button size="sm" onclick={saveRate}>Guardar</Button></div>
 						</div>

frontend/src/routes/dashboard/crm/solicitudes/nuevo/+page.svelte

@@ -9,7 +9,7 @@
 	import ServiceRequestFields from '$lib/components/crm/ServiceRequestFields.svelte';
 	import { toast } from 'svelte-sonner';
 
-	let form = $state<ServiceRequestInput>({ operation_type: 'exportacion', status: 'nueva', additional_services: [], additional_service_costs: {} });
+	let form = $state<ServiceRequestInput>({ operation_type: 'exportacion', status: 'nueva', additional_services: [], additional_service_costs: {}, request_date: new Date().toISOString().slice(0, 10) });
 	let accounts = $state<Account[]>([]);
 	let suppliers = $state<Supplier[]>([]);
 	let contacts = $state<Contact[]>([]);

frontend/src/routes/dashboard/fin/facturas/nuevo/+page.svelte

@@ -6,6 +6,7 @@
 	import { companyStore } from '$lib/stores/company.svelte';
 	import { invoicesAPI, type InvoiceInput } from '$lib/api/fin';
 	import { accountsAPI, type Account } from '$lib/api/crm';
+	import { crmCatalogs } from '$lib/stores/crm-catalogs.svelte';
 	import { toast } from 'svelte-sonner';
 
 	let form = $state<InvoiceInput>({ currency: 'MXN', tax_rate: 16 });
@@ -16,6 +17,7 @@
 	$effect(() => {
 		const cid = companyId;
 		if (!cid) return;
+		void crmCatalogs.preload(['moneda']);
 		void (async () => { accounts = await accountsAPI.list(cid); })();
 	});
 
@@ -44,9 +46,9 @@
 	<Card.Root>
 		<Card.Content class="pt-6">
 			<div class="grid gap-4 sm:grid-cols-2">
-				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Folio</span><input class={inputCls} bind:value={form.reference} placeholder="F-0001" /></label>
+				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Folio</span><input class="{inputCls} bg-muted/40" bind:value={form.reference} readonly placeholder="Se genera automáticamente (F2026-08-001)" /></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Cliente</span><select class={inputCls} bind:value={form.account_id}><option value={undefined}>—</option>{#each accounts as a (a.id)}<option value={a.id}>{a.name}</option>{/each}</select></label>
-				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><input class={inputCls} maxlength="3" bind:value={form.currency} /></label>
+				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Moneda</span><select class={inputCls} bind:value={form.currency}>{#each crmCatalogs.options('moneda') as m (m.value)}<option value={m.value}>{m.value} — {m.label}</option>{/each}</select></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">% Impuesto (IVA)</span><input type="number" min="0" max="100" step="0.01" class={inputCls} bind:value={form.tax_rate} /></label>
 				<label class="flex flex-col gap-1 text-sm"><span class="font-medium">Vencimiento</span><input type="date" class={inputCls} bind:value={form.due_date} /></label>
 				<label class="flex flex-col gap-1 text-sm sm:col-span-2"><span class="font-medium">Datos bancarios</span><textarea rows="2" class={inputCls} bind:value={form.bank_info}></textarea></label>