diff --git a/config.py b/config.py
index d7573bf..4fcf7d8 100644
--- a/config.py
+++ b/config.py
@@ -11,6 +11,9 @@ if not DB_URL:
         "Example: postgresql://user:pass@localhost/nexus_autoparts"
     )
 
+MASTER_DB_URL = os.environ.get("MASTER_DB_URL") or DB_URL
+TENANT_DB_URL_TEMPLATE = os.environ.get("TENANT_DB_URL_TEMPLATE") or DB_URL.replace("nexus_autoparts", "{db_name}")
+
 # Legacy SQLite path (used only by migration script)
 SQLITE_PATH = os.path.join(
     os.path.dirname(os.path.abspath(__file__)),
diff --git a/dashboard/admin.html b/dashboard/admin.html
index eeab4e1..8c6b907 100644
--- a/dashboard/admin.html
+++ b/dashboard/admin.html
@@ -92,6 +92,14 @@
                     <span class="badge" id="pendingUsersBadge" style="display:none; background:var(--warning); color:#000; font-size:0.7rem; padding:2px 6px; border-radius:10px; margin-left:auto;"></span>
                 </div>
             </div>
+
+            <div class="sidebar-section">
+                <h3>Tenants</h3>
+                <div class="sidebar-item" data-section="tenants">
+                    <span class="icon">🏢</span>
+                    <span>Módulos</span>
+                </div>
+            </div>
         </aside>
 
         <!-- Main Content -->
@@ -660,6 +668,35 @@
                 </div>
             </section>
 
+            <!-- Tenants / Modules Section -->
+            <section id="section-tenants" class="admin-section">
+                <div class="page-header">
+                    <h1 class="page-title">Configuración de Módulos por Tenant</h1>
+                </div>
+                <div class="card">
+                    <div class="card-header">
+                        <h2 class="card-title">Tenants Activos</h2>
+                    </div>
+                    <div style="overflow-x:auto;">
+                        <table class="data-table">
+                            <thead>
+                                <tr>
+                                    <th>ID</th>
+                                    <th>Nombre</th>
+                                    <th>WhatsApp</th>
+                                    <th>Marketplace</th>
+                                    <th>MercadoLibre</th>
+                                    <th>Acciones</th>
+                                </tr>
+                            </thead>
+                            <tbody id="tenantsTable">
+                                <tr><td colspan="6" class="loading"><div class="spinner"></div></td></tr>
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </section>
+
         </main>
     </div>
 
diff --git a/dashboard/admin.js b/dashboard/admin.js
index 62fe78d..fcd51f5 100644
--- a/dashboard/admin.js
+++ b/dashboard/admin.js
@@ -121,6 +121,9 @@ function showSection(sectionId) {
             case 'users':
                 loadUsers();
                 break;
+            case 'tenants':
+                loadTenants();
+                break;
         }
     }
 
@@ -2074,3 +2077,99 @@ async function toggleUserActive(userId, currentActive) {
         showAlert(e.message, 'error');
     }
 }
+
+// ─── Tenants / Modules ─────────────────────────────────────────────────────
+
+async function loadTenants() {
+    var token = localStorage.getItem('access_token');
+    var tbody = document.getElementById('tenantsTable');
+    tbody.innerHTML = '<tr><td colspan="6" class="loading"><div class="spinner"></div></td></tr>';
+
+    try {
+        var res = await fetch('/api/admin/tenants', {
+            headers: { 'Authorization': 'Bearer ' + token }
+        });
+        if (!res.ok) throw new Error('Error al cargar tenants (' + res.status + ')');
+        var data = await res.json();
+        var tenants = data.tenants || [];
+
+        if (tenants.length === 0) {
+            tbody.innerHTML = '<tr><td colspan="6" style="text-align:center; color:var(--text-secondary); padding:2rem;">No hay tenants activos</td></tr>';
+            return;
+        }
+
+        // Load modules for each tenant
+        var modulesMap = {};
+        await Promise.all(tenants.map(async function(t) {
+            try {
+                var mres = await fetch('/api/admin/tenants/' + t.id + '/modules', {
+                    headers: { 'Authorization': 'Bearer ' + token }
+                });
+                if (mres.ok) {
+                    modulesMap[t.id] = await mres.json();
+                } else {
+                    modulesMap[t.id] = {};
+                }
+            } catch (e) {
+                modulesMap[t.id] = {};
+            }
+        }));
+
+        renderTenantsTable(tenants, modulesMap);
+    } catch (e) {
+        tbody.innerHTML = '<tr><td colspan="6" style="text-align:center; color:#ef4444; padding:2rem;">' + e.message + '</td></tr>';
+    }
+}
+
+function renderTenantsTable(tenants, modulesMap) {
+    var tbody = document.getElementById('tenantsTable');
+    tbody.innerHTML = tenants.map(function(t) {
+        var mods = modulesMap[t.id] || {};
+        function toggleBtn(tenantId, key, enabled) {
+            var label = enabled ? 'Activado' : 'Desactivado';
+            var cls = enabled ? 'btn-primary' : 'btn-secondary';
+            return '<button class="btn ' + cls + '" style="font-size:0.75rem; padding:3px 10px;" ' +
+                'onclick="toggleTenantModule(' + tenantId + ', \'' + key + '\', ' + enabled + ')">' + label + '</button>';
+        }
+        return '<tr>' +
+            '<td>' + t.id + '</td>' +
+            '<td>' + (t.name || '-') + '</td>' +
+            '<td>' + toggleBtn(t.id, 'whatsapp_enabled', !!mods.whatsapp_enabled) + '</td>' +
+            '<td>' + toggleBtn(t.id, 'marketplace_enabled', !!mods.marketplace_enabled) + '</td>' +
+            '<td>' + toggleBtn(t.id, 'meli_enabled', !!mods.meli_enabled) + '</td>' +
+            '<td><button class="btn btn-primary" style="font-size:0.75rem; padding:3px 10px;" onclick="loadTenants()">🔄 Recargar</button></td>' +
+        '</tr>';
+    }).join('');
+}
+
+async function toggleTenantModule(tenantId, key, currentValue) {
+    var token = localStorage.getItem('access_token');
+    var moduleNames = {
+        'whatsapp_enabled': 'WhatsApp',
+        'marketplace_enabled': 'Marketplace',
+        'meli_enabled': 'MercadoLibre'
+    };
+    var action = currentValue ? 'desactivar' : 'activar';
+    if (!confirm('¿Seguro que deseas ' + action + ' ' + moduleNames[key] + ' para el tenant #' + tenantId + '?')) return;
+
+    try {
+        var payload = {};
+        payload[key] = !currentValue;
+        var res = await fetch('/api/admin/tenants/' + tenantId + '/modules', {
+            method: 'PUT',
+            headers: {
+                'Content-Type': 'application/json',
+                'Authorization': 'Bearer ' + token
+            },
+            body: JSON.stringify(payload)
+        });
+        if (!res.ok) {
+            var err = await res.json();
+            throw new Error(err.error || 'Error al actualizar módulo');
+        }
+        showAlert(moduleNames[key] + ' ' + (currentValue ? 'desactivado' : 'activado') + ' para tenant #' + tenantId);
+        loadTenants();
+    } catch (e) {
+        showAlert(e.message, 'error');
+    }
+}
diff --git a/dashboard/landing.html b/dashboard/landing.html
index 27c16f3..049aa8e 100644
--- a/dashboard/landing.html
+++ b/dashboard/landing.html
@@ -4,7 +4,7 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>Nexus Autoparts — Sistema completo para refaccionarias</title>
-  <meta name="description" content="POS + Catalogo TecDoc 1.5M+ partes + Marketplace B2B + IA. Todo lo que necesita una refaccionaria en una sola plataforma.">
+  <meta name="description" content="POS + Catalogo 1.5M+ partes + IA + Venta en linea. Todo lo que necesita una refaccionaria en una sola plataforma.">
   <script>
     (function(){
       var t = localStorage.getItem('nexus-theme') || 'industrial';
@@ -41,7 +41,7 @@
     <canvas id="heroCanvas"></canvas>
     <div class="hero-content">
       <h1 class="nx-reveal">Nexus Autoparts</h1>
-      <p class="subtitle nx-reveal">Todo lo que necesita una refaccionaria en una sola plataforma. POS, inventario, catalogo TecDoc, facturacion, marketplace B2B e inteligencia artificial.</p>
+      <p class="subtitle nx-reveal">Todo lo que necesita una refaccionaria en una sola plataforma. POS, inventario, catalogo de partes, facturacion, venta en linea e inteligencia artificial.</p>
       <div class="typewriter-line nx-reveal">
         <span id="typewriterText"></span><span class="typewriter-cursor"></span>
       </div>
@@ -78,59 +78,46 @@
   <section class="product">
     <div class="container">
       <h2 class="section-title nx-reveal">El Producto</h2>
-      <p class="section-subtitle nx-reveal">El unico sistema que combina POS + Inventario + CFDI + Catalogo + Marketplace + IA en una sola plataforma</p>
+      <p class="section-subtitle nx-reveal">Las 3 funcionalidades principales que hacen crecer tu refaccionaria</p>
       <div class="product-grid nx-stagger">
 
         <div class="product-card product-card--orange nx-reveal">
-          <h3>Ventas & POS</h3>
+          <h3>Catalogo Completo + POS + Inventario</h3>
           <ul>
-            <li>Punto de venta completo con F-keys y escaner</li>
-            <li>Caja registradora multi-caja, cortes X/Z</li>
-            <li>Cotizaciones, apartados, devoluciones</li>
-            <li>Clientes con credito y 3 niveles de precio</li>
-            <li>Facturacion CFDI 4.0 (Ingreso, Egreso, Pago)</li>
-            <li>Impresion termica ESC/POS</li>
-            <li>Contabilidad con polizas automaticas</li>
-            <li>Reportes: ventas, ABC, cortes, utilidad</li>
+            <li>Catalogo completo: 1.5M+ partes OEM y 304K+ aftermarket</li>
+            <li>Punto de venta completo con escaner y teclas rapidas</li>
+            <li>Inventario append-only con toma fisica y alertas de stock</li>
+            <li>Navegacion por vehiculo: Marca > Modelo > Ano > Motor</li>
+            <li>Decodificador VIN + busqueda por placas MX</li>
+            <li>Facturacion CFDI 4.0 integrada</li>
           </ul>
         </div>
 
         <div class="product-card product-card--cyan nx-reveal">
-          <h3>Catalogo & Inventario</h3>
+          <h3>Agente AI para WhatsApp</h3>
           <ul>
-            <li>Catalogo TecDoc: 1.5M+ partes OEM</li>
-            <li>304K+ partes aftermarket con cross-refs</li>
-            <li>Navegacion: Ano > Marca > Modelo > Motor</li>
-            <li>VIN decoder + busqueda por placas MX</li>
-            <li>Inventario append-only, toma fisica</li>
-            <li>Imagenes de productos con upload masivo</li>
-            <li>Traduccion automatica EN > ES (326 partes)</li>
-            <li>Marketplace B2B: bodegas ↔ talleres</li>
+            <li>Atiende consultas de autopartes 24/7 automaticamente</li>
+            <li>Genera cotizaciones inteligentes desde la conversacion</li>
+            <li>Reconoce piezas por foto con Vision AI</li>
+            <li>Transcripcion de notas de voz a texto</li>
+            <li>Envia catalogos y cotizaciones directo al cliente</li>
+            <li>Reduce llamadas y aumenta conversiones</li>
           </ul>
         </div>
 
         <div class="product-card product-card--green nx-reveal">
-          <h3>IA & Plataforma</h3>
+          <h3>Vinculacion con Mercado Libre</h3>
           <ul>
-            <li>Chatbot IA: diagnostico, cotizacion inteligente</li>
-            <li>Entrada por voz (Web Speech API)</li>
-            <li>Reconocimiento de partes por foto (Vision AI)</li>
-            <li>WhatsApp Business integrado (envio de cotizaciones)</li>
-            <li>Gestion de flotillas y mantenimiento</li>
-            <li>PWA + App Android, modo kiosko</li>
-            <li>Offline-first con sync automatico</li>
-            <li>2 temas, 2 idiomas (ES/EN), 2 monedas (MXN/USD)</li>
+            <li>Publica tu inventario en Mercado Libre en minutos</li>
+            <li>Sincronizacion automatica de stock y precios</li>
+            <li>Descarga ordenes y conviertelas en ventas del POS</li>
+            <li>Gestiona listados, preguntas y ventas desde un solo lugar</li>
+            <li>Empieza a vender en linea sin complicaciones</li>
+            <li>Mas canales, mas ventas, mismo inventario</li>
           </ul>
         </div>
 
       </div>
-
-      <div class="hw-banner nx-reveal">
-        <div class="hw-banner-inner">
-          <span>&#128421;</span>
-          <div class="hw-text">A partir del plan <strong>Pro</strong>: servidor en <strong>rack 3D personalizado</strong> — Mini PC + switch + AP + UPS.<br>Todo incluido por <strong>$2,000 MXN/mes</strong>. Solo conectar y empezar a vender.</div>
-        </div>
-      </div>
     </div>
   </section>
 
@@ -152,12 +139,12 @@
         <div class="step nx-reveal">
           <div class="step-number">2</div>
           <h3>Catalogo + Inventario</h3>
-          <p>Tu inventario conectado al catalogo TecDoc. Busca por vehiculo, parte o VIN.</p>
+          <p>Tu inventario conectado al catalogo de partes. Busca por vehiculo, parte o VIN.</p>
         </div>
         <div class="step nx-reveal">
           <div class="step-number">3</div>
           <h3>Vende y Crece</h3>
-          <p>POS, facturacion, marketplace B2B, WhatsApp e IA — todo desde un solo lugar.</p>
+          <p>POS, facturacion, venta en linea, WhatsApp e IA — todo desde un solo lugar.</p>
         </div>
       </div>
     </div>
@@ -176,7 +163,7 @@
       <div class="diff-grid nx-stagger">
         <div class="diff-card nx-reveal">
           <div class="diff-icon">&#128269;</div>
-          <h4>Catalogo TecDoc</h4>
+          <h4>Catalogo Completo</h4>
           <p>1.5M+ partes con cross-references. Nadie mas lo tiene en MX.</p>
         </div>
         <div class="diff-card nx-reveal">
@@ -191,13 +178,13 @@
         </div>
         <div class="diff-card nx-reveal">
           <div class="diff-icon">&#128640;</div>
-          <h4>Marketplace B2B</h4>
-          <p>Conecta bodegas con talleres. Mas ventas, menos llamadas.</p>
+          <h4>Venta en Linea</h4>
+          <p>Conecta tu inventario con Mercado Libre y vende 24/7.</p>
         </div>
         <div class="diff-card nx-reveal">
           <div class="diff-icon">&#128421;</div>
-          <h4>Hardware incluido</h4>
-          <p>Rack 3D con servidor. Renta todo por $2,000/mes.</p>
+          <h4>Hardware opcional</h4>
+          <p>Mini rack 3D con servidor. Disponible como add-on.</p>
         </div>
         <div class="diff-card nx-reveal">
           <div class="diff-icon">&#127760;</div>
@@ -227,41 +214,46 @@
   <section class="pricing">
     <div class="container">
       <h2 class="section-title nx-reveal">Planes</h2>
-      <p class="section-subtitle nx-reveal">Software desde $999/mes. Hardware incluido a partir del plan Pro.</p>
+      <p class="section-subtitle nx-reveal">Elige el plan que se ajuste a tu refaccionaria. Paga anual y ahorra 2 meses.</p>
       <div class="pricing-grid nx-stagger">
         <div class="pricing-card nx-reveal">
-          <h4>Basico</h4>
-          <div class="pricing-price">$999</div>
-          <div class="pricing-period">MXN / mes — solo software</div>
+          <h4>POS Basico</h4>
+          <div class="pricing-price">$650</div>
+          <div class="pricing-period">MXN / mes</div>
           <ul>
-            <li>POS + Inventario</li>
-            <li>Catalogo TecDoc</li>
-            <li>CFDI 4.0</li>
+            <li>Punto de venta completo</li>
+            <li>Inventario y catalogo de partes</li>
+            <li>Facturacion CFDI 4.0</li>
             <li>Reportes basicos</li>
           </ul>
         </div>
         <div class="pricing-card featured nx-reveal">
-          <h4>Pro</h4>
-          <div class="pricing-price">$2,000</div>
-          <div class="pricing-period">MXN / mes — hardware incluido</div>
+          <h4>Sistema Completo</h4>
+          <div class="pricing-price">$1,660</div>
+          <div class="pricing-period">MXN / mes</div>
           <ul>
-            <li>Todo Basico +</li>
+            <li>Todo lo del POS Basico +</li>
+            <li>Agente AI para WhatsApp</li>
+            <li>Vinculacion con Mercado Libre</li>
+            <li>Sync automatico de stock y ordenes</li>
             <li>Contabilidad automatica</li>
-            <li>Chatbot IA + WhatsApp</li>
-            <li>Marketplace B2B</li>
-            <li>&#128421; Mini PC + rack 3D + red incluidos</li>
+            <li>Multi-sucursal y flotillas</li>
           </ul>
         </div>
-        <div class="pricing-card nx-reveal">
-          <h4>Enterprise</h4>
-          <div class="pricing-price">$3,999</div>
-          <div class="pricing-period">MXN / mes — hardware incluido</div>
+      </div>
+      <div class="pricing-note nx-reveal" style="text-align:center; margin-top:var(--space-6); font-size:var(--text-body-sm); color:var(--color-text-secondary);">
+        <p><strong>Paga anual y ahorra 2 meses.</strong> Aplica a meses sin intereses (MSI).</p>
+      </div>
+      <div class="pricing-grid nx-stagger" style="margin-top:var(--space-8);">
+        <div class="pricing-card nx-reveal" style="grid-column: 1 / -1; max-width: 600px; margin: 0 auto;">
+          <h4>Add-on: Mini Rack con Servidor</h4>
+          <div class="pricing-price">$3,000</div>
+          <div class="pricing-period">MXN / mes</div>
           <ul>
-            <li>Todo Pro +</li>
-            <li>Flotillas + Multi-bodega</li>
-            <li>API dedicada</li>
-            <li>Soporte prioritario</li>
-            <li>&#128421; Hardware dedicado por sucursal</li>
+            <li>Mini PC con POS preinstalado</li>
+            <li>Switch + Access Point + UPS</li>
+            <li>Rack 3D personalizado</li>
+            <li>Solo conectar y empezar a vender</li>
           </ul>
         </div>
       </div>
@@ -281,12 +273,12 @@
         <div class="contact-card nx-reveal">
           <div class="contact-icon">&#9993;</div>
           <h4>Email</h4>
-          <a href="mailto:ialcarazsalazar@consultoria-as.com">ialcarazsalazar@consultoria-as.com</a>
+          <a href="mailto:ivan@nexusautoparts.com.mx">ivan@nexusautoparts.com.mx</a>
         </div>
         <div class="contact-card nx-reveal">
           <div class="contact-icon">&#128241;</div>
           <h4>WhatsApp</h4>
-          <a href="https://wa.me/526641234567" class="btn-whatsapp" target="_blank" rel="noopener">Enviar Mensaje</a>
+          <a href="https://wa.me/526642170990" class="btn-whatsapp" target="_blank" rel="noopener">Enviar Mensaje</a>
         </div>
         <div class="contact-card nx-reveal">
           <div class="contact-icon">&#128205;</div>
diff --git a/dashboard/server.py b/dashboard/server.py
index 2413c57..4621b06 100644
--- a/dashboard/server.py
+++ b/dashboard/server.py
@@ -16,6 +16,7 @@ sys.path.insert(0, os.path.join(_base, '..', 'pos'))   # pos/ for auth, services
 sys.path.insert(0, os.path.join(_base, '..'))           # root config.py (has DB_URL)
 from config import DB_URL
 from auth import hash_password, check_password, create_access_token, create_refresh_token, decode_token, require_auth
+from tenant_db import get_tenant_conn
 from services.translations import translate_part_name, translate_category
 
 sys.path.insert(0, os.path.join(_base, '..', 'pos'))
@@ -4628,6 +4629,76 @@ def part_aftermarket(part_id):
         session.close()
 
 
+# ============================================================================
+# Tenant Module Config Endpoints
+# ============================================================================
+
+MODULE_CONFIG_KEYS = [
+    'whatsapp_enabled',
+    'marketplace_enabled',
+    'meli_enabled',
+]
+
+
+@app.route('/api/admin/tenants')
+def api_admin_tenants():
+    session = Session()
+    try:
+        rows = session.execute(text(
+            "SELECT id, name, db_name, is_active, is_seller FROM tenants WHERE is_active = true ORDER BY id"
+        )).mappings().all()
+        return jsonify({'tenants': [dict(r) for r in rows]})
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+    finally:
+        session.close()
+
+
+@app.route('/api/admin/tenants/<int:tenant_id>/modules')
+def api_admin_tenant_modules(tenant_id):
+    try:
+        conn = get_tenant_conn(tenant_id)
+        cur = conn.cursor()
+        result = {}
+        for key in MODULE_CONFIG_KEYS:
+            cur.execute("SELECT value FROM tenant_config WHERE key = %s", (key,))
+            row = cur.fetchone()
+            result[key] = (row[0] or '').lower() == 'true' if row else False
+        cur.close()
+        conn.close()
+        return jsonify(result)
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+
+
+@app.route('/api/admin/tenants/<int:tenant_id>/modules', methods=['PUT'])
+def api_admin_tenant_modules_update(tenant_id):
+    data = request.get_json() or {}
+    if not data:
+        return jsonify({'error': 'No data provided'}), 400
+
+    try:
+        conn = get_tenant_conn(tenant_id)
+        cur = conn.cursor()
+        for key, value in data.items():
+            if key not in MODULE_CONFIG_KEYS:
+                continue
+            cur.execute(
+                """
+                INSERT INTO tenant_config (key, value, updated_at)
+                VALUES (%s, %s, NOW())
+                ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()
+                """,
+                (key, 'true' if value else 'false'),
+            )
+        conn.commit()
+        cur.close()
+        conn.close()
+        return jsonify({'ok': True})
+    except Exception as e:
+        return jsonify({'error': str(e)}), 500
+
+
 # ============================================================================
 # Static files from dashboard root (CSS/JS/HTML)
 # ============================================================================
diff --git a/docs/FASES_IMPLEMENTADAS.md b/docs/FASES_IMPLEMENTADAS.md
index 148aa55..80cd103 100644
--- a/docs/FASES_IMPLEMENTADAS.md
+++ b/docs/FASES_IMPLEMENTADAS.md
@@ -1,8 +1,9 @@
 # Nexus POS — Resumen de Fases Implementadas
 
-**Fecha:** 2026-04-29
-**Versión DB:** v3.2
+**Fecha:** 2026-06-11
+**Versión DB:** v4.1
 **Tests:** 73/73 pasando (pytest)
+**Commit:** `2b73c2c`
 
 ---
 
@@ -200,6 +201,50 @@ METABASE_URL=http://localhost:3000
 | — | **nexus-pos.service systemd** | 2026-04-29 | `c766571` |
 | — | **QWEN 3.6 AI Vehicle Fitment** | 2026-04-29 | `623c57b` |
 
+## FASE 7: Precios de Proveedor + Multi-sucursal + Factura Global
+
+**Commit:** `2b73c2c` (2026-06-11)
+
+### 7.1 Lista de Precios de Proveedor
+
+| Feature | Archivos | Capacidades |
+|---------|----------|-------------|
+| **Precios por proveedor** | `supplier_catalog_prices` (master DB) | Precio, moneda, vigencia (effective_from/to), activo/inactivo |
+| **Upload masivo** | `supplier_catalog_bp.py` | CSV/Excel con supplier_name, sku, price, currency |
+| **Visualización** | `catalog.js`, `catalog_service.py` | `supplier_price` + `supplier_currency` en tarjetas y búsqueda |
+| **Endpoints** | `supplier_catalog_bp.py` | `GET/POST/PUT/DELETE /pos/api/supplier-catalog/prices/*` |
+
+### 7.2 Multi-sucursal Completo
+
+| Feature | Archivos | Capacidades |
+|---------|----------|-------------|
+| **Schema migration v4.0** | `v4.0_multi_branch.sql` | `inventory.branch_id=NULL` (catálogo compartido), tabla `inventory_stock` |
+| **Datos fiscales por sucursal** | `branches` (tenant DB) | `rfc`, `razon_social`, `regimen_fiscal`, `codigo_postal`, `serie_cfdi`, `folio_inicial`, `licencia_fiscal`, `certificado_pem`, `llave_pem`, `is_main` |
+| **Sincronización de stock** | Trigger `trg_update_inventory_stock` | `inventory_operations` → `inventory_stock` automático |
+| **Backend branches** | `config_bp.py` | CRUD completo con campos fiscales, validación de única sucursal `is_main` |
+| **Backend inventario** | `inventory_bp.py`, `inventory_engine.py`, `pos_bp.py` | Stock por sucursal vía `inventory_stock`, catálogo compartido, verificación de stock en POS |
+| **Backend facturación** | `invoicing_bp.py` | CFDI usa datos fiscales de la sucursal de la venta (`_get_issuer_config`) |
+| **Frontend config** | `config.html`, `config.js` | Modal de sucursal expandido con todos los campos fiscales, edición inline |
+
+### 7.3 Factura Global Mensual
+
+| Feature | Archivos | Capacidades |
+|---------|----------|-------------|
+| **Schema migration v4.1** | `v4.1_global_invoice.sql` | `global_invoice_sales`, `sales.global_invoiced_at` |
+| **Builder CFDI global** | `cfdi_builder.py` | `build_global_invoice_xml()` con `InformacionGlobal` SAT-compliant (`Periodicidad="04"`) |
+| **Servicio** | `global_invoice.py` | Agrupa ventas PUE ≤$2,000 sin CFDI individual del mes/año solicitado |
+| **Endpoints** | `invoicing_bp.py` | `POST /global-invoice`, `GET /global-invoice/<id>`, `GET /global-invoice/eligible-sales` |
+| **Frontend** | `invoicing.html`, `invoicing.js` | Botón "Factura Global" con modal de año/mes + vista previa de ventas elegibles |
+
+### 7.4 Mercado Libre — Mejoras
+
+| Feature | Archivos | Capacidades |
+|---------|----------|-------------|
+| **Importar publicaciones existentes** | `meli_service.py`, `marketplace_external_service.py` | `get_user_items()` + `import_existing_listings()` — importa items del vendedor a `marketplace_listings` intentando match por SKU/part_number |
+| **Sync stock POS → ML** | `inventory_engine.py`, `marketplace_external_service.py` | Trigger en `inventory_operations` inserta en `meli_sync_queue`; `process_meli_sync_queue()` actualiza `available_quantity` en ML vía API |
+| **Sync órdenes ML → POS** | `marketplace_external_bp.py` | `POST /orders/sync` para sincronización manual; webhook `/webhook/meli` ya maneja notificaciones de órdenes vía Celery |
+| **Migration v4.2** | `v4.2_meli_sync_queue.sql` | Tabla `meli_sync_queue` para encolar actualizaciones de stock |
+
 ---
 
 ## Mejoras Pendientes (Roadmap Actualizado)
@@ -215,7 +260,7 @@ METABASE_URL=http://localhost:3000
 | 1 | **WhatsApp Business API (Meta Cloud) real** | Migrar de Baileys a Meta Cloud API. Requiere verificación de cuenta Meta, Business Manager, número de teléfono verificado. | 2-3 semanas | Stub creado (`whatsapp_cloud_bp.py`) |
 | 2 | **BNPL real** | Integrar APLAZO/Kueski/Clip con credenciales de sandbox/producción. | 2 semanas | Stub creado (`bnpl_bp.py`) |
 | 3 | **ERP Sync real** | Conectar Aspel/CONTPAQi/SAP/Odoo vía API o archivos de intercambio. | 2-3 semanas | Stub creado (`erp_bp.py`) |
-| 4 | **Mercado Libre / Amazon sync** | Publicar inventario de bodegas en marketplaces. API de ML Seller + Amazon SP-API. | 3 semanas | No iniciado |
+| 4 | **Mercado Libre / Amazon sync** | Publicar inventario de bodegas en marketplaces. API de ML Seller + Amazon SP-API. | 3 semanas | **Parcialmente listo** — ver Fase 7.4 |
 
 ### 🟡 Medio — Diferenciadores
 
diff --git a/docs/GLOBAL_INVOICE.md b/docs/GLOBAL_INVOICE.md
new file mode 100644
index 0000000..25a2017
--- /dev/null
+++ b/docs/GLOBAL_INVOICE.md
@@ -0,0 +1,82 @@
+# Factura Global Mensual — Documentación Técnica
+
+**Versión DB:** v4.1  
+**Commit:** `2b73c2c`
+
+---
+
+## Requerimiento SAT
+
+El SAT permite agrupar tickets de contado (menores a $2,000) en una sola factura mensual tipo **Ingreso** con `InformacionGlobal`.
+
+## Criterios de elegibilidad
+
+Una venta es elegible para factura global si:
+1. `metodo_pago_sat = 'PUE'` (pagado al momento)
+2. `total <= $2,000`
+3. `status = 'completed'`
+4. No tiene CFDI individual timbrado (`cfdi_queue.status = 'stamped'`)
+5. No está ya en una factura global (`sales.global_invoiced_at IS NULL`)
+6. Fecha dentro del mes/año solicitado
+
+## Arquitectura
+
+### Tablas
+- `global_invoice_sales (global_invoice_id, sale_id)` — relación N:M
+- `sales.global_invoiced_at` — marca de inclusión
+
+### XML
+- `build_global_invoice_xml()` en `cfdi_builder.py`
+- `InformacionGlobal Periodicidad="04"` (mensual)
+- Receptor: `PUBLICO EN GENERAL` (RFC XAXX010101000)
+
+---
+
+## Endpoints
+
+| Método | Endpoint | Descripción |
+|--------|----------|-------------|
+| `GET` | `/pos/api/invoicing/global-invoice/eligible-sales?year=&month=&branch_id=` | Preview de ventas elegibles |
+| `POST` | `/pos/api/invoicing/global-invoice` | Genera factura global |
+| `GET` | `/pos/api/invoicing/global-invoice/<id>` | Estado y ventas vinculadas |
+
+### POST body
+```json
+{
+  "year": 2026,
+  "month": 6,
+  "branch_id": 1
+}
+```
+
+### Response
+```json
+{
+  "id": 42,
+  "status": "pending",
+  "sales_count": 15,
+  "total": 18450.00,
+  "provisional_folio": "PRE-00042",
+  "xml": "<?xml ...>"
+}
+```
+
+---
+
+## Flujo de uso (Frontend)
+
+1. Ir a **Facturación**
+2. Clic en botón **Factura Global**
+3. Seleccionar año y mes
+4. Clic en **Vista previa** para ver ventas elegibles
+5. Clic en **Generar** para crear y encolar el CFDI
+6. Procesar cola de timbrado normalmente
+
+---
+
+## Timbrado
+
+La factura global entra en la cola `cfdi_queue` con:
+- `type = 'ingreso'`
+- `sale_id = NULL`
+- Se timbra igual que cualquier otro CFDI vía Horux360
diff --git a/docs/MULTI_BRANCH.md b/docs/MULTI_BRANCH.md
new file mode 100644
index 0000000..7c5a52f
--- /dev/null
+++ b/docs/MULTI_BRANCH.md
@@ -0,0 +1,52 @@
+# Multi-sucursal — Documentación Técnica
+
+**Versión DB:** v4.0  
+**Commit:** `2b73c2c`
+
+---
+
+## Arquitectura
+
+### Catálogo compartido
+- `inventory.branch_id` es siempre `NULL` (catálogo compartido a nivel tenant).
+- `part_number` tiene unique index `idx_inventory_part_unique`.
+- Productos duplicados por `part_number` en múltiples sucursales fueron consolidados en la migración v4.0.
+
+### Stock por sucursal
+- Tabla `inventory_stock (inventory_id, branch_id, stock, location)`.
+- Trigger `trg_update_inventory_stock` en `inventory_operations` mantiene `inventory_stock` sincronizado automáticamente.
+- `inventory_stock_summary` sigue existiendo como stock total agregado (sin `branch_id`).
+
+### Datos fiscales por sucursal
+- Tabla `branches` incluye: `rfc`, `razon_social`, `regimen_fiscal`, `codigo_postal`, `serie_cfdi`, `folio_inicial`, `licencia_fiscal`, `certificado_pem`, `llave_pem`, `is_main`.
+- Solo una sucursal puede ser `is_main = true`.
+- Al facturar, `_get_issuer_config(cur, branch_id)` usa datos de la sucursal de la venta; fallback a config global del tenant.
+
+---
+
+## Endpoints
+
+### Config
+- `GET /pos/api/config/branches` — lista sucursales (sin PEM)
+- `GET /pos/api/config/branches/<id>` — detalle completo (con PEM)
+- `POST /pos/api/config/branches` — crear
+- `PUT /pos/api/config/branches/<id>` — editar
+
+### Inventario
+- `GET /pos/api/inventory/items` — acepta `?branch_id=` para mostrar stock por sucursal
+- Stock se lee de `inventory_stock` cuando se filtra por sucursal
+
+### POS
+- Ventas verifican stock vía `get_stock(conn, inventory_id, branch_id)`
+- `inventory_operations` registra `branch_id` de la venta
+
+---
+
+## Migración
+
+```bash
+cd /home/Autopartes/pos
+python3 migrations/runner.py
+```
+
+Archivo: `pos/migrations/v4.0_multi_branch.sql`
diff --git a/manager/blueprints/tenants_bp.py b/manager/blueprints/tenants_bp.py
index 13ea21b..8a98c9a 100644
--- a/manager/blueprints/tenants_bp.py
+++ b/manager/blueprints/tenants_bp.py
@@ -58,3 +58,24 @@ def delete_tenant(tenant_id):
         return jsonify(result)
     except Exception as e:
         return jsonify({"error": str(e)}), 500
+
+
+@tenants_bp.route("/<int:tenant_id>/modules", methods=["GET"])
+@require_manager_auth
+def get_tenant_modules(tenant_id):
+    try:
+        result = tenant_service.get_tenant_modules(tenant_id)
+        return jsonify({"data": result})
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+@tenants_bp.route("/<int:tenant_id>/modules", methods=["PUT"])
+@require_manager_auth
+def update_tenant_modules(tenant_id):
+    data = request.get_json() or {}
+    try:
+        result = tenant_service.update_tenant_modules(tenant_id, data)
+        return jsonify(result)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
diff --git a/manager/services/tenant_service.py b/manager/services/tenant_service.py
index 0df77ac..6b1635c 100644
--- a/manager/services/tenant_service.py
+++ b/manager/services/tenant_service.py
@@ -311,6 +311,56 @@ def get_tenant_login_url(subdomain):
     return f"https://{subdomain}.{domain}/pos/login"
 
 
+def get_tenant_modules(tenant_id):
+    """Get enabled modules for a tenant from tenant_config."""
+    tenant = get_tenant(tenant_id)
+    if not tenant:
+        raise ValueError("Tenant not found")
+    db_name = tenant["db_name"]
+    dsn = TENANT_DB_URL_TEMPLATE.format(db_name=db_name)
+    conn = psycopg2.connect(dsn)
+    cur = conn.cursor()
+    try:
+        modules = {}
+        for key in ["module_whatsapp", "module_marketplace", "module_meli", "module_catalog"]:
+            cur.execute("SELECT value FROM tenant_config WHERE key = %s", (key,))
+            row = cur.fetchone()
+            modules[key.replace("module_", "")] = (row[0] or "").lower() == "true" if row else True
+        return modules
+    finally:
+        cur.close()
+        conn.close()
+
+
+def update_tenant_modules(tenant_id, modules):
+    """Update enabled modules for a tenant in tenant_config."""
+    tenant = get_tenant(tenant_id)
+    if not tenant:
+        raise ValueError("Tenant not found")
+    db_name = tenant["db_name"]
+    dsn = TENANT_DB_URL_TEMPLATE.format(db_name=db_name)
+    conn = psycopg2.connect(dsn)
+    cur = conn.cursor()
+    try:
+        key_map = {
+            "whatsapp": "module_whatsapp",
+            "marketplace": "module_marketplace",
+            "meli": "module_meli",
+            "catalog": "module_catalog",
+        }
+        for field, key in key_map.items():
+            value = "true" if modules.get(field) else "false"
+            cur.execute("""
+                INSERT INTO tenant_config (key, value) VALUES (%s, %s)
+                ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value
+            """, (key, value))
+        conn.commit()
+        return {"success": True, "tenant_id": tenant_id, "modules": modules}
+    finally:
+        cur.close()
+        conn.close()
+
+
 def get_dashboard_stats():
     """Global stats for the manager dashboard."""
     conn = get_master_conn()
diff --git a/manager/static/css/manager.css b/manager/static/css/manager.css
index 132ae17..5d177ac 100644
--- a/manager/static/css/manager.css
+++ b/manager/static/css/manager.css
@@ -661,3 +661,42 @@ body {
     .sidebar-brand span, .nav-item span, .user-info span { display: none; }
     .stats-grid { grid-template-columns: 1fr; }
 }
+
+/* Toggle switch for modules modal */
+.toggle-switch {
+    position: relative;
+    display: inline-block;
+    width: 44px;
+    height: 24px;
+    cursor: pointer;
+}
+.toggle-switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
+.toggle-slider {
+    position: absolute;
+    inset: 0;
+    background: var(--border);
+    border-radius: 24px;
+    transition: background 0.2s;
+}
+.toggle-slider::before {
+    content: "";
+    position: absolute;
+    height: 18px;
+    width: 18px;
+    left: 3px;
+    bottom: 3px;
+    background: white;
+    border-radius: 50%;
+    transition: transform 0.2s;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.2);
+}
+.toggle-switch input:checked + .toggle-slider {
+    background: var(--success);
+}
+.toggle-switch input:checked + .toggle-slider::before {
+    transform: translateX(20px);
+}
diff --git a/manager/static/js/manager.js b/manager/static/js/manager.js
index 327c33b..9455939 100644
--- a/manager/static/js/manager.js
+++ b/manager/static/js/manager.js
@@ -188,6 +188,7 @@ async function loadDemos() {
             <td><a href="https://${escapeHtml(d.subdomain)}.nexusautoparts.com.mx/pos/login" target="_blank" style="color:var(--accent)">${escapeHtml(d.subdomain)}</a></td>
             <td>${d.demo_days_left !== null ? d.demo_days_left + " días" : "N/A"}</td>
             <td>
+                <button class="btn-icon" onclick="openModulesModal(${d.id}, '${escapeHtml(d.name)}')" title="Módulos"><i class="fas fa-cubes" style="color:var(--accent)"></i></button>
                 <button class="btn-icon" onclick="resetTenant(${d.id})" title="Resetear"><i class="fas fa-undo"></i></button>
                 <button class="btn-icon" onclick="toggleTenant(${d.id}, ${!d.is_active})" title="${d.is_active ? "Desactivar" : "Activar"}"><i class="fas fa-${d.is_active ? "pause" : "play"}"></i></button>
                 <button class="btn-icon" onclick="confirmDelete(${d.id}, '${escapeHtml(d.name)}')" title="Eliminar"><i class="fas fa-trash" style="color:var(--danger)"></i></button>
@@ -254,6 +255,7 @@ async function loadTenants(withStats = false) {
             <td>${t.is_active ? tag("Activo", "success") : tag("Inactivo", "danger")}</td>
             <td>${formatDate(t.created_at)}</td>
             <td>
+                <button class="btn-icon" onclick="openModulesModal(${t.id}, '${escapeHtml(t.name)}')" title="Módulos"><i class="fas fa-cubes" style="color:var(--accent)"></i></button>
                 <button class="btn-icon" onclick="resetTenant(${t.id})" title="Resetear datos"><i class="fas fa-undo"></i></button>
                 <button class="btn-icon" onclick="toggleTenant(${t.id}, ${!t.is_active})" title="${t.is_active ? "Desactivar" : "Activar"}"><i class="fas fa-${t.is_active ? "pause" : "play"}"></i></button>
                 <button class="btn-icon" onclick="confirmDelete(${t.id}, '${escapeHtml(t.name)}')" title="Eliminar"><i class="fas fa-trash" style="color:var(--danger)"></i></button>
@@ -475,5 +477,60 @@ function copyText(text) {
     navigator.clipboard.writeText(text).then(() => toast("Copiado al portapapeles", "success"));
 }
 
+// ─── Modules ───────────────────────────────────────────────────────────────
+let currentModulesTenantId = null;
+
+async function openModulesModal(tenantId, name) {
+    currentModulesTenantId = tenantId;
+    document.getElementById("modules-modal-title").textContent = `Módulos — ${escapeHtml(name)}`;
+    document.getElementById("modules-modal").style.display = "flex";
+
+    // Load current state
+    const res = await api(`/api/tenants/${tenantId}/modules`);
+    if (res && res.status === 200) {
+        const m = res.data.data;
+        document.getElementById("mod-whatsapp").checked = m.whatsapp !== false;
+        document.getElementById("mod-marketplace").checked = m.marketplace !== false;
+        document.getElementById("mod-meli").checked = m.meli !== false;
+    } else {
+        toast("Error al cargar módulos", "error");
+    }
+}
+
+function closeModulesModal() {
+    document.getElementById("modules-modal").style.display = "none";
+    currentModulesTenantId = null;
+}
+
+async function saveModules() {
+    if (!currentModulesTenantId) return;
+    const btn = document.getElementById("modules-save-btn");
+    const originalText = btn.innerHTML;
+    btn.innerHTML = `<i class="fas fa-spinner fa-spin"></i> Guardando...`;
+    btn.disabled = true;
+
+    const payload = {
+        whatsapp: document.getElementById("mod-whatsapp").checked,
+        marketplace: document.getElementById("mod-marketplace").checked,
+        meli: document.getElementById("mod-meli").checked,
+        catalog: document.getElementById("mod-catalog").checked,
+    };
+
+    const res = await api(`/api/tenants/${currentModulesTenantId}/modules`, {
+        method: "PUT",
+        body: payload
+    });
+
+    if (res && res.status === 200) {
+        toast("Módulos actualizados", "success");
+        closeModulesModal();
+    } else {
+        toast(res?.data?.error || "Error al guardar", "error");
+    }
+
+    btn.innerHTML = originalText;
+    btn.disabled = false;
+}
+
 // ─── Init ──────────────────────────────────────────────────────────────────
 document.addEventListener("DOMContentLoaded", initAuth);
diff --git a/manager/systemd/nexus-manager.service b/manager/systemd/nexus-manager.service
index 2434503..ad9a36f 100644
--- a/manager/systemd/nexus-manager.service
+++ b/manager/systemd/nexus-manager.service
@@ -28,6 +28,10 @@ Environment=NEXUS_SERVER_HOST=127.0.0.1
 
 # ─── Security (CHANGE THIS) ────────────────────────────────────────────────
 Environment=MANAGER_JWT_SECRET=change-me-to-a-random-64-char-hex-string
+Environment=INTERNAL_API_KEY=c58db62766712e618a881dbe8de580960812e57a069ef92c9dd00e7e69158cb2
+
+# ─── POS Internal API (for WhatsApp bridge orchestration) ──────────────────
+Environment=POS_INTERNAL_URL=http://192.168.10.91:5001
 
 # ─── Redis (optional, health check only) ───────────────────────────────────
 Environment=REDIS_URL=redis://127.0.0.1:6379/0
diff --git a/manager/templates/index.html b/manager/templates/index.html
index 104e0eb..3c93734 100644
--- a/manager/templates/index.html
+++ b/manager/templates/index.html
@@ -316,6 +316,63 @@
         </div>
     </div>
 
+    <!-- Modules Modal -->
+    <div id="modules-modal" class="modal" style="display:none;">
+        <div class="modal-overlay" onclick="closeModulesModal()"></div>
+        <div class="modal-content" style="max-width:480px;">
+            <div class="modal-header">
+                <h3 id="modules-modal-title">Módulos del Tenant</h3>
+                <button class="btn-icon" onclick="closeModulesModal()"><i class="fas fa-times"></i></button>
+            </div>
+            <div class="modal-body">
+                <div class="form-group" style="display:flex;align-items:center;justify-content:space-between;padding:12px 0;border-bottom:1px solid var(--border);">
+                    <div>
+                        <div style="font-weight:600;color:var(--text);">WhatsApp</div>
+                        <div style="font-size:12px;color:var(--text-muted);">Mostrar menú de WhatsApp Bridge</div>
+                    </div>
+                    <label class="toggle-switch">
+                        <input type="checkbox" id="mod-whatsapp">
+                        <span class="toggle-slider"></span>
+                    </label>
+                </div>
+                <div class="form-group" style="display:flex;align-items:center;justify-content:space-between;padding:12px 0;border-bottom:1px solid var(--border);">
+                    <div>
+                        <div style="font-weight:600;color:var(--text);">Marketplace</div>
+                        <div style="font-size:12px;color:var(--text-muted);">Mostrar menú de Marketplace interno</div>
+                    </div>
+                    <label class="toggle-switch">
+                        <input type="checkbox" id="mod-marketplace">
+                        <span class="toggle-slider"></span>
+                    </label>
+                </div>
+                <div class="form-group" style="display:flex;align-items:center;justify-content:space-between;padding:12px 0;border-bottom:1px solid var(--border);">
+                    <div>
+                        <div style="font-weight:600;color:var(--text);">MercadoLibre</div>
+                        <div style="font-size:12px;color:var(--text-muted);">Mostrar menú de MercadoLibre</div>
+                    </div>
+                    <label class="toggle-switch">
+                        <input type="checkbox" id="mod-meli">
+                        <span class="toggle-slider"></span>
+                    </label>
+                </div>
+                <div class="form-group" style="display:flex;align-items:center;justify-content:space-between;padding:12px 0;">
+                    <div>
+                        <div style="font-weight:600;color:var(--text);">Catálogo</div>
+                        <div style="font-size:12px;color:var(--text-muted);">Mostrar menú de Catálogo de productos</div>
+                    </div>
+                    <label class="toggle-switch">
+                        <input type="checkbox" id="mod-catalog">
+                        <span class="toggle-slider"></span>
+                    </label>
+                </div>
+            </div>
+            <div class="modal-footer">
+                <button class="btn btn-secondary" onclick="closeModulesModal()">Cancelar</button>
+                <button class="btn btn-primary" id="modules-save-btn" onclick="saveModules()">Guardar</button>
+            </div>
+        </div>
+    </div>
+
     <!-- Toast -->
     <div id="toast-container"></div>
 
diff --git a/package.json b/package.json
index 32ba934..d91c582 100644
--- a/package.json
+++ b/package.json
@@ -19,5 +19,8 @@
   "type": "commonjs",
   "devDependencies": {
     "@playwright/test": "^1.59.1"
+  },
+  "dependencies": {
+    "playwright": "^1.60.0"
   }
 }
diff --git a/pos/app.py b/pos/app.py
index dcfa09b..7bf6c1d 100644
--- a/pos/app.py
+++ b/pos/app.py
@@ -59,6 +59,12 @@ def create_app():
     from blueprints.marketplace_bp import marketplace_bp
     app.register_blueprint(marketplace_bp)
 
+    from blueprints.marketplace_external_bp import marketplace_ext_bp
+    app.register_blueprint(marketplace_ext_bp)
+
+    from blueprints.dropshipping_bp import dropship_bp
+    app.register_blueprint(dropship_bp)
+
     from blueprints.peer_bp import peer_bp
     app.register_blueprint(peer_bp)
 
@@ -107,6 +113,9 @@ def create_app():
     from blueprints.supplier_portal_bp import supplier_portal_bp
     app.register_blueprint(supplier_portal_bp)
 
+    from blueprints.supplier_catalog_bp import supplier_catalog_bp
+    app.register_blueprint(supplier_catalog_bp)
+
     from blueprints.internal_bp import internal_bp
     app.register_blueprint(internal_bp)
 
@@ -128,6 +137,10 @@ def create_app():
                                tenant_name=getattr(g, 'tenant_name', None),
                                tenant_subdomain=getattr(g, 'tenant_subdomain', None))
 
+    @app.route('/pos/supplier-catalog')
+    def supplier_catalog_page():
+        return render_template('supplier_catalog.html')
+
     @app.route('/pos/catalog')
     def pos_catalog():
         return render_template('catalog.html')
@@ -180,6 +193,14 @@ def create_app():
     def pos_marketplace():
         return render_template('marketplace.html')
 
+    @app.route('/pos/marketplace-external')
+    def pos_marketplace_external():
+        return render_template('marketplace_external.html')
+
+    @app.route('/pos/marketplace-external/callback')
+    def pos_marketplace_external_callback():
+        return render_template('marketplace_external.html')
+
     @app.route('/pos/static/<path:filename>')
     def pos_static(filename):
         return send_from_directory('static', filename)
diff --git a/pos/blueprints/accounting_bp.py b/pos/blueprints/accounting_bp.py
index be611c2..373fa00 100644
--- a/pos/blueprints/accounting_bp.py
+++ b/pos/blueprints/accounting_bp.py
@@ -741,3 +741,45 @@ def close_period():
         cur.close()
         conn.close()
         return jsonify({'error': str(e)}), 500
+
+
+@accounting_bp.route('/stats', methods=['GET'])
+@require_auth('accounting.read')
+def api_accounting_stats():
+    """Return counts for tab badges: receivables (asset accounts with balance) and payables (liability accounts with balance)."""
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    # Count asset accounts with positive balance (cuentas por cobrar)
+    cur.execute("""
+        SELECT COUNT(*) FROM (
+            SELECT a.id
+            FROM accounts a
+            LEFT JOIN journal_entry_lines l ON l.account_id = a.id
+            WHERE a.type = 'activo' AND a.is_active = true
+            GROUP BY a.id
+            HAVING COALESCE(SUM(l.debit), 0) - COALESCE(SUM(l.credit), 0) > 0
+        ) x
+    """)
+    cxc = cur.fetchone()[0] or 0
+
+    # Count liability accounts with positive balance (cuentas por pagar)
+    cur.execute("""
+        SELECT COUNT(*) FROM (
+            SELECT a.id
+            FROM accounts a
+            LEFT JOIN journal_entry_lines l ON l.account_id = a.id
+            WHERE a.type = 'pasivo' AND a.is_active = true
+            GROUP BY a.id
+            HAVING COALESCE(SUM(l.credit), 0) - COALESCE(SUM(l.debit), 0) > 0
+        ) x
+    """)
+    cxp = cur.fetchone()[0] or 0
+
+    cur.close()
+    conn.close()
+
+    return jsonify({
+        'cuentas_cobrar': cxc,
+        'cuentas_pagar': cxp,
+    })
diff --git a/pos/blueprints/catalog_bp.py b/pos/blueprints/catalog_bp.py
index a466b82..c754b78 100644
--- a/pos/blueprints/catalog_bp.py
+++ b/pos/blueprints/catalog_bp.py
@@ -35,6 +35,25 @@ def _oem_blocked():
     return None
 
 
+def _get_allowed_brands(tenant_conn):
+    """Read allowed part brands from tenant_config. Returns list or None."""
+    import json
+    cur = tenant_conn.cursor()
+    try:
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'allowed_part_brands'")
+        row = cur.fetchone()
+        if row and row[0]:
+            try:
+                brands = json.loads(row[0])
+                if isinstance(brands, list) and brands:
+                    return brands
+            except (json.JSONDecodeError, ValueError):
+                pass
+    finally:
+        cur.close()
+    return None
+
+
 def _with_conns(fn):
     """Helper: open master + tenant connections, call fn, close both.
     fn receives (master_conn, tenant_conn, branch_id).
@@ -71,6 +90,34 @@ def _master_only(fn):
             except: pass
 
 
+def _filter_parts_by_allowed_brands(master_conn, parts_data, allowed_brands):
+    """Filter a list of part dicts to only include those with aftermarket equivalents
+    from allowed brands. parts_data items must have 'id_part' or 'id' key."""
+    if not allowed_brands or not parts_data:
+        return parts_data
+    part_ids = []
+    for p in parts_data:
+        pid = p.get('id_part') or p.get('id')
+        # Skip local inventory IDs (strings like 'inv:3') — aftermarket filter
+        # only applies to catalog parts with integer OEM part IDs.
+        if pid is not None and isinstance(pid, int):
+            part_ids.append(pid)
+    if not part_ids:
+        return parts_data
+    cur = master_conn.cursor()
+    try:
+        cur.execute("""
+            SELECT DISTINCT ap.oem_part_id
+            FROM aftermarket_parts ap
+            JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
+            WHERE ap.oem_part_id = ANY(%s) AND UPPER(m.name_manufacture) = ANY(%s)
+        """, (part_ids, allowed_brands))
+        allowed_ids = {r[0] for r in cur.fetchall()}
+    finally:
+        cur.close()
+    return [p for p in parts_data if (p.get('id_part') or p.get('id')) in allowed_ids]
+
+
 # ─── Hierarchy navigation (master DB only) ───
 
 @catalog_bp.route('/brands', methods=['GET'])
@@ -79,10 +126,11 @@ def brands():
     from services.catalog_modes import normalize_mode
     year_id = request.args.get('year_id', type=int)
     mode = normalize_mode(request.args.get('mode'))
-    def _do(master):
-        data = catalog_service.get_brands(master, year_id=year_id, mode=mode)
+    def _do(master, tenant, branch_id):
+        mye_ids = catalog_service._get_mye_ids_with_parts(tenant, tenant_id=g.tenant_id, master_conn=master) if tenant else None
+        data = catalog_service.get_brands(master, year_id=year_id, mode=mode, mye_ids=mye_ids)
         return jsonify({'data': data, 'mode': mode})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/models', methods=['GET'])
@@ -92,10 +140,11 @@ def models():
     year_id = request.args.get('year_id', type=int)
     if not brand_id:
         return jsonify({'error': 'brand_id required'}), 400
-    def _do(master):
-        data = catalog_service.get_models(master, brand_id, year_id=year_id)
+    def _do(master, tenant, branch_id):
+        mye_ids = catalog_service._get_mye_ids_with_parts(tenant, tenant_id=g.tenant_id, master_conn=master) if tenant else None
+        data = catalog_service.get_models(master, brand_id, year_id=year_id, mye_ids=mye_ids)
         return jsonify({'data': data})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/years', methods=['GET'])
@@ -104,10 +153,11 @@ def years():
     model_id = request.args.get('model_id', type=int)
     if not model_id:
         return jsonify({'error': 'model_id required'}), 400
-    def _do(master):
-        data = catalog_service.get_years(master, model_id)
+    def _do(master, tenant, branch_id):
+        mye_ids = catalog_service._get_mye_ids_with_parts(tenant, tenant_id=g.tenant_id, master_conn=master) if tenant else None
+        data = catalog_service.get_years(master, model_id, mye_ids=mye_ids)
         return jsonify({'data': data})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/years-all', methods=['GET'])
@@ -130,10 +180,11 @@ def engines():
     year_id = request.args.get('year_id', type=int)
     if not model_id or not year_id:
         return jsonify({'error': 'model_id and year_id required'}), 400
-    def _do(master):
-        data = catalog_service.get_engines(master, model_id, year_id)
+    def _do(master, tenant, branch_id):
+        mye_ids = catalog_service._get_mye_ids_with_parts(tenant, tenant_id=g.tenant_id, master_conn=master) if tenant else None
+        data = catalog_service.get_engines(master, model_id, year_id, mye_ids=mye_ids)
         return jsonify({'data': data})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/categories', methods=['GET'])
@@ -150,13 +201,14 @@ def categories():
     mode = normalize_mode(request.args.get('mode'))
     if not mye_id:
         return jsonify({'error': 'mye_id required'}), 400
-    def _do(master):
+    def _do(master, tenant, branch_id):
+        allowed_brands = _get_allowed_brands(tenant) if tenant else None
         if mode == 'local':
-            data = catalog_service.get_nexpart_groups_for_vehicle(master, mye_id)
+            data = catalog_service.get_nexpart_groups_for_vehicle(master, mye_id, tenant)
         else:
-            data = catalog_service.get_categories(master, mye_id)
-        return jsonify({'data': data, 'mode': mode})
-    return _master_only(_do)
+            data = catalog_service.get_categories(master, mye_id, allowed_brands)
+        return jsonify({'data': data, 'mode': mode, 'allowed_brands': allowed_brands or []})
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/groups', methods=['GET'])
@@ -174,17 +226,17 @@ def groups():
     mode = normalize_mode(request.args.get('mode'))
     if not mye_id:
         return jsonify({'error': 'mye_id required'}), 400
-    def _do(master):
+    def _do(master, tenant, branch_id):
         if mode == 'local':
             if not category_slug:
                 return jsonify({'error': 'category_slug required for local mode'}), 400
-            data = catalog_service.get_nexpart_subgroups_for_vehicle(master, mye_id, category_slug)
+            data = catalog_service.get_nexpart_subgroups_for_vehicle(master, mye_id, category_slug, tenant)
         else:
             if not category_id:
                 return jsonify({'error': 'category_id required for oem mode'}), 400
             data = catalog_service.get_groups(master, mye_id, category_id)
         return jsonify({'data': data, 'mode': mode})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 # ─── Parts with stock enrichment (master + tenant) ───
@@ -205,19 +257,19 @@ def part_types():
     mode = normalize_mode(request.args.get('mode'))
     if not mye_id:
         return jsonify({'error': 'mye_id required'}), 400
-    def _do(master):
+    def _do(master, tenant, branch_id):
         if mode == 'local':
             if not group_slug or not subgroup_slug:
                 return jsonify({'error': 'group_slug and subgroup_slug required for local mode'}), 400
             data = catalog_service.get_nexpart_part_types_for_vehicle(
-                master, mye_id, group_slug, subgroup_slug
+                master, mye_id, group_slug, subgroup_slug, tenant
             )
         else:
             if not group_id:
                 return jsonify({'error': 'group_id required for oem mode'}), 400
             data = catalog_service.get_part_types(master, mye_id, group_id)
         return jsonify({'data': data, 'mode': mode})
-    return _master_only(_do)
+    return _with_conns(_do)
 
 
 @catalog_bp.route('/shop-supplies/groups', methods=['GET'])
@@ -261,8 +313,8 @@ def shop_supplies_parts():
     group_slug = request.args.get('group_slug')
     subgroup_slug = request.args.get('subgroup_slug')
     part_type_slug = request.args.get('part_type_slug')
-    page = request.args.get('page', 1, type=int)
-    per_page = request.args.get('per_page', 30, type=int)
+    page = max(1, request.args.get('page', 1, type=int) or 1)
+    per_page = max(1, min(request.args.get('per_page', 30, type=int) or 30, 100))
     if not group_slug or not subgroup_slug or not part_type_slug:
         return jsonify({'error': 'group_slug, subgroup_slug, part_type_slug required'}), 400
     def _do(master, tenant, branch_id):
@@ -298,8 +350,8 @@ def parts():
     nexpart_subgroup = request.args.get('nexpart_subgroup')
     nexpart_part_type = request.args.get('nexpart_part_type')
 
-    page = request.args.get('page', 1, type=int)
-    per_page = request.args.get('per_page', 30, type=int)
+    page = max(1, request.args.get('page', 1, type=int) or 1)
+    per_page = max(1, min(request.args.get('per_page', 30, type=int) or 30, 100))
     mode = normalize_mode(request.args.get('mode'))
 
     if not mye_id:
@@ -317,19 +369,34 @@ def parts():
             return blocked
 
     def _do(master, tenant, branch_id):
+        allowed_brands = _get_allowed_brands(tenant) if tenant else None
+        # For local mode with allowed_brands, fetch everything first so filtering
+        # happens before pagination. OEM mode keeps post-filter for now.
+        fetch_all_for_filter = bool(allowed_brands) and (mode == 'local' or use_nexpart_nav)
+        _page = 1 if fetch_all_for_filter else page
+        _per_page = 9999 if fetch_all_for_filter else per_page
+
         if use_nexpart_nav:
             result = catalog_service.get_parts_for_nexpart_triple(
                 master, mye_id, nexpart_group, nexpart_subgroup, nexpart_part_type,
-                tenant, branch_id, page, per_page,
+                tenant, branch_id, _page, _per_page, tenant_id=g.tenant_id,
             )
         elif mode == 'local':
             result = catalog_service.get_parts_local(
-                master, mye_id, group_id, tenant, branch_id, page, per_page, part_type=part_type,
+                master, mye_id, group_id, tenant, branch_id, _page, _per_page, part_type=part_type,
             )
         else:
             result = catalog_service.get_parts(
                 master, mye_id, group_id, tenant, branch_id, page, per_page, part_type=part_type,
             )
+        if allowed_brands:
+            result['data'] = _filter_parts_by_allowed_brands(master, result.get('data', []), allowed_brands)
+            if fetch_all_for_filter:
+                total = len(result['data'])
+                offset = (page - 1) * per_page
+                result['data'] = result['data'][offset:offset + per_page]
+                result['pagination'] = catalog_service._pagination(page, per_page, total)
+        result['allowed_brands'] = allowed_brands or []
         return jsonify(result)
     return _with_conns(_do)
 
@@ -358,8 +425,11 @@ def search():
     limit = request.args.get('limit', 50, type=int)
     mye_id = request.args.get('mye_id', type=int)
     def _do(master, tenant, branch_id):
-        data = catalog_service.smart_search(master, q, tenant, branch_id, limit, mye_id)
-        return jsonify({'data': data})
+        allowed_brands = _get_allowed_brands(tenant) if tenant else None
+        data = catalog_service.smart_search(master, q, tenant, branch_id, limit, mye_id, tenant_id=g.tenant_id)
+        if allowed_brands:
+            data = _filter_parts_by_allowed_brands(master, data, allowed_brands)
+        return jsonify({'data': data, 'allowed_brands': allowed_brands or []})
     return _with_conns(_do)
 
 
@@ -635,10 +705,20 @@ def brand_categories():
     if not brand:
         return jsonify({'error': 'brand parameter required'}), 400
 
-    def _query(master):
+    def _query(master, tenant, branch_id):
         cur = master.cursor()
         try:
-            cur.execute("""
+            allowed_brands = _get_allowed_brands(tenant) if tenant else None
+            brand_filter = ""
+            params = [brand]
+            if allowed_brands:
+                brand_filter = """AND EXISTS (
+                    SELECT 1 FROM aftermarket_parts ap2
+                    JOIN manufacturers m2 ON m2.id_manufacture = ap2.manufacturer_id
+                    WHERE ap2.oem_part_id = p.id_part AND UPPER(m2.name_manufacture) = ANY(%s)
+                )"""
+                params.append(allowed_brands)
+            cur.execute(f"""
                 SELECT pc.id_part_category,
                        COALESCE(NULLIF(pc.name_es, ''), pc.name_part_category) as name,
                        pc.slug,
@@ -648,20 +728,22 @@ def brand_categories():
                 JOIN part_groups pg ON pg.id_part_group = p.group_id
                 JOIN part_categories pc ON pc.id_part_category = pg.category_id
                 WHERE pvp.name_brand = %s
+                {brand_filter}
                 GROUP BY pc.id_part_category, pc.name_part_category, pc.name_es, pc.slug
                 ORDER BY part_count DESC
-            """, (brand,))
+            """, params)
             rows = cur.fetchall()
             return jsonify({
                 'brand': brand,
                 'categories': [
                     {'id': r[0], 'name': r[1], 'slug': r[2], 'part_count': r[3]}
                     for r in rows
-                ]
+                ],
+                'allowed_brands': allowed_brands or []
             })
         finally:
             cur.close()
-    return _master_only(_query)
+    return _with_conns(_query)
 
 
 @catalog_bp.route('/brand-parts', methods=['GET'])
@@ -680,21 +762,110 @@ def brand_parts():
     def _query(master, tenant, branch_id):
         cur = master.cursor()
         try:
-            # Build dynamic filters
-            params = [brand]
+            allowed_brands = _get_allowed_brands(tenant) if tenant else None
+
             cat_filter = ""
             search_filter = ""
+            params = [brand]
 
             if category_id:
                 cat_filter = "AND pc.id_part_category = %s"
                 params.append(category_id)
 
+            # --- Brand-filtered mode: return aftermarket parts directly ---
+            if allowed_brands:
+                am_search = ""
+                am_params = list(params)
+                if search:
+                    am_search = "AND (ap.part_number ILIKE %s OR COALESCE(NULLIF(ap.name_aftermarket_parts, ''), p.name_part) ILIKE %s)"
+                    like_term = f"%{search}%"
+                    am_params.extend([like_term, like_term])
+
+                query_params = list(am_params)
+                cur.execute(f"""
+                    SELECT DISTINCT ap.id_aftermarket_parts,
+                           ap.part_number,
+                           COALESCE(NULLIF(ap.name_aftermarket_parts, ''), p.name_part) as name,
+                           m.name_manufacture,
+                           ap.price_usd,
+                           p.id_part,
+                           pg.id_part_group, pg.name_part_group,
+                           pc.id_part_category, pc.name_part_category
+                    FROM part_vehicle_preview pvp
+                    JOIN parts p ON p.id_part = pvp.part_id
+                    JOIN aftermarket_parts ap ON ap.oem_part_id = p.id_part
+                    JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
+                    JOIN part_groups pg ON pg.id_part_group = p.group_id
+                    JOIN part_categories pc ON pc.id_part_category = pg.category_id
+                    WHERE pvp.name_brand = %s
+                    {cat_filter}
+                    {am_search}
+                    AND UPPER(m.name_manufacture) = ANY(%s)
+                    ORDER BY m.name_manufacture, ap.part_number
+                    LIMIT %s OFFSET %s
+                """, query_params + [allowed_brands, limit, offset])
+
+                part_rows = cur.fetchall()
+                oem_ids = [r[5] for r in part_rows]
+
+                count_params = list(am_params)
+                cur.execute(f"""
+                    SELECT COUNT(DISTINCT ap.id_aftermarket_parts)
+                    FROM part_vehicle_preview pvp
+                    JOIN parts p ON p.id_part = pvp.part_id
+                    JOIN aftermarket_parts ap ON ap.oem_part_id = p.id_part
+                    JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
+                    JOIN part_groups pg ON pg.id_part_group = p.group_id
+                    JOIN part_categories pc ON pc.id_part_category = pg.category_id
+                    WHERE pvp.name_brand = %s
+                    {cat_filter}
+                    {am_search}
+                    AND UPPER(m.name_manufacture) = ANY(%s)
+                """, count_params + [allowed_brands])
+                total = cur.fetchone()[0]
+
+                local_stock = {}
+                if tenant and oem_ids:
+                    try:
+                        from services.catalog_service import _get_local_stock_bulk
+                        local_stock = _get_local_stock_bulk(tenant, branch_id, oem_ids, [])
+                    except Exception:
+                        pass
+
+                items = []
+                for r in part_rows:
+                    oem_id = r[5]
+                    stock_info = local_stock.get(oem_id, {})
+                    items.append({
+                        'id': r[0],
+                        'oem_part_number': r[1],
+                        'name': r[2],
+                        'manufacturer': r[3],
+                        'price_usd': float(r[4]) if r[4] is not None else None,
+                        'oem_id': oem_id,
+                        'group': {'id': r[6], 'name': r[7]},
+                        'category': {'id': r[8], 'name': r[9]},
+                        'local_stock': stock_info.get('stock', 0),
+                        'local_price': stock_info.get('price', None),
+                    })
+
+                return jsonify({
+                    'brand': brand,
+                    'category_id': category_id,
+                    'search': search,
+                    'items': items,
+                    'total': total,
+                    'limit': limit,
+                    'offset': offset,
+                    'allowed_brands': allowed_brands
+                })
+
+            # --- Normal mode: return OEM parts ---
             if search:
                 search_filter = "AND (p.oem_part_number ILIKE %s OR COALESCE(NULLIF(p.name_es, ''), p.name_part) ILIKE %s)"
                 like_term = f"%{search}%"
                 params.extend([like_term, like_term])
 
-            # Get parts from the brand catalog
             query_params = list(params)
             cur.execute(f"""
                 SELECT DISTINCT p.id_part, p.oem_part_number,
@@ -715,7 +886,7 @@ def brand_parts():
             part_rows = cur.fetchall()
             part_ids = [r[0] for r in part_rows]
 
-            # Count total
+            count_params = list(params)
             cur.execute(f"""
                 SELECT COUNT(DISTINCT p.id_part)
                 FROM part_vehicle_preview pvp
@@ -725,15 +896,14 @@ def brand_parts():
                 WHERE pvp.name_brand = %s
                 {cat_filter}
                 {search_filter}
-            """, params)
+            """, count_params)
             total = cur.fetchone()[0]
 
-            # Enrich with local stock if available
             local_stock = {}
             if tenant and part_ids:
                 try:
                     from services.catalog_service import _get_local_stock_bulk
-                    local_stock = _get_local_stock_bulk(tenant, part_ids)
+                    local_stock = _get_local_stock_bulk(tenant, branch_id, [], part_ids)
                 except Exception:
                     pass
 
@@ -759,6 +929,7 @@ def brand_parts():
                 'total': total,
                 'limit': limit,
                 'offset': offset,
+                'allowed_brands': []
             })
         finally:
             cur.close()
@@ -784,7 +955,8 @@ def mye_parts():
     def _query(master, tenant, branch_id):
         cur = master.cursor()
         try:
-            # Build dynamic filters
+            allowed_brands = _get_allowed_brands(tenant) if tenant else None
+
             cat_filter = ""
             search_filter = ""
             params = [mye_id]
@@ -793,12 +965,103 @@ def mye_parts():
                 cat_filter = "AND pc.id_part_category = %s"
                 params.append(category_id)
 
+            # --- Brand-filtered mode: return aftermarket parts directly ---
+            if allowed_brands:
+                am_search = ""
+                am_params = list(params)
+                if search:
+                    am_search = "AND (ap.part_number ILIKE %s OR COALESCE(NULLIF(ap.name_aftermarket_parts, ''), p.name_part) ILIKE %s)"
+                    like_term = f"%{search}%"
+                    am_params.extend([like_term, like_term])
+
+                # Get aftermarket parts
+                query_params = list(am_params)
+                cur.execute(f"""
+                    SELECT DISTINCT ap.id_aftermarket_parts,
+                           ap.part_number,
+                           COALESCE(NULLIF(ap.name_aftermarket_parts, ''), p.name_part) as name,
+                           m.name_manufacture,
+                           ap.price_usd,
+                           p.id_part,
+                           pg.id_part_group, pg.name_part_group,
+                           pc.id_part_category, pc.name_part_category
+                    FROM vehicle_parts vp
+                    JOIN parts p ON p.id_part = vp.part_id
+                    JOIN aftermarket_parts ap ON ap.oem_part_id = p.id_part
+                    JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
+                    JOIN part_groups pg ON pg.id_part_group = p.group_id
+                    JOIN part_categories pc ON pc.id_part_category = pg.category_id
+                    WHERE vp.model_year_engine_id = %s
+                    {cat_filter}
+                    {am_search}
+                    AND UPPER(m.name_manufacture) = ANY(%s)
+                    ORDER BY m.name_manufacture, ap.part_number
+                    LIMIT %s OFFSET %s
+                """, query_params + [allowed_brands, limit, offset])
+
+                part_rows = cur.fetchall()
+                oem_ids = [r[5] for r in part_rows]
+
+                # Count total
+                count_params = list(am_params)
+                cur.execute(f"""
+                    SELECT COUNT(DISTINCT ap.id_aftermarket_parts)
+                    FROM vehicle_parts vp
+                    JOIN parts p ON p.id_part = vp.part_id
+                    JOIN aftermarket_parts ap ON ap.oem_part_id = p.id_part
+                    JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
+                    JOIN part_groups pg ON pg.id_part_group = p.group_id
+                    JOIN part_categories pc ON pc.id_part_category = pg.category_id
+                    WHERE vp.model_year_engine_id = %s
+                    {cat_filter}
+                    {am_search}
+                    AND UPPER(m.name_manufacture) = ANY(%s)
+                """, count_params + [allowed_brands])
+                total = cur.fetchone()[0]
+
+                # Local stock keyed by OEM part id
+                local_stock = {}
+                if tenant and oem_ids:
+                    try:
+                        from services.catalog_service import _get_local_stock_bulk
+                        local_stock = _get_local_stock_bulk(tenant, branch_id, oem_ids, [])
+                    except Exception:
+                        pass
+
+                items = []
+                for r in part_rows:
+                    oem_id = r[5]
+                    stock_info = local_stock.get(oem_id, {})
+                    items.append({
+                        'id': r[0],
+                        'oem_part_number': r[1],
+                        'name': r[2],
+                        'manufacturer': r[3],
+                        'price_usd': float(r[4]) if r[4] is not None else None,
+                        'oem_id': oem_id,
+                        'group': {'id': r[6], 'name': r[7]},
+                        'category': {'id': r[8], 'name': r[9]},
+                        'local_stock': stock_info.get('stock', 0),
+                        'local_price': stock_info.get('price', None),
+                    })
+
+                return jsonify({
+                    'mye_id': mye_id,
+                    'category_id': category_id,
+                    'search': search,
+                    'items': items,
+                    'total': total,
+                    'limit': limit,
+                    'offset': offset,
+                    'allowed_brands': allowed_brands
+                })
+
+            # --- Normal mode: return OEM parts ---
             if search:
                 search_filter = "AND (p.oem_part_number ILIKE %s OR COALESCE(NULLIF(p.name_es, ''), p.name_part) ILIKE %s)"
                 like_term = f"%{search}%"
                 params.extend([like_term, like_term])
 
-            # Get parts
             query_params = list(params)
             cur.execute(f"""
                 SELECT DISTINCT p.id_part, p.oem_part_number,
@@ -819,7 +1082,7 @@ def mye_parts():
             part_rows = cur.fetchall()
             part_ids = [r[0] for r in part_rows]
 
-            # Count total
+            count_params = list(params)
             cur.execute(f"""
                 SELECT COUNT(DISTINCT p.id_part)
                 FROM vehicle_parts vp
@@ -829,15 +1092,14 @@ def mye_parts():
                 WHERE vp.model_year_engine_id = %s
                 {cat_filter}
                 {search_filter}
-            """, params)
+            """, count_params)
             total = cur.fetchone()[0]
 
-            # Enrich with local stock if available
             local_stock = {}
             if tenant and part_ids:
                 try:
                     from services.catalog_service import _get_local_stock_bulk
-                    local_stock = _get_local_stock_bulk(tenant, part_ids)
+                    local_stock = _get_local_stock_bulk(tenant, branch_id, [], part_ids)
                 except Exception:
                     pass
 
@@ -863,6 +1125,7 @@ def mye_parts():
                 'total': total,
                 'limit': limit,
                 'offset': offset,
+                'allowed_brands': []
             })
         finally:
             cur.close()
diff --git a/pos/blueprints/config_bp.py b/pos/blueprints/config_bp.py
index 1adfb6d..d566b06 100644
--- a/pos/blueprints/config_bp.py
+++ b/pos/blueprints/config_bp.py
@@ -13,15 +13,51 @@ config_bp = Blueprint('config', __name__, url_prefix='/pos/api/config')
 def list_branches():
     conn = get_tenant_conn(g.tenant_id)
     cur = conn.cursor()
-    cur.execute("SELECT id, name, address, phone, is_active FROM branches ORDER BY id")
+    cur.execute("""
+        SELECT id, name, address, phone, is_active, is_main,
+               rfc, razon_social, regimen_fiscal, cp,
+               direccion_fiscal, serie_cfdi, folio_inicio, folio_actual, email
+        FROM branches ORDER BY id
+    """)
     branches = []
     for r in cur.fetchall():
-        branches.append({'id': r[0], 'name': r[1], 'address': r[2], 'phone': r[3], 'is_active': r[4]})
+        branches.append({
+            'id': r[0], 'name': r[1], 'address': r[2], 'phone': r[3],
+            'is_active': r[4], 'is_main': r[5],
+            'rfc': r[6], 'razon_social': r[7], 'regimen_fiscal': r[8],
+            'cp': r[9], 'direccion_fiscal': r[10], 'serie_cfdi': r[11],
+            'folio_inicio': r[12], 'folio_actual': r[13], 'email': r[14],
+        })
     cur.close()
     conn.close()
     return jsonify({'data': branches})
 
 
+@config_bp.route('/branches/<int:branch_id>', methods=['GET'])
+@require_auth('config.view')
+def get_branch(branch_id):
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT id, name, address, phone, is_active, is_main,
+               rfc, razon_social, regimen_fiscal, cp,
+               direccion_fiscal, serie_cfdi, folio_inicio, folio_actual, email
+        FROM branches WHERE id = %s
+    """, (branch_id,))
+    r = cur.fetchone()
+    cur.close()
+    conn.close()
+    if not r:
+        return jsonify({'error': 'Branch not found'}), 404
+    return jsonify({
+        'id': r[0], 'name': r[1], 'address': r[2], 'phone': r[3],
+        'is_active': r[4], 'is_main': r[5],
+        'rfc': r[6], 'razon_social': r[7], 'regimen_fiscal': r[8],
+        'cp': r[9], 'direccion_fiscal': r[10], 'serie_cfdi': r[11],
+        'folio_inicio': r[12], 'folio_actual': r[13], 'email': r[14],
+    })
+
+
 @config_bp.route('/branches', methods=['POST'])
 @require_auth('config.edit')
 def create_branch():
@@ -47,10 +83,23 @@ def create_branch():
 
     conn = get_tenant_conn(g.tenant_id)
     cur = conn.cursor()
+
+    # If setting as main, clear any existing main
+    if data.get('is_main'):
+        cur.execute("UPDATE branches SET is_main = false WHERE is_main = true")
+
     cur.execute("""
-        INSERT INTO branches (name, address, phone)
-        VALUES (%s, %s, %s) RETURNING id
-    """, (data['name'], data.get('address'), data.get('phone')))
+        INSERT INTO branches (
+            name, address, phone, is_main,
+            rfc, razon_social, regimen_fiscal, cp,
+            direccion_fiscal, serie_cfdi, folio_inicio, folio_actual, email
+        )
+        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s) RETURNING id
+    """, (
+        data['name'], data.get('address'), data.get('phone'), bool(data.get('is_main')),
+        data.get('rfc'), data.get('razon_social'), data.get('regimen_fiscal'), data.get('cp'),
+        data.get('direccion_fiscal'), data.get('serie_cfdi'), data.get('folio_inicio'), data.get('folio_actual'), data.get('email'),
+    ))
     branch_id = cur.fetchone()[0]
     conn.commit()
     cur.close()
@@ -58,6 +107,49 @@ def create_branch():
     return jsonify({'id': branch_id, 'message': 'Branch created'}), 201
 
 
+@config_bp.route('/branches/<int:branch_id>', methods=['PUT'])
+@require_auth('config.edit')
+def update_branch(branch_id):
+    data = request.get_json() or {}
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    cur.execute("SELECT id FROM branches WHERE id = %s", (branch_id,))
+    if not cur.fetchone():
+        cur.close(); conn.close()
+        return jsonify({'error': 'Branch not found'}), 404
+
+    # If setting as main, clear any existing main
+    if data.get('is_main'):
+        cur.execute("UPDATE branches SET is_main = false WHERE is_main = true AND id <> %s", (branch_id,))
+
+    updates = []
+    params = []
+    field_map = {
+        'name': 'name', 'address': 'address', 'phone': 'phone',
+        'is_active': 'is_active', 'is_main': 'is_main',
+        'rfc': 'rfc', 'razon_social': 'razon_social',
+        'regimen_fiscal': 'regimen_fiscal', 'cp': 'cp',
+        'direccion_fiscal': 'direccion_fiscal', 'serie_cfdi': 'serie_cfdi',
+        'folio_inicio': 'folio_inicio', 'folio_actual': 'folio_actual', 'email': 'email',
+    }
+    for json_key, col in field_map.items():
+        if json_key in data:
+            updates.append(f"{col} = %s")
+            params.append(data[json_key])
+
+    if not updates:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Nothing to update'}), 400
+
+    params.append(branch_id)
+    cur.execute(f"UPDATE branches SET {', '.join(updates)} WHERE id = %s", params)
+    conn.commit()
+    cur.close()
+    conn.close()
+    return jsonify({'ok': True, 'message': 'Branch updated'})
+
+
 @config_bp.route('/employees', methods=['GET'])
 @require_auth('config.view')
 def list_employees():
@@ -469,21 +561,12 @@ _ALLOWED_PART_BRANDS = [
 @config_bp.route('/available-brands', methods=['GET'])
 @require_auth()
 def get_available_brands():
-    """Return whitelisted aftermarket manufacturer names from master DB."""
-    from tenant_db import get_master_conn
-    conn = get_master_conn()
-    cur = conn.cursor()
-    cur.execute("""
-        SELECT DISTINCT m.name_manufacture
-        FROM manufacturers m
-        JOIN aftermarket_parts ap ON ap.manufacturer_id = m.id_manufacture
-        WHERE m.name_manufacture IS NOT NULL AND m.name_manufacture != ''
-          AND LOWER(m.name_manufacture) = ANY(%s)
-        ORDER BY m.name_manufacture ASC
-    """, ([b.lower() for b in _ALLOWED_PART_BRANDS],))
-    brands = [r[0] for r in cur.fetchall()]
-    cur.close()
-    conn.close()
+    """Return the whitelisted part manufacturer names.
+
+    The master DB manufacturers/aftermarket_parts tables were removed with
+    TecDoc, so we return the curated whitelist directly.
+    """
+    brands = sorted({b.strip() for b in _ALLOWED_PART_BRANDS if b and b.strip()})
     return jsonify({'brands': brands})
 
 
@@ -579,6 +662,60 @@ def update_whatsapp_config():
     return jsonify({'message': 'WhatsApp configuration updated'})
 
 
+@config_bp.route('/modules', methods=['GET'])
+@require_auth('config.view')
+def get_modules():
+    """Get enabled modules for this tenant."""
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+    cur.execute("SELECT key, value FROM tenant_config WHERE key LIKE 'module_%'")
+    rows = {row[0]: row[1] for row in cur.fetchall()}
+    cur.close()
+    conn.close()
+
+    def _bool(key):
+        return rows.get(key, 'true').lower() == 'true'
+
+    return jsonify({
+        'whatsapp': _bool('module_whatsapp'),
+        'marketplace': _bool('module_marketplace'),
+        'meli': _bool('module_meli'),
+        'catalog': _bool('module_catalog'),
+    })
+
+
+@config_bp.route('/modules', methods=['PUT'])
+@require_auth('config.edit')
+def update_modules():
+    """Update enabled modules for this tenant."""
+    data = request.get_json() or {}
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    settings = {
+        'module_whatsapp': 'true' if data.get('whatsapp') else 'false',
+        'module_marketplace': 'true' if data.get('marketplace') else 'false',
+        'module_meli': 'true' if data.get('meli') else 'false',
+        'module_catalog': 'true' if data.get('catalog') else 'false',
+    }
+
+    for key, value in settings.items():
+        cur.execute("""
+            INSERT INTO tenant_config (key, value) VALUES (%s, %s)
+            ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value
+        """, (key, value))
+
+    conn.commit()
+    cur.close()
+    conn.close()
+
+    return jsonify({'message': 'Modules updated', 'modules': {
+        'whatsapp': data.get('whatsapp'),
+        'marketplace': data.get('marketplace'),
+        'meli': data.get('meli'),
+    }})
+
+
 @config_bp.route('/onboarding-status', methods=['GET'])
 @require_auth('pos.view')
 def get_onboarding_status():
diff --git a/pos/blueprints/customers_bp.py b/pos/blueprints/customers_bp.py
index 73a277f..bd00503 100644
--- a/pos/blueprints/customers_bp.py
+++ b/pos/blueprints/customers_bp.py
@@ -52,6 +52,7 @@ def list_customers():
     # Fetch
     cur.execute(f"""
         SELECT c.id, c.name, c.rfc, c.razon_social, c.phone, c.email,
+               c.address, c.cp,
                c.price_tier, c.credit_limit, c.credit_balance, c.vehicle_info,
                c.branch_id
         FROM customers c
@@ -64,11 +65,12 @@ def list_customers():
     for r in cur.fetchall():
         customers.append({
             'id': r[0], 'name': r[1], 'rfc': r[2], 'razon_social': r[3],
-            'phone': r[4], 'email': r[5], 'price_tier': r[6],
-            'credit_limit': float(r[7]) if r[7] else 0,
-            'credit_balance': float(r[8]) if r[8] else 0,
-            'vehicle_info': r[9],
-            'branch_id': r[10],
+            'phone': r[4], 'email': r[5], 'address': r[6], 'cp': r[7],
+            'price_tier': r[8],
+            'credit_limit': float(r[9]) if r[9] else 0,
+            'credit_balance': float(r[10]) if r[10] else 0,
+            'vehicle_info': r[11],
+            'branch_id': r[12],
         })
 
     cur.close()
@@ -91,7 +93,7 @@ def get_customer(customer_id):
     cur.execute("""
         SELECT id, branch_id, name, rfc, razon_social, regimen_fiscal, uso_cfdi,
                cp, email, phone, address, price_tier, credit_limit, credit_balance,
-               is_active, vehicle_info, created_at
+               is_active, vehicle_info, created_at, max_discount_pct
         FROM customers WHERE id = %s
     """, (customer_id,))
     row = cur.fetchone()
@@ -103,7 +105,7 @@ def get_customer(customer_id):
     customer = dict(zip(cols, row))
 
     # Convert Decimal to float
-    for k in ('credit_limit', 'credit_balance'):
+    for k in ('credit_limit', 'credit_balance', 'max_discount_pct'):
         if customer.get(k) is not None:
             customer[k] = float(customer[k])
 
@@ -213,7 +215,7 @@ def update_customer(customer_id):
     # Build dynamic update
     allowed = ['name', 'rfc', 'razon_social', 'regimen_fiscal', 'uso_cfdi',
                'cp', 'email', 'phone', 'address', 'price_tier', 'credit_limit',
-               'vehicle_info', 'is_active', 'branch_id']
+               'max_discount_pct', 'vehicle_info', 'is_active', 'branch_id']
     sets = []
     vals = []
     for field in allowed:
diff --git a/pos/blueprints/dashboard_stats_bp.py b/pos/blueprints/dashboard_stats_bp.py
index a25fae3..3479520 100644
--- a/pos/blueprints/dashboard_stats_bp.py
+++ b/pos/blueprints/dashboard_stats_bp.py
@@ -12,6 +12,7 @@ dashboard_stats_bp = Blueprint('dashboard_stats', __name__, url_prefix='/pos/api
 
 
 from middleware import require_auth
+from tenant_db import get_tenant_conn
 
 
 class DecimalEncoder(json.JSONEncoder):
@@ -25,83 +26,95 @@ class DecimalEncoder(json.JSONEncoder):
 @require_auth()
 def get_stats():
     """Summary stats for today and this month."""
-    from tenant_db import get_tenant_db
-    db = get_tenant_db()
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
     today = datetime.utcnow().date()
     month_start = today.replace(day=1)
 
-    # Sales today
-    today_sales = db.execute(
-        """SELECT COUNT(*) as count, COALESCE(SUM(total), 0) as total
-           FROM sales WHERE DATE(created_at) = %s""", (today,)
-    ).fetchone()
+    try:
+        # Sales today
+        cur.execute(
+            """SELECT COUNT(*) as count, COALESCE(SUM(total), 0) as total
+               FROM sales WHERE DATE(created_at) = %s""", (today,)
+        )
+        today_sales = cur.fetchone()
 
-    # Sales this month
-    month_sales = db.execute(
-        """SELECT COUNT(*) as count, COALESCE(SUM(total), 0) as total
-           FROM sales WHERE DATE(created_at) >= %s""", (month_start,)
-    ).fetchone()
+        # Sales this month
+        cur.execute(
+            """SELECT COUNT(*) as count, COALESCE(SUM(total), 0) as total
+               FROM sales WHERE DATE(created_at) >= %s""", (month_start,)
+        )
+        month_sales = cur.fetchone()
 
-    # Top 5 products today
-    top_products = db.execute(
-        """SELECT p.name, SUM(si.quantity) as qty, SUM(si.total) as revenue
-           FROM sale_items si
-           JOIN sales s ON si.sale_id = s.id_sale
-           JOIN parts p ON si.part_id = p.id_part
-           WHERE DATE(s.created_at) = %s
-           GROUP BY p.name
-           ORDER BY revenue DESC
-           LIMIT 5""", (today,)
-    ).fetchall()
+        # Top 5 products today
+        cur.execute(
+            """SELECT si.name, SUM(si.quantity) as qty, SUM(si.subtotal) as revenue
+               FROM sale_items si
+               JOIN sales s ON si.sale_id = s.id
+               WHERE DATE(s.created_at) = %s
+               GROUP BY si.name
+               ORDER BY revenue DESC
+               LIMIT 5""", (today,)
+        )
+        top_products = cur.fetchall()
 
-    # Hourly sales today (0-23)
-    hourly = db.execute(
-        """SELECT EXTRACT(HOUR FROM created_at)::int as hour,
-                  COUNT(*) as count, COALESCE(SUM(total), 0) as total
-           FROM sales WHERE DATE(created_at) = %s
-           GROUP BY hour ORDER BY hour""", (today,)
-    ).fetchall()
-    hourly_map = {row['hour']: {'count': row['count'], 'total': row['total']} for row in hourly}
+        # Hourly sales today (0-23)
+        cur.execute(
+            """SELECT EXTRACT(HOUR FROM created_at)::int as hour,
+                      COUNT(*) as count, COALESCE(SUM(total), 0) as total
+               FROM sales WHERE DATE(created_at) = %s
+               GROUP BY hour ORDER BY hour""", (today,)
+        )
+        hourly = cur.fetchall()
+        hourly_map = {row[0]: {'count': row[1], 'total': row[2]} for row in hourly}
 
-    return jsonify({
-        'today': {
-            'sales_count': today_sales['count'],
-            'sales_total': today_sales['total'],
-        },
-        'month': {
-            'sales_count': month_sales['count'],
-            'sales_total': month_sales['total'],
-        },
-        'top_products': [
-            {'name': row['name'], 'quantity': row['qty'], 'revenue': row['revenue']}
-            for row in top_products
-        ],
-        'hourly_sales': [
-            {'hour': h, 'count': hourly_map.get(h, {}).get('count', 0),
-             'total': hourly_map.get(h, {}).get('total', 0)}
-            for h in range(24)
-        ],
-    }, cls=DecimalEncoder)
+        return jsonify({
+            'today': {
+                'sales_count': today_sales[0],
+                'sales_total': float(today_sales[1]) if today_sales[1] is not None else 0,
+            },
+            'month': {
+                'sales_count': month_sales[0],
+                'sales_total': float(month_sales[1]) if month_sales[1] is not None else 0,
+            },
+            'top_products': [
+                {'name': row[0], 'quantity': row[1], 'revenue': float(row[2]) if row[2] is not None else 0}
+                for row in top_products
+            ],
+            'hourly_sales': [
+                {'hour': h, 'count': hourly_map.get(h, {}).get('count', 0),
+                 'total': float(hourly_map.get(h, {}).get('total', 0))}
+                for h in range(24)
+            ],
+        })
+    finally:
+        cur.close()
+        conn.close()
 
 
 @dashboard_stats_bp.route('/stats/employees', methods=['GET'])
 @require_auth()
 def get_employee_stats():
     """Sales per employee today."""
-    from tenant_db import get_tenant_db
-    db = get_tenant_db()
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
     today = datetime.utcnow().date()
-    rows = db.execute(
-        """SELECT e.name, COUNT(s.id_sale) as sales, COALESCE(SUM(s.total), 0) as total
-           FROM sales s
-           JOIN employees e ON s.employee_id = e.id_employee
-           WHERE DATE(s.created_at) = %s
-           GROUP BY e.name
-           ORDER BY total DESC""", (today,)
-    ).fetchall()
-    return jsonify({
-        'employees': [
-            {'name': row['name'], 'sales': row['sales'], 'total': row['total']}
-            for row in rows
-        ]
-    }, cls=DecimalEncoder)
+    try:
+        cur.execute(
+            """SELECT e.name, COUNT(s.id) as sales, COALESCE(SUM(s.total), 0) as total
+               FROM sales s
+               JOIN employees e ON s.employee_id = e.id
+               WHERE DATE(s.created_at) = %s
+               GROUP BY e.name
+               ORDER BY total DESC""", (today,)
+        )
+        rows = cur.fetchall()
+        return jsonify({
+            'employees': [
+                {'name': row[0], 'sales': row[1], 'total': float(row[2]) if row[2] is not None else 0}
+                for row in rows
+            ]
+        })
+    finally:
+        cur.close()
+        conn.close()
diff --git a/pos/blueprints/dropshipping_bp.py b/pos/blueprints/dropshipping_bp.py
new file mode 100644
index 0000000..2c958ad
--- /dev/null
+++ b/pos/blueprints/dropshipping_bp.py
@@ -0,0 +1,128 @@
+"""Dropshipping API — public read-only inventory endpoints.
+
+Authentication: X-Dropshipping-Key header (per-tenant).
+Optional: X-Tenant-Subdomain for faster resolution.
+"""
+
+from flask import Blueprint, request, jsonify, g
+from tenant_db import get_tenant_conn, get_master_conn
+from services import dropshipping_service as ds_svc
+from services.webhook_service import dispatch_webhooks_bulk
+
+dropship_bp = Blueprint("dropship", __name__, url_prefix="/pos/api/dropship")
+
+
+def _resolve_tenant_by_key(api_key: str, subdomain_hint: str = None):
+    """Return (tenant_conn, tenant_id) for a valid dropshipping API key.
+
+    If subdomain_hint is provided, validate only that tenant.
+    Otherwise scan active tenants (acceptable for small tenant count).
+    """
+    master = get_master_conn()
+    try:
+        cur = master.cursor()
+        if subdomain_hint:
+            cur.execute(
+                "SELECT id, db_name FROM tenants WHERE subdomain = %s AND is_active = true",
+                (subdomain_hint,),
+            )
+            rows = cur.fetchall()
+        else:
+            cur.execute("SELECT id, db_name FROM tenants WHERE is_active = true")
+            rows = cur.fetchall()
+        cur.close()
+
+        for tid, db_name in rows:
+            try:
+                tconn = get_tenant_conn(tid)
+                if ds_svc.validate_api_key(tconn, api_key):
+                    return tconn, tid
+                tconn.close()
+            except Exception:
+                continue
+        return None, None
+    finally:
+        master.close()
+
+
+def _require_dropship_auth():
+    key = request.headers.get("X-Dropshipping-Key")
+    subdomain = request.headers.get("X-Tenant-Subdomain")
+    if not key:
+        return jsonify({"error": "Missing X-Dropshipping-Key header"}), 401
+    tconn, tid = _resolve_tenant_by_key(key, subdomain_hint=subdomain)
+    if not tconn:
+        return jsonify({"error": "Invalid API key or tenant inactive"}), 401
+    g.tenant_id = tid
+    g.tenant_conn = tconn
+    return None
+
+
+def _release_tenant():
+    if hasattr(g, "tenant_conn") and g.tenant_conn:
+        g.tenant_conn.close()
+
+
+@dropship_bp.route("/inventory", methods=["GET"])
+def list_inventory():
+    err = _require_dropship_auth()
+    if err:
+        return err
+    try:
+        page = int(request.args.get("page", 1))
+        per_page = min(int(request.args.get("per_page", 50)), 200)
+        search = request.args.get("q")
+        result = ds_svc.get_inventory_list(g.tenant_conn, search=search, page=page, per_page=per_page)
+        return jsonify(result)
+    finally:
+        _release_tenant()
+
+
+@dropship_bp.route("/inventory/<sku>", methods=["GET"])
+def get_inventory_item(sku):
+    err = _require_dropship_auth()
+    if err:
+        return err
+    try:
+        item = ds_svc.get_inventory_by_sku(g.tenant_conn, sku)
+        if not item:
+            return jsonify({"error": "SKU not found"}), 404
+        return jsonify(item)
+    finally:
+        _release_tenant()
+
+
+@dropship_bp.route("/stock", methods=["GET"])
+def get_stock():
+    err = _require_dropship_auth()
+    if err:
+        return err
+    try:
+        skus = request.args.get("skus", "")
+        sku_list = [s.strip() for s in skus.split(",") if s.strip()]
+        if not sku_list:
+            return jsonify({"error": "Provide ?skus=SKU1,SKU2,SKU3"}), 400
+        result = ds_svc.get_stock_by_skus(g.tenant_conn, sku_list)
+        return jsonify({"stock": result})
+    finally:
+        _release_tenant()
+
+
+@dropship_bp.route("/webhooks/test", methods=["POST"])
+def test_webhook():
+    """Test endpoint to trigger a sample webhook to all configured targets."""
+    err = _require_dropship_auth()
+    if err:
+        return err
+    try:
+        urls = ds_svc.get_webhook_targets(g.tenant_conn, "stock_updated")
+        if not urls:
+            return jsonify({"error": "No webhook targets configured"}), 400
+        results = dispatch_webhooks_bulk(
+            urls,
+            "test",
+            {"message": "Webhook test from Nexus POS", "tenant_id": g.tenant_id},
+        )
+        return jsonify({"dispatched": len(results), "results": results})
+    finally:
+        _release_tenant()
diff --git a/pos/blueprints/inventory_bp.py b/pos/blueprints/inventory_bp.py
index 1ea2f31..d741e9a 100644
--- a/pos/blueprints/inventory_bp.py
+++ b/pos/blueprints/inventory_bp.py
@@ -4,6 +4,7 @@
 import io
 import json
 import os
+import csv
 from datetime import datetime, timedelta
 from flask import Blueprint, request, jsonify, g
 from middleware import require_auth, has_permission
@@ -26,6 +27,44 @@ from tasks import sync_vehicle_compatibility_task
 inventory_bp = Blueprint('inventory', __name__, url_prefix='/pos/api/inventory')
 
 
+def _get_tier_discounts(conn):
+    """Read global tier discounts from DB. Returns dict {tier_id: discount_pct}."""
+    cur = conn.cursor()
+    cur.execute("SELECT tier_id, discount_pct FROM tier_discounts")
+    rows = cur.fetchall()
+    cur.close()
+    return {r[0]: float(r[1]) for r in rows}
+
+
+def _apply_tier_discounts(price_1, discounts):
+    """Given a base price and discount dict, return (price_2, price_3)."""
+    if not price_1:
+        return 0, 0
+    disc2 = discounts.get(2, 0)
+    disc3 = discounts.get(3, 0)
+    p2 = round(float(price_1) * (1 - disc2 / 100), 2)
+    p3 = round(float(price_1) * (1 - disc3 / 100), 2)
+    return p2, p3
+
+
+def _to_decimal(val, default=0):
+    if val is None or val == '':
+        return default
+    try:
+        return float(str(val).replace(',', ''))
+    except (ValueError, TypeError):
+        return default
+
+
+def _to_int(val, default=0):
+    if val is None or val == '':
+        return default
+    try:
+        return int(float(str(val).replace(',', '')))
+    except (ValueError, TypeError):
+        return default
+
+
 # ─── AI Classification ───────────────────────────
 
 @inventory_bp.route('/classify/<part_number>', methods=['GET'])
@@ -61,9 +100,8 @@ def list_items():
     where_clauses = ["i.is_active = true"]
     params = []
 
-    if branch_id:
-        where_clauses.append("i.branch_id = %s")
-        params.append(branch_id)
+    # branch_id no longer filters inventory rows (shared catalog).
+    # It is used only to show per-branch stock.
     if search:
         where_clauses.append("(i.part_number ILIKE %s OR i.name ILIKE %s OR i.barcode ILIKE %s)")
         params.extend([f'%{search}%', f'%{search}%', f'%{search}%'])
@@ -77,93 +115,91 @@ def list_items():
     where = " AND ".join(where_clauses)
 
     if low_stock:
-        # low_stock filter: JOIN with stock subquery, filter items where stock < min_stock
-        # This keeps pagination accurate because the filter is in the SQL WHERE clause.
+        # low_stock filter: JOIN with total stock summary
         count_sql = f"""
             SELECT count(*) FROM inventory i
-            LEFT JOIN (
-                SELECT inventory_id, COALESCE(SUM(quantity), 0) AS stock
-                FROM inventory_operations GROUP BY inventory_id
-            ) s ON s.inventory_id = i.id
+            LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
             WHERE {where} AND i.min_stock IS NOT NULL AND i.min_stock > 0
               AND COALESCE(s.stock, 0) < i.min_stock
         """
         cur.execute(count_sql, params)
         total = cur.fetchone()[0]
 
+        stock_join = """
+            LEFT JOIN inventory_stock ist ON ist.inventory_id = i.id AND ist.branch_id = %s
+        """ if branch_id else """
+            LEFT JOIN inventory_stock_summary ist ON ist.inventory_id = i.id
+        """
+        stock_select = "COALESCE(ist.stock, 0) AS stock"
+        stock_params = [int(branch_id)] if branch_id else []
+
         cur.execute(f"""
-            SELECT i.id, i.branch_id, i.part_number, i.barcode, i.name, i.description,
+            SELECT i.id, i.part_number, i.barcode, i.name, i.description,
                    i.category_id, i.brand, i.unit, i.cost, i.price_1, i.price_2, i.price_3,
                    i.tax_rate, i.min_stock, i.max_stock, i.location, i.image_url, i.catalog_part_id,
-                   COALESCE(s.stock, 0) AS stock
+                   {stock_select}
             FROM inventory i
-            LEFT JOIN (
-                SELECT inventory_id, COALESCE(SUM(quantity), 0) AS stock
-                FROM inventory_operations GROUP BY inventory_id
-            ) s ON s.inventory_id = i.id
+            {stock_join}
             WHERE {where} AND i.min_stock IS NOT NULL AND i.min_stock > 0
-              AND COALESCE(s.stock, 0) < i.min_stock
+              AND COALESCE(
+                  (SELECT stock FROM inventory_stock_summary WHERE inventory_id = i.id), 0
+              ) < i.min_stock
             ORDER BY i.name
             LIMIT %s OFFSET %s
-        """, params + [per_page, (page - 1) * per_page])
+        """, stock_params + params + [per_page, (page - 1) * per_page])
 
         items = []
         for r in cur.fetchall():
             items.append({
-                'id': r[0], 'branch_id': r[1], 'part_number': r[2], 'barcode': r[3],
-                'name': r[4], 'description': r[5], 'category_id': r[6], 'brand': r[7],
-                'unit': r[8], 'cost': float(r[9]) if r[9] else 0,
-                'price_1': float(r[10]) if r[10] else 0,
-                'price_2': float(r[11]) if r[11] else 0,
-                'price_3': float(r[12]) if r[12] else 0,
-                'tax_rate': float(r[13]) if r[13] else 0.16,
-                'min_stock': r[14], 'max_stock': r[15], 'location': r[16],
-                'image_url': r[17], 'catalog_part_id': r[18],
-                'stock': r[19]
+                'id': r[0], 'part_number': r[1], 'barcode': r[2],
+                'name': r[3], 'description': r[4], 'category_id': r[5], 'brand': r[6],
+                'unit': r[7], 'cost': float(r[8]) if r[8] else 0,
+                'price_1': float(r[9]) if r[9] else 0,
+                'price_2': float(r[10]) if r[10] else 0,
+                'price_3': float(r[11]) if r[11] else 0,
+                'tax_rate': float(r[12]) if r[12] else 0.16,
+                'min_stock': r[13], 'max_stock': r[14], 'location': r[15],
+                'image_url': r[16], 'catalog_part_id': r[17],
+                'stock': r[18]
             })
     else:
         # Normal path: count, fetch items, then bulk-lookup stock
         cur.execute(f"SELECT count(*) FROM inventory i WHERE {where}", params)
         total = cur.fetchone()[0]
 
+        stock_join = """
+            LEFT JOIN inventory_stock ist ON ist.inventory_id = i.id AND ist.branch_id = %s
+        """ if branch_id else """
+            LEFT JOIN inventory_stock_summary ist ON ist.inventory_id = i.id
+        """
+        stock_select = "COALESCE(ist.stock, 0) AS stock"
+        stock_params = [int(branch_id)] if branch_id else []
+
         cur.execute(f"""
-            SELECT i.id, i.branch_id, i.part_number, i.barcode, i.name, i.description,
+            SELECT i.id, i.part_number, i.barcode, i.name, i.description,
                    i.category_id, i.brand, i.unit, i.cost, i.price_1, i.price_2, i.price_3,
-                   i.tax_rate, i.min_stock, i.max_stock, i.location, i.image_url, i.catalog_part_id
+                   i.tax_rate, i.min_stock, i.max_stock, i.location, i.image_url, i.catalog_part_id,
+                   {stock_select}
             FROM inventory i
+            {stock_join}
             WHERE {where}
             ORDER BY i.name
             LIMIT %s OFFSET %s
-        """, params + [per_page, (page - 1) * per_page])
-
-        items_raw = cur.fetchall()
-
-        # Get stock for all returned items
-        inv_ids = [r[0] for r in items_raw]
-        stock_map = {}
-        if inv_ids:
-            cur.execute("""
-                SELECT inventory_id, COALESCE(SUM(quantity), 0)
-                FROM inventory_operations
-                WHERE inventory_id = ANY(%s)
-                GROUP BY inventory_id
-            """, (inv_ids,))
-            stock_map = {r[0]: r[1] for r in cur.fetchall()}
+        """, stock_params + params + [per_page, (page - 1) * per_page])
 
         items = []
-        for r in items_raw:
-            stock = stock_map.get(r[0], 0)
+        for r in cur.fetchall():
             items.append({
-                'id': r[0], 'branch_id': r[1], 'part_number': r[2], 'barcode': r[3],
-                'name': r[4], 'description': r[5], 'category_id': r[6], 'brand': r[7],
-                'unit': r[8], 'cost': float(r[9]) if r[9] else 0,
-                'price_1': float(r[10]) if r[10] else 0,
-                'price_2': float(r[11]) if r[11] else 0,
-                'price_3': float(r[12]) if r[12] else 0,
-                'tax_rate': float(r[13]) if r[13] else 0.16,
-                'min_stock': r[14], 'max_stock': r[15], 'location': r[16],
-                'image_url': r[17], 'catalog_part_id': r[18],
-                'stock': stock
+                'id': r[0], 'part_number': r[1], 'barcode': r[2],
+                'name': r[3], 'description': r[4], 'category_id': r[5], 'brand': r[6],
+                'unit': r[7], 'cost': float(r[8]) if r[8] else 0,
+                'price_1': float(r[9]) if r[9] else 0,
+                'price_2': float(r[10]) if r[10] else 0,
+                'price_3': float(r[11]) if r[11] else 0,
+                'tax_rate': float(r[12]) if r[12] else 0.16,
+                'min_stock': r[13], 'max_stock': r[14], 'location': r[15],
+                'image_url': r[16], 'catalog_part_id': r[17],
+                'stock': r[18]
             })
 
     cur.close()
@@ -183,9 +219,9 @@ def get_item(item_id):
     conn = get_tenant_conn(g.tenant_id)
     cur = conn.cursor()
     cur.execute("""
-        SELECT i.*, b.name as branch_name
+        SELECT i.*, c.name as category_name
         FROM inventory i
-        LEFT JOIN branches b ON i.branch_id = b.id
+        LEFT JOIN categories c ON i.category_id = c.id
         WHERE i.id = %s
     """, (item_id,))
     row = cur.fetchone()
@@ -200,7 +236,8 @@ def get_item(item_id):
         if item.get(k) is not None:
             item[k] = float(item[k])
 
-    item['stock'] = get_stock(conn, item_id, item.get('branch_id'))
+    branch_id = request.args.get('branch_id', g.branch_id)
+    item['stock'] = get_stock(conn, item_id, branch_id)
     item['history'] = get_movement_history(conn, item_id, limit=20)
 
     cur.close()
@@ -219,8 +256,6 @@ def create_item():
             return jsonify({'error': f'{f} required'}), 400
 
     branch_id = data.get('branch_id', g.branch_id)
-    if not branch_id:
-        return jsonify({'error': 'branch_id required'}), 400
 
     # Plan limit check
     from services.billing import check_limit, next_plan, PLANS, get_plan
@@ -254,31 +289,58 @@ def create_item():
         mcur.close(); mconn.close()
         barcode = generate_barcode(conn, db_name)
 
+    # Auto-calculate tier prices from global discounts
+    discounts = _get_tier_discounts(conn)
+    price_1 = data.get('price_1', 0)
+    price_2, price_3 = _apply_tier_discounts(price_1, discounts)
+    # Allow override if explicitly sent (backward compat)
+    if 'price_2' in data:
+        price_2 = data['price_2']
+    if 'price_3' in data:
+        price_3 = data['price_3']
+
     try:
         cur.execute("""
             INSERT INTO inventory
-                (branch_id, part_number, barcode, name, description, category_id, brand,
+                (part_number, barcode, name, description, category_id, brand,
                  vehicle_compatibility, unit, cost, price_1, price_2, price_3, tax_rate,
                  min_stock, max_stock, location, image_url, catalog_part_id)
-            VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)
+            VALUES (%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s,%s)
             RETURNING id
         """, (
-            branch_id, data['part_number'], barcode, data['name'],
+            data['part_number'], barcode, data['name'],
             data.get('description'), data.get('category_id'), data.get('brand'),
             json.dumps(data.get('vehicle_compatibility')) if data.get('vehicle_compatibility') else None,
             data.get('unit', 'PZA'), data.get('cost', 0),
-            data.get('price_1', 0), data.get('price_2', 0), data.get('price_3', 0),
+            price_1, price_2, price_3,
             data.get('tax_rate', 0.16),
             data.get('min_stock', 0), data.get('max_stock', 0),
             data.get('location'), data.get('image_url'), data.get('catalog_part_id')
         ))
         item_id = cur.fetchone()[0]
 
-        # Record initial stock if provided
+        # Record initial stock if provided (requires branch_id)
         initial_stock = data.get('initial_stock', 0)
-        if initial_stock > 0:
+        if initial_stock > 0 and branch_id:
             record_initial(conn, item_id, branch_id, initial_stock, data.get('cost'))
 
+        # Insert SKU aliases if provided
+        sku_aliases = data.get('sku_aliases', [])
+        if sku_aliases:
+            for alias in sku_aliases:
+                sku = (alias.get('sku') or '').strip()
+                label = (alias.get('label') or '').strip()
+                if sku:
+                    cur.execute(
+                        """
+                        INSERT INTO inventory_sku_aliases (inventory_id, sku, label)
+                        VALUES (%s, %s, %s)
+                        ON CONFLICT (inventory_id, sku) DO UPDATE SET
+                            is_active = true, label = EXCLUDED.label
+                        """,
+                        (item_id, sku, label or None),
+                    )
+
         log_action(conn, 'INVENTORY_CREATE', 'inventory', item_id,
                    new_value={'part_number': data['part_number'], 'name': data['name'], 'initial_stock': initial_stock})
 
@@ -303,13 +365,19 @@ def create_item():
         if not compat_background:
             # Fallback: synchronous processing
             if compat_source in ('tecdoc', 'both'):
+                master = None
                 try:
                     master = get_master_conn()
                     auto_match_vehicle_compatibility(master, conn, item_id, data['part_number'],
                                                      brand=data.get('brand'), name=data.get('name'))
-                    master.close()
                 except Exception as am_err:
                     print(f"[auto_match] Error for item {item_id}: {am_err}")
+                finally:
+                    if master:
+                        try:
+                            master.close()
+                        except Exception:
+                            pass
 
             if compat_source in ('qwen', 'both'):
                 try:
@@ -336,8 +404,292 @@ def create_item():
     except Exception as e:
         conn.rollback()
         cur.close(); conn.close()
-        if 'idx_inventory_branch_part' in str(e):
-            return jsonify({'error': 'Part number already exists in this branch'}), 409
+        if 'idx_inventory_part_unique' in str(e):
+            return jsonify({'error': 'Part number already exists'}), 409
+        return jsonify({'error': str(e)}), 500
+
+
+@inventory_bp.route('/items/bulk-import', methods=['POST'])
+@require_auth('inventory.edit')
+def bulk_import_items():
+    """
+    Bulk import inventory items with optional vehicle compatibility.
+    Expects multipart/form-data with a 'file' (CSV/Excel) or JSON body.
+    Headers:
+      X-Import-Mode: 'strict' (default) aborts on first error; 'lenient' skips bad rows.
+      X-Import-Strategy: 'qwen' (default) auto-generates missing compat via QWEN;
+                         'skip' ignores missing compat; 'reject' requires all compat.
+    Expected CSV columns (case-insensitive):
+      sku/part_number, name, brand, price, stock, cost,
+      location, description, category, make, model, year, engine, engine_code
+    Optional compat columns: make, model, year, engine, engine_code
+    """
+    from services.qwen_fitment import get_vehicle_fitment
+    from services.inventory_vehicle_compat import save_qwen_fitment
+    import services.inventory_vehicle_compat as ivc_service
+
+    mode = request.headers.get('X-Import-Mode', 'strict').lower()
+    strategy = request.headers.get('X-Import-Strategy', 'qwen').lower()
+    errors = []
+    warnings = []
+    created_ids = []
+    skipped = 0
+    created = 0
+
+    # ---------- 1. Parse input ----------
+    rows = []
+    if request.content_type and 'multipart/form-data' in request.content_type:
+        file = request.files.get('file')
+        if not file:
+            return jsonify({'error': 'No file uploaded'}), 400
+        try:
+            ext = os.path.splitext(file.filename)[1].lower()
+            if ext == '.csv':
+                stream = io.TextIOWrapper(file.stream, encoding='utf-8-sig')
+                reader = csv.DictReader(stream)
+                rows = list(reader)
+            elif ext in ('.xls', '.xlsx', '.xlsm'):
+                try:
+                    import openpyxl
+                except ImportError:
+                    return jsonify({'error': 'Excel support requires openpyxl. Please convert to CSV or install openpyxl.'}), 400
+                wb = openpyxl.load_workbook(file.stream, data_only=True)
+                ws = wb.active
+                headers = [str(c).strip().lower().replace(' ', '_') if c else '' for c in next(ws.iter_rows(values_only=True))]
+                for raw in ws.iter_rows(min_row=2, values_only=True):
+                    rows.append({headers[i]: (str(v) if v is not None else '') for i, v in enumerate(raw) if i < len(headers)})
+            else:
+                return jsonify({'error': 'Unsupported file type. Use CSV or Excel.'}), 400
+        except Exception as e:
+            return jsonify({'error': f'Failed to parse file: {e}'}), 400
+    else:
+        body = request.get_json() or {}
+        rows = body.get('items')
+        if not rows or not isinstance(rows, list):
+            return jsonify({'error': 'Expected JSON body with an "items" array'}), 400
+
+    if not rows:
+        return jsonify({'error': 'No data rows found'}), 400
+
+    # Normalise column names on first row
+    if rows:
+        first = rows[0]
+        normalised_keys = {}
+        for k in list(first.keys()):
+            nk = str(k).strip().lower().replace(' ', '_')
+            normalised_keys[k] = nk
+        for r in rows:
+            for old_k, new_k in normalised_keys.items():
+                if old_k in r:
+                    r[new_k] = r.pop(old_k)
+
+    # Map common synonyms
+    col_map = {
+        'sku': 'part_number', 'numero_de_parte': 'part_number', 'parte': 'part_number',
+        'nombre': 'name', 'producto': 'name', 'descripcion': 'name',
+        'marca': 'brand', 'precio': 'price', 'costo': 'cost',
+        'cantidad': 'stock', 'existencia': 'stock', 'inventario': 'stock',
+        'ubicacion': 'location', 'categoria': 'category',
+        'fabricante': 'make', 'vehiculo': 'make', 'auto': 'make',
+        'modelo': 'model', 'anio': 'year', 'ano': 'year',
+        'motor': 'engine', 'codigo_motor': 'engine_code',
+    }
+    for r in rows:
+        for old_k, new_k in col_map.items():
+            if old_k in r and new_k not in r:
+                r[new_k] = r.pop(old_k)
+
+    required = ['part_number', 'name']
+    first_keys = set(rows[0].keys()) if rows else set()
+    missing_required = [c for c in required if c not in first_keys]
+    if missing_required:
+        return jsonify({'error': f'Missing required columns: {missing_required}'}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        from services.barcode_generator import generate_barcode
+        from tenant_db import get_master_conn
+        from services.inventory_engine import record_initial
+
+        # Pre-fetch tenant db_name for barcode generation
+        mconn = get_master_conn()
+        mcur = mconn.cursor()
+        mcur.execute("SELECT db_name FROM tenants WHERE id = %s", (g.tenant_id,))
+        db_name_row = mcur.fetchone()
+        db_name = db_name_row[0] if db_name_row else None
+        mcur.close(); mconn.close()
+
+        for row_num, row in enumerate(rows, start=1):
+            part_number = str(row.get('part_number', '')).strip()
+            name = str(row.get('name', '')).strip()
+            if not part_number or not name:
+                msg = f'Row {row_num}: part_number and name are required'
+                if mode == 'strict':
+                    conn.rollback(); cur.close(); conn.close()
+                    return jsonify({'error': msg}), 400
+                warnings.append(msg)
+                skipped += 1
+                continue
+
+            branch_id = _to_int(row.get('branch_id'), g.branch_id)
+            if not branch_id:
+                msg = f'Row {row_num}: branch_id required (not set in row or session)'
+                if mode == 'strict':
+                    conn.rollback(); cur.close(); conn.close()
+                    return jsonify({'error': msg}), 400
+                warnings.append(msg)
+                skipped += 1
+                continue
+
+            brand = str(row.get('brand', '')).strip()
+            price_1 = _to_decimal(row.get('price'), 0)
+            stock = _to_int(row.get('stock'), 0)
+            cost = _to_decimal(row.get('cost'), 0)
+            location = str(row.get('location', '')).strip()
+            description = str(row.get('description', '')).strip()
+            category = str(row.get('category', '')).strip()
+
+            # Check if item already exists (catalog is shared across branches)
+            cur.execute("SELECT id FROM inventory WHERE part_number = %s", (part_number,))
+            existing = cur.fetchone()
+
+            if existing:
+                item_id = existing[0]
+                # Update existing item — add stock if provided
+                cur.execute(
+                    """
+                    UPDATE inventory SET
+                        name = %s,
+                        brand = COALESCE(NULLIF(%s,''), brand),
+                        cost = CASE WHEN %s > 0 THEN %s ELSE cost END,
+                        price_1 = CASE WHEN %s > 0 THEN %s ELSE price_1 END,
+                        location = COALESCE(NULLIF(%s,''), location),
+                        description = COALESCE(NULLIF(%s,''), description),
+                        category = COALESCE(NULLIF(%s,''), category)
+                    WHERE id = %s
+                    """,
+                    (name, brand, cost, cost, price_1, price_1, location, description, category, item_id)
+                )
+                was_inserted = False
+                # Record stock adjustment for existing item if stock > 0
+                if stock > 0:
+                    record_initial(conn, item_id, branch_id, stock, cost if cost > 0 else None)
+            else:
+                # Generate barcode for new item
+                barcode = generate_barcode(conn, db_name)
+
+                cur.execute(
+                    """
+                    INSERT INTO inventory
+                    (part_number, barcode, name, brand, cost, price_1, location, description, category, unit)
+                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+                    RETURNING id
+                    """,
+                    (part_number, barcode, name, brand, cost, price_1, location, description, category, 'PZA')
+                )
+                item_id = cur.fetchone()[0]
+                was_inserted = True
+
+            # Record initial stock if provided and new item
+            if was_inserted and stock > 0:
+                record_initial(conn, item_id, branch_id, stock, cost if cost > 0 else None)
+
+            conn.commit()
+            created_ids.append(item_id)
+            created += 1
+
+            # ---------- 2. Vehicle compatibility ----------
+            make = str(row.get('make', '')).strip()
+            model = str(row.get('model', '')).strip()
+            year_str = str(row.get('year', '')).strip()
+            engine = str(row.get('engine', '')).strip()
+            engine_code = str(row.get('engine_code', '')).strip()
+
+            has_compat = any([make, model, year_str, engine, engine_code])
+
+            if has_compat:
+                # Validate / resolve against vehicle tables
+                year = _to_int(year_str, None)
+                mye_id = None
+                if make and model and year:
+                    # Try exact match against model_year_engine
+                    cur.execute(
+                        """
+                        SELECT mye.id FROM model_year_engine mye
+                        JOIN models m ON m.id = mye.model_id
+                        JOIN brands b ON b.id = m.brand_id
+                        JOIN years y ON y.id = mye.year_id
+                        WHERE LOWER(b.name) = LOWER(%s)
+                          AND LOWER(m.name) = LOWER(%s)
+                          AND y.year = %s
+                        LIMIT 1
+                        """,
+                        (make, model, year)
+                    )
+                    r = cur.fetchone()
+                    if r:
+                        mye_id = r[0]
+                    else:
+                        warnings.append(
+                            f'Row {row_num}: vehicle "{make} {model} {year}" not found in catalog; '
+                            'saving as text-only compatibility.'
+                        )
+
+                if mye_id:
+                    cur.execute(
+                        """
+                        INSERT INTO inventory_vehicle_compat
+                        (inventory_id, model_year_engine_id, make, model, year, engine, engine_code)
+                        VALUES (%s, %s, %s, %s, %s, %s, %s)
+                        ON CONFLICT DO NOTHING
+                        """,
+                        (item_id, mye_id, make, model, year_str, engine, engine_code)
+                    )
+                else:
+                    cur.execute(
+                        """
+                        INSERT INTO inventory_vehicle_compat
+                        (inventory_id, make, model, year, engine, engine_code)
+                        VALUES (%s, %s, %s, %s, %s, %s)
+                        ON CONFLICT DO NOTHING
+                        """,
+                        (item_id, make, model, year_str, engine, engine_code)
+                    )
+                conn.commit()
+
+            else:
+                # No compatibility provided
+                if strategy == 'reject':
+                    msg = f'Row {row_num}: missing vehicle compatibility (strategy=reject)'
+                    if mode == 'strict':
+                        conn.rollback(); cur.close(); conn.close()
+                        return jsonify({'error': msg}), 400
+                    warnings.append(msg)
+                elif strategy == 'qwen':
+                    try:
+                        fitment = get_vehicle_fitment(part_number, name, brand)
+                        save_qwen_fitment(conn, item_id, fitment)
+                        conn.commit()
+                    except Exception as qe:
+                        warnings.append(f'Row {row_num}: QWEN fitment failed: {qe}')
+                # strategy == 'skip' → do nothing
+
+        cur.close()
+        conn.close()
+        return jsonify({
+            'created': created,
+            'skipped': skipped,
+            'item_ids': created_ids,
+            'warnings': warnings,
+            'errors': errors,
+        }), 200
+
+    except Exception as e:
+        conn.rollback()
+        try: cur.close()
+        except Exception: pass
+        conn.close()
         return jsonify({'error': str(e)}), 500
 
 
@@ -365,6 +717,15 @@ def update_item(item_id):
     if changing_prices and not has_permission('config.edit_prices'):
         return jsonify({'error': 'Permission config.edit_prices required to change prices'}), 403
 
+    # Auto-calculate tier prices if price_1 changes and no explicit override
+    discounts = _get_tier_discounts(conn)
+    if 'price_1' in data and ('price_2' not in data or 'price_3' not in data):
+        p2, p3 = _apply_tier_discounts(data['price_1'], discounts)
+        if 'price_2' not in data:
+            data['price_2'] = p2
+        if 'price_3' not in data:
+            data['price_3'] = p3
+
     # Build dynamic update
     allowed = ['part_number', 'barcode', 'name', 'description', 'category_id', 'brand',
                'vehicle_compatibility', 'unit', 'cost', 'price_1', 'price_2', 'price_3',
@@ -536,6 +897,33 @@ def delete_image(item_id):
     return jsonify({'message': 'Image deleted'})
 
 
+@inventory_bp.route('/items/<int:item_id>', methods=['DELETE'])
+@require_auth('inventory.edit')
+def delete_item(item_id):
+    """Soft-delete an inventory item (mark is_active = false).
+
+    Keeps historical data (sales, movements) intact while removing
+    the item from the active catalog and stock views.
+    """
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    cur.execute("SELECT id, part_number, name FROM inventory WHERE id = %s", (item_id,))
+    row = cur.fetchone()
+    if not row:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Item not found'}), 404
+
+    cur.execute("UPDATE inventory SET is_active = false WHERE id = %s", (item_id,))
+    conn.commit()
+
+    log_action(conn, 'INVENTORY_DELETE', 'inventory', item_id,
+               old_value={'part_number': row[1], 'name': row[2]})
+
+    cur.close(); conn.close()
+    return jsonify({'message': 'Item deleted', 'id': item_id})
+
+
 # ─── Bulk Image Import ─────────────────────────
 
 @inventory_bp.route('/bulk-images', methods=['POST'])
@@ -938,7 +1326,7 @@ def api_inventory_stats():
     branch_id = getattr(g, 'branch_id', None)
 
     # Stock count
-    cur.execute("SELECT COUNT(*) FROM inventory WHERE is_active = true AND (branch_id = %s OR %s IS NULL)", (branch_id, branch_id))
+    cur.execute("SELECT COUNT(*) FROM inventory WHERE is_active = true")
     stock = cur.fetchone()[0]
 
     # Operations counts by type
@@ -973,6 +1361,62 @@ def api_inventory_stats():
     })
 
 
+@inventory_bp.route('/summary', methods=['GET'])
+@require_auth('inventory.view')
+def api_inventory_summary():
+    """Get high-level summary counts for the inventory dashboard badges."""
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+    # 1. Total active SKUs
+    cur.execute("""
+        SELECT COUNT(*) FROM inventory i
+        WHERE i.is_active = true
+    """)
+    total_skus = cur.fetchone()[0] or 0
+
+    # 2. Total inventory value (cost * stock)
+    cur.execute("""
+        SELECT COALESCE(SUM(i.cost * COALESCE(s.stock, 0)), 0)
+        FROM inventory i
+        LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
+        WHERE i.is_active = true
+    """)
+    total_value = float(cur.fetchone()[0] or 0)
+
+    # 3. Low stock count (below min_stock)
+    cur.execute("""
+        SELECT COUNT(*)
+        FROM inventory i
+        LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
+        WHERE i.is_active = true
+          AND i.min_stock IS NOT NULL AND i.min_stock > 0
+          AND COALESCE(s.stock, 0) < i.min_stock
+    """)
+    low_stock = cur.fetchone()[0] or 0
+
+    # 4. No movement in last 60 days
+    cutoff = datetime.utcnow() - timedelta(days=60)
+    cur.execute("""
+        SELECT COUNT(*)
+        FROM inventory i
+        WHERE i.is_active = true
+          AND i.id NOT IN (
+              SELECT inventory_id FROM inventory_operations
+              WHERE created_at > %s
+          )
+    """, (cutoff,))
+    no_movement = cur.fetchone()[0] or 0
+
+    cur.close(); conn.close()
+
+    return jsonify({
+        'total_skus': total_skus,
+        'total_value': round(total_value, 2),
+        'low_stock': low_stock,
+        'no_movement': no_movement,
+    })
+
+
 # ─── Alerts and History ────────────────────────
 
 @inventory_bp.route('/alerts', methods=['GET'])
@@ -981,9 +1425,18 @@ def api_alerts():
     """Get stock alerts (zero, low, over)."""
     conn = get_tenant_conn(g.tenant_id)
     branch_id = request.args.get('branch_id', g.branch_id)
-    alerts = get_alerts(conn, branch_id)
+    limit = min(int(request.args.get('limit', 500)), 2000)
+    alerts = get_alerts(conn, branch_id, limit_per_type=limit)
     conn.close()
-    return jsonify({'data': alerts, 'count': len(alerts)})
+
+    # Count totals by severity for UI summary
+    counts = {'critical': 0, 'warning': 0, 'info': 0, 'total': 0}
+    for a in alerts:
+        counts['total'] += 1
+        if a['severity'] in counts:
+            counts[a['severity']] += 1
+
+    return jsonify({'data': alerts, 'count': len(alerts), 'counts': counts, 'limit_per_type': limit})
 
 
 @inventory_bp.route('/items/<int:item_id>/history', methods=['GET'])
@@ -1011,34 +1464,40 @@ def report_valuation():
     cur = conn.cursor()
     branch_id = request.args.get('branch_id', g.branch_id)
 
-    where = "i.is_active = true"
-    params = []
     if branch_id:
-        where += " AND i.branch_id = %s"
-        params.append(branch_id)
+        sql = """
+            SELECT i.id, i.part_number, i.name, i.brand, i.cost,
+                   COALESCE(ist.stock, 0) AS stock,
+                   COALESCE(ist.stock, 0) * COALESCE(i.cost, 0) AS value
+            FROM inventory i
+            LEFT JOIN inventory_stock ist ON ist.inventory_id = i.id AND ist.branch_id = %s
+            WHERE i.is_active = true
+            ORDER BY value DESC
+        """
+        params = [branch_id]
+    else:
+        sql = """
+            SELECT i.id, i.part_number, i.name, i.brand, i.cost,
+                   COALESCE(s.stock, 0) AS stock,
+                   COALESCE(s.stock, 0) * COALESCE(i.cost, 0) AS value
+            FROM inventory i
+            LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
+            WHERE i.is_active = true
+            ORDER BY value DESC
+        """
+        params = []
 
-    cur.execute(f"""
-        SELECT i.id, i.part_number, i.name, i.brand, i.cost, i.branch_id,
-               COALESCE(s.stock, 0) AS stock,
-               COALESCE(s.stock, 0) * COALESCE(i.cost, 0) AS value
-        FROM inventory i
-        LEFT JOIN (
-            SELECT inventory_id, SUM(quantity) AS stock
-            FROM inventory_operations GROUP BY inventory_id
-        ) s ON s.inventory_id = i.id
-        WHERE {where}
-        ORDER BY value DESC
-    """, params)
+    cur.execute(sql, params)
 
     items = []
     grand_total = 0
     for r in cur.fetchall():
-        val = float(r[7])
+        val = float(r[6])
         grand_total += val
         items.append({
             'id': r[0], 'part_number': r[1], 'name': r[2], 'brand': r[3],
-            'cost': float(r[4]) if r[4] else 0, 'branch_id': r[5],
-            'stock': r[6], 'value': round(val, 2)
+            'cost': float(r[4]) if r[4] else 0,
+            'stock': r[5], 'value': round(val, 2)
         })
 
     cur.close(); conn.close()
@@ -1114,32 +1573,22 @@ def report_no_movement():
     conn = get_tenant_conn(g.tenant_id)
     cur = conn.cursor()
     days = int(request.args.get('days', 60))
-    branch_id = request.args.get('branch_id', g.branch_id)
     cutoff = datetime.utcnow() - timedelta(days=days)
 
-    where_branch = ""
-    params_main = []
-    if branch_id:
-        where_branch = "AND i.branch_id = %s"
-        params_main.append(branch_id)
-
-    cur.execute(f"""
+    cur.execute("""
         SELECT i.id, i.part_number, i.name, i.brand, i.cost,
                COALESCE(s.stock, 0) AS stock,
                last_op.last_date
         FROM inventory i
-        LEFT JOIN (
-            SELECT inventory_id, SUM(quantity) AS stock
-            FROM inventory_operations GROUP BY inventory_id
-        ) s ON s.inventory_id = i.id
+        LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
         LEFT JOIN (
             SELECT inventory_id, MAX(created_at) AS last_date
             FROM inventory_operations GROUP BY inventory_id
         ) last_op ON last_op.inventory_id = i.id
-        WHERE i.is_active = true {where_branch}
+        WHERE i.is_active = true
           AND (last_op.last_date IS NULL OR last_op.last_date < %s)
         ORDER BY last_op.last_date ASC NULLS FIRST
-    """, params_main + [cutoff])
+    """, (cutoff,))
 
     items = []
     for r in cur.fetchall():
@@ -1159,28 +1608,17 @@ def report_low_stock():
     """Items below their min_stock threshold."""
     conn = get_tenant_conn(g.tenant_id)
     cur = conn.cursor()
-    branch_id = request.args.get('branch_id', g.branch_id)
-
-    where_branch = ""
-    params = []
-    if branch_id:
-        where_branch = "AND i.branch_id = %s"
-        params.append(branch_id)
-
-    cur.execute(f"""
+    cur.execute("""
         SELECT i.id, i.part_number, i.name, i.brand, i.min_stock,
                COALESCE(s.stock, 0) AS stock,
                i.min_stock - COALESCE(s.stock, 0) AS deficit
         FROM inventory i
-        LEFT JOIN (
-            SELECT inventory_id, SUM(quantity) AS stock
-            FROM inventory_operations GROUP BY inventory_id
-        ) s ON s.inventory_id = i.id
-        WHERE i.is_active = true {where_branch}
+        LEFT JOIN inventory_stock_summary s ON s.inventory_id = i.id
+        WHERE i.is_active = true
           AND i.min_stock IS NOT NULL AND i.min_stock > 0
           AND COALESCE(s.stock, 0) < i.min_stock
         ORDER BY deficit DESC
-    """, params)
+    """)
 
     items = []
     for r in cur.fetchall():
@@ -1201,15 +1639,13 @@ def report_branch_comparison():
     cur = conn.cursor()
 
     cur.execute("""
-        SELECT i.id, i.part_number, i.name, i.brand, i.branch_id,
+        SELECT i.id, i.part_number, i.name, i.brand,
+               ist.branch_id,
                b.name AS branch_name,
-               COALESCE(s.stock, 0) AS stock
+               COALESCE(ist.stock, 0) AS stock
         FROM inventory i
-        LEFT JOIN branches b ON i.branch_id = b.id
-        LEFT JOIN (
-            SELECT inventory_id, SUM(quantity) AS stock
-            FROM inventory_operations GROUP BY inventory_id
-        ) s ON s.inventory_id = i.id
+        LEFT JOIN inventory_stock ist ON ist.inventory_id = i.id
+        LEFT JOIN branches b ON ist.branch_id = b.id
         WHERE i.is_active = true
         ORDER BY i.part_number, b.name
     """)
@@ -1220,10 +1656,11 @@ def report_branch_comparison():
         pn = r[1]
         if pn not in by_part:
             by_part[pn] = {'part_number': pn, 'name': r[2], 'brand': r[3], 'branches': []}
-        by_part[pn]['branches'].append({
-            'inventory_id': r[0], 'branch_id': r[4],
-            'branch_name': r[5], 'stock': r[6]
-        })
+        if r[4] is not None:
+            by_part[pn]['branches'].append({
+                'inventory_id': r[0], 'branch_id': r[4],
+                'branch_name': r[5], 'stock': r[6]
+            })
 
     cur.close(); conn.close()
     items = list(by_part.values())
@@ -1232,22 +1669,6 @@ def report_branch_comparison():
 
 # ─── Categories and Brands ─────────────────────
 
-@inventory_bp.route('/categories', methods=['GET'])
-@require_auth('inventory.view')
-def list_categories():
-    """Get distinct categories from inventory."""
-    conn = get_tenant_conn(g.tenant_id)
-    cur = conn.cursor()
-    cur.execute("""
-        SELECT DISTINCT category_id FROM inventory
-        WHERE is_active = true AND category_id IS NOT NULL
-        ORDER BY category_id
-    """)
-    categories = [r[0] for r in cur.fetchall()]
-    cur.close(); conn.close()
-    return jsonify({'data': categories})
-
-
 @inventory_bp.route('/brands', methods=['GET'])
 @require_auth('inventory.view')
 def list_brands():
@@ -1302,12 +1723,11 @@ def api_stock_by_branch():
     cur = conn.cursor()
     cur.execute("""
         SELECT b.id, b.name, b.address,
-               COALESCE(SUM(io.quantity), 0) as stock
+               COALESCE(ist.stock, 0) as stock
         FROM branches b
-        LEFT JOIN inventory_operations io
-            ON io.branch_id = b.id AND io.inventory_id = %s
+        LEFT JOIN inventory_stock ist
+            ON ist.branch_id = b.id AND ist.inventory_id = %s
         WHERE b.is_active = true
-        GROUP BY b.id, b.name, b.address
         ORDER BY b.name
     """, (inventory_id,))
     data = []
@@ -1579,6 +1999,89 @@ def auto_match_item_vehicles(item_id):
     return jsonify({'error': 'No compatibility source configured'}), 400
 
 
+# ─── SKU Aliases (multiple part numbers per item) ───────────────────────
+
+@inventory_bp.route('/items/<int:item_id>/skus', methods=['GET'])
+@require_auth('inventory.view')
+def get_item_sku_aliases(item_id):
+    """Return active SKU aliases for an inventory item."""
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            SELECT id, sku, label, created_at
+            FROM inventory_sku_aliases
+            WHERE inventory_id = %s AND is_active = true
+            ORDER BY created_at
+            """,
+            (item_id,),
+        )
+        rows = cur.fetchall()
+        cur.close()
+        return jsonify({
+            'aliases': [
+                {'id': r[0], 'sku': r[1], 'label': r[2], 'created_at': r[3]}
+                for r in rows
+            ]
+        })
+    finally:
+        conn.close()
+
+
+@inventory_bp.route('/items/<int:item_id>/skus', methods=['POST'])
+@require_auth('inventory.edit')
+def add_item_sku_alias(item_id):
+    """Add an SKU alias to an inventory item."""
+    data = request.get_json() or {}
+    sku = (data.get('sku') or '').strip()
+    label = (data.get('label') or '').strip()
+    if not sku:
+        return jsonify({'error': 'sku is required'}), 400
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            INSERT INTO inventory_sku_aliases (inventory_id, sku, label)
+            VALUES (%s, %s, %s)
+            ON CONFLICT (inventory_id, sku) DO UPDATE SET
+                is_active = true, label = EXCLUDED.label
+            RETURNING id
+            """,
+            (item_id, sku, label or None),
+        )
+        row = cur.fetchone()
+        conn.commit()
+        cur.close()
+        return jsonify({'id': row[0], 'message': 'SKU alias added'}), 201
+    except Exception as e:
+        conn.rollback()
+        return jsonify({'error': str(e)}), 500
+    finally:
+        conn.close()
+
+
+@inventory_bp.route('/items/<int:item_id>/skus/<int:alias_id>', methods=['DELETE'])
+@require_auth('inventory.edit')
+def delete_item_sku_alias(item_id, alias_id):
+    """Soft-delete an SKU alias."""
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            UPDATE inventory_sku_aliases SET is_active = false WHERE id = %s AND inventory_id = %s
+            """,
+            (alias_id, item_id),
+        )
+        conn.commit()
+        cur.close()
+        return jsonify({'message': 'SKU alias removed'})
+    finally:
+        conn.close()
+
+
 @inventory_bp.route('/mye/search', methods=['GET'])
 @require_auth()
 def search_mye_endpoint():
@@ -1594,3 +2097,218 @@ def search_mye_endpoint():
         return jsonify({'data': results})
     finally:
         master.close()
+
+
+# ─── Manual Vehicle Compatibility (text-based) ────────────────────────────
+
+@inventory_bp.route('/items/<int:item_id>/vehicles/manual', methods=['POST'])
+@require_auth('inventory.edit')
+def add_manual_vehicle_compat(item_id):
+    """Add a manual vehicle compatibility using free-text fields."""
+    data = request.get_json() or {}
+    make = (data.get('make') or '').strip()
+    model = (data.get('model') or '').strip()
+    year = data.get('year')
+    engine = (data.get('engine') or '').strip()
+    engine_code = (data.get('engine_code') or '').strip()
+
+    if not make or not model or not year:
+        return jsonify({'error': 'make, model and year are required'}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            """
+            INSERT INTO inventory_vehicle_compat
+                (inventory_id, make, model, year, engine, engine_code, source, model_year_engine_id)
+            VALUES (%s, %s, %s, %s, %s, %s, 'manual', NULL)
+            ON CONFLICT DO NOTHING
+            RETURNING id
+            """,
+            (item_id, make, model, year, engine or None, engine_code or None),
+        )
+        row = cur.fetchone()
+        conn.commit()
+        cur.close()
+        if not row:
+            return jsonify({'error': 'Compatibility already exists or item not found'}), 409
+        return jsonify({'id': row[0], 'message': 'Compatibility added'}), 201
+    finally:
+        conn.close()
+
+
+@inventory_bp.route('/vehicles/makes', methods=['GET'])
+@require_auth()
+def get_vehicle_makes():
+    """Return distinct vehicle makes from master DB."""
+    master = get_master_conn()
+    try:
+        cur = master.cursor()
+        cur.execute("SELECT id_brand, name_brand FROM brands ORDER BY name_brand")
+        rows = cur.fetchall()
+        cur.close()
+        return jsonify({'makes': [{'id': r[0], 'name': r[1]} for r in rows]})
+    finally:
+        master.close()
+
+
+@inventory_bp.route('/vehicles/models', methods=['GET'])
+@require_auth()
+def get_vehicle_models():
+    """Return models for a given brand."""
+    brand_id = request.args.get('brand_id', type=int)
+    if not brand_id:
+        return jsonify({'error': 'brand_id required'}), 400
+    master = get_master_conn()
+    try:
+        cur = master.cursor()
+        cur.execute(
+            "SELECT id_model, name_model FROM models WHERE brand_id = %s ORDER BY name_model",
+            (brand_id,),
+        )
+        rows = cur.fetchall()
+        cur.close()
+        return jsonify({'models': [{'id': r[0], 'name': r[1]} for r in rows]})
+    finally:
+        master.close()
+
+
+@inventory_bp.route('/vehicles/years', methods=['GET'])
+@require_auth()
+def get_vehicle_years():
+    """Return distinct years available for a model."""
+    model_id = request.args.get('model_id', type=int)
+    if not model_id:
+        return jsonify({'error': 'model_id required'}), 400
+    master = get_master_conn()
+    try:
+        cur = master.cursor()
+        cur.execute(
+            """
+            SELECT DISTINCT y.id_year, y.year_car
+            FROM model_year_engine mye
+            JOIN years y ON y.id_year = mye.year_id
+            WHERE mye.model_id = %s
+            ORDER BY y.year_car DESC
+            """,
+            (model_id,),
+        )
+        rows = cur.fetchall()
+        cur.close()
+        return jsonify({'years': [{'id': r[0], 'year': r[1]} for r in rows]})
+    finally:
+        master.close()
+
+
+@inventory_bp.route('/vehicles/engines', methods=['GET'])
+@require_auth()
+def get_vehicle_engines():
+    """Return engines available for a model+year."""
+    model_id = request.args.get('model_id', type=int)
+    year_id = request.args.get('year_id', type=int)
+    if not model_id or not year_id:
+        return jsonify({'error': 'model_id and year_id required'}), 400
+    master = get_master_conn()
+    try:
+        cur = master.cursor()
+        cur.execute(
+            """
+            SELECT DISTINCT e.id_engine, e.name_engine, e.engine_code
+            FROM model_year_engine mye
+            JOIN engines e ON e.id_engine = mye.engine_id
+            WHERE mye.model_id = %s AND mye.year_id = %s
+            ORDER BY e.name_engine
+            """,
+            (model_id, year_id),
+        )
+        rows = cur.fetchall()
+        cur.close()
+        return jsonify({'engines': [{'id': r[0], 'name': r[1], 'code': r[2]} for r in rows]})
+    finally:
+        master.close()
+
+
+# ─── Categories ──────────────────────────────────
+
+@inventory_bp.route('/categories', methods=['GET'])
+@require_auth()
+def list_inventory_categories():
+    """Return active categories (root only). Optional ?parent_id= for subcategories."""
+    parent_id = request.args.get('parent_id')
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        if parent_id:
+            cur.execute(
+                "SELECT id, name FROM categories WHERE parent_id = %s AND is_active = true ORDER BY name",
+                (parent_id,)
+            )
+        else:
+            cur.execute(
+                "SELECT id, name FROM categories WHERE parent_id IS NULL AND is_active = true ORDER BY name"
+            )
+        rows = cur.fetchall()
+        return jsonify({'categories': [{'id': r[0], 'name': r[1]} for r in rows]})
+    finally:
+        conn.close()
+
+
+@inventory_bp.route('/categories/<int:category_id>/subcategories', methods=['GET'])
+@require_auth()
+def list_inventory_subcategories(category_id):
+    """Return subcategories for a given category."""
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cur = conn.cursor()
+        cur.execute(
+            "SELECT id, name FROM categories WHERE parent_id = %s AND is_active = true ORDER BY name",
+            (category_id,)
+        )
+        rows = cur.fetchall()
+        return jsonify({'subcategories': [{'id': r[0], 'name': r[1]} for r in rows]})
+    finally:
+        conn.close()
+
+
+# ─── Global Tier Discounts ───────────────────────
+
+@inventory_bp.route('/tier-discounts', methods=['GET'])
+@require_auth()
+def get_tier_discounts_endpoint():
+    """Return global tier discount percentages."""
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        discounts = _get_tier_discounts(conn)
+        return jsonify({
+            'data': [
+                {'tier_id': 2, 'tier_name': 'Taller', 'discount_pct': discounts.get(2, 0)},
+                {'tier_id': 3, 'tier_name': 'Mayoreo', 'discount_pct': discounts.get(3, 0)},
+            ]
+        })
+    finally:
+        conn.close()
+
+
+@inventory_bp.route('/tier-discounts', methods=['PUT'])
+@require_auth('config.edit_prices')
+def update_tier_discounts_endpoint():
+    """Update global tier discount percentages."""
+    data = request.get_json() or {}
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+    try:
+        for tier_id in (2, 3):
+            key = f'discount_pct_{tier_id}'
+            if key in data:
+                val = max(0, min(100, float(data[key])))
+                cur.execute("""
+                    INSERT INTO tier_discounts (tier_id, tier_name, discount_pct)
+                    VALUES (%s, %s, %s)
+                    ON CONFLICT (tier_id) DO UPDATE SET discount_pct = EXCLUDED.discount_pct
+                """, (tier_id, 'Taller' if tier_id == 2 else 'Mayoreo', val))
+        conn.commit()
+        return jsonify({'message': 'Descuentos actualizados'})
+    finally:
+        cur.close()
+        conn.close()
diff --git a/pos/blueprints/invoicing_bp.py b/pos/blueprints/invoicing_bp.py
index 2b4dba2..e4cdf15 100644
--- a/pos/blueprints/invoicing_bp.py
+++ b/pos/blueprints/invoicing_bp.py
@@ -6,6 +6,7 @@ This blueprint is the HTTP layer that validates input and returns JSON.
 """
 
 import json
+from datetime import datetime
 from flask import Blueprint, request, jsonify, g
 from middleware import require_auth
 from tenant_db import get_tenant_conn
@@ -19,17 +20,19 @@ from services.audit import log_action
 invoicing_bp = Blueprint('invoicing', __name__, url_prefix='/pos/api/invoicing')
 
 
-def _get_tenant_config(cur):
-    """Load tenant CFDI configuration from tenant_config table.
+def _get_issuer_config(cur, branch_id=None):
+    """Load CFDI issuer configuration.
 
-    Falls back to sensible defaults if config is incomplete.
+    If branch_id is provided and the branch has fiscal data, use it.
+    Otherwise fall back to tenant-level config.
     """
+    # Tenant-level defaults
     config = {}
     cur.execute("SELECT key, value FROM tenant_config WHERE key LIKE 'cfdi_%' OR key LIKE 'tenant_%'")
     for row in cur.fetchall():
         config[row[0]] = row[1]
 
-    return {
+    result = {
         'rfc': config.get('tenant_rfc', ''),
         'razon_social': config.get('tenant_razon_social', ''),
         'regimen_fiscal': config.get('cfdi_regimen_fiscal', '601'),
@@ -39,6 +42,22 @@ def _get_tenant_config(cur):
         'horux_api_key': config.get('cfdi_horux_api_key', ''),
     }
 
+    # Branch-level override
+    if branch_id:
+        cur.execute("""
+            SELECT rfc, razon_social, regimen_fiscal, codigo_postal, serie_cfdi
+            FROM branches WHERE id = %s
+        """, (branch_id,))
+        row = cur.fetchone()
+        if row and row[0]:
+            result['rfc'] = row[0] or result['rfc']
+            result['razon_social'] = row[1] or result['razon_social']
+            result['regimen_fiscal'] = row[2] or result['regimen_fiscal']
+            result['cp'] = row[3] or result['cp']
+            result['serie'] = row[4] or result['serie']
+
+    return result
+
 
 def _get_sale_with_items(cur, sale_id):
     """Load a sale with its items for CFDI generation."""
@@ -134,14 +153,14 @@ def generate_invoice():
     cur = conn.cursor()
 
     try:
-        tenant_config = _get_tenant_config(cur)
-        if not tenant_config['rfc']:
-            return jsonify({'error': 'Tenant RFC not configured. Set tenant_rfc in config.'}), 400
-
         sale = _get_sale_with_items(cur, sale_id)
         if not sale:
             return jsonify({'error': 'Sale not found'}), 404
 
+        tenant_config = _get_issuer_config(cur, sale.get('branch_id'))
+        if not tenant_config['rfc']:
+            return jsonify({'error': 'Tenant RFC not configured. Set tenant_rfc in config.'}), 400
+
         if sale['status'] == 'cancelled':
             return jsonify({'error': 'Cannot invoice a cancelled sale'}), 400
 
@@ -261,7 +280,7 @@ def trigger_process_queue():
     cur = conn.cursor()
 
     try:
-        tenant_config = _get_tenant_config(cur)
+        tenant_config = _get_issuer_config(cur)
         horux_url = tenant_config.get('horux_api_url')
         horux_key = tenant_config.get('horux_api_key')
 
@@ -316,7 +335,7 @@ def cancel_invoice(cfdi_id):
     cur = conn.cursor()
 
     try:
-        tenant_config = _get_tenant_config(cur)
+        tenant_config = _get_issuer_config(cur)
         result = cancel_cfdi(
             conn, cfdi_id, motive, replacement_uuid,
             tenant_config.get('horux_api_url'),
@@ -362,7 +381,7 @@ def get_sale_pdf(sale_id):
         cur.close(); conn.close()
         return jsonify({'error': 'Sale not found'}), 404
 
-    tenant_config = _get_tenant_config(cur)
+    tenant_config = _get_issuer_config(cur, sale.get('branch_id'))
     customer = _get_customer(cur, sale.get('customer_id'))
 
     # Check if there's a stamped CFDI
@@ -397,3 +416,129 @@ def get_sale_pdf(sale_id):
         'customer': customer,
         'cfdi': cfdi_info,
     })
+
+
+@invoicing_bp.route('/stats', methods=['GET'])
+@require_auth('invoicing.read')
+def api_invoicing_stats():
+    """Return counts for tab badges: invoices, credit notes, payment complements, cancellations."""
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    cur.execute("""
+        SELECT
+            COUNT(*) FILTER (WHERE type = 'ingreso' AND status IN ('pending', 'stamped', 'retry')) as facturas,
+            COUNT(*) FILTER (WHERE type = 'egreso' AND status IN ('pending', 'stamped', 'retry')) as notas_credito,
+            COUNT(*) FILTER (WHERE type = 'pago' AND status IN ('pending', 'stamped', 'retry')) as complementos,
+            COUNT(*) FILTER (WHERE status = 'cancelled') as cancelaciones
+        FROM cfdi_queue
+    """)
+    row = cur.fetchone()
+    cur.close()
+    conn.close()
+
+    return jsonify({
+        'facturas': row[0] or 0,
+        'notas_credito': row[1] or 0,
+        'complementos': row[2] or 0,
+        'cancelaciones': row[3] or 0,
+    })
+
+
+@invoicing_bp.route('/global-invoice', methods=['POST'])
+@require_auth('invoicing.create')
+def generate_global_invoice():
+    """Generate a monthly global invoice for cash sales.
+
+    Body: {
+        year: int (default current year),
+        month: int (default current month),
+        branch_id: int (optional)
+    }
+    """
+    data = request.get_json() or {}
+    now = datetime.now()
+    year = data.get('year', now.year)
+    month = data.get('month', now.month)
+    branch_id = data.get('branch_id')
+
+    try:
+        year = int(year)
+        month = int(month)
+        if month < 1 or month > 12:
+            return jsonify({'error': 'month must be 1-12'}), 400
+    except (ValueError, TypeError):
+        return jsonify({'error': 'year and month must be integers'}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    tenant_config = _get_issuer_config(cur, branch_id)
+    if not tenant_config['rfc']:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Tenant RFC not configured'}), 400
+
+    from services.global_invoice import generate_global_invoice
+    result = generate_global_invoice(
+        conn, tenant_config, year, month,
+        branch_id=branch_id,
+        employee_id=getattr(g, 'employee_id', None)
+    )
+
+    if 'error' in result:
+        cur.close(); conn.close()
+        return jsonify(result), 400
+
+    log_action(conn, 'GLOBAL_INVOICE_CREATE', 'cfdi_queue', result['id'],
+               new_value={'year': year, 'month': month, 'sales_count': result['sales_count']})
+    conn.commit()
+    cur.close()
+    conn.close()
+
+    return jsonify(result), 201
+
+
+@invoicing_bp.route('/global-invoice/<int:cfdi_id>', methods=['GET'])
+@require_auth('invoicing.view')
+def get_global_invoice(cfdi_id):
+    """Get status and linked sales of a global invoice."""
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
+
+    from services.global_invoice import get_global_invoice_status
+    result = get_global_invoice_status(conn, cfdi_id)
+
+    cur.close()
+    conn.close()
+
+    if not result:
+        return jsonify({'error': 'Global invoice not found'}), 404
+
+    return jsonify(result)
+
+
+@invoicing_bp.route('/global-invoice/eligible-sales', methods=['GET'])
+@require_auth('invoicing.view')
+def get_eligible_sales_for_global():
+    """Preview sales that would be included in a global invoice.
+
+    Query params: year, month, branch_id
+    """
+    now = datetime.now()
+    year = request.args.get('year', now.year, type=int)
+    month = request.args.get('month', now.month, type=int)
+    branch_id = request.args.get('branch_id', type=int)
+
+    conn = get_tenant_conn(g.tenant_id)
+
+    from services.global_invoice import get_eligible_sales
+    sales = get_eligible_sales(conn, year, month, branch_id)
+
+    conn.close()
+
+    return jsonify({
+        'year': year, 'month': month,
+        'count': len(sales),
+        'total': sum(s['total'] for s in sales),
+        'sales': [{'id': s['id'], 'total': s['total'], 'created_at': s['created_at']} for s in sales],
+    })
diff --git a/pos/blueprints/marketplace_bp.py b/pos/blueprints/marketplace_bp.py
index 1e8258a..a69a04d 100644
--- a/pos/blueprints/marketplace_bp.py
+++ b/pos/blueprints/marketplace_bp.py
@@ -190,6 +190,16 @@ def bodegas_with_part(part_id):
     return _with_master(_do)
 
 
+@marketplace_bp.route('/inventory/listing/<int:wi_id>', methods=['GET'])
+@require_auth()
+def bodegas_with_listing(wi_id):
+    """Return bodegas stocking a specific seller listing (wi_id)."""
+    def _do(master):
+        data = mkt.get_bodegas_with_listing(master, wi_id)
+        return jsonify({'data': data, 'count': len(data)})
+    return _with_master(_do)
+
+
 # ═══════════════════════════════════════════════════════════════════════════
 # PURCHASE ORDERS
 # ═══════════════════════════════════════════════════════════════════════════
diff --git a/pos/blueprints/marketplace_external_bp.py b/pos/blueprints/marketplace_external_bp.py
new file mode 100644
index 0000000..08fb313
--- /dev/null
+++ b/pos/blueprints/marketplace_external_bp.py
@@ -0,0 +1,703 @@
+"""MercadoLibre external marketplace REST endpoints.
+
+Routes:
+  Config
+    GET  /pos/api/marketplace-ext/config
+    POST /pos/api/marketplace-ext/connect
+    DELETE /pos/api/marketplace-ext/connect
+    GET  /pos/api/marketplace-ext/categories
+
+  Listings
+    GET  /pos/api/marketplace-ext/listings
+    POST /pos/api/marketplace-ext/listings
+    POST /pos/api/marketplace-ext/listings/<id>/sync
+    POST /pos/api/marketplace-ext/listings/<id>/pause
+    POST /pos/api/marketplace-ext/listings/<id>/activate
+    DELETE /pos/api/marketplace-ext/listings/<id>
+
+  Orders
+    GET  /pos/api/marketplace-ext/orders
+    GET  /pos/api/marketplace-ext/orders/<id>
+    POST /pos/api/marketplace-ext/orders/<id>/convert
+
+  Webhook (public)
+    POST /pos/api/marketplace-ext/webhook/meli
+"""
+
+from flask import Blueprint, request, jsonify, g
+from middleware import require_auth, has_permission
+from tenant_db import get_tenant_conn, get_master_conn
+from services import marketplace_external_service as meli_svc
+
+
+def _get_public_base_url() -> str:
+    """Build the tenant's public base URL from request headers (handles reverse proxy)."""
+    proto = request.headers.get("X-Forwarded-Proto", request.scheme)
+    host = request.headers.get("X-Forwarded-Host", request.host)
+
+    # Cloudflare specific header
+    cf_visitor = request.headers.get("CF-Visitor")
+    if cf_visitor and '"scheme":"https"' in cf_visitor:
+        proto = "https"
+
+    # Force https for production domain if we detect http behind a TLS terminator
+    if proto == "http" and ("nexusautoparts.com.mx" in host or request.headers.get("X-Forwarded-Ssl") == "on"):
+        proto = "https"
+
+    return f"{proto}://{host}/"
+from services.meli_service import MeliService, MeliAuthError
+
+marketplace_ext_bp = Blueprint(
+    "marketplace_ext", __name__, url_prefix="/pos/api/marketplace-ext"
+)
+
+
+# ─── Helpers ───────────────────────────────────────────────────────────────
+
+def _require_meli_manage():
+    if not has_permission("marketplace.manage"):
+        return jsonify({"error": "Missing permission: marketplace.manage"}), 403
+    return None
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# CONFIG
+# ═══════════════════════════════════════════════════════════════════════════
+
+@marketplace_ext_bp.route("/config", methods=["GET"])
+@require_auth()
+def get_config():
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cfg = meli_svc.get_meli_config(conn)
+        # Never return tokens to frontend
+        safe = {
+            k: v for k, v in cfg.items()
+            if k not in ("meli_access_token", "meli_refresh_token", "meli_client_secret")
+        }
+        safe["connected"] = bool(cfg.get("meli_access_token"))
+        return jsonify(safe)
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/connect", methods=["POST"])
+@require_auth()
+def connect_meli():
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    data = request.get_json() or {}
+    code = data.get("code")
+    client_id = data.get("client_id")
+    client_secret = data.get("client_secret")
+    redirect_uri = data.get("redirect_uri", "")
+
+    if not code or not client_id or not client_secret:
+        return jsonify({"error": "code, client_id and client_secret required"}), 400
+
+    try:
+        token_data = MeliService.exchange_code(code, client_id, client_secret, redirect_uri)
+    except MeliAuthError as e:
+        return jsonify({"error": str(e)}), 400
+
+    access_token = token_data.get("access_token")
+    refresh_token = token_data.get("refresh_token")
+    user_id = token_data.get("user_id")
+
+    # Validate token by fetching user
+    svc = MeliService(access_token)
+    try:
+        user = svc.get_user()
+    except MeliAuthError as e:
+        return jsonify({"error": f"Invalid token: {e}"}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        meli_svc.save_meli_config(conn, {
+            "meli_access_token": access_token,
+            "meli_refresh_token": refresh_token,
+            "meli_user_id": str(user_id or user.get("id")),
+            "meli_site_id": user.get("site_id", "MLM"),
+            "meli_enabled": "true",
+            "meli_client_id": client_id,
+            "meli_client_secret": client_secret,
+        })
+        return jsonify({
+            "ok": True,
+            "user_id": user_id or user.get("id"),
+            "nickname": user.get("nickname"),
+            "site_id": user.get("site_id"),
+        })
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/connect", methods=["DELETE"])
+@require_auth()
+def disconnect_meli():
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        meli_svc.delete_meli_config(conn)
+        return jsonify({"ok": True})
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/categories", methods=["GET"])
+@require_auth()
+def search_categories():
+    q = request.args.get("q", "")
+    site_id = request.args.get("site_id", "MLM")
+    if not q or len(q) < 2:
+        return jsonify({"categories": []})
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cfg = meli_svc.get_meli_config(conn)
+        svc = meli_svc._get_meli_service(cfg)
+        if not svc:
+            return jsonify({"error": "MercadoLibre not connected"}), 400
+        result = svc.search_categories(site_id, q)
+        return jsonify({"categories": result})
+    except MeliAuthError:
+        return jsonify({"error": "MercadoLibre token expired. Please reconnect."}), 401
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# LISTINGS
+# ═══════════════════════════════════════════════════════════════════════════
+
+@marketplace_ext_bp.route("/listings", methods=["GET"])
+@require_auth()
+def list_listings():
+    page = int(request.args.get("page", 1))
+    per_page = min(int(request.args.get("per_page", 50)), 200)
+    status = request.args.get("status")
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.get_listings(conn, page=page, per_page=per_page, status=status)
+        return jsonify(result)
+    except MeliAuthError:
+        return jsonify({"error": "MercadoLibre token expired. Please reconnect."}), 401
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings", methods=["POST"])
+@require_auth()
+def create_listings():
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    data = request.get_json() or {}
+    inventory_ids = data.get("inventory_ids", [])
+    category_id = data.get("category_id")
+    listing_type = data.get("listing_type", "gold_special")
+    shipping_mode = data.get("shipping_mode", "me2")
+    custom_data = data.get("custom_data", {})
+
+    if not inventory_ids:
+        return jsonify({"error": "inventory_ids required"}), 400
+    if not category_id:
+        return jsonify({"error": "category_id required"}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.publish_items(
+            conn,
+            inventory_ids=inventory_ids,
+            meli_category_id=category_id,
+            listing_type_id=listing_type,
+            shipping_mode=shipping_mode,
+            custom_data=custom_data,
+            base_url=_get_public_base_url(),
+        )
+        return jsonify(result), 201
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/import-existing", methods=["POST"])
+@require_auth()
+def import_existing_listings():
+    """Import all existing MercadoLibre listings for the connected seller."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.import_existing_listings(conn)
+        return jsonify(result), 200
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/inventory-check", methods=["POST"])
+@require_auth()
+def inventory_check():
+    """Check local pre-flight status for ML publishing (duplicates, stock, price, image)."""
+    data = request.get_json() or {}
+    inventory_ids = data.get("inventory_ids", [])
+    if not inventory_ids:
+        return jsonify({"error": "inventory_ids required"}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.check_inventory_ml_status(conn, inventory_ids, base_url=_get_public_base_url())
+        return jsonify(result)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/sync-stock", methods=["POST"])
+@require_auth()
+def sync_stock_to_meli():
+    """Process pending stock updates to MercadoLibre."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.process_meli_sync_queue(conn)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/categories/<category_id>/attributes", methods=["GET"])
+@require_auth()
+def category_attributes(category_id):
+    """Get required attributes for a MercadoLibre category."""
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        cfg = meli_svc.get_meli_config(conn)
+        svc = meli_svc._get_meli_service(cfg)
+        if not svc:
+            return jsonify({"error": "MercadoLibre not connected"}), 400
+        attrs = svc.get_category_attributes(category_id)
+        # Filter to required attributes only for the UI
+        required = [a for a in attrs if a.get("tags", {}).get("required")]
+        return jsonify({"attributes": required, "all": attrs})
+    except MeliAuthError:
+        return jsonify({"error": "MercadoLibre token expired. Please reconnect."}), 401
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/validate", methods=["POST"])
+@require_auth()
+def validate_listings():
+    """Validate items payload against ML /items/validate without creating them."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    data = request.get_json() or {}
+    inventory_ids = data.get("inventory_ids", [])
+    category_id = data.get("category_id")
+    listing_type = data.get("listing_type", "gold_special")
+    shipping_mode = data.get("shipping_mode", "me2")
+    custom_data = data.get("custom_data", {})
+
+    if not inventory_ids:
+        return jsonify({"error": "inventory_ids required"}), 400
+    if not category_id:
+        return jsonify({"error": "category_id required"}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.validate_items(
+            conn,
+            inventory_ids=inventory_ids,
+            meli_category_id=category_id,
+            listing_type_id=listing_type,
+            shipping_mode=shipping_mode,
+            custom_data=custom_data,
+            base_url=_get_public_base_url(),
+        )
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/async", methods=["POST"])
+@require_auth()
+def create_listings_async():
+    """Enqueue ML publishing as a Celery background task."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    data = request.get_json() or {}
+    inventory_ids = data.get("inventory_ids", [])
+    category_id = data.get("category_id")
+    listing_type = data.get("listing_type", "gold_special")
+    shipping_mode = data.get("shipping_mode", "me2")
+    custom_data = data.get("custom_data", {})
+
+    if not inventory_ids:
+        return jsonify({"error": "inventory_ids required"}), 400
+    if not category_id:
+        return jsonify({"error": "category_id required"}), 400
+
+    try:
+        from tasks import publish_meli_items_task
+        task = publish_meli_items_task.delay(
+            g.tenant_id,
+            inventory_ids=inventory_ids,
+            category_id=category_id,
+            listing_type=listing_type,
+            shipping_mode=shipping_mode,
+            custom_data=custom_data,
+            base_url=_get_public_base_url(),
+        )
+        return jsonify({"task_id": task.id, "status": "queued"}), 202
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+@marketplace_ext_bp.route("/listings/async/<task_id>", methods=["GET"])
+@require_auth()
+def get_async_listing_status(task_id):
+    """Get status of an async ML publishing task."""
+    try:
+        from celery.result import AsyncResult
+        from app import celery as celery_app
+        result = AsyncResult(task_id, app=celery_app)
+        if result.ready():
+            return jsonify({"status": "done", "result": result.result or {}})
+        return jsonify({"status": "pending"})
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+
+
+@marketplace_ext_bp.route("/listings/<int:listing_id>/sync", methods=["POST"])
+@require_auth()
+def sync_listing(listing_id):
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.sync_listing(conn, listing_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/<int:listing_id>/pause", methods=["POST"])
+@require_auth()
+def pause_listing(listing_id):
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.pause_listing(conn, listing_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/<int:listing_id>/activate", methods=["POST"])
+@require_auth()
+def activate_listing(listing_id):
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.activate_listing(conn, listing_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/<int:listing_id>", methods=["DELETE"])
+@require_auth()
+def delete_listing(listing_id):
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.close_listing(conn, listing_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/listings/<int:listing_id>/permanent", methods=["DELETE"])
+@require_auth()
+def delete_listing_permanent(listing_id):
+    """Hard-delete a closed listing from the local DB."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.delete_listing_permanently(conn, listing_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# QUESTIONS & ANSWERS
+# ═══════════════════════════════════════════════════════════════════════════
+
+@marketplace_ext_bp.route("/questions", methods=["GET"])
+@require_auth()
+def list_questions():
+    """List questions from local DB. Query param: ?status=unanswered"""
+    status = request.args.get("status")
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        items = meli_svc.list_local_questions(conn, status=status)
+        return jsonify({"items": items})
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/questions/sync", methods=["POST"])
+@require_auth()
+def sync_questions():
+    """Force sync questions from ML for all active listings."""
+    err = _require_meli_manage()
+    if err:
+        return err
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.sync_questions(conn)
+        return jsonify(result)
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/questions/<int:question_id>/answer", methods=["POST"])
+@require_auth()
+def answer_question(question_id):
+    """Answer a buyer question via ML API."""
+    err = _require_meli_manage()
+    if err:
+        return err
+    data = request.get_json() or {}
+    text = data.get("text", "").strip()
+    if not text:
+        return jsonify({"error": "Answer text is required"}), 400
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.answer_question(conn, question_id, text)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# ORDERS
+# ═══════════════════════════════════════════════════════════════════════════
+
+@marketplace_ext_bp.route("/orders/sync", methods=["POST"])
+@require_auth()
+def sync_orders():
+    """Manually trigger sync of MercadoLibre orders."""
+    err = _require_meli_manage()
+    if err:
+        return err
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.fetch_and_save_orders(conn)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/orders", methods=["GET"])
+@require_auth()
+def list_orders():
+    page = int(request.args.get("page", 1))
+    per_page = min(int(request.args.get("per_page", 50)), 200)
+    status = request.args.get("status")
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.get_orders(conn, page=page, per_page=per_page, status=status)
+        return jsonify(result)
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/orders/<int:order_id>", methods=["GET"])
+@require_auth()
+def get_order(order_id):
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.get_order_detail(conn, order_id)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 404
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/orders/<int:order_id>/convert", methods=["POST"])
+@require_auth("pos.sell")
+def convert_order(order_id):
+    data = request.get_json() or {}
+    register_id = data.get("register_id")
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.convert_order_to_sale(
+            conn, order_id, employee_id=g.employee_id, register_id=register_id
+        )
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+@marketplace_ext_bp.route("/orders/<int:order_id>/status", methods=["POST"])
+@require_auth()
+def update_order_status_route(order_id):
+    data = request.get_json() or {}
+    new_status = data.get("status")
+    if not new_status:
+        return jsonify({"error": "status required"}), 400
+
+    conn = get_tenant_conn(g.tenant_id)
+    try:
+        result = meli_svc.update_order_status(conn, order_id, new_status)
+        return jsonify(result)
+    except ValueError as e:
+        return jsonify({"error": str(e)}), 400
+    except Exception as e:
+        return jsonify({"error": str(e)}), 500
+    finally:
+        conn.close()
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# WEBHOOK (public — no auth)
+# ═══════════════════════════════════════════════════════════════════════════
+
+@marketplace_ext_bp.route("/webhook/meli", methods=["POST"])
+def meli_webhook():
+    """Receive MercadoLibre notifications.
+
+    ML sends a lightweight payload with topic + resource URL.
+    We ack immediately and enqueue Celery for async processing.
+    """
+    data = request.get_json(force=True, silent=True) or {}
+    topic = data.get("topic", "")
+    resource = data.get("resource", "")
+    user_id = data.get("user_id")
+
+    # Resolve tenant by meli_user_id
+    tenant_id = None
+    if user_id:
+        try:
+            mconn = get_master_conn()
+            mcur = mconn.cursor()
+            mcur.execute(
+                """
+                SELECT t.id FROM tenants t
+                JOIN tenant_config c ON c.key = 'meli_user_id' AND c.value = %s
+                WHERE t.is_active = true
+                LIMIT 1
+                """,
+                (str(user_id),),
+            )
+            row = mcur.fetchone()
+            if row:
+                tenant_id = row[0]
+            mcur.close()
+            mconn.close()
+        except Exception:
+            pass
+
+    if tenant_id and topic:
+        try:
+            from tasks import process_meli_webhook_task
+            process_meli_webhook_task.delay(tenant_id, topic, resource)
+        except Exception as e:
+            print(f"[ML Webhook] Failed to enqueue task: {e}")
+
+    return jsonify({"ok": True})
diff --git a/pos/blueprints/pos_bp.py b/pos/blueprints/pos_bp.py
index 7e0ee85..4b43c0f 100644
--- a/pos/blueprints/pos_bp.py
+++ b/pos/blueprints/pos_bp.py
@@ -15,6 +15,7 @@ from services.pos_engine import (
     process_sale, cancel_sale, calculate_totals,
     get_price_for_customer, get_margin_info
 )
+from services.inventory_engine import get_stock
 from services.audit import log_action
 from config import JWT_SECRET
 
@@ -34,7 +35,7 @@ def _enrich_items(cur, items, customer_id=None):
     # Batch fetch all inventory items in one query
     cur.execute("""
         SELECT id, part_number, name, cost, price_1, price_2, price_3,
-               tax_rate, branch_id
+               tax_rate
         FROM inventory WHERE id = ANY(%s) AND is_active = true
     """, (inv_ids,))
     inv_map = {r[0]: r for r in cur.fetchall()}
@@ -75,7 +76,6 @@ def _enrich_items(cur, items, customer_id=None):
             'unit_cost': float(inv[3]) if inv[3] else 0,
             'discount_pct': discount_pct,
             'tax_rate': tax_rate,
-            'branch_id': inv[8],
         })
     return enriched
 
@@ -103,6 +103,19 @@ def create_sale():
     data = request.get_json() or {}
     conn = get_tenant_conn(g.tenant_id)
 
+    # Verify stock availability per item for the active branch
+    branch_id = data.get('branch_id', g.branch_id)
+    for item in data.get('items', []):
+        inv_id = item.get('inventory_id')
+        qty = int(item.get('quantity', 1))
+        if inv_id:
+            available = get_stock(conn, inv_id, branch_id)
+            if available < qty:
+                conn.close()
+                return jsonify({
+                    'error': f'Insufficient stock for item {inv_id}. Available: {available}, requested: {qty}'
+                }), 400
+
     try:
         sale = process_sale(conn, data)
         conn.commit()
@@ -1864,6 +1877,14 @@ def complete_layaway(layaway_id):
                    new_value={'sale_id': sale['id'], 'total': total})
 
         conn.commit()
+
+        # WhatsApp learning hook (non-blocking)
+        try:
+            from services.wa_learning import check_learning_resolution
+            check_learning_resolution(sale['id'], cust_id, conn)
+        except Exception:
+            pass
+
         cur.close(); conn.close()
         return jsonify(sale), 201
 
diff --git a/pos/blueprints/supplier_catalog_bp.py b/pos/blueprints/supplier_catalog_bp.py
new file mode 100644
index 0000000..0fb51d7
--- /dev/null
+++ b/pos/blueprints/supplier_catalog_bp.py
@@ -0,0 +1,538 @@
+"""Supplier Catalog Blueprint — parts from suppliers with vehicle compatibility.
+
+Independent from inventory. Supports:
+- Browse by supplier/category
+- Search by text or vehicle (MYE or make/model/year)
+- Part detail with compatibilities and interchanges
+- Bulk import via Excel
+"""
+
+import csv
+import io
+from datetime import date
+from flask import Blueprint, request, jsonify, g, render_template
+from psycopg2.extras import RealDictCursor
+
+from tenant_db import get_master_conn
+from middleware import require_auth
+
+supplier_catalog_bp = Blueprint('supplier_catalog', __name__, url_prefix='/pos/api/supplier-catalog')
+
+
+# ─── Helpers ───────────────────────────────────────────────────────────────
+
+def _get_master_conn():
+    return get_master_conn()
+
+
+def _json_response(data, status=200):
+    return jsonify(data), status
+
+
+# ─── Brands ────────────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/brands', methods=['GET'])
+@require_auth('catalog.view')
+def list_brands():
+    """Return distinct makes (vehicle brands) present in the supplier catalog."""
+    conn = _get_master_conn()
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT DISTINCT make, COUNT(*) as cnt
+        FROM supplier_catalog_compat
+        WHERE make IS NOT NULL AND make != ''
+        GROUP BY make
+        ORDER BY make ASC
+    """)
+    rows = cur.fetchall()
+    cur.close(); conn.close()
+    return jsonify({'brands': [{'name': r[0], 'count': r[1]} for r in rows]})
+
+
+# ─── Search ────────────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/search', methods=['GET'])
+@require_auth('catalog.view')
+def search_items():
+    """Search supplier catalog by text and/or vehicle."""
+    q = (request.args.get('q') or '').strip()
+    mye_id = request.args.get('mye_id', type=int)
+    make = (request.args.get('make') or '').strip()
+    model = (request.args.get('model') or '').strip()
+    year = request.args.get('year', type=int)
+    supplier = (request.args.get('supplier') or '').strip()
+    category = (request.args.get('category') or '').strip()
+    page = max(1, request.args.get('page', 1, type=int))
+    per_page = min(100, request.args.get('per_page', 30, type=int))
+    offset = (page - 1) * per_page
+
+    conn = _get_master_conn()
+    cur = conn.cursor()
+
+    # Build query dynamically
+    where_parts = ["sc.is_active = true"]
+    params = []
+
+    if supplier:
+        where_parts.append("sc.supplier_name = %s")
+        params.append(supplier)
+    if category:
+        where_parts.append("sc.category = %s")
+        params.append(category)
+
+    # Text search on SKU, name, or interchange part_number
+    if q:
+        where_parts.append("""
+            (sc.sku ILIKE %s OR sc.name ILIKE %s
+             OR EXISTS (
+                 SELECT 1 FROM supplier_catalog_interchange sci2
+                 WHERE sci2.catalog_id = sc.id AND sci2.part_number ILIKE %s
+             ))
+        """)
+        like_q = f'%{q}%'
+        params.extend([like_q, like_q, like_q])
+
+    # Vehicle filter
+    vehicle_join = ""
+    if mye_id:
+        vehicle_join = "JOIN supplier_catalog_compat scc ON scc.catalog_id = sc.id"
+        where_parts.append("scc.model_year_engine_id = %s")
+        params.append(mye_id)
+    elif make or model or year:
+        vehicle_join = "JOIN supplier_catalog_compat scc ON scc.catalog_id = sc.id"
+        if make:
+            where_parts.append("scc.make ILIKE %s")
+            params.append(f'%{make}%')
+        if model:
+            where_parts.append("scc.model ILIKE %s")
+            params.append(f'%{model}%')
+        if year:
+            where_parts.append("scc.year = %s")
+            params.append(year)
+
+    where_sql = " AND ".join(where_parts)
+
+    # Count total
+    count_sql = f"""
+        SELECT COUNT(DISTINCT sc.id)
+        FROM supplier_catalog sc
+        {vehicle_join}
+        WHERE {where_sql}
+    """
+    cur.execute(count_sql, params)
+    total = cur.fetchone()[0]
+
+    # Fetch page
+    fetch_sql = f"""
+        SELECT DISTINCT
+            sc.id, sc.supplier_name, sc.sku, sc.name,
+            sc.category, sc.description, sc.image_url
+        FROM supplier_catalog sc
+        {vehicle_join}
+        WHERE {where_sql}
+        ORDER BY sc.name ASC
+        LIMIT %s OFFSET %s
+    """
+    cur.execute(fetch_sql, params + [per_page, offset])
+    rows = cur.fetchall()
+
+    items = []
+    for r in rows:
+        items.append({
+            'id': r[0],
+            'supplier_name': r[1],
+            'sku': r[2],
+            'name': r[3],
+            'category': r[4],
+            'description': r[5],
+            'image_url': r[6],
+        })
+
+    cur.close(); conn.close()
+    return jsonify({
+        'data': items,
+        'pagination': {
+            'page': page,
+            'per_page': per_page,
+            'total': total,
+            'total_pages': (total + per_page - 1) // per_page,
+        }
+    })
+
+
+# ─── Item Detail ───────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/items/<int:item_id>', methods=['GET'])
+@require_auth('catalog.view')
+def get_item_detail(item_id):
+    """Return full detail for a supplier catalog item including compat + interchanges."""
+    conn = _get_master_conn()
+    cur = conn.cursor()
+
+    cur.execute("""
+        SELECT id, supplier_name, sku, name, category, description, image_url, created_at
+        FROM supplier_catalog WHERE id = %s AND is_active = true
+    """, (item_id,))
+    row = cur.fetchone()
+    if not row:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Item not found'}), 404
+
+    item = {
+        'id': row[0],
+        'supplier_name': row[1],
+        'sku': row[2],
+        'name': row[3],
+        'category': row[4],
+        'description': row[5],
+        'image_url': row[6],
+        'created_at': str(row[7]) if row[7] else None,
+    }
+
+    # Compatibilities — deduplicate by (make, model, year, engine) because
+    # the same vehicle may map to multiple MYE ids (especially when engine
+    # text is empty from the supplier catalog).
+    cur.execute("""
+        SELECT make, model, year, engine, model_year_engine_id, source
+        FROM supplier_catalog_compat
+        WHERE catalog_id = %s
+        ORDER BY make, model, year, engine
+    """, (item_id,))
+    seen_compat = set()
+    compatibilities = []
+    for r in cur.fetchall():
+        key = (r[0], r[1], r[2], r[3])
+        if key in seen_compat:
+            continue
+        seen_compat.add(key)
+        compatibilities.append({
+            'make': r[0], 'model': r[1], 'year': r[2], 'engine': r[3],
+            'model_year_engine_id': r[4], 'source': r[5]
+        })
+    item['compatibilities'] = compatibilities
+
+    # Interchanges
+    cur.execute("""
+        SELECT brand, part_number
+        FROM supplier_catalog_interchange
+        WHERE catalog_id = %s
+        ORDER BY brand, part_number
+    """, (item_id,))
+    item['interchanges'] = [
+        {'brand': r[0], 'part_number': r[1]}
+        for r in cur.fetchall()
+    ]
+
+    cur.close(); conn.close()
+    return jsonify(item)
+
+
+# ─── Categories ────────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/categories', methods=['GET'])
+@require_auth('catalog.view')
+def list_categories():
+    """Return distinct categories with counts."""
+    conn = _get_master_conn()
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT category, COUNT(*) as cnt
+        FROM supplier_catalog
+        WHERE is_active = true
+        GROUP BY category
+        ORDER BY cnt DESC
+    """)
+    rows = cur.fetchall()
+    cur.close(); conn.close()
+    return jsonify({'categories': [{'name': r[0], 'count': r[1]} for r in rows]})
+
+
+# ─── Suppliers ─────────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/suppliers', methods=['GET'])
+@require_auth('catalog.view')
+def list_suppliers():
+    """Return distinct suppliers with counts."""
+    conn = _get_master_conn()
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT supplier_name, COUNT(*) as cnt
+        FROM supplier_catalog
+        WHERE is_active = true
+        GROUP BY supplier_name
+        ORDER BY supplier_name ASC
+    """)
+    rows = cur.fetchall()
+    cur.close(); conn.close()
+    return jsonify({'suppliers': [{'name': r[0], 'count': r[1]} for r in rows]})
+
+
+# ─── Delete ────────────────────────────────────────────────────────────────
+
+@supplier_catalog_bp.route('/items/<int:item_id>', methods=['DELETE'])
+@require_auth('inventory.edit')
+def delete_item(item_id):
+    """Soft-delete a supplier catalog item."""
+    conn = _get_master_conn()
+    cur = conn.cursor()
+    cur.execute("UPDATE supplier_catalog SET is_active = false WHERE id = %s", (item_id,))
+    conn.commit()
+    cur.close(); conn.close()
+    return jsonify({'success': True})
+
+
+# ─── Prices ────────────────────────────────────────────────────────────────
+
+def _get_latest_prices(master_conn, tenant_id, catalog_ids):
+    """Return a dict catalog_id -> price row for the latest active price per item."""
+    if not catalog_ids:
+        return {}
+    cur = master_conn.cursor()
+    cur.execute("""
+        SELECT DISTINCT ON (catalog_id)
+            catalog_id, price, currency, effective_from, effective_to
+        FROM supplier_catalog_prices
+        WHERE tenant_id = %s AND catalog_id = ANY(%s) AND is_active = true
+          AND (effective_to IS NULL OR effective_to >= CURRENT_DATE)
+        ORDER BY catalog_id, effective_from DESC
+    """, (tenant_id, list(catalog_ids)))
+    prices = {}
+    for r in cur.fetchall():
+        prices[r[0]] = {
+            'price': float(r[1]) if r[1] is not None else None,
+            'currency': r[2] or 'MXN',
+            'effective_from': str(r[3]) if r[3] else None,
+            'effective_to': str(r[4]) if r[4] else None,
+        }
+    cur.close()
+    return prices
+
+
+@supplier_catalog_bp.route('/prices', methods=['GET'])
+@require_auth('catalog.view')
+def list_prices():
+    """List active supplier prices for the current tenant."""
+    supplier = (request.args.get('supplier') or '').strip()
+    q = (request.args.get('q') or '').strip()
+    page = max(1, request.args.get('page', 1, type=int))
+    per_page = min(200, request.args.get('per_page', 50, type=int))
+    offset = (page - 1) * per_page
+
+    conn = _get_master_conn()
+    cur = conn.cursor()
+
+    where_parts = ["sc.is_active = true", "scp.tenant_id = %s"]
+    params = [g.tenant_id]
+
+    if supplier:
+        where_parts.append("sc.supplier_name = %s")
+        params.append(supplier)
+    if q:
+        where_parts.append("(sc.sku ILIKE %s OR sc.name ILIKE %s)")
+        like_q = f'%{q}%'
+        params.extend([like_q, like_q])
+
+    where_sql = " AND ".join(where_parts)
+
+    cur.execute(f"""
+        SELECT COUNT(DISTINCT sc.id)
+        FROM supplier_catalog sc
+        JOIN supplier_catalog_prices scp ON scp.catalog_id = sc.id
+        WHERE {where_sql}
+          AND scp.is_active = true
+          AND (scp.effective_to IS NULL OR scp.effective_to >= CURRENT_DATE)
+    """, params)
+    total = cur.fetchone()[0]
+
+    cur.execute(f"""
+        SELECT DISTINCT ON (sc.id)
+            sc.id, sc.supplier_name, sc.sku, sc.name, sc.category,
+            scp.price, scp.currency, scp.effective_from, scp.effective_to
+        FROM supplier_catalog sc
+        JOIN supplier_catalog_prices scp ON scp.catalog_id = sc.id
+        WHERE {where_sql}
+          AND scp.is_active = true
+          AND (scp.effective_to IS NULL OR scp.effective_to >= CURRENT_DATE)
+        ORDER BY sc.id, scp.effective_from DESC
+        LIMIT %s OFFSET %s
+    """, params + [per_page, offset])
+
+    items = []
+    for r in cur.fetchall():
+        items.append({
+            'catalog_id': r[0],
+            'supplier_name': r[1],
+            'sku': r[2],
+            'name': r[3],
+            'category': r[4],
+            'price': float(r[5]) if r[5] is not None else None,
+            'currency': r[6] or 'MXN',
+            'effective_from': str(r[7]) if r[7] else None,
+            'effective_to': str(r[8]) if r[8] else None,
+        })
+
+    cur.close(); conn.close()
+    return jsonify({
+        'data': items,
+        'pagination': {'page': page, 'per_page': per_page, 'total': total,
+                       'total_pages': (total + per_page - 1) // per_page}
+    })
+
+
+@supplier_catalog_bp.route('/prices/template', methods=['GET'])
+@require_auth('catalog.view')
+def download_price_template():
+    """Return a CSV template for uploading supplier prices."""
+    output = io.StringIO()
+    writer = csv.writer(output)
+    writer.writerow(['supplier_name', 'sku', 'price', 'currency', 'effective_from'])
+    writer.writerow(['YOKOMITSU', 'DENK070A', '1250.00', 'MXN', '2026-01-01'])
+    output.seek(0)
+    return (output.getvalue(), 200, {
+        'Content-Type': 'text/csv; charset=utf-8',
+        'Content-Disposition': 'attachment; filename="supplier_prices_template.csv"'
+    })
+
+
+def _read_upload_file(file_storage):
+    """Read CSV or Excel upload and return list of dict rows."""
+    filename = (file_storage.filename or '').lower()
+    content = file_storage.read()
+    if filename.endswith('.csv'):
+        text = content.decode('utf-8-sig')
+        reader = csv.DictReader(io.StringIO(text))
+        return [row for row in reader]
+    if filename.endswith(('.xlsx', '.xls')):
+        try:
+            import openpyxl
+        except ImportError as e:
+            raise RuntimeError('openpyxl no instalado; sube CSV o instala openpyxl') from e
+        wb = openpyxl.load_workbook(io.BytesIO(content), data_only=True)
+        ws = wb.active
+        rows = list(ws.iter_rows(values_only=True))
+        if not rows:
+            return []
+        headers = [str(c).strip().lower() if c else '' for c in rows[0]]
+        return [
+            dict(zip(headers, row))
+            for row in rows[1:] if any(cell is not None and str(cell).strip() for cell in row)
+        ]
+    raise ValueError('Formato no soportado. Usa CSV o Excel (.xlsx)')
+
+
+@supplier_catalog_bp.route('/prices/upload', methods=['POST'])
+@require_auth('inventory.edit')
+def upload_prices():
+    """Bulk upload/upsert supplier prices for the current tenant.
+
+    Expected columns: supplier_name, sku, price, [currency], [effective_from]
+    """
+    if 'file' not in request.files:
+        return jsonify({'error': 'Archivo requerido'}), 400
+    file_storage = request.files['file']
+    if not file_storage or not file_storage.filename:
+        return jsonify({'error': 'Archivo requerido'}), 400
+
+    try:
+        rows = _read_upload_file(file_storage)
+    except Exception as e:
+        return jsonify({'error': str(e)}), 400
+
+    if not rows:
+        return jsonify({'error': 'El archivo esta vacio o no tiene filas validas'}), 400
+
+    conn = _get_master_conn()
+    cur = conn.cursor()
+
+    # Build a lookup of supplier+sku -> catalog_id
+    # We expect all rows to refer to existing catalog items.
+    normalized_rows = []
+    errors = []
+    for idx, row in enumerate(rows, start=2):
+        supplier = str(row.get('supplier_name') or '').strip()
+        sku = str(row.get('sku') or '').strip()
+        price_raw = row.get('price')
+        currency = str(row.get('currency') or 'MXN').strip().upper() or 'MXN'
+        eff_from_raw = row.get('effective_from')
+
+        if not supplier or not sku:
+            errors.append(f'Fila {idx}: supplier_name y sku son requeridos')
+            continue
+
+        try:
+            price = float(str(price_raw).replace(',', '').strip())
+        except Exception:
+            errors.append(f'Fila {idx}: precio invalido para {supplier}/{sku}')
+            continue
+
+        eff_from = date.today()
+        if eff_from_raw:
+            try:
+                eff_from = date.fromisoformat(str(eff_from_raw).strip())
+            except Exception:
+                errors.append(f'Fila {idx}: effective_from invalido (use YYYY-MM-DD)')
+                continue
+
+        normalized_rows.append((supplier, sku, price, currency, eff_from))
+
+    if errors:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Errores de validacion', 'details': errors}), 400
+
+    # Bulk lookup catalog IDs
+    catalog_lookup = {}
+    for supplier, sku, *_ in normalized_rows:
+        catalog_lookup[(supplier, sku)] = None
+
+    if catalog_lookup:
+        keys = list(catalog_lookup.keys())
+        # Batch query using unnest
+        cur.execute("""
+            SELECT supplier_name, sku, id
+            FROM supplier_catalog
+            WHERE is_active = true
+              AND (supplier_name, sku) = ANY(%s)
+        """, (keys,))
+        for r in cur.fetchall():
+            catalog_lookup[(r[0], r[1])] = r[2]
+
+    upserts = []
+    for idx, (supplier, sku, price, currency, eff_from) in enumerate(normalized_rows, start=2):
+        catalog_id = catalog_lookup.get((supplier, sku))
+        if not catalog_id:
+            errors.append(f'Fila {idx}: SKU {supplier}/{sku} no existe en el catalogo')
+            continue
+        upserts.append((g.tenant_id, catalog_id, price, currency, eff_from))
+
+    if errors:
+        cur.close(); conn.close()
+        return jsonify({'error': 'Errores de validacion', 'details': errors}), 400
+
+    inserted = 0
+    updated = 0
+    for tenant_id, catalog_id, price, currency, eff_from in upserts:
+        # Try update existing row with same (tenant_id, catalog_id, effective_from)
+        cur.execute("""
+            UPDATE supplier_catalog_prices
+            SET price = %s, currency = %s, is_active = true, updated_at = NOW()
+            WHERE tenant_id = %s AND catalog_id = %s AND effective_from = %s
+            RETURNING id
+        """, (price, currency, tenant_id, catalog_id, eff_from))
+        if cur.fetchone():
+            updated += 1
+        else:
+            cur.execute("""
+                INSERT INTO supplier_catalog_prices
+                    (tenant_id, catalog_id, price, currency, effective_from, is_active)
+                VALUES (%s, %s, %s, %s, %s, true)
+            """, (tenant_id, catalog_id, price, currency, eff_from))
+            inserted += 1
+
+    conn.commit()
+    cur.close(); conn.close()
+    return jsonify({
+        'success': True,
+        'processed': len(upserts),
+        'inserted': inserted,
+        'updated': updated,
+    })
diff --git a/pos/blueprints/supplier_portal_bp.py b/pos/blueprints/supplier_portal_bp.py
index 33a5125..16034fe 100644
--- a/pos/blueprints/supplier_portal_bp.py
+++ b/pos/blueprints/supplier_portal_bp.py
@@ -12,6 +12,7 @@ supplier_portal_bp = Blueprint('supplier_portal', __name__, url_prefix='/pos/api
 
 
 from middleware import require_auth
+from tenant_db import get_tenant_conn
 
 
 class DecimalEncoder(json.JSONEncoder):
@@ -26,48 +27,47 @@ class DecimalEncoder(json.JSONEncoder):
 def get_demand():
     """Aggregated demand by zone, part group, and time range."""
     days = request.args.get('days', 30, type=int)
-    group_id = request.args.get('group_id', type=int)
     branch_id = request.args.get('branch_id', type=int)
 
-    from tenant_db import get_tenant_db
-    db = get_tenant_db()
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
     since = datetime.utcnow() - timedelta(days=days)
 
-    params = [since]
-    filters = "s.created_at >= %s"
-    if group_id:
-        filters += " AND p.group_id = %s"
-        params.append(group_id)
-    if branch_id:
-        filters += " AND s.branch_id = %s"
-        params.append(branch_id)
+    try:
+        params = [since]
+        filters = "s.created_at >= %s"
+        if branch_id:
+            filters += " AND s.branch_id = %s"
+            params.append(branch_id)
 
-    rows = db.execute(
-        f"""SELECT g.name as group_name, b.name as branch_name,
-                   COUNT(DISTINCT s.id_sale) as orders,
-                   SUM(si.quantity) as qty_requested,
-                   COALESCE(SUM(si.total), 0) as revenue
-            FROM sale_items si
-            JOIN sales s ON si.sale_id = s.id_sale
-            JOIN parts p ON si.part_id = p.id_part
-            JOIN part_groups g ON p.group_id = g.id_group
-            LEFT JOIN branches b ON s.branch_id = b.id_branch
-            WHERE {filters}
-            GROUP BY g.name, b.name
-            ORDER BY revenue DESC
-            LIMIT 100""", tuple(params)
-    ).fetchall()
+        cur.execute(
+            f"""SELECT b.name as branch_name,
+                       COUNT(DISTINCT s.id) as orders,
+                       SUM(si.quantity) as qty_requested,
+                       COALESCE(SUM(si.subtotal), 0) as revenue
+                FROM sale_items si
+                JOIN sales s ON si.sale_id = s.id
+                LEFT JOIN branches b ON s.branch_id = b.id
+                WHERE {filters}
+                GROUP BY b.name
+                ORDER BY revenue DESC
+                LIMIT 100""", tuple(params)
+        )
+        rows = cur.fetchall()
 
-    return jsonify({
-        'since': since.isoformat(),
-        'days': days,
-        'demand': [
-            {'group': row['group_name'], 'branch': row['branch_name'],
-             'orders': row['orders'], 'quantity': row['qty_requested'],
-             'revenue': row['revenue']}
-            for row in rows
-        ]
-    }, cls=DecimalEncoder)
+        return jsonify({
+            'since': since.isoformat(),
+            'days': days,
+            'demand': [
+                {'branch': row[0] or 'Sin sucursal',
+                 'orders': row[1], 'quantity': row[2],
+                 'revenue': float(row[3]) if row[3] is not None else 0}
+                for row in rows
+            ]
+        })
+    finally:
+        cur.close()
+        conn.close()
 
 
 @supplier_portal_bp.route('/top-parts', methods=['GET'])
@@ -75,31 +75,31 @@ def get_demand():
 def get_top_parts():
     """Top moving parts for suppliers to restock."""
     days = request.args.get('days', 30, type=int)
-    from tenant_db import get_tenant_db
-    db = get_tenant_db()
+    conn = get_tenant_conn(g.tenant_id)
+    cur = conn.cursor()
     since = datetime.utcnow() - timedelta(days=days)
 
-    rows = db.execute(
-        """SELECT p.oem_part_number, p.name, g.name as group_name,
-                  SUM(si.quantity) as sold, COALESCE(SUM(si.total), 0) as revenue,
-                  COALESCE(SUM(wi.stock_quantity), 0) as current_stock
-           FROM sale_items si
-           JOIN sales s ON si.sale_id = s.id_sale
-           JOIN parts p ON si.part_id = p.id_part
-           JOIN part_groups g ON p.group_id = g.id_group
-           LEFT JOIN warehouse_inventory wi ON p.id_part = wi.part_id
-           WHERE s.created_at >= %s
-           GROUP BY p.oem_part_number, p.name, g.name
-           ORDER BY sold DESC
-           LIMIT 50""", (since,)
-    ).fetchall()
+    try:
+        cur.execute(
+            """SELECT si.part_number, si.name,
+                      SUM(si.quantity) as sold, COALESCE(SUM(si.subtotal), 0) as revenue
+               FROM sale_items si
+               JOIN sales s ON si.sale_id = s.id
+               WHERE s.created_at >= %s
+               GROUP BY si.part_number, si.name
+               ORDER BY sold DESC
+               LIMIT 50""", (since,)
+        )
+        rows = cur.fetchall()
 
-    return jsonify({
-        'since': since.isoformat(),
-        'parts': [
-            {'oem': row['oem_part_number'], 'name': row['name'],
-             'group': row['group_name'], 'sold': row['sold'],
-             'revenue': row['revenue'], 'stock': row['current_stock']}
-            for row in rows
-        ]
-    }, cls=DecimalEncoder)
+        return jsonify({
+            'since': since.isoformat(),
+            'parts': [
+                {'part_number': row[0], 'name': row[1],
+                 'sold': row[2], 'revenue': float(row[3]) if row[3] is not None else 0}
+                for row in rows
+            ]
+        })
+    finally:
+        cur.close()
+        conn.close()
diff --git a/pos/blueprints/whatsapp_bp.py b/pos/blueprints/whatsapp_bp.py
index 9983a68..ccb0d10 100644
--- a/pos/blueprints/whatsapp_bp.py
+++ b/pos/blueprints/whatsapp_bp.py
@@ -15,25 +15,63 @@ from flask import Blueprint, request, jsonify, g
 from middleware import require_auth
 from tenant_db import get_tenant_conn, get_master_conn
 from services import whatsapp_service
+from config import WHATSAPP_BRIDGE_URL, WHATSAPP_BRIDGE_KEY
+from datetime import datetime
 
 whatsapp_bp = Blueprint('whatsapp', __name__, url_prefix='/pos/api/whatsapp')
 
 
 def _get_whatsapp_config(conn):
     """Read WhatsApp bridge configuration from tenant_config.
-    Returns dict with bridge_url, enabled, etc."""
+    Falls back to global server config (config.py / env vars) when tenant
+    has no explicit WhatsApp settings. This allows the shared bridge to work
+    out of the box for all tenants.
+    """
     cur = conn.cursor()
     cur.execute("SELECT key, value FROM tenant_config WHERE key LIKE 'whatsapp_%'")
     config = {row[0]: row[1] for row in cur.fetchall()}
     cur.close()
+
+    bridge_url = config.get('whatsapp_bridge_url', '') or WHATSAPP_BRIDGE_URL or ''
+    bridge_key = config.get('whatsapp_bridge_key', '') or WHATSAPP_BRIDGE_KEY or ''
+    enabled_raw = config.get('whatsapp_enabled', '').lower()
+    if enabled_raw == 'true':
+        enabled = True
+    elif enabled_raw == 'false':
+        enabled = False
+    else:
+        # No explicit tenant setting: auto-enable if a bridge URL is configured
+        enabled = bool(bridge_url)
+
     return {
-        'bridge_url': config.get('whatsapp_bridge_url', ''),
-        'bridge_key': config.get('whatsapp_bridge_key', ''),
-        'enabled': config.get('whatsapp_enabled', 'false').lower() == 'true',
+        'bridge_url': bridge_url,
+        'bridge_key': bridge_key,
+        'enabled': enabled,
         'phone_number': config.get('whatsapp_phone_number', ''),
     }
 
 
+def _get_branch_phone(tenant_conn, branch_id=None):
+    """Obtener teléfono de la sucursal."""
+    if not tenant_conn:
+        return '(pendiente)'
+    try:
+        cur = tenant_conn.cursor()
+        if branch_id:
+            cur.execute("SELECT phone FROM branches WHERE id = %s", (branch_id,))
+            row = cur.fetchone()
+            if row and row[0]:
+                cur.close()
+                return row[0]
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'tenant_phone'")
+        row = cur.fetchone()
+        cur.close()
+        return row[0] if row and row[0] else '(pendiente)'
+    except Exception as e:
+        print(f"[WA-SM] get_branch_phone error: {e}")
+        return '(pendiente)'
+
+
 def _resolve_mye_ids(vehicle, master_conn):
     """Return list of MYE ids matching vehicle brand/model/year text."""
     if not master_conn or not vehicle:
@@ -194,27 +232,9 @@ def _enrich_wa_reply_with_part(search_query, vehicle, tenant_conn, master_conn=N
             fallback_rows = _do_search(use_compat=False)
 
         if not rows and not fallback_rows:
-            # Truly nothing found — return a conversational message that doesn't kill the chat
-            v_str = ""
-            if vehicle and vehicle.get('brand'):
-                v_str = f"{vehicle.get('brand','')} {vehicle.get('model','')} {vehicle.get('year','')}".strip()
-
-            msg_parts = [
-                "🔍 Revisé nuestro inventario y no encontré esas partes en este momento."
-            ]
-            if v_str:
-                msg_parts.append(f"Para tu {v_str}, puedo:")
-            else:
-                msg_parts.append("Te puedo ayudar de estas formas:")
-            msg_parts.extend([
-                "",
-                "• *Pedirlas por encargo* — te doy tiempo y precio estimado",
-                "• *Buscar alternativas* — equivalentes de otra marca que sí tengamos",
-                "• *Sugerir refaccionarias cercanas* — si es urgente",
-                "",
-                "¿Qué prefieres? O dime si quieres buscar otra parte."
-            ])
-            return '\n'.join(msg_parts), None
+            # Nothing found in local inventory — let the AI's original response stand.
+            # The webhook will append a soft note instead of replacing the message.
+            return None, None
 
         # Use fallback rows if primary search returned nothing
         using_fallback = False
@@ -331,11 +351,7 @@ def logout():
 def webhook():
     """Receive messages from Baileys bridge (public, no auth).
 
-    Flow:
-      1. Persist the incoming message to the tenant's whatsapp_messages log.
-      2. Build inventory context for the AI (what this tenant has in stock).
-      3. Ask the chatbot for a reply, enriched with that context.
-      4. Send the reply back via the Baileys bridge.
+    Nuevo flujo: máquina de estados estructurada.
     """
     data = request.get_json(force=True, silent=True) or {}
 
@@ -346,292 +362,227 @@ def webhook():
     if not msg.get('phone') or msg.get('from_me'):
         return jsonify({'ok': True})
 
-    # Resolve tenant: try query param first, then fallback to first enabled tenant
+    phone = msg['phone']
+    reply_to = msg.get('sender_pn') or msg.get('jid') or phone
+    text = msg.get('text', '')
+    media_kind = msg.get('media_kind', 'text')
+
+    # Audio transcription (voice notes)
+    if media_kind == 'audio' and msg.get('media_base64'):
+        try:
+            from services.whisper_local import transcribe_audio_base64
+            transcript = transcribe_audio_base64(
+                msg['media_base64'],
+                mimetype=msg.get('media_mimetype') or 'audio/ogg',
+            )
+            if transcript:
+                text = transcript
+                print(f"[WA-SM] Voice note transcribed: {transcript[:100]}")
+        except ImportError:
+            pass
+        except Exception as e:
+            print(f"[WA-SM] Whisper transcription failed: {e}")
+
+    # Location message: if current state expects it, store coordinates
+    if media_kind == 'location' and msg.get('latitude') is not None:
+        text = f"Ubicación: {msg['latitude']},{msg['longitude']}"
+
+    # Image without caption: provide a default text so the state machine can handle it
+    if media_kind == 'image' and not text:
+        text = "(imagen)"
+
+
+    # Resolve tenant
     tenant_id = request.args.get('tenant_id', type=int)
     if not tenant_id:
-        # Fallback: find first tenant with whatsapp enabled
         try:
             mconn = get_master_conn()
             mcur = mconn.cursor()
             mcur.execute("""
-                SELECT t.id FROM tenants t
-                JOIN tenant_config c ON c.key = 'whatsapp_enabled' AND c.value = 'true'
-                WHERE t.is_active = true
-                ORDER BY t.id LIMIT 1
+                SELECT id, db_name FROM tenants
+                WHERE is_active = true
+                ORDER BY id
             """)
-            row = mcur.fetchone()
+            tenants = mcur.fetchall()
             mcur.close()
             mconn.close()
-            tenant_id = row[0] if row else None
+            # Find first tenant with whatsapp_enabled in their config
+            for tid, db_name in tenants:
+                try:
+                    from tenant_db import get_tenant_conn_by_dbname
+                    tconn = get_tenant_conn_by_dbname(db_name)
+                    tcur = tconn.cursor()
+                    tcur.execute(
+                        "SELECT value FROM tenant_config WHERE key = 'whatsapp_enabled'"
+                    )
+                    row = tcur.fetchone()
+                    tcur.close()
+                    tconn.close()
+                    if row and row[0].lower() == 'true':
+                        tenant_id = tid
+                        break
+                except Exception:
+                    continue
         except Exception:
             tenant_id = None
 
     tenant_conn = None
     master_conn = None
-    inventory_context = None
-    wa_config = {}
+
     try:
         tenant_conn = get_tenant_conn(tenant_id)
         master_conn = get_master_conn()
         wa_config = _get_whatsapp_config(tenant_conn)
 
-        # 1. Log the incoming message (with contact display name)
+        # Deduplicate by wa_message_id
+        wa_message_id = msg.get('message_id')
+        if wa_message_id:
+            cur = tenant_conn.cursor()
+            cur.execute("SELECT 1 FROM whatsapp_messages WHERE wa_message_id = %s LIMIT 1", (wa_message_id,))
+            if cur.fetchone():
+                cur.close()
+                return jsonify({'ok': True})
+            cur.close()
+
+        # 1. Log incoming message
         cur = tenant_conn.cursor()
         cur.execute("""
             INSERT INTO whatsapp_messages (phone, direction, message_text, wa_message_id, push_name)
             VALUES (%s, 'incoming', %s, %s, %s)
             ON CONFLICT DO NOTHING
-        """, (msg['phone'], msg['text'], msg['message_id'], msg.get('push_name') or None))
+        """, (phone, text, wa_message_id, msg.get('push_name')))
         tenant_conn.commit()
         cur.close()
 
-        # 2. Build inventory context once per webhook call so the chatbot
-        # can say things like "tengo 5 Bosch BP-123 por $450".
-        try:
-            from services.ai_chat import get_inventory_context
-            inventory_context = get_inventory_context(tenant_conn)
-        except Exception as e:
-            print(f"[WA-AI] inventory_context failed: {e}")
-            inventory_context = None
+        # 2. Load session state
+        from services.wa_state_machine import get_session, save_session, process_message, StateContext
+        session = get_session(tenant_conn, phone)
 
-        # 2b. Append previously-detected vehicle so the AI keeps context
-        # even when we don't send full conversation history (Hermes is slow with it)
-        try:
-            from services.wa_quotation import get_vehicle
-            saved_vehicle = get_vehicle(clean_phone)
-            if saved_vehicle and inventory_context:
-                v_str = f"{saved_vehicle.get('brand','')} {saved_vehicle.get('model','')} {saved_vehicle.get('year','')}".strip()
-                if v_str:
-                    inventory_context += f"\n\nVEHICULO DEL CLIENTE: {v_str}"
-            elif saved_vehicle:
-                v_str = f"{saved_vehicle.get('brand','')} {saved_vehicle.get('model','')} {saved_vehicle.get('year','')}".strip()
-                if v_str:
-                    inventory_context = f"VEHICULO DEL CLIENTE: {v_str}"
-        except Exception as e:
-            print(f"[WA-AI] vehicle_context failed: {e}")
-    except Exception as e:
-        print(f"[WA-AI] tenant connection failed: {e}")
+        # 3. Check session expiry (30 minutes)
+        current_state = session.get('state', 'idle')
+        state_data = session.get('state_data', {})
+        last_updated = session.get('updated_at')
 
-    # 3. Dispatch by media kind + quotation commands
-    reply = None
-    reply_to = msg.get('jid') or msg['phone']
-    media_kind = msg.get('media_kind', 'text')
-    clean_phone = msg.get('phone', '')
-
-    # ── Check for quotation commands FIRST (before AI) ──
-    if media_kind == 'text' and msg.get('text'):
-        from services.wa_quotation import (
-            detect_quote_intent, get_open_quotation, create_quotation,
-            add_item_to_quotation, get_quotation_detail, format_quotation_wa,
-            clear_quotation, confirm_quotation, get_last_shown_part, set_last_shown_part,
-        )
-        has_open = bool(tenant_conn and get_open_quotation(tenant_conn, clean_phone))
-        intent, qty = detect_quote_intent(msg['text'], has_open_quote=has_open)
-
-        if intent == 'add':
-            last_part = get_last_shown_part(clean_phone)
-            if not last_part:
-                reply = '⚠️ Primero pregunta por una parte y luego escribe "cotizar" para agregarla.'
-            elif tenant_conn:
-                qid = get_open_quotation(tenant_conn, clean_phone)
-                if not qid:
-                    qid = create_quotation(tenant_conn, clean_phone)
-                add_item_to_quotation(tenant_conn, qid, last_part, quantity=qty or 1)
-                detail = get_quotation_detail(tenant_conn, qid)
-                item_count = len(detail['items']) if detail else 0
-                reply = (
-                    f'✅ *{last_part.get("name", "")}* × {qty or 1} agregado a tu cotización.\n'
-                    f'Llevas {item_count} producto{"s" if item_count != 1 else ""} — total parcial: ${detail["total"]:,.2f}\n\n'
-                    f'_Sigue preguntando por más partes, o escribe "enviar cotización" cuando termines._'
-                )
-
-        elif intent == 'send':
-            if tenant_conn:
-                qid = get_open_quotation(tenant_conn, clean_phone)
-                if qid:
-                    detail = get_quotation_detail(tenant_conn, qid)
-                    reply = format_quotation_wa(detail)
-                    if not reply:
-                        reply = '⚠️ Tu cotización está vacía. Pregunta por partes y escribe "cotizar" para agregarlas.'
-                else:
-                    reply = '⚠️ No tienes una cotización abierta. Pregunta por una parte primero.'
-
-        elif intent == 'clear':
-            if tenant_conn:
-                clear_quotation(tenant_conn, clean_phone)
-            reply = '🗑️ Cotización limpiada. Pregunta por partes para empezar una nueva.'
-
-        elif intent == 'confirm':
-            if tenant_conn:
-                qid = confirm_quotation(tenant_conn, clean_phone)
-                if qid:
-                    reply = (
-                        f'✅ *Pedido confirmado!*\n\n'
-                        f'Tu cotización #{qid} fue registrada.\n'
-                        f'Nos pondremos en contacto contigo para coordinar la entrega/recolección.\n\n'
-                        f'¡Gracias por tu compra! 🙏'
-                    )
-                else:
-                    reply = '⚠️ No tienes una cotización abierta para confirmar.'
-
-        # ── Check for conversation reset commands ──
-        if media_kind == 'text' and msg.get('text'):
-            txt_lower = msg['text'].lower().strip()
-            if txt_lower in ('limpiar chat', 'nuevo chat', 'borrar conversacion', 'borrar conversación', 'reset', 'reiniciar'):
-                if tenant_conn:
-                    try:
-                        cur_del = tenant_conn.cursor()
-                        cur_del.execute("DELETE FROM whatsapp_messages WHERE phone = %s", (clean_phone,))
-                        tenant_conn.commit()
-                        cur_del.close()
-                    except Exception as del_err:
-                        print(f"[WA-AI] Failed to clear conversation history: {del_err}")
-                reply = '🗑️ *Conversación reiniciada.*\n\n¡Hola de nuevo! ¿En qué puedo ayudarte?'
-                result = whatsapp_service.send_message(reply_to, reply, bridge_url=wa_config.get('bridge_url'))
-                if tenant_conn:
-                    try:
-                        cur_save = tenant_conn.cursor()
-                        cur_save.execute("INSERT INTO whatsapp_messages (phone, direction, message_text) VALUES (%s, 'outgoing', %s)", (clean_phone, reply))
-                        tenant_conn.commit()
-                        cur_save.close()
-                    except Exception:
-                        pass
-                if tenant_conn:
-                    try: tenant_conn.close()
-                    except Exception: pass
-                return jsonify({'ok': True})
-
-        if intent is not None:
-            # It was a quote command — send reply and skip the AI
-            if reply:
-                result = whatsapp_service.send_message(reply_to, reply, bridge_url=wa_config.get('bridge_url'))
-                if tenant_conn:
-                    try:
-                        cur_save = tenant_conn.cursor()
-                        cur_save.execute("INSERT INTO whatsapp_messages (phone, direction, message_text) VALUES (%s, 'outgoing', %s)", (clean_phone, reply))
-                        tenant_conn.commit()
-                        cur_save.close()
-                    except Exception:
-                        pass
-            # Clean up and return early
-            if tenant_conn:
-                try: tenant_conn.close()
-                except Exception: pass
-            return jsonify({'ok': True})
-
-    # Load conversation history so the AI remembers context (vehicle, parts, etc.)
-    conversation_history = []
-    if tenant_conn:
-        conversation_history = _get_conversation_history(clean_phone, tenant_conn, limit=2)
-        if conversation_history:
-            print(f"[WA-AI] Loaded {len(conversation_history)} history messages for {clean_phone}")
-
-    try:
-        if media_kind == 'image' and msg.get('media_base64'):
-            from services.ai_chat import chat_with_image
-            # Prompt: use the caption if provided, else default to
-            # "identify this part" which chat_with_image handles gracefully.
-            prompt = msg.get('text') or 'Identifica esta parte automotriz y sugiere terminos de busqueda.'
-            ai_resp = chat_with_image(
-                user_message=prompt,
-                image_base64=msg['media_base64'],
-                conversation_history=conversation_history,
-                inventory_context=inventory_context,
-            )
-            reply = ai_resp.get('message', '') or ''
-            print(f"[WA-AI] Image from {reply_to}: {reply[:80]}...")
-
-        elif media_kind == 'audio' and msg.get('media_base64'):
-            # Voice note handling — transcribe first, then chat().
-            # See services.whisper_local for the transcriber.
+        if last_updated and hasattr(last_updated, 'strftime'):
+            # PostgreSQL returns datetime objects (often timezone-aware)
+            from datetime import timezone
+            now = datetime.now(timezone.utc)
+            if last_updated.tzinfo is None:
+                now = now.replace(tzinfo=None)
+            elapsed = (now - last_updated).total_seconds()
+            if elapsed > 1800:
+                current_state = 'idle'
+                state_data = {'customer_id': state_data.get('customer_id')}
+        elif last_updated and isinstance(last_updated, str):
+            from datetime import datetime as dt
             try:
-                from services.whisper_local import transcribe_audio_base64
-                transcript = transcribe_audio_base64(
-                    msg['media_base64'],
-                    mimetype=msg.get('media_mimetype') or 'audio/ogg',
+                parsed = dt.fromisoformat(last_updated.replace('Z', '+00:00'))
+                elapsed = (dt.now(dt.now().astimezone().tzinfo) - parsed).total_seconds()
+                if elapsed > 1800:
+                    current_state = 'idle'
+                    state_data = {'customer_id': state_data.get('customer_id')}
+            except Exception:
+                pass
+
+        # Global reset commands work from any state
+        if text and text.strip().lower() in ('limpiar chat', 'nuevo chat', 'borrar conversacion', 'borrar conversación', 'reset', 'reiniciar', 'menu', 'menú'):
+            current_state = 'idle'
+            state_data = {'customer_id': state_data.get('customer_id')}
+
+        # Abandoned quotation follow-up
+        try:
+            from services.part_kits import should_send_followup
+            followup = should_send_followup(phone, tenant_conn)
+            if followup:
+                whatsapp_service.send_message(reply_to, followup, bridge_url=wa_config.get('bridge_url'))
+                cur_fu = tenant_conn.cursor()
+                cur_fu.execute(
+                    "INSERT INTO whatsapp_messages (phone, direction, message_text) VALUES (%s, 'outgoing', %s)",
+                    (phone, followup)
                 )
-            except ImportError:
-                transcript = None
-                print("[WA-AI] whisper_local not installed — voice notes skipped")
-            except Exception as e:
-                transcript = None
-                print(f"[WA-AI] Whisper transcription failed: {e}")
+                tenant_conn.commit()
+                cur_fu.close()
+        except Exception as fu_err:
+            print(f"[WA-SM] Follow-up send failed: {fu_err}")
 
-            if transcript:
-                print(f"[WA-AI] Voice note transcribed: {transcript[:100]}")
-                from services.ai_chat import chat
-                ai_resp = chat(transcript, conversation_history=conversation_history, inventory_context=inventory_context)
-                reply = ai_resp.get('message', '') or ''
-                # Prefix the reply so the sender knows we understood the voice note
-                if reply:
-                    reply = f'🎙️ Entendi: "{transcript}"\n\n{reply}'
-            else:
-                reply = ('Recibi tu nota de voz pero no pude transcribirla. '
-                         'Puedes escribirme el mensaje?')
+        # 4. Build context
+        context = StateContext(
+            tenant_conn=tenant_conn,
+            master_conn=master_conn,
+            wa_config=wa_config,
+            tenant_id=tenant_id,
+            phone=phone,
+            media_kind=media_kind,
+            media_base64=msg.get('media_base64'),
+            push_name=msg.get('push_name'),
+        )
 
-        elif msg.get('text'):
-            # Plain text message — standard chatbot flow
-            from services.ai_chat import chat
-            ai_resp = chat(msg['text'], conversation_history=conversation_history, inventory_context=inventory_context)
-            reply = ai_resp.get('message', '') or ''
+        # 5. Process through state machine
+        reply, next_state, next_state_data = process_message(
+            phone=phone,
+            text=text,
+            current_state=current_state,
+            state_data=state_data,
+            context=context,
+        )
 
-            # Enrich: if the AI returned a search_query, look up real parts
-            # from the catalog and append them to the WhatsApp reply.
-            search_q = ai_resp.get('search_query')
-            vehicle = ai_resp.get('vehicle')
+        # 5b. Si el estado transicionó sin mensaje, procesar el siguiente inmediatamente
+        # (algunos estados solo hacen transiciones y delegan el mensaje al siguiente estado)
+        loop_guard = 0
+        while reply is None and loop_guard < 5:
+            loop_guard += 1
+            reply, next_state, next_state_data = process_message(
+                phone=phone,
+                text=text,
+                current_state=next_state,
+                state_data=next_state_data,
+                context=context,
+            )
 
-            # Persist detected vehicle so we don't lose context between messages
-            if vehicle and isinstance(vehicle, dict) and vehicle.get('brand'):
-                try:
-                    from services.wa_quotation import set_vehicle
-                    set_vehicle(clean_phone, vehicle)
-                except Exception as veh_err:
-                    print(f"[WA-AI] Failed to save vehicle: {veh_err}")
+        # 6. Save new state
+        save_session(tenant_conn, phone, next_state, next_state_data)
 
-            if search_q and reply:
-                try:
-                    enrichment, found_part = _enrich_wa_reply_with_part(search_q, vehicle, tenant_conn, master_conn)
-                    if enrichment:
-                        reply = reply + '\n\n' + enrichment
-                    # Track the found part so "cotizar" can add it
-                    if found_part:
-                        from services.wa_quotation import set_last_shown_part
-                        set_last_shown_part(clean_phone, found_part)
-                except Exception as enrich_err:
-                    print(f"[WA-AI] Enrichment failed: {enrich_err}")
-
-        # Send reply if we produced one
+        # 7. Send reply
         if reply:
             result = whatsapp_service.send_message(reply_to, reply, bridge_url=wa_config.get('bridge_url'))
-            print(f"[WA-AI] Replied to {reply_to} ({media_kind}): {reply[:80]}... result={result}")
+            print(f"[WA-SM] Replied to {phone}: {reply[:80]}... result={result}")
 
-            # Save the bot's reply to DB so it shows in the WhatsApp UI
-            if tenant_conn:
-                try:
-                    cur2 = tenant_conn.cursor()
-                    cur2.execute("""
-                        INSERT INTO whatsapp_messages (phone, direction, message_text)
-                        VALUES (%s, 'outgoing', %s)
-                    """, (msg['phone'], reply))
-                    tenant_conn.commit()
-                    cur2.close()
-                except Exception as db_err:
-                    print(f"[WA-AI] Failed to save bot reply to DB: {db_err}")
+            # Log outgoing
+            cur = tenant_conn.cursor()
+            cur.execute("""
+                INSERT INTO whatsapp_messages (phone, direction, message_text)
+                VALUES (%s, 'outgoing', %s)
+            """, (phone, reply))
+            tenant_conn.commit()
+            cur.close()
 
     except Exception as e:
-        print(f"[WA-AI] Error handling {media_kind} from {reply_to}: {e}")
+        print(f"[WA-SM] Webhook error: {e}")
+        import traceback
+        traceback.print_exc()
+        # Fallback: enviar mensaje de error genérico
+        try:
+            if tenant_conn:
+                phone_branch = _get_branch_phone(tenant_conn, None)
+                fallback = (
+                    "Estoy teniendo problemas técnicos en este momento. 😕\n\n"
+                    f"Por favor llámanos directamente al {phone_branch}."
+                )
+                whatsapp_service.send_message(reply_to, fallback, bridge_url=wa_config.get('bridge_url'))
+        except Exception:
+            pass
 
-    # 4. Clean up connections
-    if tenant_conn is not None:
-        try:
-            tenant_conn.close()
-        except Exception:
-            pass
-    if master_conn is not None:
-        try:
-            master_conn.close()
-        except Exception:
-            pass
+    finally:
+        if tenant_conn:
+            try:
+                tenant_conn.close()
+            except Exception:
+                pass
+        if master_conn:
+            try:
+                master_conn.close()
+            except Exception:
+                pass
 
     return jsonify({'ok': True})
 
diff --git a/pos/gunicorn.conf.py b/pos/gunicorn.conf.py
index e94ed72..6e1c7ab 100644
--- a/pos/gunicorn.conf.py
+++ b/pos/gunicorn.conf.py
@@ -5,7 +5,7 @@ bind = "0.0.0.0:5001"
 # gthread workers handle multiple concurrent requests per worker via threads.
 # Ideal for I/O-bound Flask apps with DB queries.
 # 4 workers × 4 threads = 16 concurrent requests.
-workers = 4
+workers = 8
 threads = 4
 worker_class = "gthread"
 worker_connections = 1000
diff --git a/pos/middleware.py b/pos/middleware.py
index 15df096..1ad532c 100644
--- a/pos/middleware.py
+++ b/pos/middleware.py
@@ -29,7 +29,7 @@ def require_auth(*required_permissions):
             except jwt.InvalidTokenError:
                 return jsonify({'error': 'Invalid token'}), 401
 
-            if payload.get('type') != 'pos_access':
+            if payload.get('type') not in ('pos_access', 'access'):
                 return jsonify({'error': 'Invalid token type'}), 401
 
             g.tenant_id = payload['tenant_id']
diff --git a/pos/middleware_tenant.py b/pos/middleware_tenant.py
index f724c1d..f1e4935 100644
--- a/pos/middleware_tenant.py
+++ b/pos/middleware_tenant.py
@@ -55,7 +55,7 @@ def _lookup_tenant_by_subdomain(subdomain):
         conn = get_master_conn()
         cur = conn.cursor()
         cur.execute(
-            "SELECT id, name FROM tenants WHERE subdomain = %s AND is_active = true",
+            "SELECT id, name FROM tenants WHERE LOWER(subdomain) = %s AND is_active = true",
             (subdomain,)
         )
         row = cur.fetchone()
diff --git a/pos/migrations/runner.py b/pos/migrations/runner.py
index c2cefaf..6cff34b 100755
--- a/pos/migrations/runner.py
+++ b/pos/migrations/runner.py
@@ -33,6 +33,14 @@ MIGRATIONS = {
     'v3.0': 'v3.0_public_api.sql',
     'v3.1': 'v3.1_inventory_vehicle_compat.sql',
     'v3.2': 'v3.2_db_performance.sql',
+    'v3.4': 'v3.4_meli_integration.sql',
+    'v3.5': 'v3.5_meli_questions.sql',
+    'v3.6': 'v3.6_dropshipping.sql',
+    'v3.7': 'v3.7_sku_aliases.sql',
+    'v3.8': 'v3.8_supplier_catalog.sql',
+    'v4.0': 'v4.0_multi_branch.sql',
+    'v4.1': 'v4.1_global_invoice.sql',
+    'v4.2': 'v4.2_meli_sync_queue.sql',
 }
 
 
diff --git a/pos/migrations/v1.0_initial.sql b/pos/migrations/v1.0_initial.sql
index b6f8719..2cdcf5e 100644
--- a/pos/migrations/v1.0_initial.sql
+++ b/pos/migrations/v1.0_initial.sql
@@ -386,3 +386,4 @@ CREATE TABLE IF NOT EXISTS tenant_config (
 
 -- Barcode sequence
 CREATE SEQUENCE IF NOT EXISTS barcode_seq START 1;
+
diff --git a/pos/migrations/v3.3_marketplace_any_part.sql b/pos/migrations/v3.3_marketplace_any_part.sql
new file mode 100644
index 0000000..f2a40dd
--- /dev/null
+++ b/pos/migrations/v3.3_marketplace_any_part.sql
@@ -0,0 +1,91 @@
+-- ═══════════════════════════════════════════════════════════════════════
+-- v3.3 — Marketplace accepts any part number (seller listings)
+-- Target: nexus_autoparts (master DB)
+-- Date: 2026-05-17
+--
+-- Makes warehouse_inventory part_id nullable and adds seller-defined
+-- fields so any seller can list parts that don't exist in the OEM catalog.
+-- Existing OEM-matched listings are untouched.
+-- ═══════════════════════════════════════════════════════════════════════
+
+-- ─── 1. WAREHOUSE_INVENTORY — add seller listing columns ─────────────
+
+ALTER TABLE warehouse_inventory
+    ADD COLUMN IF NOT EXISTS seller_part_number VARCHAR(100),
+    ADD COLUMN IF NOT EXISTS seller_part_name   VARCHAR(300),
+    ADD COLUMN IF NOT EXISTS seller_category    VARCHAR(100),
+    ADD COLUMN IF NOT EXISTS tenant_inventory_id INTEGER;
+
+-- Make part_id nullable so seller listings (without catalog match) can exist
+ALTER TABLE warehouse_inventory ALTER COLUMN part_id DROP NOT NULL;
+
+-- ─── 2. WAREHOUSE_INVENTORY — drop old unique, add partial uniques ───
+
+-- The old constraint was on (user_id, part_id, warehouse_location).
+-- We replace it with two partial unique indexes:
+--   - OEM items:    (bodega_id, part_id, warehouse_location) WHERE part_id IS NOT NULL
+--   - Seller items: (bodega_id, seller_part_number, warehouse_location) WHERE part_id IS NULL
+
+ALTER TABLE warehouse_inventory
+    DROP CONSTRAINT IF EXISTS warehouse_inventory_user_id_part_id_warehouse_location_key;
+
+DROP INDEX IF EXISTS idx_wi_unique_composite;
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_wi_unique_oem
+ON warehouse_inventory(bodega_id, part_id, warehouse_location)
+WHERE part_id IS NOT NULL;
+
+CREATE UNIQUE INDEX IF NOT EXISTS idx_wi_unique_seller
+ON warehouse_inventory(bodega_id, seller_part_number, warehouse_location)
+WHERE part_id IS NULL;
+
+-- Ensure every row has either part_id or seller_part_number
+ALTER TABLE warehouse_inventory
+    DROP CONSTRAINT IF EXISTS chk_wi_part_or_seller;
+
+ALTER TABLE warehouse_inventory
+    ADD CONSTRAINT chk_wi_part_or_seller
+    CHECK (
+        (part_id IS NOT NULL AND seller_part_number IS NULL)
+        OR
+        (part_id IS NULL AND seller_part_number IS NOT NULL)
+    );
+
+-- ─── 3. WAREHOUSE_INVENTORY — search indexes ─────────────────────────
+
+CREATE INDEX IF NOT EXISTS idx_wi_seller_pn
+ON warehouse_inventory (bodega_id, seller_part_number)
+WHERE part_id IS NULL;
+
+CREATE INDEX IF NOT EXISTS idx_wi_seller_category
+ON warehouse_inventory (seller_category)
+WHERE part_id IS NULL;
+
+-- GIN index for text search on seller listings
+CREATE INDEX IF NOT EXISTS idx_wi_seller_search
+ON warehouse_inventory
+USING gin (to_tsvector('spanish',
+    COALESCE(seller_part_name, '') || ' ' || COALESCE(seller_part_number, '')
+))
+WHERE part_id IS NULL;
+
+-- ─── 4. PURCHASE_ORDER_ITEMS — make part_id nullable ─────────────────
+
+ALTER TABLE purchase_order_items
+    ALTER COLUMN part_id DROP NOT NULL;
+
+-- Add a flag so seller listings can be distinguished in POs
+ALTER TABLE purchase_order_items
+    ADD COLUMN IF NOT EXISTS is_seller_listing BOOLEAN NOT NULL DEFAULT FALSE;
+
+-- ─── 5. Back-compat: ensure existing rows are valid ──────────────────
+
+-- Existing rows should have part_id set and seller_part_number NULL.
+-- If any row violates the new check, this will fail loudly.
+UPDATE warehouse_inventory
+SET seller_part_number = NULL
+WHERE part_id IS NOT NULL AND seller_part_number IS NOT NULL;
+
+UPDATE warehouse_inventory
+SET part_id = NULL
+WHERE part_id IS NULL AND seller_part_number IS NULL;
diff --git a/pos/migrations/v3.4_meli_integration.sql b/pos/migrations/v3.4_meli_integration.sql
new file mode 100644
index 0000000..496cb1b
--- /dev/null
+++ b/pos/migrations/v3.4_meli_integration.sql
@@ -0,0 +1,110 @@
+-- ============================================================
+-- v3.4 MercadoLibre Integration
+-- ============================================================
+-- Adds tables for external marketplace listings, orders,
+-- order items, and a generic sync queue.
+-- All tables live in the tenant DB.
+-- ============================================================
+
+-- Listings published on MercadoLibre (extensible to Amazon later)
+CREATE TABLE IF NOT EXISTS marketplace_listings (
+    id                  SERIAL PRIMARY KEY,
+    inventory_id        INTEGER REFERENCES inventory(id),
+    channel             VARCHAR(20) NOT NULL DEFAULT 'mercadolibre',
+    external_item_id    VARCHAR(50) NOT NULL,
+    external_status     VARCHAR(30) DEFAULT 'active',
+    external_permalink  TEXT,
+    title               TEXT,
+    meli_category_id    VARCHAR(30),
+    publish_price       NUMERIC(12,2),
+    last_sync_at        TIMESTAMPTZ,
+    sync_errors         TEXT,
+    is_active           BOOLEAN DEFAULT true,
+    created_at          TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_marketplace_listings_inventory
+    ON marketplace_listings(inventory_id);
+CREATE INDEX IF NOT EXISTS idx_marketplace_listings_external
+    ON marketplace_listings(external_item_id);
+CREATE UNIQUE INDEX IF NOT EXISTS idx_marketplace_listings_unique
+    ON marketplace_listings(inventory_id, channel) WHERE is_active = true;
+
+-- Orders received from MercadoLibre
+CREATE TABLE IF NOT EXISTS marketplace_orders (
+    id                  SERIAL PRIMARY KEY,
+    channel             VARCHAR(20) NOT NULL DEFAULT 'mercadolibre',
+    external_order_id   VARCHAR(50) NOT NULL UNIQUE,
+    external_status     VARCHAR(30) NOT NULL,
+    buyer_name          VARCHAR(200),
+    buyer_email         VARCHAR(200),
+    buyer_phone         VARCHAR(50),
+    buyer_nickname      VARCHAR(100),
+    shipping_address    JSONB,
+    total_amount        NUMERIC(12,2),
+    shipping_cost       NUMERIC(12,2),
+    meli_shipping_id    VARCHAR(50),
+    nexus_sale_id       INTEGER REFERENCES sales(id),
+    status              VARCHAR(20) DEFAULT 'pending',
+    notes               TEXT,
+    raw_json            JSONB,
+    created_at          TIMESTAMPTZ DEFAULT NOW(),
+    updated_at          TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_marketplace_orders_status
+    ON marketplace_orders(status);
+CREATE INDEX IF NOT EXISTS idx_marketplace_orders_external
+    ON marketplace_orders(external_order_id);
+
+-- Items inside a marketplace order
+CREATE TABLE IF NOT EXISTS marketplace_order_items (
+    id                      SERIAL PRIMARY KEY,
+    marketplace_order_id    INTEGER REFERENCES marketplace_orders(id) ON DELETE CASCADE,
+    inventory_id            INTEGER REFERENCES inventory(id),
+    external_item_id        VARCHAR(50),
+    title                   VARCHAR(300),
+    quantity                INTEGER NOT NULL,
+    unit_price              NUMERIC(12,2),
+    total_price             NUMERIC(12,2),
+    listing_id              INTEGER REFERENCES marketplace_listings(id)
+);
+
+-- Generic sync queue (reusable for future Amazon integration)
+CREATE TABLE IF NOT EXISTS marketplace_sync_queue (
+    id              SERIAL PRIMARY KEY,
+    inventory_id    INTEGER REFERENCES inventory(id),
+    channel         VARCHAR(20) NOT NULL,
+    action          VARCHAR(20) NOT NULL,
+    status          VARCHAR(20) DEFAULT 'pending',
+    payload         JSONB,
+    error_message   TEXT,
+    retry_count     INT DEFAULT 0,
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    processed_at    TIMESTAMPTZ
+);
+
+CREATE INDEX IF NOT EXISTS idx_marketplace_sync_queue_pending
+    ON marketplace_sync_queue(status, channel) WHERE status = 'pending';
+
+-- Add source column to sales to track origin (POS, ML, Amazon, etc.)
+-- If the column already exists from another migration, do nothing.
+DO $$
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'sales' AND column_name = 'source'
+    ) THEN
+        ALTER TABLE sales ADD COLUMN source VARCHAR(30) DEFAULT 'pos';
+    END IF;
+END $$;
+
+DO $$
+BEGIN
+    IF NOT EXISTS (
+        SELECT 1 FROM information_schema.columns
+        WHERE table_name = 'sales' AND column_name = 'external_order_id'
+    ) THEN
+        ALTER TABLE sales ADD COLUMN external_order_id VARCHAR(50);
+    END IF;
+END $$;
diff --git a/pos/migrations/v3.5_meli_questions.sql b/pos/migrations/v3.5_meli_questions.sql
new file mode 100644
index 0000000..e1b7683
--- /dev/null
+++ b/pos/migrations/v3.5_meli_questions.sql
@@ -0,0 +1,30 @@
+-- ============================================================
+-- v3.5 MercadoLibre Questions & Answers
+-- ============================================================
+-- Adds table for tracking buyer questions on ML listings.
+-- All tables live in the tenant DB.
+-- ============================================================
+
+CREATE TABLE IF NOT EXISTS marketplace_questions (
+    id                      SERIAL PRIMARY KEY,
+    listing_id              INTEGER REFERENCES marketplace_listings(id) ON DELETE SET NULL,
+    external_question_id    VARCHAR(50) NOT NULL UNIQUE,
+    external_item_id        VARCHAR(50) NOT NULL,
+    question_text           TEXT NOT NULL,
+    answer_text             TEXT,
+    status                  VARCHAR(20) DEFAULT 'unanswered',  -- unanswered, answered, closed
+    buyer_id                VARCHAR(50),
+    buyer_nickname          VARCHAR(100),
+    question_date           TIMESTAMPTZ,
+    answer_date             TIMESTAMPTZ,
+    raw_json                JSONB,
+    created_at              TIMESTAMPTZ DEFAULT NOW(),
+    updated_at              TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_marketplace_questions_status
+    ON marketplace_questions(status);
+CREATE INDEX IF NOT EXISTS idx_marketplace_questions_listing
+    ON marketplace_questions(listing_id);
+CREATE INDEX IF NOT EXISTS idx_marketplace_questions_external
+    ON marketplace_questions(external_question_id);
diff --git a/pos/migrations/v3.5_whatsapp_state_machine.sql b/pos/migrations/v3.5_whatsapp_state_machine.sql
new file mode 100644
index 0000000..f9a6ea3
--- /dev/null
+++ b/pos/migrations/v3.5_whatsapp_state_machine.sql
@@ -0,0 +1,100 @@
+-- ============================================================
+-- v3.5 WhatsApp State Machine
+-- Reorganización del chatbot de AI libre a flujo estructurado
+-- ============================================================
+
+-- 1. Extender whatsapp_sessions con estado y contexto
+-- ---------------------------------------------------
+ALTER TABLE whatsapp_sessions
+ADD COLUMN IF NOT EXISTS state VARCHAR(50) DEFAULT 'idle',
+ADD COLUMN IF NOT EXISTS state_data JSONB DEFAULT '{}',
+ADD COLUMN IF NOT EXISTS customer_id INTEGER REFERENCES customers(id),
+ADD COLUMN IF NOT EXISTS branch_id INTEGER REFERENCES branches(id),
+ADD COLUMN IF NOT EXISTS learning_cycle INTEGER DEFAULT 0,
+ADD COLUMN IF NOT EXISTS created_at TIMESTAMPTZ DEFAULT NOW();
+
+-- Índices para lookups rápidos de sesión
+CREATE INDEX IF NOT EXISTS idx_wa_sessions_state ON whatsapp_sessions(state);
+CREATE INDEX IF NOT EXISTS idx_wa_sessions_customer ON whatsapp_sessions(customer_id);
+CREATE INDEX IF NOT EXISTS idx_wa_sessions_updated ON whatsapp_sessions(updated_at);
+
+-- 2. Tabla de vínculo persistente WA ID ↔ Cliente
+-- ------------------------------------------------
+CREATE TABLE IF NOT EXISTS wa_customer_links (
+    phone VARCHAR(50) PRIMARY KEY,
+    customer_id INTEGER NOT NULL REFERENCES customers(id),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_wa_cust_link_customer ON wa_customer_links(customer_id);
+
+-- Trigger para updated_at
+CREATE OR REPLACE FUNCTION update_wa_link_timestamp()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = NOW();
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_wa_link_updated ON wa_customer_links;
+CREATE TRIGGER trg_wa_link_updated
+    BEFORE UPDATE ON wa_customer_links
+    FOR EACH ROW EXECUTE FUNCTION update_wa_link_timestamp();
+
+-- 3. Tabla de sesiones de aprendizaje (piezas no resueltas)
+-- ---------------------------------------------------------
+CREATE TABLE IF NOT EXISTS wa_learning_sessions (
+    id SERIAL PRIMARY KEY,
+    phone VARCHAR(50) NOT NULL,
+    customer_id INTEGER REFERENCES customers(id),
+    description TEXT NOT NULL,
+    offered_parts JSONB DEFAULT '[]',
+    status VARCHAR(20) DEFAULT 'pending',
+    resolved_part_id INTEGER REFERENCES inventory(id),
+    resolution_sale_id INTEGER REFERENCES sales(id),
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    resolved_at TIMESTAMPTZ
+);
+
+CREATE INDEX IF NOT EXISTS idx_wa_learn_phone ON wa_learning_sessions(phone);
+CREATE INDEX IF NOT EXISTS idx_wa_learn_status ON wa_learning_sessions(status);
+CREATE INDEX IF NOT EXISTS idx_wa_learn_customer ON wa_learning_sessions(customer_id);
+CREATE INDEX IF NOT EXISTS idx_wa_learn_created ON wa_learning_sessions(created_at);
+
+-- 4. Tabla de configuración de envío por sucursal
+-- ------------------------------------------------
+CREATE TABLE IF NOT EXISTS branch_delivery_config (
+    id SERIAL PRIMARY KEY,
+    branch_id INTEGER NOT NULL UNIQUE REFERENCES branches(id),
+    is_enabled BOOLEAN DEFAULT FALSE,
+    delivery_fee NUMERIC(12,2) DEFAULT 0,
+    free_delivery_threshold NUMERIC(12,2) DEFAULT NULL,
+    coverage_radius_km INTEGER DEFAULT NULL,
+    delivery_hours VARCHAR(100) DEFAULT 'Lun-Vie 9:00-18:00',
+    notes TEXT,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    updated_at TIMESTAMPTZ DEFAULT NOW()
+);
+
+-- 5. Agregar push_name a whatsapp_messages (schema drift existente)
+-- ------------------------------------------------------------------
+ALTER TABLE whatsapp_messages
+ADD COLUMN IF NOT EXISTS push_name VARCHAR(200);
+
+-- 6. Migrar datos existentes: vincular por teléfono
+-- --------------------------------------------------
+-- Intentar vincular sesiones WA existentes con customers por teléfono
+INSERT INTO wa_customer_links (phone, customer_id)
+SELECT ws.phone, c.id
+FROM whatsapp_sessions ws
+JOIN customers c ON c.phone = ws.phone
+WHERE ws.phone IS NOT NULL AND c.phone IS NOT NULL
+ON CONFLICT (phone) DO NOTHING;
+
+-- Actualizar customer_id en whatsapp_sessions desde el vínculo
+UPDATE whatsapp_sessions ws
+SET customer_id = wcl.customer_id
+FROM wa_customer_links wcl
+WHERE ws.phone = wcl.phone AND ws.customer_id IS NULL;
diff --git a/pos/migrations/v3.6_dropshipping.sql b/pos/migrations/v3.6_dropshipping.sql
new file mode 100644
index 0000000..87f04d7
--- /dev/null
+++ b/pos/migrations/v3.6_dropshipping.sql
@@ -0,0 +1,18 @@
+-- ============================================================
+-- v3.6 Dropshipping API Integration
+-- ============================================================
+-- Adds config keys and webhook targets for external
+-- dropshipping platforms.
+-- ============================================================
+
+-- Webhook targets for dropshipping notifications per tenant
+CREATE TABLE IF NOT EXISTS dropshipping_webhooks (
+    id          SERIAL PRIMARY KEY,
+    event_type  VARCHAR(30) NOT NULL,  -- stock_updated, price_updated, sale_made
+    target_url  TEXT NOT NULL,
+    is_active   BOOLEAN DEFAULT true,
+    created_at  TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_dropshipping_webhooks_event
+    ON dropshipping_webhooks(event_type) WHERE is_active = true;
diff --git a/pos/migrations/v3.7_sku_aliases.sql b/pos/migrations/v3.7_sku_aliases.sql
new file mode 100644
index 0000000..6bd355f
--- /dev/null
+++ b/pos/migrations/v3.7_sku_aliases.sql
@@ -0,0 +1,22 @@
+-- ============================================================
+-- v3.7 SKU Aliases (multiple SKUs per inventory item)
+-- ============================================================
+-- Allows registering 2-3 alternative part numbers/SKUs for the
+-- same product (e.g. different supplier SKUs).
+-- ============================================================
+
+CREATE TABLE IF NOT EXISTS inventory_sku_aliases (
+    id              SERIAL PRIMARY KEY,
+    inventory_id    INTEGER NOT NULL REFERENCES inventory(id) ON DELETE CASCADE,
+    sku             VARCHAR(100) NOT NULL,
+    label           VARCHAR(50),      -- e.g. "Bodega A", "Proveedor X"
+    is_active       BOOLEAN DEFAULT true,
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    CONSTRAINT inventory_sku_aliases_unique_sku
+        UNIQUE (inventory_id, sku)
+);
+
+CREATE INDEX IF NOT EXISTS idx_inventory_sku_aliases_inventory
+    ON inventory_sku_aliases(inventory_id) WHERE is_active = true;
+CREATE INDEX IF NOT EXISTS idx_inventory_sku_aliases_sku
+    ON inventory_sku_aliases(sku) WHERE is_active = true;
diff --git a/pos/migrations/v3.8_supplier_catalog.sql b/pos/migrations/v3.8_supplier_catalog.sql
new file mode 100644
index 0000000..1563873
--- /dev/null
+++ b/pos/migrations/v3.8_supplier_catalog.sql
@@ -0,0 +1,63 @@
+-- v3.8 — Supplier Catalog tables
+-- Adds supplier_catalog, supplier_catalog_compat, and supplier_catalog_interchange
+-- to support multi-supplier parts injection into the vehicle catalog.
+
+CREATE TABLE IF NOT EXISTS supplier_catalog (
+    id              SERIAL PRIMARY KEY,
+    tenant_id       INTEGER NOT NULL,
+    supplier_name   VARCHAR(255) NOT NULL,
+    sku             VARCHAR(255) NOT NULL,
+    name            VARCHAR(500) NOT NULL,
+    category        VARCHAR(255),
+    description     TEXT,
+    image_url       TEXT,
+    is_active       BOOLEAN DEFAULT TRUE,
+    created_at      TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS supplier_catalog_tenant_id_supplier_name_sku_category_key
+    ON supplier_catalog (tenant_id, supplier_name, sku, category);
+
+CREATE INDEX IF NOT EXISTS idx_sc_supplier
+    ON supplier_catalog (tenant_id, supplier_name, is_active);
+
+CREATE INDEX IF NOT EXISTS idx_sc_sku
+    ON supplier_catalog (tenant_id, sku, category);
+
+
+CREATE TABLE IF NOT EXISTS supplier_catalog_compat (
+    id                  SERIAL PRIMARY KEY,
+    catalog_id          INTEGER NOT NULL REFERENCES supplier_catalog(id) ON DELETE CASCADE,
+    make                VARCHAR(255),
+    model               VARCHAR(255),
+    year                INTEGER,
+    engine              VARCHAR(255),
+    engine_code         VARCHAR(255),
+    model_year_engine_id INTEGER,
+    source              VARCHAR(50) DEFAULT 'import',
+    created_at          TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE UNIQUE INDEX IF NOT EXISTS supplier_catalog_compat_catalog_id_make_model_year_engine_key
+    ON supplier_catalog_compat (catalog_id, make, model, year, engine);
+
+CREATE INDEX IF NOT EXISTS idx_scc_catalog
+    ON supplier_catalog_compat (catalog_id);
+
+CREATE INDEX IF NOT EXISTS idx_scc_vehicle
+    ON supplier_catalog_compat (make, model, year);
+
+CREATE INDEX IF NOT EXISTS idx_scc_mye
+    ON supplier_catalog_compat (model_year_engine_id);
+
+
+CREATE TABLE IF NOT EXISTS supplier_catalog_interchange (
+    id              SERIAL PRIMARY KEY,
+    catalog_id      INTEGER NOT NULL REFERENCES supplier_catalog(id) ON DELETE CASCADE,
+    brand           VARCHAR(255),
+    part_number     VARCHAR(255),
+    created_at      TIMESTAMPTZ DEFAULT NOW()
+);
+
+CREATE INDEX IF NOT EXISTS idx_sci_catalog
+    ON supplier_catalog_interchange (catalog_id);
diff --git a/pos/migrations/v3.9_supplier_catalog_prices.sql b/pos/migrations/v3.9_supplier_catalog_prices.sql
new file mode 100644
index 0000000..72b67e3
--- /dev/null
+++ b/pos/migrations/v3.9_supplier_catalog_prices.sql
@@ -0,0 +1,40 @@
+-- v3.9_supplier_catalog_prices.sql
+-- Per-tenant supplier pricing for items in the master supplier_catalog.
+-- This table lives in the master DB and is joined by tenant_id.
+
+CREATE TABLE IF NOT EXISTS supplier_catalog_prices (
+    id              SERIAL PRIMARY KEY,
+    tenant_id       INTEGER NOT NULL REFERENCES tenants(id) ON DELETE CASCADE,
+    catalog_id      INTEGER NOT NULL REFERENCES supplier_catalog(id) ON DELETE CASCADE,
+    price           NUMERIC(12,2) NOT NULL,
+    currency        VARCHAR(3) DEFAULT 'MXN',
+    effective_from  DATE DEFAULT CURRENT_DATE,
+    effective_to    DATE,
+    is_active       BOOLEAN DEFAULT TRUE,
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE(tenant_id, catalog_id, effective_from)
+);
+
+CREATE INDEX IF NOT EXISTS idx_supplier_catalog_prices_tenant_catalog
+    ON supplier_catalog_prices(tenant_id, catalog_id, effective_from DESC)
+    WHERE is_active = true;
+
+-- Index for quick "latest active price" lookups per tenant+item.
+CREATE INDEX IF NOT EXISTS idx_supplier_catalog_prices_lookup
+    ON supplier_catalog_prices(tenant_id, catalog_id, effective_from DESC, is_active);
+
+-- Trigger to keep updated_at current on row changes.
+CREATE OR REPLACE FUNCTION update_supplier_catalog_prices_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = NOW();
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_supplier_catalog_prices_updated_at ON supplier_catalog_prices;
+CREATE TRIGGER trg_supplier_catalog_prices_updated_at
+    BEFORE UPDATE ON supplier_catalog_prices
+    FOR EACH ROW
+    EXECUTE FUNCTION update_supplier_catalog_prices_updated_at();
diff --git a/pos/migrations/v4.0_multi_branch.sql b/pos/migrations/v4.0_multi_branch.sql
new file mode 100644
index 0000000..4ea5850
--- /dev/null
+++ b/pos/migrations/v4.0_multi_branch.sql
@@ -0,0 +1,253 @@
+-- v4.0_multi_branch.sql
+-- Multi-branch overhaul: branch fiscal data + shared inventory with per-branch stock.
+-- WARNING: this migration restructures inventory data. A full DB backup is required.
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 1. BRANCHES: fiscal fields + main flag
+-- ═════════════════════════════════════════════════════════════════════════════
+
+ALTER TABLE branches
+    ADD COLUMN IF NOT EXISTS is_main BOOLEAN DEFAULT FALSE,
+    ADD COLUMN IF NOT EXISTS rfc VARCHAR(13),
+    ADD COLUMN IF NOT EXISTS razon_social VARCHAR(300),
+    ADD COLUMN IF NOT EXISTS regimen_fiscal VARCHAR(10),
+    ADD COLUMN IF NOT EXISTS cp VARCHAR(5),
+    ADD COLUMN IF NOT EXISTS direccion_fiscal TEXT,
+    ADD COLUMN IF NOT EXISTS serie_cfdi VARCHAR(10) DEFAULT 'A',
+    ADD COLUMN IF NOT EXISTS folio_inicio INTEGER DEFAULT 1,
+    ADD COLUMN IF NOT EXISTS folio_actual INTEGER DEFAULT 1,
+    ADD COLUMN IF NOT EXISTS email VARCHAR(200);
+
+-- Ensure at least one branch is marked main (the first one created).
+DO $$
+DECLARE
+    main_branch_id INTEGER;
+    branch_count INTEGER;
+BEGIN
+    SELECT COUNT(*) INTO branch_count FROM branches;
+
+    IF branch_count = 0 THEN
+        INSERT INTO branches (name, is_main)
+        VALUES ('Principal', TRUE);
+    ELSE
+        SELECT id INTO main_branch_id FROM branches ORDER BY id LIMIT 1;
+
+        UPDATE branches SET is_main = FALSE;
+        UPDATE branches SET is_main = TRUE WHERE id = main_branch_id;
+    END IF;
+END $$;
+
+-- Constraint: only one main branch per tenant.
+-- Because this runs inside a single tenant DB, a simple partial unique index is enough.
+CREATE UNIQUE INDEX IF NOT EXISTS idx_branches_single_main
+    ON branches (is_main)
+    WHERE is_main = TRUE;
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 2. INVENTORY STOCK: new per-branch stock table
+-- ═════════════════════════════════════════════════════════════════════════════
+
+CREATE TABLE IF NOT EXISTS inventory_stock (
+    id              SERIAL PRIMARY KEY,
+    inventory_id    INTEGER NOT NULL REFERENCES inventory(id) ON DELETE CASCADE,
+    branch_id       INTEGER NOT NULL REFERENCES branches(id) ON DELETE CASCADE,
+    stock           INTEGER DEFAULT 0,
+    location        VARCHAR(50),
+    created_at      TIMESTAMPTZ DEFAULT NOW(),
+    updated_at      TIMESTAMPTZ DEFAULT NOW(),
+    UNIQUE(inventory_id, branch_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_inventory_stock_branch ON inventory_stock(branch_id);
+CREATE INDEX IF NOT EXISTS idx_inventory_stock_inventory ON inventory_stock(inventory_id);
+
+CREATE OR REPLACE FUNCTION update_inventory_stock_updated_at()
+RETURNS TRIGGER AS $$
+BEGIN
+    NEW.updated_at = NOW();
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_inventory_stock_updated_at ON inventory_stock;
+CREATE TRIGGER trg_inventory_stock_updated_at
+    BEFORE UPDATE ON inventory_stock
+    FOR EACH ROW
+    EXECUTE FUNCTION update_inventory_stock_updated_at();
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 3. INVENTORY: make branch_id nullable + prepare for consolidation
+-- ═════════════════════════════════════════════════════════════════════════════
+
+-- Drop the old unique constraint that forces one record per (branch, part_number).
+DROP INDEX IF EXISTS idx_inventory_branch_part;
+
+-- Make branch_id nullable so we can have master records without a branch.
+ALTER TABLE inventory ALTER COLUMN branch_id DROP NOT NULL;
+
+-- Add unique constraint on part_number at tenant level so a product exists once.
+-- If duplicates still exist this will fail, so we consolidate below first.
+-- We create it at the end of this migration after deduplication.
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 4. DATA MIGRATION: consolidate duplicated inventory rows by part_number
+-- ═════════════════════════════════════════════════════════════════════════════
+
+-- Build a mapping: for each duplicated part_number, choose the master record.
+-- Master = record belonging to the main branch; fallback = oldest id.
+CREATE TEMP TABLE _inventory_master_map AS
+SELECT DISTINCT ON (part_number)
+    id AS master_id,
+    part_number
+FROM inventory
+ORDER BY part_number,
+    CASE WHEN branch_id = (SELECT id FROM branches WHERE is_main = TRUE LIMIT 1) THEN 0 ELSE 1 END,
+    id ASC;
+
+-- Create temp table of duplicates (all rows that are NOT the master for their part_number).
+CREATE TEMP TABLE _inventory_duplicates AS
+SELECT i.id AS duplicate_id, m.master_id
+FROM inventory i
+JOIN _inventory_master_map m ON i.part_number = m.part_number
+WHERE i.id <> m.master_id;
+
+
+
+-- Compute per-duplicate stock and insert into inventory_stock against master_id + duplicate's branch.
+INSERT INTO inventory_stock (inventory_id, branch_id, stock, location)
+SELECT
+    dups.master_id,
+    dups.branch_id,
+    GREATEST(0, COALESCE(stock_by_dup.stock, 0))::int,
+    dups.location
+FROM (
+    SELECT d.master_id, d.duplicate_id, i.branch_id, i.location
+    FROM _inventory_duplicates d
+    JOIN inventory i ON i.id = d.duplicate_id
+) dups
+JOIN LATERAL (
+    SELECT COALESCE(SUM(quantity), 0) AS stock
+    FROM inventory_operations
+    WHERE inventory_id = dups.duplicate_id AND branch_id = dups.branch_id
+) stock_by_dup ON TRUE
+ON CONFLICT (inventory_id, branch_id) DO UPDATE
+SET stock = inventory_stock.stock + EXCLUDED.stock;
+
+-- Also migrate stock from master records themselves (they were already in inventory.branch_id).
+INSERT INTO inventory_stock (inventory_id, branch_id, stock, location)
+SELECT
+    i.id,
+    i.branch_id,
+    GREATEST(0, COALESCE(stock_by_inv.stock, 0))::int,
+    i.location
+FROM inventory i
+JOIN _inventory_master_map m ON i.id = m.master_id
+JOIN LATERAL (
+    SELECT COALESCE(SUM(quantity), 0) AS stock
+    FROM inventory_operations
+    WHERE inventory_id = i.id AND branch_id = i.branch_id
+) stock_by_inv ON TRUE
+WHERE i.branch_id IS NOT NULL
+ON CONFLICT (inventory_id, branch_id) DO UPDATE
+SET stock = EXCLUDED.stock;
+
+-- Handle inventory_stock_summary specially: it has PK on inventory_id.
+-- If master already has a summary row, add duplicate's stock and remove duplicate row.
+-- Otherwise repoint the duplicate row to master.
+UPDATE inventory_stock_summary s
+SET stock = s.stock + d.stock
+FROM (
+    SELECT duplicate_id, master_id, stock FROM inventory_stock_summary ss
+    JOIN _inventory_duplicates m ON ss.inventory_id = m.duplicate_id
+    WHERE EXISTS (SELECT 1 FROM inventory_stock_summary sm WHERE sm.inventory_id = m.master_id)
+) d
+WHERE s.inventory_id = d.master_id;
+
+DELETE FROM inventory_stock_summary
+WHERE inventory_id IN (
+    SELECT m.duplicate_id
+    FROM _inventory_duplicates m
+    WHERE EXISTS (SELECT 1 FROM inventory_stock_summary sm WHERE sm.inventory_id = m.master_id)
+);
+
+UPDATE inventory_stock_summary
+SET inventory_id = m.master_id
+FROM _inventory_duplicates m
+WHERE inventory_id = m.duplicate_id;
+
+-- Update FK references from duplicate inventory rows to master inventory rows.
+-- We use dynamic SQL to update every known referencing table.
+DO $$
+DECLARE
+    rec RECORD;
+    fk_sql TEXT;
+BEGIN
+    FOR rec IN
+        SELECT
+            tc.table_name,
+            kcu.column_name
+        FROM information_schema.table_constraints tc
+        JOIN information_schema.key_column_usage kcu
+            ON tc.constraint_name = kcu.constraint_name
+        JOIN information_schema.constraint_column_usage ccu
+            ON ccu.constraint_name = tc.constraint_name
+        WHERE tc.constraint_type = 'FOREIGN KEY'
+          AND ccu.table_name = 'inventory'
+          AND tc.table_name <> 'inventory_stock_summary'
+    LOOP
+        fk_sql := format(
+            'UPDATE %I SET %I = m.master_id FROM _inventory_duplicates m WHERE %I = m.duplicate_id',
+            rec.table_name, rec.column_name, rec.column_name
+        );
+        EXECUTE fk_sql;
+    END LOOP;
+END $$;
+
+-- Delete duplicate inventory rows now that FKs are repointed.
+DELETE FROM inventory
+WHERE id IN (SELECT duplicate_id FROM _inventory_duplicates);
+
+-- Clean up master records: remove branch_id so they become shared catalog items.
+UPDATE inventory SET branch_id = NULL WHERE branch_id IS NOT NULL;
+
+-- Now safe to enforce uniqueness at tenant level.
+CREATE UNIQUE INDEX IF NOT EXISTS idx_inventory_part_unique ON inventory (part_number);
+
+-- Clean temp tables.
+DROP TABLE IF EXISTS _inventory_master_map;
+DROP TABLE IF EXISTS _inventory_duplicates;
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 5. CFDI_QUEUE: allow sale_id to be NULL for global invoices (Phase 3 prep)
+-- ═════════════════════════════════════════════════════════════════════════════
+
+ALTER TABLE cfdi_queue ALTER COLUMN sale_id DROP NOT NULL;
+
+-- ═════════════════════════════════════════════════════════════════════════════
+-- 6. TRIGGER: Keep inventory_stock in sync with inventory_operations
+-- ═════════════════════════════════════════════════════════════════════════════
+
+CREATE OR REPLACE FUNCTION update_inventory_stock()
+RETURNS TRIGGER AS $$
+BEGIN
+    -- Skip operations that are not tied to a specific branch.
+    -- Per-branch stock tracking requires a branch_id; without it we can't
+    -- assign the stock to any location.
+    IF NEW.branch_id IS NULL THEN
+        RETURN NEW;
+    END IF;
+
+    INSERT INTO inventory_stock (inventory_id, branch_id, stock)
+    VALUES (NEW.inventory_id, NEW.branch_id, NEW.quantity)
+    ON CONFLICT (inventory_id, branch_id) DO UPDATE
+    SET stock = inventory_stock.stock + EXCLUDED.stock,
+        updated_at = NOW();
+    RETURN NEW;
+END;
+$$ LANGUAGE plpgsql;
+
+DROP TRIGGER IF EXISTS trg_update_inventory_stock ON inventory_operations;
+CREATE TRIGGER trg_update_inventory_stock
+    AFTER INSERT ON inventory_operations
+    FOR EACH ROW
+    EXECUTE FUNCTION update_inventory_stock();
diff --git a/pos/migrations/v4.1_global_invoice.sql b/pos/migrations/v4.1_global_invoice.sql
new file mode 100644
index 0000000..d624cd0
--- /dev/null
+++ b/pos/migrations/v4.1_global_invoice.sql
@@ -0,0 +1,17 @@
+-- v4.1 — Global Invoice (Factura Global Mensual)
+-- Supports grouping cash sales (<= $2,000) into a single monthly CFDI.
+
+-- Link global invoices to their constituent sales
+CREATE TABLE IF NOT EXISTS global_invoice_sales (
+    global_invoice_id INTEGER NOT NULL REFERENCES cfdi_queue(id) ON DELETE CASCADE,
+    sale_id           INTEGER NOT NULL REFERENCES sales(id) ON DELETE CASCADE,
+    PRIMARY KEY (global_invoice_id, sale_id)
+);
+
+CREATE INDEX IF NOT EXISTS idx_gis_global ON global_invoice_sales(global_invoice_id);
+CREATE INDEX IF NOT EXISTS idx_gis_sale   ON global_invoice_sales(sale_id);
+
+-- Track which sales have been included in any global invoice
+-- (quick lookup without joining global_invoice_sales)
+ALTER TABLE sales ADD COLUMN IF NOT EXISTS global_invoiced_at TIMESTAMPTZ;
+CREATE INDEX IF NOT EXISTS idx_sales_global_invoiced_at ON sales(global_invoiced_at) WHERE global_invoiced_at IS NULL;
diff --git a/pos/migrations/v4.2_meli_sync_queue.sql b/pos/migrations/v4.2_meli_sync_queue.sql
new file mode 100644
index 0000000..2a2558d
--- /dev/null
+++ b/pos/migrations/v4.2_meli_sync_queue.sql
@@ -0,0 +1,14 @@
+-- v4.2 — MercadoLibre sync queue for stock synchronization
+
+CREATE TABLE IF NOT EXISTS meli_sync_queue (
+    id SERIAL PRIMARY KEY,
+    inventory_id INTEGER NOT NULL REFERENCES inventory(id),
+    action VARCHAR(20) NOT NULL DEFAULT 'stock_update',
+    status VARCHAR(20) NOT NULL DEFAULT 'pending',
+    retry_count INTEGER DEFAULT 0,
+    error_message TEXT,
+    created_at TIMESTAMPTZ DEFAULT NOW(),
+    processed_at TIMESTAMPTZ
+);
+
+CREATE INDEX IF NOT EXISTS idx_meli_sync_pending ON meli_sync_queue(status, created_at) WHERE status = 'pending';
diff --git a/pos/services/ai_chat.py b/pos/services/ai_chat.py
index cfe2dae..64df9cd 100644
--- a/pos/services/ai_chat.py
+++ b/pos/services/ai_chat.py
@@ -86,11 +86,42 @@ def _post_chat_completion(url, api_key, model_id, messages, max_tokens=800, temp
         return None
 
 
-SYSTEM_PROMPT_SHORT = """Eres un asistente de refaccionaria automotriz mexicana. Ayuda a encontrar autopartes.
+SYSTEM_PROMPT_SHORT = """Eres Juan, vendedor estrella de Autopartes Estrada. Llevas 10 años ayudando a mecanicos y dueños de taller. Tu estilo: directo, calido, sin rollos tecnicos. Hablas como un compa que sabe de carros.
+
+IMPORTANTE: NO prometas stock hasta verificar. Usa "Reviso...", "Busco...", "Déjame checar..." en vez de "Tengo..." a menos que estes 100% seguro.
+
 Responde SIEMPRE en formato JSON: {"message":"...","search_query":"...","vehicle":{"brand":"...","model":"...","year":...}}
-search_query va EN INGLES cuando el usuario pide una parte. Traducciones: Balatas=Brake Pad, Disco de freno=Brake Disc, Amortiguador=Shock Absorber, Filtro de aceite=Oil Filter, Filtro de aire=Air Filter, Bujias=Spark Plug, Banda=V-Belt, Bomba de agua=Water Pump, Alternador=Alternator, Radiador=Radiator, Sensor de oxigeno=Oxygen Sensor, Terminal de direccion=Tie Rod End, Bomba de gasolina=Fuel Pump, Clutch=Clutch Kit, Mofle=Exhaust, Inyector=Injector.
-No preguntes mas si ya puedes buscar. Si el usuario describe un sintoma, diagnostica y sugiere partes.
-Cuando pida cotizacion o multiples partes, search_query DEBE usar | para separar cada parte: "Brake Pad|Air Filter|Oil Filter|Spark Plug".
+
+REGLAS DE VENTA AVANZADAS:
+1. PRECIO AL FRENTE: Si hay stock, di precio y marca sin rodeos.
+2. KIT INTELIGENTE: Siempre sugiere 1-2 productos relacionados que se necesitan para el mismo trabajo.
+   - Balatas → "Ya que vas a cambiar balatas, checa si los discos tambien estan gastados. Te armo paquete con descuento."
+   - Alternador → "Mientras cambias alternador, conviene cambiar la banda serpentina para que no se te rompa despues."
+   - Filtro de aceite → "¿Ya tienes filtro de aire y bujias? Para servicio completo conviene cambiar todo junto."
+3. MANEJO DE OBJECIONES:
+   - "Esta caro" → "Te entiendo. Esta es marca original. Tambien manejo opcion economica. ¿Te mando las dos para comparar?"
+   - "Voy a checar en otro lado" → "Dale, te espero. Guardame este precio. Si encuentras mas barato, mandame foto de la cotizacion y veo si te la mejoro."
+   - "Lo necesito para hoy" / "Urgente" → "Perfecto. Tenemos entrega express en 2-4 horas o puedes pasar directo a la tienda. ¿Te lo armo ya?"
+   - "No se si sea esa" → "No hay problema. Dame los ultimos 4 digitos de tu VIN y te confirmo compatibilidad exacta."
+   - "Solo estoy cotizando" → "Claro, sin compromiso. Te armo la cotizacion y si decides despues, aqui queda guardada."
+4. CIERRE SUAVE (termina SIEMPRE con pregunta):
+   - "¿Te lo aparto?"
+   - "¿Lo mando a tu taller o lo pasas a recoger?"
+   - "¿Con esto quedas o necesitas algo mas?"
+   - "¿Te armo el paquete completo? Sale mejor que por separado."
+5. RECONOCIMIENTO DE CLIENTE: Si el contexto dice que compro antes, mencionalo. "Veo que compraste balatas hace 6 meses. ¿Ya es hora de cambiar las del otro eje?"
+6. DIAGNOSTICO RAPIDO: Si describe sintoma, diagnostica en 1-2 frases y sugiere 2-3 partes mas probables.
+
+TRADUCCIONES search_query (EN INGLES):
+Balatas=Brake Pad, Disco de freno=Brake Disc, Amortiguador=Shock Absorber, Filtro de aceite=Oil Filter, Filtro de aire=Air Filter, Bujias=Spark Plug, Banda=V-Belt, Bomba de agua=Water Pump, Alternador=Alternator, Radiador=Radiator, Sensor de oxigeno=Oxygen Sensor, Terminal de direccion=Tie Rod End, Bomba de gasolina=Fuel Pump, Clutch=Clutch Kit, Mofle=Exhaust, Inyector=Injector, Banda de distribucion=Timing Belt, Tensor=Belt Tensioner, Junta homocinetica=CV Joint, Marcha=Starter Motor, Bateria=Battery, Aceite=Engine Oil, Refrigerante=Coolant.
+
+FORMATO:
+- search_query EN INGLES. NUNCA null si pide algo.
+- vehicle: {"brand":"NISSAN","model":"Frontier","year":2019} marca en MAYUSCULAS.
+- Multiples partes: "Brake Pad|Brake Disc|Brake Fluid"
+- Mensaje maximo 4 lineas cortas. Lenguaje natural, nada robotico.
+- Si ya detectaste vehiculo en conversacion anterior, NO vuelvas a pedirlo.
+- Termina SIEMPRE con una pregunta de cierre.
 """
 
 SYSTEM_PROMPT = """Eres un asistente de refaccionaria automotriz mexicana. Tu trabajo es ayudar a encontrar autopartes.
@@ -195,11 +226,24 @@ def get_inventory_context(tenant_conn, branch_id=None):
             WHERE {where} AND i.brand IS NOT NULL AND i.brand != ''
             GROUP BY i.brand
             ORDER BY cnt DESC
-            LIMIT 15
+            LIMIT 10
         """, params)
         brands = cur.fetchall()
         brand_list = ", ".join(f"{row[0]} ({row[1]})" for row in brands if row[0])
 
+        # Top categories with counts
+        cur.execute(f"""
+            SELECT c.name, COUNT(*) as cnt
+            FROM inventory i
+            JOIN part_categories c ON c.id = i.category_id
+            WHERE {where} AND c.name IS NOT NULL AND c.name != ''
+            GROUP BY c.name
+            ORDER BY cnt DESC
+            LIMIT 10
+        """, params)
+        categories = cur.fetchall()
+        category_list = ", ".join(f"{row[0]} ({row[1]})" for row in categories if row[0])
+
         # Products with low stock (<=3)
         cur.execute(f"""
             SELECT COUNT(*) FROM inventory i
@@ -212,10 +256,12 @@ def get_inventory_context(tenant_conn, branch_id=None):
             "CONTEXTO DEL INVENTARIO:",
             f"Este negocio tiene {total} productos en inventario.",
         ]
+        if category_list:
+            lines.append(f"Categorias principales: {category_list}")
         if brand_list:
-            lines.append(f"Marcas disponibles: {brand_list}")
+            lines.append(f"Marcas top: {brand_list}")
         lines.append(f"Productos con stock bajo (<=3 unidades): {low_stock}")
-        lines.append("IMPORTANTE: Cuando busques partes, SIEMPRE prioriza lo que el negocio tiene en inventario local.")
+        lines.append("IMPORTANTE: Cuando busques partes, SIEMPRE prioriza lo que el negocio tiene en inventario local. Si no hay stock exacto, sugiere alternativa similar.")
 
         return "\n".join(lines)
     except Exception:
@@ -284,10 +330,10 @@ def chat_with_image(user_message, image_base64, conversation_history=None, inven
     ]
     messages.append({"role": "user", "content": user_content})
 
-    # Try Hermes first for vision (if enabled), fallback to OpenRouter
+    # Vision backends: QWEN only, fallback to OpenRouter if key present
     backends = []
-    if HERMES_ENABLED:
-        backends.append((HERMES_CHAT_URL, HERMES_API_KEY, HERMES_VISION_MODEL))
+    if QWEN_ENABLED:
+        backends.append((QWEN_CHAT_URL, QWEN_API_KEY, QWEN_MODEL))
     if OPENROUTER_API_KEY:
         backends.append((OPENROUTER_URL, OPENROUTER_API_KEY, VISION_MODEL))
     
@@ -339,10 +385,10 @@ def classify_part(part_number):
         {"role": "user", "content": prompt}
     ]
 
-    # Try Hermes first (if enabled), fallback to OpenRouter
+    # Backends: QWEN only, fallback to OpenRouter if key present
     backends = []
-    if HERMES_ENABLED:
-        backends.append((HERMES_CHAT_URL, HERMES_API_KEY, HERMES_MODEL))
+    if QWEN_ENABLED:
+        backends.append((QWEN_CHAT_URL, QWEN_API_KEY, QWEN_MODEL))
     if OPENROUTER_API_KEY:
         backends.append((OPENROUTER_URL, OPENROUTER_API_KEY, MODEL))
     
@@ -528,12 +574,10 @@ def chat(user_message, conversation_history=None, inventory_context=None):
 
     last_error = None
 
-    # Build backend list: QWEN first (fast, ~1s), then Hermes (specialized, ~30s), then OpenRouter
+    # Build backend list: QWEN first, then OpenRouter fallback
     backends = []
     if QWEN_ENABLED:
-        backends.append((QWEN_CHAT_URL, QWEN_API_KEY, QWEN_MODEL, 35, SYSTEM_PROMPT_SHORT, 4000))
-    if HERMES_ENABLED:
-        backends.append((HERMES_CHAT_URL, HERMES_API_KEY, HERMES_MODEL, 45, SYSTEM_PROMPT, 800))
+        backends.append((QWEN_CHAT_URL, QWEN_API_KEY, QWEN_MODEL, 18, SYSTEM_PROMPT_SHORT, 1200))
     if OPENROUTER_API_KEY:
         for m in FALLBACK_MODELS:
             backends.append((OPENROUTER_URL, OPENROUTER_API_KEY, m, 25, SYSTEM_PROMPT, 800))
@@ -548,14 +592,22 @@ def chat(user_message, conversation_history=None, inventory_context=None):
         if conversation_history:
             msgs.extend(conversation_history)
         msgs.append({"role": "user", "content": user_message})
-        result = _post_chat_completion(url, key, model_id, msgs, max_tokens=max_tok, temperature=0.3, timeout=timeout_sec)
+
+        # Retry logic: QWEN gets 3 attempts with 2s delay because the API is flaky
+        max_retries = 3 if url == QWEN_CHAT_URL else 1
+        result = None
+        for attempt in range(1, max_retries + 1):
+            result = _post_chat_completion(url, key, model_id, msgs, max_tokens=max_tok, temperature=0.3, timeout=timeout_sec)
+            if result is not None:
+                break
+            if attempt < max_retries:
+                print(f"[AI] QWEN attempt {attempt} failed, retrying in 2s...")
+                _time_chat.sleep(2)
+
         if result is None:
             if url == QWEN_CHAT_URL:
-                print(f"[AI] QWEN failed, trying Hermes fallback...")
+                print(f"[AI] QWEN failed after {max_retries} attempts, trying fallback...")
                 last_error = "qwen_failed"
-            elif url == HERMES_CHAT_URL:
-                print(f"[AI] Hermes failed, trying OpenRouter fallback...")
-                last_error = "hermes_timeout"
             else:
                 print(f"[AI] Rate limited on {model_id}, trying next model...")
                 last_error = "rate_limit"
@@ -589,7 +641,7 @@ def chat(user_message, conversation_history=None, inventory_context=None):
     # All models exhausted — DON'T cache errors, we want retries next time
     if last_error == "rate_limit":
         return {"message": "El asistente está ocupado. Intenta de nuevo en unos segundos.", "search_query": None, "vehicle": None}
-    if last_error == "hermes_timeout":
+    if last_error == "qwen_failed":
         return {"message": "El asistente tardó mucho en responder. Intenta de nuevo en un momento.", "search_query": None, "vehicle": None}
     return {
         "message": "El asistente no está disponible en este momento. Intenta de nuevo en unos segundos.",
diff --git a/pos/services/catalog_import_service.py b/pos/services/catalog_import_service.py
new file mode 100644
index 0000000..a755be8
--- /dev/null
+++ b/pos/services/catalog_import_service.py
@@ -0,0 +1,157 @@
+"""Bulk catalog import service.
+
+Imports products into inventory with optional vehicle compatibilities
+and SKU aliases. Can auto-generate vehicle fitment via QWEN AI if
+compatibilities are not provided.
+"""
+
+import logging
+from typing import Optional
+
+logger = logging.getLogger(__name__)
+
+
+def import_products(
+    tenant_conn,
+    products: list[dict],
+    branch_id: int,
+    auto_generate_compat: bool = False,
+    employee_id: Optional[int] = None,
+):
+    """Import a list of products into inventory.
+
+    Each product dict may contain:
+      - sku (str) *required
+      - name (str) *required
+      - brand (str)
+      - description (str)
+      - cost (float)
+      - price (float)
+      - stock (int)
+      - location (str)
+      - sku_aliases (list[dict]) [{"sku": str, "label": str}]
+      - vehicles (list[dict]) [{"make", "model", "year", "engine", "engine_code"}]
+
+    Returns {"imported": N, "failed": [{"sku": ..., "error": ...}], "compat_generated": M}
+    """
+    cur = tenant_conn.cursor()
+    imported = 0
+    failed = []
+    compat_generated = 0
+
+    for idx, p in enumerate(products):
+        sku = (p.get("sku") or "").strip()
+        name = (p.get("name") or "").strip()
+        if not sku or not name:
+            failed.append({"index": idx, "sku": sku, "error": "sku and name are required"})
+            continue
+
+        brand = (p.get("brand") or "").strip() or None
+        description = (p.get("description") or "").strip() or None
+        cost = float(p.get("cost") or 0)
+        price = float(p.get("price") or 0)
+        stock = int(p.get("stock") or 0)
+        location = (p.get("location") or "").strip() or None
+        barcode = (p.get("barcode") or "").strip() or None
+
+        try:
+            # Check for duplicate SKU in same branch
+            cur.execute(
+                "SELECT id FROM inventory WHERE part_number = %s AND branch_id = %s AND is_active = true",
+                (sku, branch_id),
+            )
+            if cur.fetchone():
+                # Update existing item instead of creating new
+                cur.execute(
+                    """
+                    UPDATE inventory
+                    SET name = %s, brand = %s, description = %s, cost = %s, price_1 = %s,
+                        location = %s, barcode = COALESCE(%s, barcode), updated_at = NOW()
+                    WHERE part_number = %s AND branch_id = %s AND is_active = true
+                    RETURNING id
+                    """,
+                    (name, brand, description, cost, price, location, barcode, sku, branch_id),
+                )
+                row = cur.fetchone()
+                item_id = row[0]
+            else:
+                # Insert new item
+                cur.execute(
+                    """
+                    INSERT INTO inventory
+                        (branch_id, part_number, barcode, name, description, brand,
+                         unit, cost, price_1, price_2, price_3, tax_rate,
+                         min_stock, max_stock, location, is_active)
+                    VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, true)
+                    RETURNING id
+                    """,
+                    (
+                        branch_id, sku, barcode, name, description, brand,
+                        "PZA", cost, price, price, price, 0.16,
+                        0, 0, location,
+                    ),
+                )
+                row = cur.fetchone()
+                item_id = row[0]
+
+                # Record initial stock if provided
+                if stock > 0:
+                    from services.inventory_engine import record_initial
+                    record_initial(tenant_conn, item_id, branch_id, stock, cost)
+
+            # Insert SKU aliases
+            aliases = p.get("sku_aliases") or []
+            for alias in aliases:
+                alias_sku = (alias.get("sku") or "").strip()
+                label = (alias.get("label") or "").strip() or None
+                if alias_sku:
+                    cur.execute(
+                        """
+                        INSERT INTO inventory_sku_aliases (inventory_id, sku, label)
+                        VALUES (%s, %s, %s)
+                        ON CONFLICT (inventory_id, sku) DO UPDATE SET
+                            is_active = true, label = EXCLUDED.label
+                        """,
+                        (item_id, alias_sku, label),
+                    )
+
+            # Insert manual vehicle compatibilities
+            vehicles = p.get("vehicles") or []
+            for v in vehicles:
+                make = (v.get("make") or "").strip()
+                model = (v.get("model") or "").strip()
+                year = v.get("year")
+                engine = (v.get("engine") or "").strip() or None
+                engine_code = (v.get("engine_code") or "").strip() or None
+                if make and model and year:
+                    cur.execute(
+                        """
+                        INSERT INTO inventory_vehicle_compat
+                            (inventory_id, make, model, year, engine, engine_code, source, model_year_engine_id)
+                        VALUES (%s, %s, %s, %s, %s, %s, 'manual', NULL)
+                        ON CONFLICT DO NOTHING
+                        """,
+                        (item_id, make, model, year, engine, engine_code),
+                    )
+
+            tenant_conn.commit()
+            imported += 1
+
+            # Auto-generate compat via QWEN if requested and no vehicles provided
+            if auto_generate_compat and not vehicles:
+                try:
+                    from services.qwen_fitment import get_vehicle_fitment
+                    from services.inventory_vehicle_compat import save_qwen_fitment
+                    fitment = get_vehicle_fitment(sku, name, brand or "")
+                    inserted = save_qwen_fitment(tenant_conn, item_id, fitment)
+                    compat_generated += inserted
+                except Exception as qe:
+                    logger.warning("QWEN auto-match failed for %s: %s", sku, qe)
+
+        except Exception as e:
+            tenant_conn.rollback()
+            logger.warning("Import failed for sku=%s: %s", sku, e)
+            failed.append({"index": idx, "sku": sku, "error": str(e)})
+
+    cur.close()
+    return {"imported": imported, "failed": failed, "compat_generated": compat_generated}
diff --git a/pos/services/catalog_service.py b/pos/services/catalog_service.py
index 4b0603e..7332a63 100644
--- a/pos/services/catalog_service.py
+++ b/pos/services/catalog_service.py
@@ -95,8 +95,13 @@ def _clean_model_name(name):
     s = re.sub(r'\s*\([^)]*\)\s*', '', s)
     # Remove Roman numeral generation suffixes: I, II, III, IV, V, VI, VII, VIII, IX, X
     s = re.sub(r'\s+(?:VIII|VII|VI|IV|IX|III|II|V|X|I)(?:\s|$)', ' ', s)
-    # Remove body type suffixes
-    s = re.sub(r'\s+(?:Estate|Saloon|Hatchback|Van|Coupe|Coupé|Convertible|Wagon|Pickup|Cab|Sedan|SUV|MPV|Kombi|Kasten|Bus|Box|Platform|Chassis)\b', '', s, flags=re.IGNORECASE)
+    # Remove body type suffixes (keep Saloon/Hatchback/Sedan/Wagon as they distinguish variants)
+    s = re.sub(r'\s+(?:Estate|Van|Coupe|Coupé|Convertible|Pickup|Cab|SUV|MPV|Kombi|Kasten|Bus|Box|Platform|Chassis)\b', '', s, flags=re.IGNORECASE)
+    # Remove truck cab/bed suffixes: CREW, EXTENDED, STANDARD, HD, etc.
+    s = re.sub(r'\s+(?:CREW|EXTENDED|STANDARD|CUTAWAY|PASSENGER|CARGO)\b', '', s, flags=re.IGNORECASE)
+    # Remove "HD", "&" suffixes that create fake variants
+    s = re.sub(r'\s+HD\b', '', s, flags=re.IGNORECASE)
+    s = re.sub(r'\s+&\s*$', '', s)
     # Remove "Hatchback Van", "Box Body" compound types
     s = re.sub(r'\s+(?:Hatchback|Box)\s+(?:Van|Body)\b', '', s, flags=re.IGNORECASE)
     # Clean up extra spaces
@@ -115,7 +120,67 @@ from services.catalog_modes import get_brands_for_mode
 NORTH_AMERICA_BRANDS = get_brands_for_mode('oem')
 
 
-def get_brands(master_conn, year_id=None, mode='oem'):
+def _get_mye_ids_with_parts(tenant_conn, min_parts=1, tenant_id=None, master_conn=None):
+    """Return MYE ids that have at least min_parts total (local inventory + supplier catalog).
+
+    Results are cached in Redis per-tenant for 60s to avoid repeated
+    expensive UNION ALL + GROUP BY queries during navigation.
+    """
+    if tenant_id:
+        r = _get_redis()
+        if r:
+            cache_key = f'nexus:mye_ids:{tenant_id}:{min_parts}'
+            try:
+                cached = r.get(cache_key)
+                if cached:
+                    return json.loads(cached)
+            except Exception:
+                pass
+
+    # Inventory from tenant DB
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT model_year_engine_id, COUNT(*) as cnt
+        FROM inventory_vehicle_compat
+        WHERE model_year_engine_id IS NOT NULL
+        GROUP BY model_year_engine_id
+    """)
+    inventory_counts = {r[0]: r[1] for r in cur.fetchall()}
+    cur.close()
+
+    # Supplier catalog from master DB
+    supplier_counts = {}
+    if master_conn:
+        cur = master_conn.cursor()
+        cur.execute("""
+            SELECT model_year_engine_id, COUNT(*) as cnt
+            FROM supplier_catalog_compat
+            WHERE model_year_engine_id IS NOT NULL
+            GROUP BY model_year_engine_id
+        """)
+        supplier_counts = {r[0]: r[1] for r in cur.fetchall()}
+        cur.close()
+
+    # Combine and filter
+    all_myes = set(inventory_counts.keys()) | set(supplier_counts.keys())
+    result = []
+    for mye_id in all_myes:
+        total = inventory_counts.get(mye_id, 0) + supplier_counts.get(mye_id, 0)
+        if total >= min_parts:
+            result.append(mye_id)
+
+    if tenant_id:
+        r = _get_redis()
+        if r:
+            try:
+                r.setex(cache_key, 60, json.dumps(result))
+            except Exception:
+                pass
+
+    return result
+
+
+def get_brands(master_conn, year_id=None, mode='oem', mye_ids=None):
     """Get vehicle brands that have MYE entries, filtered by catalog mode.
 
     Args:
@@ -125,30 +190,50 @@ def get_brands(master_conn, year_id=None, mode='oem'):
     """
     allowed = list(get_brands_for_mode(mode))
     cur = master_conn.cursor()
-    if year_id:
-        cur.execute("""
-            SELECT DISTINCT b.id_brand, b.name_brand
-            FROM brands b
-            JOIN models m ON m.brand_id = b.id_brand
-            JOIN model_year_engine mye ON mye.model_id = m.id_model
-            WHERE b.name_brand = ANY(%s) AND mye.year_id = %s
-            ORDER BY b.name_brand
-        """, (allowed, year_id))
+    if mye_ids:
+        if year_id:
+            cur.execute("""
+                SELECT DISTINCT b.id_brand, b.name_brand
+                FROM brands b
+                JOIN models m ON m.brand_id = b.id_brand
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE b.name_brand = ANY(%s) AND mye.year_id = %s AND mye.id_mye = ANY(%s)
+                ORDER BY b.name_brand
+            """, (allowed, year_id, mye_ids))
+        else:
+            cur.execute("""
+                SELECT DISTINCT b.id_brand, b.name_brand
+                FROM brands b
+                JOIN models m ON m.brand_id = b.id_brand
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE b.name_brand = ANY(%s) AND mye.id_mye = ANY(%s)
+                ORDER BY b.name_brand
+            """, (allowed, mye_ids))
     else:
-        cur.execute("""
-            SELECT DISTINCT b.id_brand, b.name_brand
-            FROM brands b
-            JOIN models m ON m.brand_id = b.id_brand
-            JOIN model_year_engine mye ON mye.model_id = m.id_model
-            WHERE b.name_brand = ANY(%s)
-            ORDER BY b.name_brand
-        """, (allowed,))
+        if year_id:
+            cur.execute("""
+                SELECT DISTINCT b.id_brand, b.name_brand
+                FROM brands b
+                JOIN models m ON m.brand_id = b.id_brand
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE b.name_brand = ANY(%s) AND mye.year_id = %s
+                ORDER BY b.name_brand
+            """, (allowed, year_id))
+        else:
+            cur.execute("""
+                SELECT DISTINCT b.id_brand, b.name_brand
+                FROM brands b
+                JOIN models m ON m.brand_id = b.id_brand
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE b.name_brand = ANY(%s)
+                ORDER BY b.name_brand
+            """, (allowed,))
     rows = cur.fetchall()
     cur.close()
     return [{'id_brand': r[0], 'name_brand': r[1]} for r in rows]
 
 
-def get_models(master_conn, brand_id, year_id=None, brand_name=None):
+def get_models(master_conn, brand_id, year_id=None, brand_name=None, mye_ids=None):
     """Get models for a brand that have MYE entries, filtered to North America.
     If year_id is provided, only models available for that year.
     brand_name is used for NA filtering; looked up from DB if not provided."""
@@ -160,35 +245,55 @@ def get_models(master_conn, brand_id, year_id=None, brand_name=None):
         row = cur.fetchone()
         brand_name = row[0] if row else ''
 
-    if year_id:
-        cur.execute("""
-            SELECT DISTINCT m.id_model, m.name_model
-            FROM models m
-            JOIN model_year_engine mye ON mye.model_id = m.id_model
-            WHERE m.brand_id = %s AND mye.year_id = %s
-            ORDER BY m.name_model
-        """, (brand_id, year_id))
+    if mye_ids:
+        if year_id:
+            cur.execute("""
+                SELECT DISTINCT m.id_model, m.name_model
+                FROM models m
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE m.brand_id = %s AND mye.year_id = %s AND mye.id_mye = ANY(%s)
+                ORDER BY m.name_model
+            """, (brand_id, year_id, mye_ids))
+        else:
+            cur.execute("""
+                SELECT DISTINCT m.id_model, m.name_model
+                FROM models m
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE m.brand_id = %s AND mye.id_mye = ANY(%s)
+                ORDER BY m.name_model
+            """, (brand_id, mye_ids))
     else:
-        cur.execute("""
-            SELECT DISTINCT m.id_model, m.name_model
-            FROM models m
-            JOIN model_year_engine mye ON mye.model_id = m.id_model
-            WHERE m.brand_id = %s
-            ORDER BY m.name_model
-        """, (brand_id,))
+        if year_id:
+            cur.execute("""
+                SELECT DISTINCT m.id_model, m.name_model
+                FROM models m
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE m.brand_id = %s AND mye.year_id = %s
+                ORDER BY m.name_model
+            """, (brand_id, year_id))
+        else:
+            cur.execute("""
+                SELECT DISTINCT m.id_model, m.name_model
+                FROM models m
+                JOIN model_year_engine mye ON mye.model_id = m.id_model
+                WHERE m.brand_id = %s
+                ORDER BY m.name_model
+            """, (brand_id,))
     rows = cur.fetchall()
     cur.close()
 
     # Filter to North America models only, add clean display name, deduplicate
     filtered = [r for r in rows if is_na_model(brand_name, r[1])]
 
-    # Group by clean name — keep all id_models but show one display name
-    seen = {}  # display_name → first row
+    # Group by (display_name, raw name) so distinct body-style variants
+    # (e.g. AVEO vs AVEO SALOON) remain selectable.
+    seen = set()
     results = []
     for r in filtered:
         display = _clean_model_name(r[1])
-        if display not in seen:
-            seen[display] = True
+        key = (display, r[1])
+        if key not in seen:
+            seen.add(key)
             results.append({
                 'id_model': r[0],
                 'name_model': r[1],
@@ -200,59 +305,86 @@ def get_models(master_conn, brand_id, year_id=None, brand_name=None):
     return results
 
 
-def get_years(master_conn, model_id):
+def get_years(master_conn, model_id, mye_ids=None):
     """Get distinct years for a model via MYE (fast, no vehicle_parts scan). Ordered DESC."""
     cur = master_conn.cursor()
-    cur.execute("""
-        SELECT DISTINCT y.id_year, y.year_car
-        FROM years y
-        JOIN model_year_engine mye ON mye.year_id = y.id_year
-        WHERE mye.model_id = %s
-        ORDER BY y.year_car DESC
-    """, (model_id,))
+    if mye_ids:
+        cur.execute("""
+            SELECT DISTINCT y.id_year, y.year_car
+            FROM years y
+            JOIN model_year_engine mye ON mye.year_id = y.id_year
+            WHERE mye.model_id = %s AND mye.id_mye = ANY(%s)
+            ORDER BY y.year_car DESC
+        """, (model_id, mye_ids))
+    else:
+        cur.execute("""
+            SELECT DISTINCT y.id_year, y.year_car
+            FROM years y
+            JOIN model_year_engine mye ON mye.year_id = y.id_year
+            WHERE mye.model_id = %s
+            ORDER BY y.year_car DESC
+        """, (model_id,))
     rows = cur.fetchall()
     cur.close()
     return [{'id_year': r[0], 'year_car': r[1]} for r in rows]
 
 
-def get_engines(master_conn, model_id, year_id):
+def get_engines(master_conn, model_id, year_id, mye_ids=None):
     """Get MYE entries (engine + trim) for a model+year combo."""
     cur = master_conn.cursor()
-    cur.execute("""
+    mye_filter = ""
+    params = [model_id, year_id]
+    if mye_ids:
+        mye_filter = " AND mye.id_mye = ANY(%s)"
+        params.append(mye_ids)
+    cur.execute(f"""
         SELECT mye.id_mye, e.name_engine, mye.trim_level
         FROM model_year_engine mye
         JOIN engines e ON e.id_engine = mye.engine_id
-        WHERE mye.model_id = %s AND mye.year_id = %s
+        WHERE mye.model_id = %s AND mye.year_id = %s{mye_filter}
         ORDER BY e.name_engine, mye.trim_level
-    """, (model_id, year_id))
+    """, tuple(params))
     rows = cur.fetchall()
     cur.close()
     return [{'id_mye': r[0], 'name_engine': r[1], 'trim_level': r[2] or ''} for r in rows]
 
 
-def get_categories(master_conn, mye_id):
+def get_categories(master_conn, mye_id, allowed_brands=None):
     """Get part categories that have parts for this vehicle (mye_id).
 
     Uses a subquery on vehicle_parts filtered by mye_id (indexed),
     then JOINs through parts -> part_groups -> part_categories.
     Uses COUNT with a safety LIMIT on the subquery.
+
+    If allowed_brands is provided, only counts parts that have at least one
+    aftermarket equivalent from those manufacturers.
     """
     cur = master_conn.cursor()
-    cur.execute("""
+    brand_filter = ""
+    params = [mye_id]
+    if allowed_brands:
+        brand_filter = """AND EXISTS (
+            SELECT 1 FROM aftermarket_parts ap2
+            JOIN manufacturers m2 ON m2.id_manufacture = ap2.manufacturer_id
+            WHERE ap2.oem_part_id = p.id_part AND UPPER(m2.name_manufacture) = ANY(%s)
+        )"""
+        params.append(allowed_brands)
+    cur.execute(f"""
         SELECT pc.id_part_category,
                COALESCE(pc.name_es, pc.name_part_category) AS name,
                sub.cnt
         FROM (
-            SELECT pg.category_id, COUNT(*) AS cnt
+            SELECT pg.category_id, COUNT(DISTINCT p.id_part) AS cnt
             FROM vehicle_parts vp
             JOIN parts p ON p.id_part = vp.part_id
             JOIN part_groups pg ON pg.id_part_group = p.group_id
             WHERE vp.model_year_engine_id = %s
+            {brand_filter}
             GROUP BY pg.category_id
         ) sub
         JOIN part_categories pc ON pc.id_part_category = sub.category_id
         ORDER BY name
-    """, (mye_id,))
+    """, params)
     rows = cur.fetchall()
     cur.close()
     return [{'id_part_category': r[0], 'name': translate_category(r[1]), 'part_count': r[2]} for r in rows]
@@ -294,15 +426,23 @@ def _classify_vehicle_parts(master_conn, mye_id):
 
     from services.nexpart_taxonomy import tecdoc_to_nexpart
 
-    cur = master_conn.cursor()
-    cur.execute("""
-        SELECT p.id_part, p.name_part
-        FROM vehicle_parts vp
-        JOIN parts p ON p.id_part = vp.part_id
-        WHERE vp.model_year_engine_id = %s
-    """, (mye_id,))
-    rows = cur.fetchall()
-    cur.close()
+    rows = []
+    try:
+        cur = master_conn.cursor()
+        cur.execute("""
+            SELECT p.id_part, p.name_part
+            FROM vehicle_parts vp
+            JOIN parts p ON p.id_part = vp.part_id
+            WHERE vp.model_year_engine_id = %s
+        """, (mye_id,))
+        rows = cur.fetchall()
+        cur.close()
+    except Exception:
+        # vehicle_parts or parts table may not exist (TecDoc removed)
+        try:
+            master_conn.rollback()
+        except Exception:
+            pass
 
     classified = {}
     for part_id, name_part in rows:
@@ -319,7 +459,247 @@ def _classify_vehicle_parts(master_conn, mye_id):
     return classified
 
 
-def get_nexpart_groups_for_vehicle(master_conn, mye_id):
+def _classify_inventory_parts(tenant_conn, mye_id):
+    """Classify local inventory parts for a vehicle into Nexpart triples.
+
+    Uses inventory_vehicle_compat to find local items linked to the MYE,
+    then classifies each item's name via tecdoc_to_nexpart.
+
+    Returns the same nested dict shape as _classify_vehicle_parts but
+    uses inventory id values as the leaf list items.
+    """
+    from services.nexpart_taxonomy import tecdoc_to_nexpart
+
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT i.id, i.name
+        FROM inventory i
+        JOIN inventory_vehicle_compat ivc ON ivc.inventory_id = i.id
+        WHERE ivc.model_year_engine_id = %s
+          AND i.is_active = true
+    """, (mye_id,))
+    rows = cur.fetchall()
+    cur.close()
+
+    classified = {}
+    for inv_id, name in rows:
+        triple = tecdoc_to_nexpart(name)
+        if not triple:
+            continue
+        group, subgroup, part_type = triple
+        classified.setdefault(group, {}) \
+                  .setdefault(subgroup, {}) \
+                  .setdefault(part_type, []) \
+                  .append(f"inv:{inv_id}")
+    return classified
+
+
+# Keyword-based Spanish → Nexpart mapping for supplier catalog items.
+# Each entry is ((group, subgroup, part_type), [spanish_keywords...])
+# Keywords are checked in order; first match wins.
+_SPANISH_KEYWORDS = [
+    # ── Steering & Suspension ──
+    (("Steering & Suspension Parts", "Shock Absorbers & Struts", "Suspension Shock Absorber Mount"),
+     ["base amortiguador", "base de amortiguador"]),
+    (("Steering & Suspension Parts", "Shock Absorbers & Struts", "Suspension Shock Absorber"),
+     ["amortiguador"]),
+    (("Steering & Suspension Parts", "Shock Absorbers & Struts", "Suspension Strut"),
+     ["strut", "torre"]),
+    (("Steering & Suspension Parts", "Ball Joints & Control Arms", "Suspension Control Arm and Ball Joint Assembly"),
+     ["horquilla", "mango de suspension", "mangueta"]),
+    (("Steering & Suspension Parts", "Sway Bars, Stabilizer Bars, Strut Rods & Parts", "Suspension Stabilizer Bar Link"),
+     ["bieleta", "estabilizador"]),
+    (("Steering & Suspension Parts", "Steering Linkages, Rods & Arms", "Steering Tie Rod End"),
+     ["terminal", "rotula direccion", "rotula de direccion", "espiga"]),
+    (("Steering & Suspension Parts", "Ball Joints & Control Arms", "Suspension Ball Joint"),
+     ["rotula"]),
+    (("Steering & Suspension Parts", "Ball Joints & Control Arms", "Suspension Control Arm Bushing"),
+     ["buje", "bujes"]),
+    (("Steering & Suspension Parts", "Rack & Pinion, Gear Box, Power Cylinder", "Rack and Pinion Assembly"),
+     ["caja de direccion", "cremallera"]),
+
+    # ── Brake System ──
+    (("Brake System, Wheel Bearings, Studs, Nuts & Hardware", "Front Wheel Bearings & Seals", "Front Wheel Bearing"),
+     ["balero", "rodamiento", "maza", "cubo"]),
+    (("Brake System, Wheel Bearings, Studs, Nuts & Hardware", "Front Friction, Drums & Rotors", "Front Disc Brake Pad Set"),
+     ["balata", "pastilla de freno"]),
+    (("Brake System, Wheel Bearings, Studs, Nuts & Hardware", "Front Friction, Drums & Rotors", "Front Disc Brake Rotor"),
+     ["disco de freno", "freno de disco", "rotor"]),
+    (("Brake System, Wheel Bearings, Studs, Nuts & Hardware", "Front Calipers, Wheel Cylinders, Hoses", "Front Disc Brake Caliper"),
+     ["caliper", "calipers"]),
+    (("Brake System, Wheel Bearings, Studs, Nuts & Hardware", "Master Cylinders, Boosters & Switches", "Brake Master Cylinder"),
+     ["cilindro maestro"]),
+
+    # ── Ignition & Filters ──
+    (("Ignition & Filters", "Filters & PCV", "Engine Oil Filter"),
+     ["filtro de aceite", "filtro aceite"]),
+    (("Ignition & Filters", "Filters & PCV", "Engine Air Filter"),
+     ["filtro de aire", "filtro aire"]),
+    (("Ignition & Filters", "Filters & PCV", "Cabin Air Filter"),
+     ["filtro de cabina", "filtro cabina"]),
+    (("Ignition & Filters", "Filters & PCV", "Fuel Filter"),
+     ["filtro de gasolina", "filtro gasolina"]),
+
+    # ── Cooling System ──
+    (("Belts, Hoses, Water Pumps & Cooling System Parts", "Radiators & Electric Fan Motors", "Engine Coolant Reservoir"),
+     ["radiador"]),
+    (("Belts, Hoses, Water Pumps & Cooling System Parts", "Water Pumps, Fan Blades & Clutches", "Engine Water Pump"),
+     ["bomba de agua"]),
+    (("Belts, Hoses, Water Pumps & Cooling System Parts", "Thermostats, Housings & Radiator Caps", "Engine Coolant Thermostat"),
+     ["termostato"]),
+    (("Belts, Hoses, Water Pumps & Cooling System Parts", "Belts, Tensioners & Pulleys", "Accessory Drive Belt Tensioner Assembly"),
+     ["tensor", "polea", "bandas"]),
+
+    # ── Engine ──
+    (("Engine Parts", "Engine Parts", "Engine Oil Pump"),
+     ["bomba de aceite"]),
+
+    # ── Drivetrain ──
+    (("Drivetrain Parts", "Driveshafts, U-Joints & CV (Constant Velocity) Parts", "CV Axle Assembly"),
+     ["cople flecha", "junta homocinetica", "juntas homocineticas"]),
+    (("Drivetrain Parts", "Axle & Differential Parts", "Manual Transmission Differential Bearing"),
+     ["collarin", "collar"]),
+
+    # ── Clutch ──
+    (("Exhaust, Clutch & Flywheel Parts", "Clutches & Clutch Kits", "Transmission Clutch Kit"),
+     ["clutch", "kit de clutch"]),
+
+    # ── Engine Mounts ──
+    (("Engine Parts", "Engine Mounts & Other Miscellaneous Engine Parts", "Engine Mount"),
+     ["soporte motor", "soporte de motor"]),
+    (("Engine Parts", "Engine Mounts & Other Miscellaneous Engine Parts", "Automatic Transmission Mount"),
+     ["soporte transmision", "soporte de transmision"]),
+
+    # ── Dust Boots ──
+    (("Steering & Suspension Parts", "Shock Absorbers & Struts", "Suspension Strut Bellows"),
+     ["cubre polvo"]),
+
+    # ── Suspension Arms / Links ──
+    (("Steering & Suspension Parts", "Ball Joints & Control Arms", "Suspension Control Arm and Ball Joint Assembly"),
+     ["tirante"]),
+    (("Steering & Suspension Parts", "Sway Bars, Stabilizer Bars, Strut Rods & Parts", "Suspension Stabilizer Bar Link"),
+     ["tornillo estabilizador"]),
+]
+
+# Fallback: supplier category → Nexpart group
+_SUPPLIER_CATEGORY_TO_GROUP = {
+    "SUSPENSION": "Steering & Suspension Parts",
+    "DIRECCION": "Steering & Suspension Parts",
+    "RODAMIENTOS": "Brake System, Wheel Bearings, Studs, Nuts & Hardware",
+    "CAT05_Filtros_Juntas_Bomb": "Ignition & Filters",
+    "CAT06_Radiadores": "Belts, Hoses, Water Pumps & Cooling System Parts",
+    "CAT07_Balatas": "Brake System, Wheel Bearings, Studs, Nuts & Hardware",
+    "CAT08_Collarines": "Drivetrain Parts",
+    # Raybestos
+    "FRENO_DE_DISCO": "Brake System, Wheel Bearings, Studs, Nuts & Hardware",
+    # LUK
+    "KIT_CLUTCH": "Exhaust, Clutch & Flywheel Parts",
+    # VAZLO
+    "AMORTIGUADOR": "Steering & Suspension Parts",
+    "BASE_AMORTIGUADOR": "Steering & Suspension Parts",
+    "BUJES": "Steering & Suspension Parts",
+    "COPLE_FLECHA": "Drivetrain Parts",
+    "CUBRE_POLVO": "Steering & Suspension Parts",
+    "GOMAS_BARRA_ESTABILIZADORA": "Steering & Suspension Parts",
+    "HORQUILLAS": "Steering & Suspension Parts",
+    "JUNTAS_HOMOCINETICAS": "Drivetrain Parts",
+    "SOPORTE_MOTOR": "Engine Parts",
+    "SOPORTE_TRANSMISION": "Engine Parts",
+    "TERMINAL_DIRECCION": "Steering & Suspension Parts",
+    "TIRANTE": "Steering & Suspension Parts",
+    "TORNILLO_ESTABILIZADOR": "Steering & Suspension Parts",
+}
+
+
+def _spanish_name_to_nexpart(name, category=None):
+    """Map a Spanish part name to a Nexpart (group, subgroup, part_type).
+
+    Uses keyword matching against known Spanish auto-part terms.
+    Returns None if no match and no category fallback available.
+    """
+    if not name:
+        return None
+    name_lower = name.lower().replace('_', ' ').replace('\n', ' ').replace('\r', '')
+
+    # 1. Keyword match (most specific first)
+    for triple, keywords in _SPANISH_KEYWORDS:
+        for kw in keywords:
+            if kw in name_lower:
+                return triple
+
+    # 2. Category fallback → group + first available subgroup/part_type
+    if category:
+        group = _SUPPLIER_CATEGORY_TO_GROUP.get(category.upper())
+        if group:
+            from services.nexpart_taxonomy import NEXPART_TAXONOMY
+            subgroups = NEXPART_TAXONOMY.get(group, {})
+            if subgroups:
+                # Pick the first subgroup and its first part_type
+                subgroup = next(iter(subgroups.keys()))
+                part_types = subgroups[subgroup]
+                if part_types:
+                    return (group, subgroup, part_types[0])
+                return (group, subgroup, subgroup)
+            return (group, group, group)
+
+    return None
+
+
+def _classify_supplier_catalog_parts(master_conn, mye_id):
+    """Classify supplier catalog parts for a vehicle into Nexpart triples.
+
+    Uses supplier_catalog_compat (in master DB) to find supplier items linked
+    to the MYE, then classifies each item's name via _spanish_name_to_nexpart.
+
+    Returns the same nested dict shape but uses supplier_catalog id values
+    prefixed with 'sc:' as the leaf list items.
+    """
+    rows = []
+    try:
+        cur = master_conn.cursor()
+        cur.execute("""
+            SELECT sc.id, sc.name, sc.category
+            FROM supplier_catalog sc
+            JOIN supplier_catalog_compat scc ON scc.catalog_id = sc.id
+            WHERE scc.model_year_engine_id = %s AND sc.is_active = true
+        """, (mye_id,))
+        rows = cur.fetchall()
+        cur.close()
+    except Exception:
+        # supplier_catalog table may not exist
+        try:
+            master_conn.rollback()
+        except Exception:
+            pass
+
+    classified = {}
+    for sc_id, name, category in rows:
+        triple = _spanish_name_to_nexpart(name, category)
+        if not triple:
+            continue
+        group, subgroup, part_type = triple
+        classified.setdefault(group, {}) \
+                  .setdefault(subgroup, {}) \
+                  .setdefault(part_type, []) \
+                  .append(f"sc:{sc_id}")
+    return classified
+
+
+def _merge_classified(base, extra):
+    """Merge two classified dicts (group -> subgroup -> part_type -> ids).
+    Modifies base in place and returns it."""
+    if not extra:
+        return base
+    for group, subgroups in extra.items():
+        sg_base = base.setdefault(group, {})
+        for subgroup, part_types in subgroups.items():
+            pt_base = sg_base.setdefault(subgroup, {})
+            for part_type, ids in part_types.items():
+                pt_base.setdefault(part_type, []).extend(ids)
+    return base
+
+
+def get_nexpart_groups_for_vehicle(master_conn, mye_id, tenant_conn=None):
     """Local mode: return Nexpart top-level groups that have parts for this vehicle.
 
     Output shape mirrors get_categories() but uses `slug` (string) instead of
@@ -332,6 +712,10 @@ def get_nexpart_groups_for_vehicle(master_conn, mye_id):
     )
 
     classified = _classify_vehicle_parts(master_conn, mye_id)
+    # Merge local inventory and supplier catalog classifications
+    if tenant_conn:
+        _merge_classified(classified, _classify_inventory_parts(tenant_conn, mye_id))
+        _merge_classified(classified, _classify_supplier_catalog_parts(master_conn, mye_id))
 
     result = []
     # Iterate in canonical Nexpart order so the UI is stable
@@ -353,7 +737,7 @@ def get_nexpart_groups_for_vehicle(master_conn, mye_id):
     return result
 
 
-def get_nexpart_subgroups_for_vehicle(master_conn, mye_id, group_slug):
+def get_nexpart_subgroups_for_vehicle(master_conn, mye_id, group_slug, tenant_conn=None):
     """Local mode: return Nexpart subgroups within a group that have vehicle parts."""
     from services.nexpart_taxonomy import (
         NEXPART_TAXONOMY,
@@ -361,6 +745,9 @@ def get_nexpart_subgroups_for_vehicle(master_conn, mye_id, group_slug):
     )
 
     classified = _classify_vehicle_parts(master_conn, mye_id)
+    if tenant_conn:
+        _merge_classified(classified, _classify_inventory_parts(tenant_conn, mye_id))
+        _merge_classified(classified, _classify_supplier_catalog_parts(master_conn, mye_id))
     group_data = classified.get(group_slug, {})
     if not group_data:
         return []
@@ -749,7 +1136,7 @@ def _local_name_matches_part_type(name, part_type_slug):
 
 def get_parts_for_nexpart_triple(master_conn, mye_id, group_slug, subgroup_slug,
                                    part_type_slug, tenant_conn, branch_id,
-                                   page=1, per_page=30):
+                                   page=1, per_page=30, tenant_id=None):
     """Local mode: fetch parts (aftermarket-prioritized) for a Nexpart triple.
 
     Steps:
@@ -760,28 +1147,72 @@ def get_parts_for_nexpart_triple(master_conn, mye_id, group_slug, subgroup_slug,
     Returns the same shape as get_parts_local().
     """
     classified = _classify_vehicle_parts(master_conn, mye_id)
-    part_ids = (
+    # Also merge inventory and supplier catalog so the leaf IDs may be a mix
+    if tenant_conn:
+        _merge_classified(classified, _classify_inventory_parts(tenant_conn, mye_id))
+        _merge_classified(classified, _classify_supplier_catalog_parts(master_conn, mye_id))
+
+    all_ids = (
         classified
         .get(group_slug, {})
         .get(subgroup_slug, {})
         .get(part_type_slug, [])
     )
-    result = get_parts_local(
-        master_conn, mye_id=None, group_id=None,
-        tenant_conn=tenant_conn, branch_id=branch_id,
-        page=page, per_page=per_page,
-        oem_part_ids=part_ids,
-    )
+    # Separate OEM (TecDoc) IDs, inventory prefixed IDs, and supplier-catalog prefixed IDs
+    oem_ids = [pid for pid in all_ids if isinstance(pid, int)]
+    inv_ids = [pid for pid in all_ids if isinstance(pid, str) and pid.startswith('inv:')]
+    sc_ids = [pid for pid in all_ids if isinstance(pid, str) and pid.startswith('sc:')]
+
+    # If no OEM IDs, skip get_parts_local (TecDoc tables may not exist)
+    if oem_ids:
+        try:
+            result = get_parts_local(
+                master_conn, mye_id=None, group_id=None,
+                tenant_conn=tenant_conn, branch_id=branch_id,
+                page=1, per_page=999999,
+                oem_part_ids=oem_ids,
+            )
+        except Exception:
+            # TecDoc tables (parts, aftermarket_parts, vehicle_parts) may not exist
+            result = {
+                'data': [],
+                'pagination': {
+                    'page': 1,
+                    'per_page': 999999,
+                    'total': 0,
+                    'total_pages': 0,
+                },
+                'mode': 'local',
+            }
+    else:
+        result = {
+            'data': [],
+            'pagination': {
+                'page': 1,
+                'per_page': 999999,
+                'total': 0,
+                'total_pages': 0,
+            },
+            'mode': 'local',
+        }
+
     # Inject local inventory items linked to this vehicle
-    # (get_parts_local with oem_part_ids skips mye_id, so we call it separately)
-    local_injected = 0
     if tenant_conn and mye_id:
         from services.inventory_vehicle_compat import get_inventory_by_vehicle
         local_rows = get_inventory_by_vehicle(tenant_conn, master_conn, mye_id, branch_id)
+        # If specific inventory IDs were classified for this triple, filter to those only
+        if inv_ids:
+            allowed_inv_ids = {int(pid.replace('inv:', '')) for pid in inv_ids}
+        else:
+            allowed_inv_ids = None
         for lr in local_rows:
             inv_id, pn, name, brand, p1, p2, p3, img, desc, stock = lr
-            # Only include if name roughly matches the Nexpart part_type
-            if part_type_slug and not _local_name_matches_part_type(name, part_type_slug):
+            if allowed_inv_ids is not None and inv_id not in allowed_inv_ids:
+                continue
+            # Only apply name-based filtering when we don't have explicit classified IDs.
+            # If _classify_inventory_parts already matched these IDs to the triple,
+            # trust that classification and skip the expensive name check.
+            if allowed_inv_ids is None and part_type_slug and not _local_name_matches_part_type(name, part_type_slug):
                 continue
             result['data'].append({
                 'id_part': f'inv:{inv_id}',
@@ -802,17 +1233,65 @@ def get_parts_for_nexpart_triple(master_conn, mye_id, group_slug, subgroup_slug,
                 'price_usd': None,
                 'source': 'local_inventory',
             })
-            local_injected += 1
-    # Update pagination total to include injected local items
-    if local_injected:
-        result['pagination']['total'] = result['pagination'].get('total', 0) + local_injected
-        result['pagination']['total_pages'] = (
-            (result['pagination']['total'] + per_page - 1) // per_page
-        )
+
+    # Inject supplier catalog items linked to this vehicle (from master DB)
+    if master_conn and sc_ids:
+        cur = master_conn.cursor()
+        sc_id_values = [int(pid.replace('sc:', '')) for pid in sc_ids]
+        cur.execute("""
+            SELECT id, supplier_name, sku, name, category, description, image_url
+            FROM supplier_catalog
+            WHERE id = ANY(%s)
+            ORDER BY name
+        """, (sc_id_values,))
+        sc_rows = cur.fetchall()
+        cur.close()
+
+        sc_prices = _get_supplier_prices(master_conn, tenant_id, sc_id_values)
+
+        for row in sc_rows:
+            sc_id, supplier, sku, name, category, desc, img = row
+            item = {
+                'id_part': f'sc:{sc_id}',
+                'id_aftermarket': None,
+                'oem_part_number': sku,
+                'part_number': sku,
+                'name': name.replace('\\n', ' ') if name else '',
+                'description': desc or category,
+                'image_url': img,
+                'manufacturer': supplier,
+                'priority_tier': 3,
+                'local_stock': None,
+                'local_price': None,
+                'bodega_count': 0,
+                'warehouse_stock': 0,
+                'warehouse_price': None,
+                'in_stock_network': False,
+                'price_usd': None,
+                'source': 'supplier_catalog',
+            }
+            p = sc_prices.get(sc_id)
+            if p:
+                item['supplier_price'] = p['price']
+                item['supplier_currency'] = p['currency']
+            result['data'].append(item)
+
+    # Sort combined list and paginate in Python
+    all_items = result['data']
+    all_items.sort(key=lambda x: (
+        x.get('priority_tier', 3),
+        0 if (x.get('in_stock_network') or (x.get('local_stock') or 0) > 0) else 1,
+        (x.get('manufacturer') or '').lower(),
+        (x.get('name') or '').lower()
+    ))
+    total = len(all_items)
+    offset = (page - 1) * per_page
+    result['data'] = all_items[offset:offset + per_page]
+    result['pagination'] = _pagination(page, per_page, total)
     return result
 
 
-def get_nexpart_part_types_for_vehicle(master_conn, mye_id, group_slug, subgroup_slug):
+def get_nexpart_part_types_for_vehicle(master_conn, mye_id, group_slug, subgroup_slug, tenant_conn=None):
     """Local mode: return Nexpart part types within a subgroup that have vehicle parts.
 
     Output shape matches get_part_types() so the frontend can render with
@@ -824,27 +1303,36 @@ def get_nexpart_part_types_for_vehicle(master_conn, mye_id, group_slug, subgroup
     )
 
     classified = _classify_vehicle_parts(master_conn, mye_id)
+    if tenant_conn:
+        _merge_classified(classified, _classify_inventory_parts(tenant_conn, mye_id))
+        _merge_classified(classified, _classify_supplier_catalog_parts(master_conn, mye_id))
     subgroup_data = classified.get(group_slug, {}).get(subgroup_slug, {})
     if not subgroup_data:
         return []
 
-    # Pull a sample image for each part type — single query, all part_ids at once
+    # Pull a sample image for each part type — single query, all OEM part_ids at once
+    # Only integer IDs exist in the TecDoc parts table; skip inv: and sc: prefixed IDs.
     all_part_ids = [
         pid
         for pids in subgroup_data.values()
         for pid in pids
+        if isinstance(pid, int)
     ]
     image_map = {}
     if all_part_ids:
-        cur = master_conn.cursor()
-        cur.execute("""
-            SELECT id_part, image_url
-            FROM parts
-            WHERE id_part = ANY(%s) AND image_url IS NOT NULL
-        """, (all_part_ids,))
-        for pid, url in cur.fetchall():
-            image_map[pid] = url
-        cur.close()
+        try:
+            cur = master_conn.cursor()
+            cur.execute("""
+                SELECT id_part, image_url
+                FROM parts
+                WHERE id_part = ANY(%s) AND image_url IS NOT NULL
+            """, (all_part_ids,))
+            for pid, url in cur.fetchall():
+                image_map[pid] = url
+            cur.close()
+        except Exception:
+            # parts table may not exist (TecDoc removed)
+            pass
 
     canonical_order = NEXPART_TAXONOMY.get(group_slug, {}).get(subgroup_slug, [])
 
@@ -1080,125 +1568,121 @@ def get_parts_local(master_conn, mye_id, group_id, tenant_conn, branch_id,
             where_clause += " AND p.name_part = %s"
             where_params_count = (mye_id, group_id, part_type)
 
-    # Count total aftermarket parts
-    cur.execute(
-        "SELECT COUNT(*) " + from_join_count + " WHERE " + where_clause,
-        where_params_count,
-    )
-    total = cur.fetchone()[0]
+    # Priority-sorted fetch — same WHERE clause, plus tiers. No SQL paging here;
+    # we combine with local inventory and supplier catalog, then paginate in Python.
+    fetch_params = list(where_params_count) + [tier1, tier2]
 
-    # Priority-sorted fetch — same WHERE clause as the COUNT, plus tiers + paging.
-    fetch_params = list(where_params_count) + [tier1, tier2, per_page, offset]
+    rows = []
+    try:
+        cur.execute("""
+            WITH aftermarket_for_vehicle AS (
+                SELECT DISTINCT
+                    ap.id_aftermarket_parts,
+                    ap.oem_part_id,
+                    ap.part_number,
+                    COALESCE(ap.name_es, ap.name_aftermarket_parts) AS am_name,
+                    ap.price_usd,
+                    m.name_manufacture,
+                    p.oem_part_number,
+                    COALESCE(p.name_es, p.name_part) AS oem_name,
+                    COALESCE(p.description_es, p.description) AS oem_desc,
+                    p.image_url AS oem_image
+                """ + from_join_count + """
+                WHERE """ + where_clause + """
+            ),
+            stock_per_oem AS (
+                SELECT part_id, COUNT(*) AS bodega_count, MIN(price) AS min_price, SUM(stock_quantity) AS total_stock
+                FROM warehouse_inventory
+                WHERE stock_quantity > 0
+                GROUP BY part_id
+            )
+            SELECT afv.id_aftermarket_parts,
+                   afv.oem_part_id,
+                   afv.part_number,
+                   afv.am_name,
+                   afv.price_usd,
+                   afv.name_manufacture,
+                   afv.oem_part_number,
+                   afv.oem_name,
+                   afv.oem_desc,
+                   afv.oem_image,
+                   COALESCE(s.bodega_count, 0) AS bodega_count,
+                   s.min_price AS warehouse_price,
+                   COALESCE(s.total_stock, 0) AS warehouse_stock,
+                   CASE
+                       WHEN UPPER(afv.name_manufacture) = ANY(%s) THEN 1
+                       WHEN UPPER(afv.name_manufacture) = ANY(%s) THEN 2
+                       ELSE 3
+                   END AS tier
+            FROM aftermarket_for_vehicle afv
+            LEFT JOIN stock_per_oem s ON s.part_id = afv.oem_part_id
+            ORDER BY tier ASC,
+                     (COALESCE(s.bodega_count, 0) > 0) DESC,
+                     afv.name_manufacture ASC,
+                     afv.am_name ASC
+        """, fetch_params)
 
-    cur.execute("""
-        WITH aftermarket_for_vehicle AS (
-            SELECT DISTINCT
-                ap.id_aftermarket_parts,
-                ap.oem_part_id,
-                ap.part_number,
-                COALESCE(ap.name_es, ap.name_aftermarket_parts) AS am_name,
-                ap.price_usd,
-                m.name_manufacture,
-                p.oem_part_number,
-                COALESCE(p.name_es, p.name_part) AS oem_name,
-                COALESCE(p.description_es, p.description) AS oem_desc,
-                p.image_url AS oem_image
-            """ + from_join_count + """
-            WHERE """ + where_clause + """
-        ),
-        stock_per_oem AS (
-            SELECT part_id, COUNT(*) AS bodega_count, MIN(price) AS min_price, SUM(stock_quantity) AS total_stock
-            FROM warehouse_inventory
-            WHERE stock_quantity > 0
-            GROUP BY part_id
-        )
-        SELECT afv.id_aftermarket_parts,
-               afv.oem_part_id,
-               afv.part_number,
-               afv.am_name,
-               afv.price_usd,
-               afv.name_manufacture,
-               afv.oem_part_number,
-               afv.oem_name,
-               afv.oem_desc,
-               afv.oem_image,
-               COALESCE(s.bodega_count, 0) AS bodega_count,
-               s.min_price AS warehouse_price,
-               COALESCE(s.total_stock, 0) AS warehouse_stock,
-               CASE
-                   WHEN UPPER(afv.name_manufacture) = ANY(%s) THEN 1
-                   WHEN UPPER(afv.name_manufacture) = ANY(%s) THEN 2
-                   ELSE 3
-               END AS tier
-        FROM aftermarket_for_vehicle afv
-        LEFT JOIN stock_per_oem s ON s.part_id = afv.oem_part_id
-        ORDER BY tier ASC,
-                 (COALESCE(s.bodega_count, 0) > 0) DESC,
-                 afv.name_manufacture ASC,
-                 afv.am_name ASC
-        LIMIT %s OFFSET %s
-    """, fetch_params)
-
-    rows = cur.fetchall()
-    cur.close()
-
-    if not rows:
-        return {'data': [], 'pagination': _pagination(page, per_page, total), 'mode': 'local'}
-
-    # Enrich with tenant local stock (look up by OEM part number).
-    # Use a different name to avoid shadowing the `oem_part_ids` parameter.
-    oem_numbers = list({r[6] for r in rows if r[6]})
-    result_oem_ids = list({r[1] for r in rows if r[1]})
-    local_map = _get_local_stock_bulk(tenant_conn, branch_id, oem_numbers, result_oem_ids)
+        rows = cur.fetchall()
+    except Exception:
+        # TecDoc tables (parts, aftermarket_parts, vehicle_parts) may not exist
+        try:
+            master_conn.rollback()
+        except Exception:
+            pass
+    finally:
+        cur.close()
 
     items = []
     seen_part_numbers = set()
 
-    for r in rows:
-        aft_id = r[0]
-        oem_part_id = r[1]
-        aft_number = r[2]
-        aft_name = r[3]
-        price_usd = r[4]
-        manufacturer = r[5]
-        oem_number = r[6]
-        oem_name = r[7]
-        oem_desc = r[8]
-        oem_image = r[9]
-        bodega_count = r[10]
-        warehouse_price = r[11]
-        warehouse_stock = r[12]
-        tier = r[13]
+    if rows:
+        # Enrich with tenant local stock (look up by OEM part number).
+        oem_numbers = list({r[6] for r in rows if r[6]})
+        result_oem_ids = list({r[1] for r in rows if r[1]})
+        local_map = _get_local_stock_bulk(tenant_conn, branch_id, oem_numbers, result_oem_ids)
 
-        # Tenant local stock (refaccionaria's own inventory)
-        local = local_map.get(oem_number) or local_map.get(f'cat:{oem_part_id}')
-        image_url = (local.get('image_url') if local else None) or oem_image
+        for r in rows:
+            aft_id = r[0]
+            oem_part_id = r[1]
+            aft_number = r[2]
+            aft_name = r[3]
+            price_usd = r[4]
+            manufacturer = r[5]
+            oem_number = r[6]
+            oem_name = r[7]
+            oem_desc = r[8]
+            oem_image = r[9]
+            bodega_count = r[10]
+            warehouse_price = r[11]
+            warehouse_stock = r[12]
+            tier = r[13]
 
-        part_number = aft_number or oem_number
-        if part_number:
-            seen_part_numbers.add(part_number.upper())
+            local = local_map.get(oem_number) or local_map.get(f'cat:{oem_part_id}')
+            image_url = (local.get('image_url') if local else None) or oem_image
 
-        items.append({
-            # Keep fields compatible with OEM mode output so the frontend
-            # can render with minimal branching.
-            'id_part': oem_part_id,          # OEM id used for detail drill-down
-            'id_aftermarket': aft_id,        # aftermarket row id (for future use)
-            'oem_part_number': oem_number,
-            'part_number': aft_number,       # aftermarket SKU
-            'name': translate_part_name(aft_name or oem_name),
-            'description': oem_desc,
-            'image_url': image_url,
-            'manufacturer': manufacturer,
-            'priority_tier': tier,           # 1, 2, or 3
-            'local_stock': local['stock'] if local else 0,
-            'local_price': local['price_1'] if local else None,
-            'bodega_count': bodega_count,
-            'warehouse_stock': warehouse_stock,
-            'warehouse_price': float(warehouse_price) if warehouse_price is not None else None,
-            'in_stock_network': bodega_count > 0,
-            'price_usd': float(price_usd) if price_usd is not None else None,
-            'source': 'aftermarket',
-        })
+            part_number = aft_number or oem_number
+            if part_number:
+                seen_part_numbers.add(part_number.upper())
+
+            items.append({
+                'id_part': oem_part_id,
+                'id_aftermarket': aft_id,
+                'oem_part_number': oem_number,
+                'part_number': aft_number,
+                'name': translate_part_name(aft_name or oem_name),
+                'description': oem_desc,
+                'image_url': image_url,
+                'manufacturer': manufacturer,
+                'priority_tier': tier,
+                'local_stock': local['stock'] if local else 0,
+                'local_price': local['price_1'] if local else None,
+                'bodega_count': bodega_count,
+                'warehouse_stock': warehouse_stock,
+                'warehouse_price': float(warehouse_price) if warehouse_price is not None else None,
+                'in_stock_network': bodega_count > 0,
+                'price_usd': float(price_usd) if price_usd is not None else None,
+                'source': 'aftermarket',
+            })
 
     # ─── Inject local inventory items linked to this vehicle ──────────────────
     if mye_id and tenant_conn:
@@ -1207,7 +1691,7 @@ def get_parts_local(master_conn, mye_id, group_id, tenant_conn, branch_id,
         for lr in local_rows:
             inv_id, pn, name, brand, p1, p2, p3, img, desc, stock = lr
             if pn and pn.upper() in seen_part_numbers:
-                continue  # deduplicate: already shown via aftermarket match
+                continue
             seen_part_numbers.add(pn.upper() if pn else '')
             items.append({
                 'id_part': f'inv:{inv_id}',
@@ -1218,7 +1702,7 @@ def get_parts_local(master_conn, mye_id, group_id, tenant_conn, branch_id,
                 'description': desc,
                 'image_url': img,
                 'manufacturer': brand,
-                'priority_tier': 1,  # treat as tier 1 since it's local stock
+                'priority_tier': 1,
                 'local_stock': int(stock) if stock else 0,
                 'local_price': float(p1) if p1 else None,
                 'bodega_count': 0,
@@ -1228,9 +1712,18 @@ def get_parts_local(master_conn, mye_id, group_id, tenant_conn, branch_id,
                 'price_usd': None,
                 'source': 'local_inventory',
             })
-            total += 1
 
-    return {'data': items, 'pagination': _pagination(page, per_page, total), 'mode': 'local'}
+    # Sort combined list (aftermarket + local) by tier, in-stock, manufacturer/name
+    items.sort(key=lambda x: (
+        x.get('priority_tier', 3),
+        0 if (x.get('in_stock_network') or (x.get('local_stock') or 0) > 0) else 1,
+        (x.get('manufacturer') or '').lower(),
+        (x.get('name') or '').lower()
+    ))
+    total = len(items)
+    offset = (page - 1) * per_page
+    paginated = items[offset:offset + per_page]
+    return {'data': paginated, 'pagination': _pagination(page, per_page, total), 'mode': 'local'}
 
 
 def get_part_detail(master_conn, part_id, tenant_conn, branch_id):
@@ -1422,7 +1915,7 @@ def _search_meili_fallback(master_conn, q, limit):
         return None
 
 
-def smart_search(master_conn, q, tenant_conn, branch_id, limit=50, mye_id=None):
+def smart_search(master_conn, q, tenant_conn, branch_id, limit=50, mye_id=None, tenant_id=None):
     """Search parts by part number or text. Enriches with local stock.
 
     Strategy:
@@ -1436,97 +1929,13 @@ def smart_search(master_conn, q, tenant_conn, branch_id, limit=50, mye_id=None):
         return []
 
     limit = min(limit, 100)
-    cur = master_conn.cursor()
 
     # ── Attempt Meilisearch first ───────────────────────────────────────────
-    meili_rows = _search_meili_fallback(master_conn, q, limit)
-    if meili_rows is not None:
-        rows = meili_rows
-    else:
-        # PostgreSQL fallback
-        is_part_number = bool(re.search(r'\d.*[-/]|[-/].*\d|\d{3,}', q))
-
-        if is_part_number:
-            clean_q = q.replace(' ', '').upper()
-            cur.execute("""
-                SELECT p.id_part, p.oem_part_number, p.name_part, p.name_es,
-                       p.image_url, p.group_id
-                FROM parts p
-                WHERE REPLACE(UPPER(p.oem_part_number), ' ', '') LIKE %s
-                ORDER BY p.oem_part_number
-                LIMIT %s
-            """, (f'%{clean_q}%', limit))
-        else:
-            tsquery = ' & '.join(q.split())
-            cur.execute("""
-                SELECT p.id_part, p.oem_part_number, p.name_part, p.name_es,
-                       p.image_url, p.group_id
-                FROM parts p
-                WHERE p.search_vector @@ to_tsquery('spanish', %s)
-                   OR p.name_part ILIKE %s
-                   OR p.name_es ILIKE %s
-                ORDER BY
-                    CASE WHEN p.search_vector @@ to_tsquery('spanish', %s)
-                         THEN 0 ELSE 1 END,
-                    p.name_part
-                LIMIT %s
-            """, (tsquery, f'%{q}%', f'%{q}%', tsquery, limit))
-        rows = cur.fetchall()
-
-    part_ids = [r[0] for r in rows]
-    oem_numbers = [r[1] for r in rows]
-
-    # Get vehicle info for each part (Redis cache first, then DB fallback)
-    vehicle_info_map = {}
-    missing_ids = []
-    r = _get_redis()
-    if r:
-        for pid in part_ids:
-            cached = r.get(f'nexus:vehicle:{pid}')
-            if cached is not None:
-                vehicle_info_map[pid] = cached
-            else:
-                missing_ids.append(pid)
-    else:
-        missing_ids = part_ids
-
-    if missing_ids:
-        cur.execute("""
-            SELECT part_id, name_brand, name_model, year_car
-            FROM part_vehicle_preview
-            WHERE part_id = ANY(%s)
-        """, (missing_ids,))
-        for row in cur.fetchall():
-            info = f"{row[1]} {row[2]} {row[3]}"
-            vehicle_info_map[row[0]] = info
-            if r:
-                try:
-                    r.setex(f'nexus:vehicle:{row[0]}', _VEHICLE_TTL_SECONDS, info)
-                except Exception:
-                    pass
-    cur.close()
-
-    # Local stock enrichment
-    local_map = _get_local_stock_bulk(tenant_conn, branch_id, oem_numbers, part_ids)
-
-    results = []
+    # NOTE: TecDoc parts table was removed. Central catalog search is disabled.
+    # Only local inventory search remains active.
+    rows = []
     seen_local_ids = set()
-    for r in rows:
-        part_id = r[0]
-        oem = r[1]
-        local = local_map.get(oem) or local_map.get(f'cat:{part_id}')
-        results.append({
-            'id_part': part_id,
-            'oem_part_number': oem,
-            'name': translate_part_name(r[3] or r[2]),
-            'image_url': r[4],
-            'local_stock': local['stock'] if local else 0,
-            'local_price': local['price_1'] if local else None,
-            'vehicle_info': vehicle_info_map.get(part_id, ''),
-        })
-        # Track which local inventory items are already shown via OEM link
-        if local:
-            seen_local_ids.add(local.get('inventory_id'))
+    results = []
 
     # ── Inject local inventory items that match the query directly ──────────
     if tenant_conn:
@@ -1544,9 +1953,118 @@ def smart_search(master_conn, q, tenant_conn, branch_id, limit=50, mye_id=None):
                 'vehicle_info': '',
                 'source': 'local_inventory',
             })
+            seen_local_ids.add(li['inventory_id'])
             if len(results) >= limit:
                 break
 
+    # ── Inject supplier catalog items ───────────────────────────────────────
+    if master_conn:
+        supplier_items = _search_supplier_catalog(master_conn, q, mye_id, limit, tenant_id=tenant_id)
+        for si in supplier_items:
+            if f"sc:{si['id']}" in seen_local_ids:
+                continue
+            results.append({
+                'id_part': f"sc:{si['id']}",
+                'oem_part_number': si['sku'],
+                'name': si['name'],
+                'image_url': si['image_url'],
+                'local_stock': None,
+                'local_price': None,
+                'supplier_price': si.get('supplier_price'),
+                'supplier_currency': si.get('supplier_currency'),
+                'vehicle_info': si['category'] or '',
+                'source': 'supplier_catalog',
+            })
+            seen_local_ids.add(f"sc:{si['id']}")
+            if len(results) >= limit:
+                break
+
+    return results
+
+
+def _get_supplier_prices(master_conn, tenant_id, catalog_ids):
+    """Return a dict catalog_id -> {price, currency} for the current active price."""
+    if master_conn is None or not tenant_id or not catalog_ids:
+        return {}
+    cur = master_conn.cursor()
+    cur.execute("""
+        SELECT DISTINCT ON (catalog_id)
+            catalog_id, price, currency
+        FROM supplier_catalog_prices
+        WHERE tenant_id = %s AND catalog_id = ANY(%s) AND is_active = true
+          AND (effective_to IS NULL OR effective_to >= CURRENT_DATE)
+        ORDER BY catalog_id, effective_from DESC
+    """, (tenant_id, list(catalog_ids)))
+    prices = {}
+    for r in cur.fetchall():
+        prices[r[0]] = {'price': float(r[1]) if r[1] is not None else None,
+                        'currency': r[2] or 'MXN'}
+    cur.close()
+    return prices
+
+
+def _search_supplier_catalog(master_conn, q, mye_id, limit, tenant_id=None):
+    """Search supplier catalog items by SKU or name.
+
+    If mye_id is provided, only returns items compatible with that vehicle.
+    Enriches each item with the tenant-specific supplier price when tenant_id is given.
+    """
+    if master_conn is None:
+        return []
+    cur = master_conn.cursor()
+    clean_q = q.replace(' ', '').upper()
+
+    _SQL_UNACCENT = """
+        REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+        REPLACE(REPLACE(REPLACE(REPLACE(REPLACE(
+        UPPER(sc.name)
+        , 'Á', 'A'), 'É', 'E'), 'Í', 'I'), 'Ó', 'O'), 'Ú', 'U')
+        , 'À', 'A'), 'È', 'E'), 'Ì', 'I'), 'Ò', 'O'), 'Ù', 'U')
+    """
+    _q_unaccent = q.upper()
+    for a, b in [('Á', 'A'), ('É', 'E'), ('Í', 'I'), ('Ó', 'O'), ('Ú', 'U'),
+                 ('À', 'A'), ('È', 'E'), ('Ì', 'I'), ('Ò', 'O'), ('Ù', 'U'),
+                 ('Ä', 'A'), ('Ë', 'E'), ('Ï', 'I'), ('Ö', 'O'), ('Ü', 'U'),
+                 ('Ñ', 'N')]:
+        _q_unaccent = _q_unaccent.replace(a, b)
+
+    if mye_id:
+        cur.execute(f"""
+            SELECT DISTINCT sc.id, sc.sku, sc.name, sc.image_url, sc.category
+            FROM supplier_catalog sc
+            JOIN supplier_catalog_compat scc ON scc.catalog_id = sc.id
+            WHERE sc.is_active = true
+              AND scc.model_year_engine_id = %s
+              AND (REPLACE(UPPER(sc.sku), ' ', '') LIKE %s
+                   OR {_SQL_UNACCENT} LIKE %s)
+            ORDER BY sc.name
+            LIMIT %s
+        """, (mye_id, f'%{clean_q}%', f'%{_q_unaccent}%', limit))
+    else:
+        cur.execute(f"""
+            SELECT DISTINCT sc.id, sc.sku, sc.name, sc.image_url, sc.category
+            FROM supplier_catalog sc
+            WHERE sc.is_active = true
+              AND (REPLACE(UPPER(sc.sku), ' ', '') LIKE %s
+                   OR {_SQL_UNACCENT} LIKE %s)
+            ORDER BY sc.name
+            LIMIT %s
+        """, (f'%{clean_q}%', f'%{_q_unaccent}%', limit))
+
+    rows = cur.fetchall()
+    cur.close()
+
+    catalog_ids = [r[0] for r in rows]
+    prices = _get_supplier_prices(master_conn, tenant_id, catalog_ids)
+
+    results = []
+    for r in rows:
+        item = {'id': r[0], 'sku': r[1], 'name': r[2], 'image_url': r[3], 'category': r[4]}
+        p = prices.get(r[0])
+        if p:
+            item['supplier_price'] = p['price']
+            item['supplier_currency'] = p['currency']
+        results.append(item)
     return results
 
 
@@ -1804,7 +2322,7 @@ def get_alternatives(master_conn, part_id):
 
 def _pagination(page, per_page, total):
     """Build standard pagination dict."""
-    total_pages = max(1, (total + per_page - 1) // per_page)
+    total_pages = max(0, (total + per_page - 1) // per_page)
     return {
         'page': page,
         'per_page': per_page,
diff --git a/pos/services/cfdi_builder.py b/pos/services/cfdi_builder.py
index 55afa63..ac92b9f 100644
--- a/pos/services/cfdi_builder.py
+++ b/pos/services/cfdi_builder.py
@@ -464,3 +464,130 @@ def build_pago_xml(payment, tenant_config, customer, original_uuid):
 
     return etree.tostring(root, xml_declaration=True, encoding='UTF-8',
                           pretty_print=True).decode('utf-8')
+
+
+def build_global_invoice_xml(sales, tenant_config, year, month):
+    """Build CFDI 4.0 XML for a monthly global invoice (Factura Global).
+
+    Groups multiple cash sales (PUE, <= $2,000 each, no individual CFDI)
+    into a single CFDI tipo Ingreso with InformacionGlobal.
+
+    Args:
+        sales: list of dicts with keys:
+            id, subtotal, discount_total, tax_total, total,
+            items: [{name, quantity, unit_price, discount_amount,
+                     tax_rate, tax_amount, subtotal,
+                     clave_prod_serv, clave_unidad}]
+        tenant_config: dict with keys:
+            rfc, razon_social, regimen_fiscal, cp, serie (optional)
+        year: int, e.g. 2026
+        month: int, e.g. 6
+
+    Returns:
+        str: XML string (unsigned, ready for Horux)
+    """
+    nsmap = {
+        'cfdi': CFDI_NS,
+        'xsi': XSI_NS,
+    }
+
+    # Aggregate totals
+    total_subtotal = Decimal('0')
+    total_discount = Decimal('0')
+    total_tax = Decimal('0')
+    total_total = Decimal('0')
+    for sale in sales:
+        total_subtotal += _to_dec(sale.get('subtotal', 0))
+        total_discount += _to_dec(sale.get('discount_total', 0))
+        total_tax += _to_dec(sale.get('tax_total', 0))
+        total_total += _to_dec(sale.get('total', 0))
+
+    root = etree.Element(f'{{{CFDI_NS}}}Comprobante', nsmap=nsmap)
+    root.set(f'{{{XSI_NS}}}schemaLocation', CFDI_SCHEMA_LOCATION)
+    root.set('Version', '4.0')
+    root.set('Serie', tenant_config.get('serie', 'FG'))
+    root.set('Folio', f'{year}{month:02d}')
+    root.set('Fecha', datetime.now().strftime('%Y-%m-%dT%H:%M:%S'))
+    root.set('FormaPago', '01')  # Efectivo (most common for global)
+    root.set('SubTotal', _format_amount(total_subtotal))
+
+    if total_discount > 0:
+        root.set('Descuento', _format_amount(total_discount))
+
+    root.set('Moneda', 'MXN')
+    root.set('Total', _format_amount(total_total))
+    root.set('TipoDeComprobante', 'I')  # Ingreso
+    root.set('Exportacion', '01')
+    root.set('MetodoPago', 'PUE')
+    root.set('LugarExpedicion', tenant_config.get('cp', '00000'))
+
+    # InformacionGlobal (monthly global invoice)
+    info_global = _make_element(root, 'InformacionGlobal')
+    info_global.set('Periodicidad', '04')  # Mensual
+    info_global.set('Meses', f'{month:02d}')
+    info_global.set('Anio', str(year))
+
+    # Emisor
+    emisor = _make_element(root, 'Emisor')
+    emisor.set('Rfc', tenant_config['rfc'])
+    emisor.set('Nombre', tenant_config['razon_social'])
+    emisor.set('RegimenFiscal', tenant_config.get('regimen_fiscal', '601'))
+
+    # Receptor: Publico en general
+    receptor = _make_element(root, 'Receptor')
+    receptor.set('Rfc', RFC_PUBLICO_GENERAL)
+    receptor.set('Nombre', 'PUBLICO EN GENERAL')
+    receptor.set('DomicilioFiscalReceptor', tenant_config.get('cp', '00000'))
+    receptor.set('RegimenFiscalReceptor', '616')
+    receptor.set('UsoCFDI', 'S01')
+
+    # Conceptos: one per sale item (simplified)
+    conceptos = _make_element(root, 'Conceptos')
+
+    for sale in sales:
+        for item in sale.get('items', []):
+            qty = int(item.get('quantity', 1))
+            unit_price = _to_dec(item.get('unit_price', 0))
+            discount_amount = _to_dec(item.get('discount_amount', 0))
+            tax_rate = _to_dec(item.get('tax_rate', '0.16'))
+            tax_amount = _to_dec(item.get('tax_amount', 0))
+
+            importe = (unit_price * qty).quantize(TWO, ROUND_HALF_UP)
+            base = (importe - discount_amount).quantize(TWO, ROUND_HALF_UP)
+
+            concepto = _make_element(conceptos, 'Concepto')
+            concepto.set('ClaveProdServ', item.get('clave_prod_serv') or '25174800')
+            concepto.set('NoIdentificacion', item.get('part_number') or str(sale['id']))
+            concepto.set('Cantidad', str(qty))
+            concepto.set('ClaveUnidad', item.get('clave_unidad') or 'H87')
+            concepto.set('Unidad', 'PZA')
+            concepto.set('Descripcion', item.get('name') or 'Autoparte')
+            concepto.set('ValorUnitario', _format_amount(unit_price))
+            concepto.set('Importe', _format_amount(importe))
+            concepto.set('ObjetoImp', '02')
+
+            if discount_amount > 0:
+                concepto.set('Descuento', _format_amount(discount_amount))
+
+            impuestos_concepto = _make_element(concepto, 'Impuestos')
+            traslados_concepto = _make_element(impuestos_concepto, 'Traslados')
+            traslado = _make_element(traslados_concepto, 'Traslado')
+            traslado.set('Base', _format_amount(base))
+            traslado.set('Impuesto', '002')
+            traslado.set('TipoFactor', 'Tasa')
+            traslado.set('TasaOCuota', _format_rate(tax_rate))
+            traslado.set('Importe', _format_amount(tax_amount))
+
+    # Impuestos totales
+    impuestos = _make_element(root, 'Impuestos')
+    impuestos.set('TotalImpuestosTrasladados', _format_amount(total_tax))
+    traslados = _make_element(impuestos, 'Traslados')
+    traslado_total = _make_element(traslados, 'Traslado')
+    traslado_total.set('Base', _format_amount(total_subtotal))
+    traslado_total.set('Impuesto', '002')
+    traslado_total.set('TipoFactor', 'Tasa')
+    traslado_total.set('TasaOCuota', '0.160000')
+    traslado_total.set('Importe', _format_amount(total_tax))
+
+    return etree.tostring(root, xml_declaration=True, encoding='UTF-8',
+                          pretty_print=True).decode('utf-8')
diff --git a/pos/services/dropshipping_service.py b/pos/services/dropshipping_service.py
new file mode 100644
index 0000000..11e823a
--- /dev/null
+++ b/pos/services/dropshipping_service.py
@@ -0,0 +1,168 @@
+"""Dropshipping integration service.
+
+Provides read-only inventory access for external dropshipping platforms
+and webhook dispatching on stock/price/sale events.
+"""
+
+import logging
+from services.inventory_engine import get_stock_bulk
+
+logger = logging.getLogger(__name__)
+
+
+def resolve_tenant_by_api_key(master_conn, api_key: str):
+    """Find tenant_id and db_name for a given dropshipping API key.
+
+    Returns (tenant_id, db_name) or (None, None) if invalid.
+    """
+    if not api_key:
+        return None, None
+    cur = master_conn.cursor()
+    # tenant_config lives in each tenant DB, so we need to scan tenants
+    cur.execute("SELECT id, db_name FROM tenants WHERE is_active = true")
+    tenants = cur.fetchall()
+    for tid, db_name in tenants:
+        try:
+            tcur = master_conn.cursor()
+            # Use dblink or connect to tenant DB? Simpler: the blueprint
+            # will pass tenant_conn directly after resolution.
+            # Instead, we store a mapping in master DB for speed.
+            # For now, return all candidates and let caller validate.
+            pass
+        except Exception:
+            continue
+    cur.close()
+    return None, None
+
+
+def _get_dropshipping_key(tenant_conn):
+    cur = tenant_conn.cursor()
+    cur.execute("SELECT value FROM tenant_config WHERE key = 'dropshipping_api_key'")
+    row = cur.fetchone()
+    cur.close()
+    return row[0] if row else None
+
+
+def validate_api_key(tenant_conn, api_key: str) -> bool:
+    """Check if the provided API key matches the tenant's configured key."""
+    if not api_key:
+        return False
+    expected = _get_dropshipping_key(tenant_conn)
+    return expected is not None and expected == api_key
+
+
+def get_inventory_list(tenant_conn, search: str = None, page: int = 1, per_page: int = 50):
+    """Return inventory items with stock and price for dropshipping."""
+    offset = (max(page, 1) - 1) * per_page
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+
+    cur = tenant_conn.cursor()
+    params = []
+    where = "WHERE is_active = true"
+    if search:
+        where += " AND (name ILIKE %s OR part_number ILIKE %s)"
+        params.extend([f"%{search}%", f"%{search}%"])
+
+    cur.execute(
+        f"""
+        SELECT id, part_number, name, brand, price_1, price_2, price_3,
+               image_url, unit, description
+        FROM inventory
+        {where}
+        ORDER BY id DESC
+        LIMIT %s OFFSET %s
+        """,
+        params + [per_page, offset],
+    )
+    rows = cur.fetchall()
+
+    # Count total
+    cur.execute(f"SELECT COUNT(*) FROM inventory {where}", params)
+    total = cur.fetchone()[0]
+    cur.close()
+
+    items = []
+    for r in rows:
+        inv_id = r[0]
+        items.append({
+            "id": inv_id,
+            "sku": r[1],
+            "name": r[2],
+            "brand": r[3],
+            "price_1": float(r[4]) if r[4] else None,
+            "price_2": float(r[5]) if r[5] else None,
+            "price_3": float(r[6]) if r[6] else None,
+            "stock": stock_map.get(inv_id, 0),
+            "image_url": r[7],
+            "unit": r[8],
+            "description": r[9],
+        })
+    return {"items": items, "page": page, "per_page": per_page, "total": total}
+
+
+def get_inventory_by_sku(tenant_conn, sku: str):
+    """Return a single inventory item by SKU/part_number."""
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, part_number, name, brand, price_1, price_2, price_3,
+               image_url, unit, description
+        FROM inventory
+        WHERE part_number = %s AND is_active = true
+        LIMIT 1
+        """,
+        (sku,),
+    )
+    row = cur.fetchone()
+    cur.close()
+    if not row:
+        return None
+    inv_id = row[0]
+    return {
+        "id": inv_id,
+        "sku": row[1],
+        "name": row[2],
+        "brand": row[3],
+        "price_1": float(row[4]) if row[4] else None,
+        "price_2": float(row[5]) if row[5] else None,
+        "price_3": float(row[6]) if row[6] else None,
+        "stock": stock_map.get(inv_id, 0),
+        "image_url": row[7],
+        "unit": row[8],
+        "description": row[9],
+    }
+
+
+def get_stock_by_skus(tenant_conn, skus: list[str]) -> dict:
+    """Return stock levels for a list of SKUs."""
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, part_number FROM inventory
+        WHERE part_number = ANY(%s) AND is_active = true
+        """,
+        (skus,),
+    )
+    rows = cur.fetchall()
+    cur.close()
+    result = {}
+    for inv_id, sku in rows:
+        result[sku] = stock_map.get(inv_id, 0)
+    return result
+
+
+def get_webhook_targets(tenant_conn, event_type: str) -> list[str]:
+    """Return active webhook URLs for a given event type."""
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT target_url FROM dropshipping_webhooks
+        WHERE event_type = %s AND is_active = true
+        """,
+        (event_type,),
+    )
+    urls = [r[0] for r in cur.fetchall()]
+    cur.close()
+    return urls
diff --git a/pos/services/geo_branches.py b/pos/services/geo_branches.py
new file mode 100644
index 0000000..51d10ed
--- /dev/null
+++ b/pos/services/geo_branches.py
@@ -0,0 +1,56 @@
+import math
+
+def haversine(lat1, lon1, lat2, lon2):
+    """Calculate the great-circle distance between two points on Earth in km."""
+    R = 6371.0  # Earth radius in km
+    phi1 = math.radians(lat1)
+    phi2 = math.radians(lat2)
+    dphi = math.radians(lat2 - lat1)
+    dlambda = math.radians(lon2 - lon1)
+
+    a = math.sin(dphi / 2) ** 2 + math.cos(phi1) * math.cos(phi2) * math.sin(dlambda / 2) ** 2
+    c = 2 * math.atan2(math.sqrt(a), math.sqrt(1 - a))
+
+    return R * c
+
+
+def find_nearest_branch(tenant_conn, latitude, longitude):
+    """
+    Find the nearest active branch with coordinates.
+    Returns a dict with branch info + distance_km, or None.
+    """
+    if not tenant_conn or latitude is None or longitude is None:
+        return None
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, name, address, phone, latitude, longitude
+        FROM branches
+        WHERE is_active = TRUE AND latitude IS NOT NULL AND longitude IS NOT NULL
+        """
+    )
+    branches = cur.fetchall()
+    cur.close()
+
+    nearest = None
+    min_dist = float('inf')
+
+    for row in branches:
+        bid, name, address, phone, b_lat, b_lon = row
+        if b_lat is None or b_lon is None:
+            continue
+        dist = haversine(float(latitude), float(longitude), float(b_lat), float(b_lon))
+        if dist < min_dist:
+            min_dist = dist
+            nearest = {
+                'id': bid,
+                'name': name,
+                'address': address or '',
+                'phone': phone or '',
+                'latitude': float(b_lat),
+                'longitude': float(b_lon),
+                'distance_km': round(dist, 1),
+            }
+
+    return nearest
diff --git a/pos/services/global_invoice.py b/pos/services/global_invoice.py
new file mode 100644
index 0000000..41559d6
--- /dev/null
+++ b/pos/services/global_invoice.py
@@ -0,0 +1,210 @@
+# /home/Autopartes/pos/services/global_invoice.py
+"""Global invoice (Factura Global) service.
+
+Groups cash sales (PUE, <= $2,000, no individual CFDI) into a single
+monthly CFDI with InformacionGlobal per SAT requirements.
+"""
+
+from datetime import datetime
+from decimal import Decimal
+
+from services.cfdi_builder import build_global_invoice_xml
+from services.cfdi_queue import enqueue_cfdi, _generate_provisional_folio
+
+
+def get_eligible_sales(conn, year, month, branch_id=None, max_total=2000):
+    """Find sales eligible for global invoicing.
+
+    Criteria:
+    - Payment method: PUE (paid in full)
+    - Total <= max_total
+    - No individual CFDI stamped
+    - Not already included in a global invoice
+    - Created in the given year/month
+    - Optionally filtered by branch_id
+
+    Returns:
+        list of sale dicts with items
+    """
+    cur = conn.cursor()
+
+    # Find eligible sale IDs
+    sql = """
+        SELECT s.id
+        FROM sales s
+        WHERE s.metodo_pago_sat = 'PUE'
+          AND s.total <= %s
+          AND s.status = 'completed'
+          AND s.global_invoiced_at IS NULL
+          AND EXTRACT(YEAR FROM s.created_at) = %s
+          AND EXTRACT(MONTH FROM s.created_at) = %s
+          AND NOT EXISTS (
+              SELECT 1 FROM cfdi_queue c
+              WHERE c.sale_id = s.id AND c.status = 'stamped'
+          )
+    """
+    params = [max_total, year, month]
+
+    if branch_id:
+        sql += " AND s.branch_id = %s"
+        params.append(branch_id)
+
+    sql += " ORDER BY s.created_at ASC"
+
+    cur.execute(sql, params)
+    sale_ids = [r[0] for r in cur.fetchall()]
+
+    if not sale_ids:
+        cur.close()
+        return []
+
+    # Load sale details with items
+    sales = []
+    for sale_id in sale_ids:
+        cur.execute("""
+            SELECT id, branch_id, customer_id, employee_id, sale_type,
+                   payment_method, subtotal, discount_total, tax_total, total,
+                   metodo_pago_sat, forma_pago_sat, status, created_at
+            FROM sales WHERE id = %s
+        """, (sale_id,))
+        row = cur.fetchone()
+        if not row:
+            continue
+
+        sale = {
+            'id': row[0], 'branch_id': row[1], 'customer_id': row[2],
+            'employee_id': row[3], 'sale_type': row[4],
+            'payment_method': row[5],
+            'subtotal': float(row[6]) if row[6] else 0,
+            'discount_total': float(row[7]) if row[7] else 0,
+            'tax_total': float(row[8]) if row[8] else 0,
+            'total': float(row[9]) if row[9] else 0,
+            'metodo_pago_sat': row[10] or 'PUE',
+            'forma_pago_sat': row[11] or '01',
+            'status': row[12],
+            'created_at': str(row[13]),
+            'items': [],
+        }
+
+        cur.execute("""
+            SELECT id, inventory_id, part_number, name, quantity, unit_price,
+                   unit_cost, discount_pct, discount_amount, tax_rate, tax_amount,
+                   subtotal, clave_prod_serv, clave_unidad
+            FROM sale_items WHERE sale_id = %s ORDER BY id
+        """, (sale_id,))
+
+        for r in cur.fetchall():
+            sale['items'].append({
+                'id': r[0], 'inventory_id': r[1], 'part_number': r[2],
+                'name': r[3], 'quantity': r[4],
+                'unit_price': float(r[5]) if r[5] else 0,
+                'unit_cost': float(r[6]) if r[6] else 0,
+                'discount_pct': float(r[7]) if r[7] else 0,
+                'discount_amount': float(r[8]) if r[8] else 0,
+                'tax_rate': float(r[9]) if r[9] else 0.16,
+                'tax_amount': float(r[10]) if r[10] else 0,
+                'subtotal': float(r[11]) if r[11] else 0,
+                'clave_prod_serv': r[12] or '25174800',
+                'clave_unidad': r[13] or 'H87',
+            })
+
+        sales.append(sale)
+
+    cur.close()
+    return sales
+
+
+def generate_global_invoice(conn, tenant_config, year, month, branch_id=None,
+                            max_total=2000, employee_id=None):
+    """Generate a global invoice for the given month.
+
+    Args:
+        conn: psycopg2 connection
+        tenant_config: dict with rfc, razon_social, regimen_fiscal, cp, serie
+        year: int
+        month: int
+        branch_id: optional branch filter
+        max_total: max sale total to include (default $2,000)
+        employee_id: optional employee ID for audit
+
+    Returns:
+        dict: {id, status, sales_count, total, xml, provisional_folio}
+              or {error, message} if no eligible sales
+    """
+    sales = get_eligible_sales(conn, year, month, branch_id, max_total)
+
+    if not sales:
+        return {'error': 'NO_ELIGIBLE_SALES',
+                'message': f'No hay ventas elegibles para factura global de {month:02d}/{year}'}
+
+    xml = build_global_invoice_xml(sales, tenant_config, year, month)
+
+    # Enqueue with sale_id=NULL (global invoice)
+    result = enqueue_cfdi(conn, None, 'ingreso', xml)
+    cfdi_id = result['id']
+
+    cur = conn.cursor()
+
+    # Link sales to global invoice
+    for sale in sales:
+        cur.execute("""
+            INSERT INTO global_invoice_sales (global_invoice_id, sale_id)
+            VALUES (%s, %s)
+            ON CONFLICT DO NOTHING
+        """, (cfdi_id, sale['id']))
+
+        # Mark sale as globally invoiced
+        cur.execute("""
+            UPDATE sales SET global_invoiced_at = NOW() WHERE id = %s
+        """, (sale['id'],))
+
+    conn.commit()
+    cur.close()
+
+    return {
+        'id': cfdi_id,
+        'status': 'pending',
+        'sales_count': len(sales),
+        'total': sum(s['total'] for s in sales),
+        'provisional_folio': result['provisional_folio'],
+        'xml': xml,
+    }
+
+
+def get_global_invoice_status(conn, cfdi_id):
+    """Get status of a global invoice including linked sales."""
+    cur = conn.cursor()
+
+    cur.execute("""
+        SELECT id, status, uuid_fiscal, provisional_folio, error_message,
+               created_at, stamped_at
+        FROM cfdi_queue WHERE id = %s
+    """, (cfdi_id,))
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        return None
+
+    result = {
+        'id': row[0], 'status': row[1], 'uuid_fiscal': row[2],
+        'provisional_folio': row[3], 'error_message': row[4],
+        'created_at': str(row[5]), 'stamped_at': str(row[6]) if row[6] else None,
+        'sales': [],
+    }
+
+    cur.execute("""
+        SELECT s.id, s.total, s.created_at
+        FROM global_invoice_sales gis
+        JOIN sales s ON s.id = gis.sale_id
+        WHERE gis.global_invoice_id = %s
+        ORDER BY s.created_at ASC
+    """, (cfdi_id,))
+
+    for r in cur.fetchall():
+        result['sales'].append({
+            'id': r[0], 'total': float(r[1]) if r[1] else 0,
+            'created_at': str(r[2]),
+        })
+
+    cur.close()
+    return result
diff --git a/pos/services/inventory_engine.py b/pos/services/inventory_engine.py
index b7f115e..26251b6 100644
--- a/pos/services/inventory_engine.py
+++ b/pos/services/inventory_engine.py
@@ -25,22 +25,23 @@ def _safe_g(attr, default=None):
 def get_stock(conn, inventory_id, branch_id=None):
     """Get current stock for an inventory item. Optionally filter by branch.
 
-    Uses Redis cache first, then inventory_stock_summary, falls back to
-    PostgreSQL SUM query.
+    Uses Redis cache first, then inventory_stock (per-branch) or
+    inventory_stock_summary (total), falls back to PostgreSQL SUM query.
     """
     # Try Redis first
     cached = get_cached_stock(inventory_id, branch_id)
     if cached is not None:
         return cached
 
-    # Use inventory_stock_summary (O(1) lookup)
     cur = conn.cursor()
     if branch_id:
+        # Per-branch stock from inventory_stock
         cur.execute(
-            "SELECT stock FROM inventory_stock_summary WHERE inventory_id = %s AND branch_id = %s",
+            "SELECT stock FROM inventory_stock WHERE inventory_id = %s AND branch_id = %s",
             (inventory_id, branch_id)
         )
     else:
+        # Total stock from inventory_stock_summary
         cur.execute(
             "SELECT stock FROM inventory_stock_summary WHERE inventory_id = %s",
             (inventory_id,)
@@ -73,13 +74,14 @@ def get_stock(conn, inventory_id, branch_id=None):
 def get_stock_bulk(conn, branch_id=None):
     """Get stock for all items. Returns dict {inventory_id: stock_quantity}.
 
-    Uses inventory_stock_summary for O(1) bulk lookup.
+    Uses inventory_stock (per-branch) or inventory_stock_summary (total)
+    for O(1) bulk lookup.
     """
     cur = conn.cursor()
     if branch_id:
         cur.execute("""
             SELECT inventory_id, stock
-            FROM inventory_stock_summary WHERE branch_id = %s
+            FROM inventory_stock WHERE branch_id = %s
         """, (branch_id,))
     else:
         cur.execute("""
@@ -119,6 +121,18 @@ def record_operation(conn, inventory_id, branch_id, operation_type, quantity,
         notes
     ))
     op_id = cur.fetchone()[0]
+
+    # Queue ML stock sync if this product has an active ML listing
+    cur.execute("""
+        INSERT INTO meli_sync_queue (inventory_id, action, status)
+        SELECT %s, 'stock_update', 'pending'
+        WHERE EXISTS (
+            SELECT 1 FROM marketplace_listings
+            WHERE inventory_id = %s AND channel = 'mercadolibre' AND is_active = true
+        )
+        ON CONFLICT DO NOTHING
+    """, (inventory_id, inventory_id))
+
     cur.close()
     return op_id
 
@@ -272,38 +286,72 @@ def record_initial(conn, inventory_id, branch_id, quantity, cost=None):
     return result
 
 
-def get_alerts(conn, branch_id=None):
-    """Get stock alerts: zero stock, below minimum, above maximum."""
-    stock_map = get_stock_bulk(conn, branch_id)
+def get_alerts(conn, branch_id=None, limit_per_type=500):
+    """Get stock alerts: zero stock, below minimum, above maximum.
+    Returns at most limit_per_type alerts per severity to avoid browser freeze.
+    """
     cur = conn.cursor()
-
-    where = "WHERE i.is_active = true"
+    branch_filter = ""
     params = []
     if branch_id:
-        where += " AND i.branch_id = %s"
+        branch_filter = " AND i.branch_id = %s"
         params.append(branch_id)
 
+    # Use a single SQL query with window functions to rank and limit per type
     cur.execute(f"""
-        SELECT i.id, i.part_number, i.name, i.min_stock, i.max_stock, i.branch_id
-        FROM inventory i {where}
-    """, params)
+        WITH stock AS (
+            SELECT inventory_id, COALESCE(SUM(quantity), 0) AS qty
+            FROM inventory_operations
+            GROUP BY inventory_id
+        ),
+        alerts_raw AS (
+            SELECT
+                i.id AS inventory_id,
+                i.part_number,
+                i.name,
+                COALESCE(s.qty, 0) AS stock,
+                i.min_stock,
+                i.max_stock,
+                i.branch_id,
+                CASE
+                    WHEN COALESCE(s.qty, 0) <= 0 THEN 'zero'
+                    WHEN i.min_stock IS NOT NULL AND COALESCE(s.qty, 0) < i.min_stock THEN 'low'
+                    WHEN i.max_stock IS NOT NULL AND COALESCE(s.qty, 0) > i.max_stock THEN 'over'
+                END AS alert_type,
+                CASE
+                    WHEN COALESCE(s.qty, 0) <= 0 THEN 'critical'
+                    WHEN i.min_stock IS NOT NULL AND COALESCE(s.qty, 0) < i.min_stock THEN 'warning'
+                    WHEN i.max_stock IS NOT NULL AND COALESCE(s.qty, 0) > i.max_stock THEN 'info'
+                END AS severity
+            FROM inventory i
+            LEFT JOIN stock s ON s.inventory_id = i.id
+            WHERE i.is_active = true {branch_filter}
+        ),
+        ranked AS (
+            SELECT *,
+                ROW_NUMBER() OVER (PARTITION BY alert_type ORDER BY inventory_id) AS rn
+            FROM alerts_raw
+            WHERE alert_type IS NOT NULL
+        )
+        SELECT inventory_id, part_number, name, stock, min_stock, max_stock, branch_id, alert_type, severity
+        FROM ranked
+        WHERE rn <= %s
+        ORDER BY severity DESC, inventory_id
+    """, params + [limit_per_type])
 
     alerts = []
     for row in cur.fetchall():
-        inv_id, part_num, name, min_s, max_s, br_id = row
-        stock = stock_map.get(inv_id, 0)
-
-        if stock <= 0:
-            alerts.append({'type': 'zero', 'severity': 'critical', 'inventory_id': inv_id,
-                           'part_number': part_num, 'name': name, 'stock': stock, 'branch_id': br_id})
-        elif min_s and stock < min_s:
-            alerts.append({'type': 'low', 'severity': 'warning', 'inventory_id': inv_id,
-                           'part_number': part_num, 'name': name, 'stock': stock,
-                           'min_stock': min_s, 'branch_id': br_id})
-        elif max_s and stock > max_s:
-            alerts.append({'type': 'over', 'severity': 'info', 'inventory_id': inv_id,
-                           'part_number': part_num, 'name': name, 'stock': stock,
-                           'max_stock': max_s, 'branch_id': br_id})
+        alerts.append({
+            'inventory_id': row[0],
+            'part_number': row[1],
+            'name': row[2],
+            'stock': row[3],
+            'min_stock': row[4],
+            'max_stock': row[5],
+            'branch_id': row[6],
+            'type': row[7],
+            'severity': row[8],
+        })
 
     cur.close()
     return alerts
diff --git a/pos/services/marketplace_external_service.py b/pos/services/marketplace_external_service.py
new file mode 100644
index 0000000..fd79db2
--- /dev/null
+++ b/pos/services/marketplace_external_service.py
@@ -0,0 +1,1768 @@
+"""Business logic for MercadoLibre external marketplace integration.
+
+Depends on:
+  - meli_service.py        (HTTP client)
+  - pos_engine.py          (sale creation)
+  - inventory_engine.py    (stock queries)
+  - image_service.py       (image URLs)
+"""
+
+import json
+import logging
+import urllib.parse
+from typing import Optional
+from decimal import Decimal
+
+from services.meli_service import MeliService, MeliError, MeliAuthError
+from services.pos_engine import process_sale, calculate_totals
+from services.inventory_engine import get_stock, get_stock_bulk
+
+logger = logging.getLogger(__name__)
+
+
+def _resolve_image_urls(images: list[str], base_url: str | None = None) -> list[str]:
+    """Convert relative image paths to absolute URLs."""
+    resolved = []
+    for url in images:
+        if not url:
+            continue
+        if base_url and url.startswith("/"):
+            resolved.append(urllib.parse.urljoin(base_url.rstrip("/") + "/", url.lstrip("/")))
+        else:
+            resolved.append(url)
+    return resolved
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# CONFIG HELPERS
+# ═══════════════════════════════════════════════════════════════════════════
+
+MELI_CONFIG_KEYS = [
+    "meli_access_token",
+    "meli_refresh_token",
+    "meli_user_id",
+    "meli_site_id",
+    "meli_enabled",
+    "meli_auto_publish",
+    "meli_sync_interval_min",
+    "meli_order_sync_interval_min",
+    "meli_default_category_id",
+    "meli_shipping_mode",
+    "meli_client_id",
+    "meli_client_secret",
+]
+
+
+def _get_config_value(cur, key: str, default=None):
+    cur.execute("SELECT value FROM tenant_config WHERE key = %s", (key,))
+    row = cur.fetchone()
+    return row[0] if row else default
+
+
+def get_meli_config(tenant_conn) -> dict:
+    """Read ML config from tenant_config."""
+    cur = tenant_conn.cursor()
+    cfg = {}
+    for key in MELI_CONFIG_KEYS:
+        cfg[key] = _get_config_value(cur, key)
+    cur.close()
+    # Normalize booleans
+    cfg["meli_enabled"] = (cfg.get("meli_enabled") or "").lower() == "true"
+    cfg["meli_auto_publish"] = (cfg.get("meli_auto_publish") or "").lower() == "true"
+    cfg["meli_sync_interval_min"] = int(cfg.get("meli_sync_interval_min") or 15)
+    cfg["meli_order_sync_interval_min"] = int(cfg.get("meli_order_sync_interval_min") or 5)
+    return cfg
+
+
+def save_meli_config(tenant_conn, updates: dict) -> None:
+    """Upsert ML config keys into tenant_config."""
+    cur = tenant_conn.cursor()
+    for key, value in updates.items():
+        if value is None:
+            continue
+        cur.execute(
+            """
+            INSERT INTO tenant_config (key, value, updated_at)
+            VALUES (%s, %s, NOW())
+            ON CONFLICT (key) DO UPDATE SET value = EXCLUDED.value, updated_at = NOW()
+            """,
+            (key, str(value)),
+        )
+    tenant_conn.commit()
+    cur.close()
+
+
+def delete_meli_config(tenant_conn) -> None:
+    """Remove all ML config keys."""
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "DELETE FROM tenant_config WHERE key LIKE 'meli_%'"
+    )
+    tenant_conn.commit()
+    cur.close()
+
+
+def _get_meli_service(cfg: dict) -> Optional[MeliService]:
+    """Build MeliService from config dict."""
+    token = cfg.get("meli_access_token")
+    if not token:
+        return None
+    return MeliService(
+        access_token=token,
+        refresh_token=cfg.get("meli_refresh_token"),
+        client_id=cfg.get("meli_client_id"),
+        client_secret=cfg.get("meli_client_secret"),
+    )
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# ITEM PAYLOAD BUILDER
+# ═══════════════════════════════════════════════════════════════════════════
+
+def _extract_meli_error(err: MeliError) -> str:
+    """Extract the most useful error message from a MeliError response."""
+    base = str(err)
+    body = err.response_body
+    if not body:
+        return base
+    try:
+        data = json.loads(body)
+        msg = data.get("message") or data.get("error")
+        causes = data.get("cause", [])
+        if causes and isinstance(causes, list):
+            cause_msgs = [c.get("message") for c in causes if c.get("message")]
+            if cause_msgs:
+                msg = (msg + " | " if msg else "") + "; ".join(cause_msgs)
+        if msg:
+            # Translate common account-configuration errors to actionable messages
+            lowered = msg.lower()
+            if "me2 adoption is mandatory" in lowered:
+                return msg + " | Debes activar MercadoEnvíos (ME2) en tu cuenta de MercadoLibre. Ve a Configuración > Envíos en el panel de vendedor de ML."
+            if "user has not mode" in lowered:
+                return msg + " | Tu cuenta no tiene configurado este modo de envío. Ve a Configuración > Envíos en MercadoLibre y completa la configuración de MercadoEnvíos."
+            if "mandatory free shipping" in lowered:
+                return msg + " | MercadoLibre está forzando envío gratis en tu cuenta. Esto es normal si estás en el programa de envíos gratuito. El artículo se publicará con envío gratis."
+            return msg
+    except Exception:
+        pass
+    return base
+
+
+def build_item_payload(
+    inventory_row: dict,
+    images: list[str],
+    meli_category_id: str,
+    price: float,
+    stock: int,
+    shipping_mode: str = "me2",
+    listing_type_id: str = "gold_special",
+    custom_title: str = None,
+    extra_attributes: list = None,
+    shipping_cost: float = None,
+    base_url: str = None,
+) -> dict:
+    """Convert a Nexus inventory row into a MercadoLibre item payload."""
+    title = custom_title or f"{inventory_row['name']} {inventory_row['brand'] or ''} {inventory_row['part_number'] or ''}".strip()
+    # ML title limit is 60 chars; truncate smartly
+    if len(title) > 60:
+        title = title[:57] + "..."
+
+    shipping_payload = {"mode": shipping_mode}
+    if shipping_mode == "custom" and shipping_cost is not None:
+        shipping_payload["local_pick_up"] = False
+        shipping_payload["free_shipping"] = False
+        shipping_payload["methods"] = []
+        shipping_payload["costs"] = [{"description": "Envio", "cost": str(shipping_cost)}]
+    # family_name is required for ML's User Products model (enabled sellers).
+    # It's a generic product description shared across variations.
+    family_name = inventory_row.get("name") or title
+
+    payload = {
+        "title": title,
+        "family_name": family_name,
+        "category_id": meli_category_id,
+        "price": round(float(price), 2),
+        "currency_id": "MXN",
+        "available_quantity": max(int(stock), 0),
+        "buying_mode": "buy_it_now",
+        "listing_type_id": listing_type_id,
+        "condition": "new",
+        "pictures": [{"source": url} for url in _resolve_image_urls(images, base_url) if url],
+        "shipping": shipping_payload,
+        "attributes": [],
+        "seller_custom_field": inventory_row.get("part_number") or str(inventory_row.get("id")),
+    }
+
+    # Collect extra attribute IDs to avoid duplicates
+    extra_attr_ids = {a.get("id") for a in (extra_attributes or []) if a.get("id")}
+
+    if inventory_row.get("brand") and "BRAND" not in extra_attr_ids:
+        payload["attributes"].append(
+            {"id": "BRAND", "value_name": inventory_row["brand"]}
+        )
+
+    if inventory_row.get("part_number") and "PART_NUMBER" not in extra_attr_ids:
+        payload["attributes"].append(
+            {"id": "PART_NUMBER", "value_name": inventory_row["part_number"]}
+        )
+
+    # Vehicle compatibility as attributes (if available)
+    vehicle_compat = inventory_row.get("vehicle_compatibility")
+    if vehicle_compat:
+        if isinstance(vehicle_compat, str):
+            try:
+                vehicle_compat = json.loads(vehicle_compat)
+            except Exception:
+                vehicle_compat = None
+        if isinstance(vehicle_compat, list) and vehicle_compat:
+            first = vehicle_compat[0]
+            if isinstance(first, dict):
+                if first.get("brand") and "VEHICLE_MODEL" not in extra_attr_ids:
+                    payload["attributes"].append(
+                        {"id": "VEHICLE_MODEL", "value_name": first["brand"]}
+                    )
+                if first.get("model") and "VEHICLE_MODEL_NAME" not in extra_attr_ids:
+                    payload["attributes"].append(
+                        {"id": "VEHICLE_MODEL_NAME", "value_name": first["model"]}
+                    )
+
+    # Extra attributes from user input (category requirements)
+    if extra_attributes:
+        for attr in extra_attributes:
+            if attr.get("id") and attr.get("value_name"):
+                payload["attributes"].append(attr)
+
+    return payload
+
+
+def _upload_images_to_meli(svc: MeliService, image_urls: list[str]) -> list[str]:
+    """Upload images to MercadoLibre and return their secure URLs.
+
+    If an image is already a ML URL, it's passed through unchanged.
+    """
+    results = []
+    for url in image_urls:
+        if not url:
+            continue
+        # Already a ML hosted image?
+        if "mercadolibre" in url or "mercadoli.com" in url:
+            results.append(url)
+            continue
+        try:
+            pic = svc.upload_image(url)
+            secure_url = pic.get("secure_url") or pic.get("url") or url
+            results.append(secure_url)
+        except Exception as e:
+            logger.warning("Failed to upload image %s to ML: %s", url, e)
+            # Fallback: try using the original URL anyway
+            results.append(url)
+    return results
+
+
+def _calculate_meli_net_price(svc: MeliService, site_id: str, price: float, listing_type_id: str, category_id: str) -> dict:
+    """Calculate net amount after ML commissions.
+
+    Returns dict with fee_amount, net_amount, fee_pct.
+    Falls back to approximate percentages if the API call fails.
+    """
+    try:
+        fee_info = svc.get_listing_price(site_id, price, listing_type_id, category_id)
+        # Response structure varies; try common keys
+        sale_fee = fee_info.get("sale_fee_amount") or fee_info.get("fee_amount") or 0
+        net_amount = fee_info.get("net_amount") or fee_info.get("net_receive_amount")
+        if net_amount is None:
+            net_amount = price - sale_fee
+        return {
+            "fee_amount": float(sale_fee),
+            "net_amount": float(net_amount),
+            "fee_pct": round((sale_fee / price) * 100, 2) if price > 0 else 0,
+            "source": "ml_api",
+        }
+    except Exception as e:
+        logger.warning("Failed to fetch ML listing price for fee calc: %s", e)
+        # Fallback approximations for MLM
+        approx_fees = {
+            "gold_special": 0.13,
+            "gold_pro": 0.16,
+            "gold_premium": 0.18,
+            "free": 0.0,
+        }
+        fee_rate = approx_fees.get(listing_type_id, 0.13)
+        fee_amount = round(price * fee_rate, 2)
+        return {
+            "fee_amount": fee_amount,
+            "net_amount": round(price - fee_amount, 2),
+            "fee_pct": round(fee_rate * 100, 2),
+            "source": "approximation",
+        }
+
+
+def check_meli_shipping_config(svc: MeliService, cfg: dict) -> dict:
+    """Check if the user's ML account has the required shipping modes configured.
+
+    Returns {"ok": True} or {"ok": False, "error": "...", "available_modes": [...]}.
+    """
+    user_id = cfg.get("meli_user_id")
+    if not user_id:
+        return {"ok": False, "error": "Usuario de ML no configurado"}
+    try:
+        prefs = svc.get_shipping_preferences(str(user_id))
+        modes = prefs.get("modes", [])
+        mandatory = prefs.get("mandatory_mode_for_user", [])
+        if mandatory and not any(m in modes for m in mandatory):
+            return {
+                "ok": False,
+                "error": f"Tu cuenta requiere obligatoriamente los modos de envío: {', '.join(mandatory)}. Actualmente solo tienes: {', '.join(modes)}. Configúralos en el panel de vendedor de MercadoLibre.",
+                "available_modes": modes,
+                "mandatory_modes": mandatory,
+            }
+        return {"ok": True, "available_modes": modes, "mandatory_modes": mandatory}
+    except MeliError as e:
+        logger.warning("Failed to fetch shipping preferences: %s", e)
+        return {"ok": True}  # Don't block on preference fetch failure
+    except Exception as e:
+        logger.warning("Failed to fetch shipping preferences: %s", e)
+        return {"ok": True}
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# LISTINGS CRUD
+# ═══════════════════════════════════════════════════════════════════════════
+
+def check_inventory_ml_status(tenant_conn, inventory_ids: list[int], base_url: str = None) -> dict:
+    """Check local pre-flight status for ML publishing.
+
+    Returns per-item dict with checks: has_image, has_stock, has_price,
+    already_published, and the generated title.
+    """
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, part_number, name, brand, price_1, image_url
+        FROM inventory
+        WHERE id = ANY(%s)
+        """,
+        (inventory_ids,),
+    )
+    rows = {r[0]: r for r in cur.fetchall()}
+
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+
+    # Check existing active listings
+    cur.execute(
+        """
+        SELECT inventory_id, external_item_id, external_status, external_permalink
+        FROM marketplace_listings
+        WHERE inventory_id = ANY(%s) AND channel = 'mercadolibre' AND is_active = true
+        """,
+        (inventory_ids,),
+    )
+    listings = {r[0]: {"external_item_id": r[1], "status": r[2], "permalink": r[3]} for r in cur.fetchall()}
+    cur.close()
+
+    results = []
+    for inv_id in inventory_ids:
+        row = rows.get(inv_id)
+        if not row:
+            results.append({"inventory_id": inv_id, "exists": False})
+            continue
+
+        price = float(row[4]) if row[4] else 0
+        stock = stock_map.get(inv_id, 0)
+        image_url = row[5]
+        title = f"{row[2]} {row[3] or ''} {row[1] or ''}".strip()
+        if len(title) > 60:
+            title = title[:57] + "..."
+
+        existing = listings.get(inv_id)
+        results.append({
+            "inventory_id": inv_id,
+            "exists": True,
+            "title": title,
+            "has_image": bool(image_url),
+            "has_stock": stock > 0,
+            "has_price": price > 0,
+            "price": price,
+            "stock": stock,
+            "image_url": _resolve_image_urls([image_url], base_url)[0] if image_url else None,
+            "already_published": existing is not None,
+            "existing_listing": existing,
+        })
+    return {"items": results}
+
+
+def validate_items(
+    tenant_conn,
+    inventory_ids: list[int],
+    meli_category_id: str,
+    listing_type_id: str = "gold_special",
+    shipping_mode: str = "me2",
+    custom_data: dict = None,
+    base_url: str = None,
+) -> dict:
+    """Validate items against ML /items/validate without creating them.
+
+    Returns per-item validation results with ML error details if any.
+    """
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    shipping_check = check_meli_shipping_config(svc, cfg)
+    if not shipping_check["ok"]:
+        return {"valid": [], "invalid": [{"inventory_id": "config", "error": shipping_check["error"]}]}
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, part_number, name, brand, price_1, vehicle_compatibility,
+               image_url, unit, is_active
+        FROM inventory
+        WHERE id = ANY(%s) AND is_active = true
+        """,
+        (inventory_ids,),
+    )
+    rows = {r[0]: r for r in cur.fetchall()}
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+
+    custom_data = custom_data or {}
+    results = {"valid": [], "invalid": []}
+
+    for inv_id in inventory_ids:
+        row = rows.get(inv_id)
+        if not row:
+            results["invalid"].append({"inventory_id": inv_id, "error": "No encontrado o inactivo"})
+            continue
+
+        inv = {
+            "id": row[0],
+            "part_number": row[1],
+            "name": row[2],
+            "brand": row[3],
+            "price_1": float(row[4]) if row[4] else 0,
+            "vehicle_compatibility": row[5],
+            "image_url": row[6],
+            "unit": row[7],
+        }
+
+        stock = stock_map.get(inv_id, 0)
+        if stock <= 0:
+            results["invalid"].append({"inventory_id": inv_id, "error": "Sin stock disponible"})
+            continue
+        if inv["price_1"] <= 0:
+            results["invalid"].append({"inventory_id": inv_id, "error": "El precio debe ser mayor a 0"})
+            continue
+
+        images = []
+        if inv.get("image_url"):
+            images.append(inv["image_url"])
+        images = _resolve_image_urls(images, base_url)
+        if not images:
+            results["invalid"].append({"inventory_id": inv_id, "error": "El producto no tiene imagen"})
+            continue
+
+        # Upload images to ML hosting so they are publicly accessible
+        try:
+            ml_images = _upload_images_to_meli(svc, images)
+        except Exception as e:
+            results["invalid"].append({"inventory_id": inv_id, "error": f"Error subiendo imagen a ML: {e}"})
+            continue
+
+        if not ml_images:
+            results["invalid"].append({"inventory_id": inv_id, "error": "No se pudo subir la imagen a MercadoLibre"})
+            continue
+
+        title = (custom_data.get("titles") or {}).get(str(inv_id))
+        extra_attrs = (custom_data.get("attributes") or {}).get(str(inv_id))
+        price = (custom_data.get("prices") or {}).get(str(inv_id), inv["price_1"])
+        item_stock = (custom_data.get("stocks") or {}).get(str(inv_id), stock)
+        shipping_cost = custom_data.get("shipping_cost")
+
+        payload = build_item_payload(
+            inv, ml_images, meli_category_id, price, item_stock,
+            shipping_mode=shipping_mode, listing_type_id=listing_type_id,
+            custom_title=title, extra_attributes=extra_attrs,
+            shipping_cost=shipping_cost,
+            base_url=base_url,
+        )
+
+        try:
+            validation = svc.validate_item(payload)
+            if validation.get("status") == "valid":
+                # Calculate estimated net earnings after ML fees
+                site_id = cfg.get("meli_site_id", "MLM")
+                fee_calc = _calculate_meli_net_price(svc, site_id, float(price), listing_type_id, meli_category_id)
+                results["valid"].append({
+                    "inventory_id": inv_id,
+                    "validation": validation,
+                    "price": float(price),
+                    "fee_amount": fee_calc["fee_amount"],
+                    "net_amount": fee_calc["net_amount"],
+                    "fee_pct": fee_calc["fee_pct"],
+                    "fee_source": fee_calc["source"],
+                })
+            else:
+                errors = validation.get("validation_errors", [])
+                error_msgs = [f"{e.get('field', '')}: {e.get('message', '')}" for e in errors]
+                results["invalid"].append({"inventory_id": inv_id, "error": " | ".join(error_msgs) or "Validación fallida", "validation": validation})
+        except MeliError as e:
+            err_msg = _extract_meli_error(e)
+            results["invalid"].append({"inventory_id": inv_id, "error": err_msg})
+        except Exception as e:
+            results["invalid"].append({"inventory_id": inv_id, "error": str(e)})
+
+    cur.close()
+    return results
+
+
+def publish_items(
+    tenant_conn,
+    inventory_ids: list[int],
+    meli_category_id: str,
+    listing_type_id: str = "gold_special",
+    shipping_mode: str = "me2",
+    custom_data: dict = None,
+    base_url: str = None,
+) -> dict:
+    """Publish one or more inventory items to MercadoLibre.
+
+    Returns summary dict with success/failure per item.
+    """
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    shipping_check = check_meli_shipping_config(svc, cfg)
+    if not shipping_check["ok"]:
+        return {"success": [], "failed": [{"inventory_id": "config", "error": shipping_check["error"]}]}
+
+    cur = tenant_conn.cursor()
+
+    # Batch fetch inventory rows
+    cur.execute(
+        """
+        SELECT id, part_number, name, brand, price_1, vehicle_compatibility,
+               image_url, unit, is_active
+        FROM inventory
+        WHERE id = ANY(%s) AND is_active = true
+        """,
+        (inventory_ids,),
+    )
+    rows = {r[0]: r for r in cur.fetchall()}
+
+    # Batch fetch stock
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+
+    custom_data = custom_data or {}
+    results = {"success": [], "failed": []}
+
+    for inv_id in inventory_ids:
+        row = rows.get(inv_id)
+        if not row:
+            results["failed"].append({"inventory_id": inv_id, "error": "Not found or inactive"})
+            continue
+
+        inv = {
+            "id": row[0],
+            "part_number": row[1],
+            "name": row[2],
+            "brand": row[3],
+            "price_1": float(row[4]) if row[4] else 0,
+            "vehicle_compatibility": row[5],
+            "image_url": row[6],
+            "unit": row[7],
+        }
+
+        stock = stock_map.get(inv_id, 0)
+        if stock <= 0:
+            results["failed"].append({"inventory_id": inv_id, "error": "Sin stock disponible"})
+            continue
+
+        if inv["price_1"] <= 0:
+            results["failed"].append({"inventory_id": inv_id, "error": "El precio debe ser mayor a 0"})
+            continue
+
+        # Build image list
+        images = []
+        if inv.get("image_url"):
+            images.append(inv["image_url"])
+        images = _resolve_image_urls(images, base_url)
+
+        if not images:
+            results["failed"].append({"inventory_id": inv_id, "error": "El producto no tiene imagen. ML requiere imagen para publicar."})
+            continue
+
+        # Upload images to ML hosting so they are publicly accessible
+        try:
+            ml_images = _upload_images_to_meli(svc, images)
+        except Exception as e:
+            results["failed"].append({"inventory_id": inv_id, "error": f"Error subiendo imagen a ML: {e}"})
+            continue
+
+        if not ml_images:
+            results["failed"].append({"inventory_id": inv_id, "error": "No se pudo subir la imagen a MercadoLibre"})
+            continue
+
+        title = (custom_data.get("titles") or {}).get(str(inv_id))
+        extra_attrs = (custom_data.get("attributes") or {}).get(str(inv_id))
+        price = (custom_data.get("prices") or {}).get(str(inv_id), inv["price_1"])
+        item_stock = (custom_data.get("stocks") or {}).get(str(inv_id), stock)
+        shipping_cost = custom_data.get("shipping_cost")
+
+        payload = build_item_payload(
+            inv, ml_images, meli_category_id, price, item_stock,
+            shipping_mode=shipping_mode, listing_type_id=listing_type_id,
+            custom_title=title, extra_attributes=extra_attrs,
+            shipping_cost=shipping_cost,
+            base_url=base_url,
+        )
+
+        try:
+            ml_item = svc.create_item(payload)
+            external_item_id = ml_item.get("id")
+            permalink = ml_item.get("permalink")
+
+            # Persist listing
+            cur.execute(
+                """
+                INSERT INTO marketplace_listings
+                    (inventory_id, channel, external_item_id, external_status,
+                     external_permalink, title, meli_category_id, publish_price,
+                     last_sync_at, sync_errors, is_active)
+                VALUES (%s, 'mercadolibre', %s, 'active', %s, %s, %s, %s, NOW(), NULL, true)
+                ON CONFLICT (inventory_id, channel) WHERE is_active = true
+                DO UPDATE SET
+                    external_item_id = EXCLUDED.external_item_id,
+                    external_status = EXCLUDED.external_status,
+                    external_permalink = EXCLUDED.external_permalink,
+                    title = EXCLUDED.title,
+                    meli_category_id = EXCLUDED.meli_category_id,
+                    publish_price = EXCLUDED.publish_price,
+                    last_sync_at = NOW(),
+                    sync_errors = NULL,
+                    is_active = true
+                """,
+                (
+                    inv_id,
+                    external_item_id,
+                    permalink,
+                    payload["title"],
+                    meli_category_id,
+                    inv["price_1"],
+                ),
+            )
+            tenant_conn.commit()
+            results["success"].append(
+                {"inventory_id": inv_id, "external_item_id": external_item_id, "permalink": permalink}
+            )
+        except MeliError as e:
+            tenant_conn.rollback()
+            err_msg = _extract_meli_error(e)
+            logger.warning("ML publish failed for inventory_id=%s: %s | payload=%s | response=%s", inv_id, err_msg, json.dumps(payload), e.response_body)
+            results["failed"].append({"inventory_id": inv_id, "error": err_msg})
+        except Exception as e:
+            tenant_conn.rollback()
+            logger.exception("Unexpected error publishing inventory_id=%s", inv_id)
+            results["failed"].append({"inventory_id": inv_id, "error": str(e)})
+
+    cur.close()
+    return results
+
+
+def get_listings(tenant_conn, page: int = 1, per_page: int = 50, status: str = None):
+    cur = tenant_conn.cursor()
+    where = ["1=1"]
+    params = []
+    if status:
+        where.append("external_status = %s")
+        params.append(status)
+
+    count_sql = f"SELECT COUNT(*) FROM marketplace_listings WHERE {' AND '.join(where)}"
+    cur.execute(count_sql, params)
+    total = cur.fetchone()[0]
+
+    sql = f"""
+        SELECT l.id, l.inventory_id, l.external_item_id, l.external_status,
+               l.external_permalink, l.title, l.meli_category_id, l.publish_price,
+               l.last_sync_at, l.sync_errors, l.is_active, l.created_at,
+               i.part_number, i.name, i.price_1, i.brand
+        FROM marketplace_listings l
+        LEFT JOIN inventory i ON i.id = l.inventory_id
+        WHERE {' AND '.join(where)}
+        ORDER BY l.created_at DESC
+        LIMIT %s OFFSET %s
+    """
+    cur.execute(sql, params + [per_page, (page - 1) * per_page])
+    rows = cur.fetchall()
+    cur.close()
+
+    items = []
+    for r in rows:
+        items.append({
+            "id": r[0],
+            "inventory_id": r[1],
+            "external_item_id": r[2],
+            "external_status": r[3],
+            "external_permalink": r[4],
+            "title": r[5],
+            "meli_category_id": r[6],
+            "publish_price": float(r[7]) if r[7] else None,
+            "last_sync_at": str(r[8]) if r[8] else None,
+            "sync_errors": r[9],
+            "is_active": r[10],
+            "created_at": str(r[11]),
+            "part_number": r[12],
+            "inventory_name": r[13],
+            "current_price": float(r[14]) if r[14] else None,
+            "brand": r[15],
+        })
+
+    return {"items": items, "total": total, "page": page, "per_page": per_page}
+
+
+def sync_listing(tenant_conn, listing_id: int) -> dict:
+    """Force a manual sync of stock/price for a single listing."""
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, inventory_id, external_item_id, meli_category_id
+        FROM marketplace_listings WHERE id = %s AND is_active = true
+        """,
+        (listing_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Listing not found")
+
+    listing = {
+        "id": row[0],
+        "inventory_id": row[1],
+        "external_item_id": row[2],
+        "meli_category_id": row[3],
+    }
+
+    # Get current stock/price
+    cur.execute(
+        "SELECT price_1 FROM inventory WHERE id = %s",
+        (listing["inventory_id"],),
+    )
+    price_row = cur.fetchone()
+    current_price = float(price_row[0]) if price_row and price_row[0] else 0
+
+    stock_map = get_stock_bulk(tenant_conn, branch_id=None)
+    current_stock = stock_map.get(listing["inventory_id"], 0)
+
+    try:
+        svc.update_item(
+            listing["external_item_id"],
+            {"price": round(current_price, 2), "available_quantity": max(current_stock, 0)},
+        )
+        cur.execute(
+            """
+            UPDATE marketplace_listings
+            SET last_sync_at = NOW(), sync_errors = NULL, publish_price = %s
+            WHERE id = %s
+            """,
+            (current_price, listing_id),
+        )
+        tenant_conn.commit()
+        cur.close()
+        return {"ok": True, "price": current_price, "stock": current_stock}
+    except MeliError as e:
+        tenant_conn.rollback()
+        cur.execute(
+            "UPDATE marketplace_listings SET sync_errors = %s WHERE id = %s",
+            (str(e)[:500], listing_id),
+        )
+        tenant_conn.commit()
+        cur.close()
+        raise
+
+
+def pause_listing(tenant_conn, listing_id: int) -> dict:
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT external_item_id FROM marketplace_listings WHERE id = %s",
+        (listing_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Listing not found")
+
+    svc.pause_item(row[0])
+    cur.execute(
+        "UPDATE marketplace_listings SET external_status = 'paused' WHERE id = %s",
+        (listing_id,),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"ok": True, "status": "paused"}
+
+
+def activate_listing(tenant_conn, listing_id: int) -> dict:
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT external_item_id FROM marketplace_listings WHERE id = %s",
+        (listing_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Listing not found")
+
+    svc.activate_item(row[0])
+    cur.execute(
+        "UPDATE marketplace_listings SET external_status = 'active' WHERE id = %s",
+        (listing_id,),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"ok": True, "status": "active"}
+
+
+def close_listing(tenant_conn, listing_id: int) -> dict:
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT external_item_id FROM marketplace_listings WHERE id = %s",
+        (listing_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Listing not found")
+
+    svc.close_item(row[0])
+    cur.execute(
+        "UPDATE marketplace_listings SET external_status = 'closed', is_active = false WHERE id = %s",
+        (listing_id,),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"ok": True, "status": "closed"}
+
+
+def delete_listing_permanently(tenant_conn, listing_id: int) -> dict:
+    """Hard-delete a closed listing from the local DB.
+
+    Sets listing_id = NULL on marketplace_order_items to avoid FK errors,
+    then deletes the marketplace_listings row.
+    """
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT id, external_status FROM marketplace_listings WHERE id = %s",
+        (listing_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Listing not found")
+
+    # Clear FK references so we can delete safely
+    cur.execute(
+        "UPDATE marketplace_order_items SET listing_id = NULL WHERE listing_id = %s",
+        (listing_id,),
+    )
+    cur.execute(
+        "DELETE FROM marketplace_listings WHERE id = %s",
+        (listing_id,),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"ok": True, "deleted": True}
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# QUESTIONS & ANSWERS
+# ═══════════════════════════════════════════════════════════════════════════
+
+def _upsert_question(cur, q_data: dict, listing_id_map: dict):
+    """Upsert a single question from ML API into marketplace_questions."""
+    external_qid = str(q_data.get("id"))
+    external_item_id = str(q_data.get("item_id"))
+    text = q_data.get("text", "")
+    status = q_data.get("status", "unanswered")
+    answer = q_data.get("answer", {})
+    answer_text = answer.get("text") if answer else None
+    answer_date = None
+    if answer and answer.get("date_created"):
+        answer_date = answer["date_created"]
+    from_user = q_data.get("from", {})
+    buyer_id = str(from_user.get("id")) if from_user else None
+    buyer_nickname = from_user.get("nickname") if from_user else None
+    question_date = q_data.get("date_created")
+    listing_id = listing_id_map.get(external_item_id)
+
+    cur.execute(
+        """
+        INSERT INTO marketplace_questions
+            (listing_id, external_question_id, external_item_id, question_text,
+             answer_text, status, buyer_id, buyer_nickname, question_date,
+             answer_date, raw_json, updated_at)
+        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW())
+        ON CONFLICT (external_question_id)
+        DO UPDATE SET
+            question_text = EXCLUDED.question_text,
+            answer_text = EXCLUDED.answer_text,
+            status = EXCLUDED.status,
+            buyer_id = EXCLUDED.buyer_id,
+            buyer_nickname = EXCLUDED.buyer_nickname,
+            question_date = EXCLUDED.question_date,
+            answer_date = EXCLUDED.answer_date,
+            raw_json = EXCLUDED.raw_json,
+            updated_at = NOW()
+        """,
+        (
+            listing_id,
+            external_qid,
+            external_item_id,
+            text,
+            answer_text,
+            status,
+            buyer_id,
+            buyer_nickname,
+            question_date,
+            answer_date,
+            json.dumps(q_data),
+        ),
+    )
+
+
+def sync_questions(tenant_conn) -> dict:
+    """Fetch questions from ML for all active listings and upsert locally.
+
+    Returns {"synced": N, "items": [...]}.
+    """
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, external_item_id
+        FROM marketplace_listings
+        WHERE channel = 'mercadolibre' AND is_active = true
+        """
+    )
+    listings = {r[1]: r[0] for r in cur.fetchall()}
+    cur.close()
+
+    if not listings:
+        return {"synced": 0, "items": []}
+
+    total_synced = 0
+    for item_id in listings:
+        try:
+            resp = svc.get_questions(item_id, limit=50)
+            questions = resp.get("questions", [])
+            if not questions:
+                continue
+            cur = tenant_conn.cursor()
+            for q in questions:
+                _upsert_question(cur, q, listings)
+            tenant_conn.commit()
+            cur.close()
+            total_synced += len(questions)
+        except Exception as e:
+            logger.warning("Failed to sync questions for item %s: %s", item_id, e)
+
+    return {"synced": total_synced}
+
+
+def fetch_question_from_ml(tenant_conn, external_question_id: str) -> dict:
+    """Fetch a single question from ML API and upsert locally."""
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    q_data = svc.get_question(external_question_id)
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT id, external_item_id FROM marketplace_listings WHERE external_item_id = %s",
+        (str(q_data.get("item_id")),),
+    )
+    row = cur.fetchone()
+    listing_id_map = {row[1]: row[0]} if row else {}
+    _upsert_question(cur, q_data, listing_id_map)
+    tenant_conn.commit()
+    cur.close()
+    return q_data
+
+
+def answer_question(tenant_conn, local_question_id: int, text: str) -> dict:
+    """Answer a question via ML API and update local status."""
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "SELECT external_question_id FROM marketplace_questions WHERE id = %s",
+        (local_question_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Question not found")
+    external_qid = row[0]
+    cur.close()
+
+    resp = svc.answer_question(external_qid, text)
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        UPDATE marketplace_questions
+        SET answer_text = %s, status = 'answered', answer_date = NOW(), updated_at = NOW()
+        WHERE id = %s
+        """,
+        (text, local_question_id),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"ok": True, "ml_response": resp}
+
+
+def list_local_questions(tenant_conn, status: str = None) -> list:
+    """Return questions from local DB, optionally filtered by status."""
+    cur = tenant_conn.cursor()
+    if status:
+        cur.execute(
+            """
+            SELECT q.id, q.external_question_id, q.external_item_id, q.question_text,
+                   q.answer_text, q.status, q.buyer_nickname, q.question_date,
+                   q.answer_date, q.created_at, l.title, l.external_permalink
+            FROM marketplace_questions q
+            LEFT JOIN marketplace_listings l ON l.id = q.listing_id
+            WHERE q.status = %s
+            ORDER BY q.question_date DESC
+            """,
+            (status,),
+        )
+    else:
+        cur.execute(
+            """
+            SELECT q.id, q.external_question_id, q.external_item_id, q.question_text,
+                   q.answer_text, q.status, q.buyer_nickname, q.question_date,
+                   q.answer_date, q.created_at, l.title, l.external_permalink
+            FROM marketplace_questions q
+            LEFT JOIN marketplace_listings l ON l.id = q.listing_id
+            ORDER BY q.question_date DESC
+            """
+        )
+    rows = cur.fetchall()
+    cur.close()
+    results = []
+    for r in rows:
+        results.append({
+            "id": r[0],
+            "external_question_id": r[1],
+            "external_item_id": r[2],
+            "question_text": r[3],
+            "answer_text": r[4],
+            "status": r[5],
+            "buyer_nickname": r[6],
+            "question_date": r[7],
+            "answer_date": r[8],
+            "created_at": r[9],
+            "listing_title": r[10],
+            "listing_permalink": r[11],
+        })
+    return results
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# ORDERS
+# ═══════════════════════════════════════════════════════════════════════════
+
+def fetch_and_save_orders(tenant_conn, date_from: Optional[str] = None) -> dict:
+    """Pull orders from ML and upsert into marketplace_orders."""
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    user_id = cfg.get("meli_user_id")
+    if not svc or not user_id:
+        raise ValueError("MercadoLibre not configured")
+
+    ml_resp = svc.get_orders(user_id, status="paid", date_from=date_from)
+    orders = ml_resp.get("results", [])
+
+    cur = tenant_conn.cursor()
+    created = 0
+    updated = 0
+
+    for order_summary in orders:
+        order_id = order_summary.get("id")
+        if not order_id:
+            continue
+
+        # Fetch full order detail
+        try:
+            full = svc.get_order(str(order_id))
+        except MeliError:
+            continue
+
+        external_status = full.get("status")
+        buyer = full.get("buyer", {})
+        shipping = full.get("shipping", {})
+        order_items = full.get("order_items", [])
+
+        # Build shipping address JSON
+        shipping_address = None
+        if shipping:
+            shipping_address = {
+                "id": shipping.get("id"),
+                "status": shipping.get("status"),
+                "tracking_number": shipping.get("tracking_number"),
+                "shipping_method": shipping.get("shipping_option", {}).get("name"),
+            }
+
+        total_amount = full.get("total_amount")
+        shipping_cost = shipping.get("cost") if shipping else None
+
+        # Upsert order
+        cur.execute(
+            """
+            INSERT INTO marketplace_orders
+                (channel, external_order_id, external_status, buyer_name,
+                 buyer_email, buyer_phone, buyer_nickname, shipping_address,
+                 total_amount, shipping_cost, meli_shipping_id, raw_json, updated_at)
+            VALUES ('mercadolibre', %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, NOW())
+            ON CONFLICT (external_order_id) DO UPDATE SET
+                external_status = EXCLUDED.external_status,
+                buyer_name = EXCLUDED.buyer_name,
+                buyer_email = EXCLUDED.buyer_email,
+                buyer_phone = EXCLUDED.buyer_phone,
+                shipping_address = EXCLUDED.shipping_address,
+                total_amount = EXCLUDED.total_amount,
+                shipping_cost = EXCLUDED.shipping_cost,
+                meli_shipping_id = EXCLUDED.meli_shipping_id,
+                raw_json = EXCLUDED.raw_json,
+                updated_at = NOW()
+            RETURNING id
+            """,
+            (
+                str(order_id),
+                external_status,
+                buyer.get("first_name", "") + " " + buyer.get("last_name", ""),
+                buyer.get("email"),
+                buyer.get("phone", {}).get("number"),
+                buyer.get("nickname"),
+                json.dumps(shipping_address) if shipping_address else None,
+                total_amount,
+                shipping_cost,
+                str(shipping.get("id")) if shipping else None,
+                json.dumps(full),
+            ),
+        )
+        row = cur.fetchone()
+        mpo_id = row[0] if row else None
+
+        if mpo_id:
+            # Check if this was insert or update
+            cur.execute(
+                "SELECT created_at FROM marketplace_orders WHERE id = %s",
+                (mpo_id,),
+            )
+            created_at = cur.fetchone()[0]
+            # Simple heuristic: if updated_at == created_at (within 1s), it's new
+            is_new = True  # ON CONFLICT always returns id; we count as updated for simplicity
+            updated += 1
+
+        # Upsert order items
+        if mpo_id and order_items:
+            # Clear old items and re-insert
+            cur.execute(
+                "DELETE FROM marketplace_order_items WHERE marketplace_order_id = %s",
+                (mpo_id,),
+            )
+            for it in order_items:
+                item_data = it.get("item", {})
+                cur.execute(
+                    """
+                    INSERT INTO marketplace_order_items
+                        (marketplace_order_id, external_item_id, title,
+                         quantity, unit_price, total_price)
+                    VALUES (%s, %s, %s, %s, %s, %s)
+                    """,
+                    (
+                        mpo_id,
+                        item_data.get("id"),
+                        item_data.get("title"),
+                        it.get("quantity"),
+                        it.get("unit_price"),
+                        it.get("full_unit_price"),
+                    ),
+                )
+
+    tenant_conn.commit()
+    cur.close()
+    return {"processed": len(orders), "updated": updated}
+
+
+def get_orders(tenant_conn, page=1, per_page=50, status=None):
+    cur = tenant_conn.cursor()
+    where = ["1=1"]
+    params = []
+    if status:
+        where.append("status = %s")
+        params.append(status)
+
+    cur.execute(
+        f"SELECT COUNT(*) FROM marketplace_orders WHERE {' AND '.join(where)}",
+        params,
+    )
+    total = cur.fetchone()[0]
+
+    cur.execute(
+        f"""
+        SELECT o.id, o.external_order_id, o.external_status, o.buyer_name,
+               o.buyer_nickname, o.total_amount, o.status, o.created_at,
+               o.nexus_sale_id
+        FROM marketplace_orders o
+        WHERE {' AND '.join(where)}
+        ORDER BY o.created_at DESC
+        LIMIT %s OFFSET %s
+        """,
+        params + [per_page, (page - 1) * per_page],
+    )
+    rows = cur.fetchall()
+    cur.close()
+
+    items = []
+    for r in rows:
+        items.append({
+            "id": r[0],
+            "external_order_id": r[1],
+            "external_status": r[2],
+            "buyer_name": r[3],
+            "buyer_nickname": r[4],
+            "total_amount": float(r[5]) if r[5] else None,
+            "status": r[6],
+            "created_at": str(r[7]),
+            "nexus_sale_id": r[8],
+        })
+    return {"items": items, "total": total, "page": page, "per_page": per_page}
+
+
+def get_order_detail(tenant_conn, order_id: int) -> dict:
+    cur = tenant_conn.cursor()
+    cur.execute(
+        """
+        SELECT id, external_order_id, external_status, buyer_name, buyer_email,
+               buyer_phone, buyer_nickname, shipping_address, total_amount,
+               shipping_cost, meli_shipping_id, nexus_sale_id, status, notes,
+               raw_json, created_at, updated_at
+        FROM marketplace_orders WHERE id = %s
+        """,
+        (order_id,),
+    )
+    row = cur.fetchone()
+    if not row:
+        cur.close()
+        raise ValueError("Order not found")
+
+    order = {
+        "id": row[0],
+        "external_order_id": row[1],
+        "external_status": row[2],
+        "buyer_name": row[3],
+        "buyer_email": row[4],
+        "buyer_phone": row[5],
+        "buyer_nickname": row[6],
+        "shipping_address": row[7],
+        "total_amount": float(row[8]) if row[8] else None,
+        "shipping_cost": float(row[9]) if row[9] else None,
+        "meli_shipping_id": row[10],
+        "nexus_sale_id": row[11],
+        "status": row[12],
+        "notes": row[13],
+        "raw_json": row[14],
+        "created_at": str(row[15]),
+        "updated_at": str(row[16]),
+    }
+
+    cur.execute(
+        """
+        SELECT id, inventory_id, external_item_id, title, quantity,
+               unit_price, total_price
+        FROM marketplace_order_items WHERE marketplace_order_id = %s
+        """,
+        (order_id,),
+    )
+    items = []
+    for r in cur.fetchall():
+        items.append({
+            "id": r[0],
+            "inventory_id": r[1],
+            "external_item_id": r[2],
+            "title": r[3],
+            "quantity": r[4],
+            "unit_price": float(r[5]) if r[5] else None,
+            "total_price": float(r[6]) if r[6] else None,
+        })
+    order["items"] = items
+    cur.close()
+    return order
+
+
+def update_order_status(tenant_conn, order_id: int, new_status: str) -> dict:
+    valid = {"pending", "confirmed", "packed", "shipped", "delivered", "cancelled", "rejected"}
+    if new_status not in valid:
+        raise ValueError(f"Invalid status. Allowed: {valid}")
+
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "UPDATE marketplace_orders SET status = %s, updated_at = NOW() WHERE id = %s RETURNING external_order_id",
+        (new_status, order_id),
+    )
+    row = cur.fetchone()
+    tenant_conn.commit()
+    cur.close()
+    if not row:
+        raise ValueError("Order not found")
+    return {"ok": True, "status": new_status, "external_order_id": row[0]}
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# CONVERT ORDER → SALE
+# ═══════════════════════════════════════════════════════════════════════════
+
+def convert_order_to_sale(
+    tenant_conn, marketplace_order_id: int, employee_id: int = None, register_id: int = None
+) -> dict:
+    """Convert a marketplace order into a Nexus sale.
+
+    1. Look up marketplace_order + items
+    2. Map items to inventory_id (via marketplace_listings external_item_id)
+    3. Build sale_data compatible with process_sale()
+    4. Call process_sale()
+    5. Link sale back to marketplace_order
+    """
+    order = get_order_detail(tenant_conn, marketplace_order_id)
+    if order.get("nexus_sale_id"):
+        raise ValueError("Order already converted to sale")
+
+    cur = tenant_conn.cursor()
+
+    # Build sale items
+    sale_items = []
+    for it in order["items"]:
+        # Map external_item_id -> inventory_id via marketplace_listings
+        cur.execute(
+            "SELECT inventory_id FROM marketplace_listings WHERE external_item_id = %s LIMIT 1",
+            (it["external_item_id"],),
+        )
+        inv_row = cur.fetchone()
+        inventory_id = inv_row[0] if inv_row else None
+
+        if not inventory_id:
+            # Try to match by title fuzzy? Skip for now.
+            cur.close()
+            raise ValueError(f"Could not map item {it['external_item_id']} to inventory")
+
+        sale_items.append({
+            "inventory_id": inventory_id,
+            "quantity": it["quantity"],
+            "unit_price": float(it["unit_price"] or 0),
+            "discount_pct": 0,
+            "tax_rate": 0.16,
+        })
+
+    # Find or create generic "MercadoLibre" customer
+    cur.execute(
+        "SELECT id FROM customers WHERE name = 'MercadoLibre' LIMIT 1"
+    )
+    cust = cur.fetchone()
+    if cust:
+        customer_id = cust[0]
+    else:
+        cur.execute(
+            """
+            INSERT INTO customers (name, email, phone, is_active, price_tier)
+            VALUES ('MercadoLibre', 'marketplace@mercadolibre.com', '', true, 1)
+            RETURNING id
+            """
+        )
+        customer_id = cur.fetchone()[0]
+
+    # Build sale_data
+    sale_data = {
+        "items": sale_items,
+        "customer_id": customer_id,
+        "payment_method": "transferencia",
+        "sale_type": "cash",
+        "register_id": register_id,
+        "amount_paid": float(order["total_amount"] or 0),
+        "notes": f"MercadoLibre order #{order['external_order_id']}",
+    }
+
+    # We need to run process_sale inside the same connection.
+    # process_sale expects the caller to commit. We'll do that.
+    # However, process_sale uses flask.g for employee_id and branch_id.
+    # We need to set those or pass them explicitly.
+    # For now, we'll create the sale manually to avoid flask.g dependency.
+
+    sale = _create_sale_manual(tenant_conn, sale_data, employee_id=employee_id)
+
+    # Link order to sale
+    cur.execute(
+        "UPDATE marketplace_orders SET nexus_sale_id = %s, status = 'confirmed', updated_at = NOW() WHERE id = %s",
+        (sale["id"], marketplace_order_id),
+    )
+    tenant_conn.commit()
+    cur.close()
+    return {"sale_id": sale["id"], "marketplace_order_id": marketplace_order_id}
+
+
+def _create_sale_manual(tenant_conn, sale_data: dict, employee_id: int = None) -> dict:
+    """Create a sale record without relying on flask.g.
+
+    Simplified version of process_sale for background / external use.
+    """
+    from services.inventory_engine import record_sale as inventory_record_sale
+    from decimal import Decimal, ROUND_HALF_UP
+
+    cur = tenant_conn.cursor()
+    items = sale_data.get("items", [])
+    customer_id = sale_data.get("customer_id")
+    payment_method = sale_data.get("payment_method", "efectivo")
+    sale_type = sale_data.get("sale_type", "cash")
+    register_id = sale_data.get("register_id")
+    amount_paid = float(sale_data.get("amount_paid", 0))
+    notes = sale_data.get("notes")
+
+    if not items:
+        raise ValueError("No items in sale")
+
+    # Enrich items
+    inv_ids = [it["inventory_id"] for it in items]
+    cur.execute(
+        """
+        SELECT id, part_number, name, cost, price_1, tax_rate
+        FROM inventory WHERE id = ANY(%s) AND is_active = true
+        ORDER BY id FOR UPDATE
+        """,
+        (inv_ids,),
+    )
+    inv_map = {r[0]: r for r in cur.fetchall()}
+
+    enriched = []
+    for it in items:
+        inv_id = it["inventory_id"]
+        inv = inv_map.get(inv_id)
+        if not inv:
+            raise ValueError(f"Inventory item {inv_id} not found")
+        qty = int(it.get("quantity", 1))
+        unit_price = float(it.get("unit_price", inv[4] or 0))
+        discount_pct = float(it.get("discount_pct", 0))
+        tax_rate = float(it.get("tax_rate", inv[5] or 0.16))
+        unit_cost = float(inv[3]) if inv[3] else 0
+
+        enriched.append({
+            "inventory_id": inv_id,
+            "part_number": inv[1],
+            "name": inv[2],
+            "quantity": qty,
+            "unit_price": unit_price,
+            "unit_cost": unit_cost,
+            "discount_pct": discount_pct,
+            "tax_rate": tax_rate,
+        })
+
+    totals = calculate_totals(enriched)
+
+    # Insert sale
+    cur.execute(
+        """
+        INSERT INTO sales
+            (customer_id, employee_id, register_id, sale_type, payment_method,
+             subtotal, discount_total, tax_total, total, amount_paid, change_given,
+             status, notes, source, external_order_id)
+        VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, 'completed', %s, 'mercadolibre', %s)
+        RETURNING id
+        """,
+        (
+            customer_id,
+            employee_id,
+            register_id,
+            sale_type,
+            payment_method,
+            totals["subtotal"],
+            totals["discount_total"],
+            totals["tax_total"],
+            totals["total"],
+            amount_paid,
+            0,
+            notes,
+            sale_data.get("external_order_id"),
+        ),
+    )
+    sale_id = cur.fetchone()[0]
+
+    # Insert sale_items
+    for it in totals["items"]:
+        cur.execute(
+            """
+            INSERT INTO sale_items
+                (sale_id, inventory_id, part_number, name, quantity, unit_price,
+                 unit_cost, discount_pct, discount_amount, tax_rate, tax_amount, subtotal)
+            VALUES (%s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s, %s)
+            """,
+            (
+                sale_id,
+                it["inventory_id"],
+                it["part_number"],
+                it["name"],
+                it["quantity"],
+                it["unit_price"],
+                it.get("unit_cost", 0),
+                it.get("discount_pct", 0),
+                it.get("discount_amount", 0),
+                it.get("tax_rate", 0.16),
+                it.get("tax_amount", 0),
+                it["subtotal"],
+            ),
+        )
+
+    # Deduct inventory
+    for it in enriched:
+        inventory_record_sale(
+            tenant_conn, it["inventory_id"], it["quantity"], reference=f"ML sale {sale_id}"
+        )
+
+    tenant_conn.commit()
+    cur.close()
+    return {"id": sale_id, **totals}
+
+
+# ═══════════════════════════════════════════════════════════════════════════
+# IMPORT EXISTING LISTINGS FROM ML
+# ═══════════════════════════════════════════════════════════════════════════
+
+def process_meli_sync_queue(tenant_conn, batch_size: int = 50) -> dict:
+    """Process pending meli_sync_queue items and update stock on MercadoLibre.
+
+    Called by a cronjob or manual trigger.
+    """
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    if not svc:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT id, inventory_id FROM meli_sync_queue
+        WHERE status = 'pending'
+        ORDER BY created_at ASC
+        LIMIT %s
+    """, (batch_size,))
+    items = cur.fetchall()
+
+    processed = 0
+    failed = 0
+
+    for queue_id, inventory_id in items:
+        # Get current stock
+        from services.inventory_engine import get_stock
+        stock = get_stock(tenant_conn, inventory_id, branch_id=None)
+
+        # Find the ML listing
+        cur.execute("""
+            SELECT external_item_id FROM marketplace_listings
+            WHERE inventory_id = %s AND channel = 'mercadolibre' AND is_active = true
+            LIMIT 1
+        """, (inventory_id,))
+        row = cur.fetchone()
+        if not row:
+            # No active listing, mark as done
+            cur.execute("""
+                UPDATE meli_sync_queue SET status = 'done', processed_at = NOW()
+                WHERE id = %s
+            """, (queue_id,))
+            tenant_conn.commit()
+            processed += 1
+            continue
+
+        external_item_id = row[0]
+
+        try:
+            svc.update_item(external_item_id, {"available_quantity": max(0, int(stock))})
+            cur.execute("""
+                UPDATE meli_sync_queue SET status = 'done', processed_at = NOW()
+                WHERE id = %s
+            """, (queue_id,))
+            tenant_conn.commit()
+            processed += 1
+        except MeliError as e:
+            tenant_conn.rollback()
+            err_msg = _extract_meli_error(e)
+            cur.execute("""
+                UPDATE meli_sync_queue
+                SET status = 'failed', retry_count = retry_count + 1,
+                    error_message = %s, processed_at = NOW()
+                WHERE id = %s
+            """, (err_msg[:500], queue_id))
+            tenant_conn.commit()
+            failed += 1
+        except Exception:
+            tenant_conn.rollback()
+            cur.execute("""
+                UPDATE meli_sync_queue
+                SET status = 'failed', retry_count = retry_count + 1,
+                    error_message = 'Unexpected error', processed_at = NOW()
+                WHERE id = %s
+            """, (queue_id,))
+            tenant_conn.commit()
+            failed += 1
+
+    cur.close()
+    return {"processed": processed, "failed": failed, "total": len(items)}
+
+
+def import_existing_listings(tenant_conn, page_limit: int = 50) -> dict:
+    """Import all existing MercadoLibre listings for the connected seller.
+
+    For each ML item, tries to match it to a local inventory product by:
+    1. seller_custom_field (if it contains a part_number)
+    2. inventory_sku_aliases.sku matching the ML item id
+    3. inventory.part_number matching the ML item id or title
+
+    Returns summary of imported / unmatched items.
+    """
+    cfg = get_meli_config(tenant_conn)
+    svc = _get_meli_service(cfg)
+    user_id = cfg.get("meli_user_id")
+    if not svc or not user_id:
+        raise ValueError("MercadoLibre not configured")
+
+    cur = tenant_conn.cursor()
+
+    # Build lookup maps for matching
+    cur.execute("SELECT id, part_number FROM inventory WHERE is_active = true")
+    inv_by_part = {r[1].strip().upper(): r[0] for r in cur.fetchall() if r[1]}
+
+    cur.execute("SELECT inventory_id, sku FROM inventory_sku_aliases WHERE is_active = true")
+    inv_by_sku = {r[1].strip().upper(): r[0] for r in cur.fetchall() if r[1]}
+
+    imported = 0
+    unmatched = 0
+    errors = 0
+    offset = 0
+
+    while True:
+        try:
+            resp = svc.get_user_items(str(user_id), limit=page_limit, offset=offset)
+        except MeliError as e:
+            cur.close()
+            raise ValueError(f"Failed to fetch items: {e}")
+
+        results = resp.get("results", [])
+        if not results:
+            break
+
+        for item_id in results:
+            try:
+                item = svc.get_item(item_id)
+            except MeliError:
+                errors += 1
+                continue
+
+            title = item.get("title", "")
+            price = item.get("price", 0)
+            status = item.get("status", "active")
+            permalink = item.get("permalink", "")
+            category_id = item.get("category_id", "")
+            custom_field = item.get("seller_custom_field", "") or ""
+
+            # Try to match to local inventory
+            inventory_id = None
+            cf_upper = custom_field.strip().upper()
+            if cf_upper and cf_upper in inv_by_part:
+                inventory_id = inv_by_part[cf_upper]
+            elif cf_upper and cf_upper in inv_by_sku:
+                inventory_id = inv_by_sku[cf_upper]
+            else:
+                item_id_upper = str(item_id).strip().upper()
+                if item_id_upper in inv_by_sku:
+                    inventory_id = inv_by_sku[item_id_upper]
+                elif item_id_upper in inv_by_part:
+                    inventory_id = inv_by_part[item_id_upper]
+
+            # Upsert listing
+            try:
+                cur.execute(
+                    """
+                    INSERT INTO marketplace_listings
+                        (inventory_id, channel, external_item_id, external_status,
+                         external_permalink, title, meli_category_id, publish_price,
+                         last_sync_at, sync_errors, is_active)
+                    VALUES (%s, 'mercadolibre', %s, %s, %s, %s, %s, %s, NOW(), NULL, true)
+                    ON CONFLICT (inventory_id, channel) WHERE is_active = true
+                    DO UPDATE SET
+                        external_item_id = EXCLUDED.external_item_id,
+                        external_status = EXCLUDED.external_status,
+                        external_permalink = EXCLUDED.external_permalink,
+                        title = EXCLUDED.title,
+                        meli_category_id = EXCLUDED.meli_category_id,
+                        publish_price = EXCLUDED.publish_price,
+                        last_sync_at = NOW(),
+                        sync_errors = NULL,
+                        is_active = true
+                    """,
+                    (
+                        inventory_id,
+                        str(item_id),
+                        status,
+                        permalink,
+                        title,
+                        category_id,
+                        price,
+                    ),
+                )
+                tenant_conn.commit()
+                if inventory_id:
+                    imported += 1
+                else:
+                    unmatched += 1
+            except Exception:
+                tenant_conn.rollback()
+                errors += 1
+
+        if len(results) < page_limit:
+            break
+        offset += page_limit
+
+    cur.close()
+    return {
+        "imported": imported,
+        "unmatched": unmatched,
+        "errors": errors,
+        "total_processed": imported + unmatched + errors,
+    }
diff --git a/pos/services/marketplace_service.py b/pos/services/marketplace_service.py
index 93e4bf6..465d4ea 100644
--- a/pos/services/marketplace_service.py
+++ b/pos/services/marketplace_service.py
@@ -136,15 +136,15 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
     Expected columns (case-insensitive, whitespace-tolerant):
         part_number, stock, price
     Optional:
-        min_order, warehouse_location, currency
+        name, min_order, warehouse_location, currency
 
     Resolution rules:
-      - part_number matches `parts.oem_part_number` exactly (case-sensitive).
-      - Parts not found in the master catalog are skipped and reported.
-      - Existing rows for (bodega_id, part_id, warehouse_location) are updated
-        via UPSERT; new rows are inserted.
+      - part_number matches `parts.oem_part_number` or `part_cross_references.cross_reference_number`.
+      - If matched → linked to catalog (part_id set, seller fields NULL).
+      - If NOT matched → created as seller listing (part_id NULL, seller_part_number set).
+      - Existing rows are updated via UPSERT on the composite unique key.
 
-    Returns a summary dict: {ok, inserted, updated, skipped, errors}
+    Returns a summary dict: {ok, inserted, updated, skipped, errors, oem_count, seller_count}
     """
     reader = csv.DictReader(io.StringIO(csv_text))
     # Normalize header names
@@ -166,9 +166,15 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
         cur.close()
         return {'ok': False, 'error': f'bodega_id {bodega_id} no existe'}
 
+    # Pre-load cross-reference map for fast lookup
+    cur.execute("SELECT cross_reference_number, oem_part_id FROM part_cross_references")
+    xref_map = {row[0].strip(): row[1] for row in cur.fetchall()}
+
     inserted = 0
     updated = 0
     skipped = 0
+    oem_count = 0
+    seller_count = 0
     errors = []
 
     for i, row in enumerate(reader, start=2):  # start=2 because row 1 is headers
@@ -176,6 +182,7 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
         part_number = norm.get('part_number', '')
         stock_str = norm.get('stock', '0')
         price_str = norm.get('price', '0')
+        part_name = norm.get('name', '')
 
         if not part_number:
             errors.append(f'Fila {i}: part_number vacio')
@@ -190,17 +197,20 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
             skipped += 1
             continue
 
-        # Resolve part_number → part_id
+        # Resolve part_number → part_id (OEM catalog or cross-reference)
+        part_id = None
         cur.execute(
             "SELECT id_part FROM parts WHERE oem_part_number = %s LIMIT 1",
             (part_number,)
         )
         row_part = cur.fetchone()
-        if not row_part:
-            errors.append(f'Fila {i}: part_number "{part_number}" no encontrado en catalogo')
-            skipped += 1
-            continue
-        part_id = row_part[0]
+        if row_part:
+            part_id = row_part[0]
+        else:
+            # Try cross-reference
+            xref_id = xref_map.get(part_number)
+            if xref_id:
+                part_id = xref_id
 
         # Resolve user_id from the bodega (use bodega_id as fallback if null)
         user_id = norm.get('user_id') or bodega_id  # backward compat
@@ -213,24 +223,48 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
         currency = (norm.get('currency') or 'MXN').upper()
         min_order = int(norm.get('min_order') or 1)
 
-        # UPSERT on (user_id, part_id, warehouse_location) — the existing
-        # unique constraint. Don't block if user_id FK fails.
+        # UPSERT on composite unique (bodega_id, part_id, seller_part_number, warehouse_location)
         try:
-            cur.execute("""
-                INSERT INTO warehouse_inventory
-                    (user_id, part_id, price, stock_quantity, min_order_quantity,
-                     warehouse_location, bodega_id, currency, updated_at)
-                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, NOW())
-                ON CONFLICT (user_id, part_id, warehouse_location)
-                DO UPDATE SET
-                    price = EXCLUDED.price,
-                    stock_quantity = EXCLUDED.stock_quantity,
-                    min_order_quantity = EXCLUDED.min_order_quantity,
-                    bodega_id = EXCLUDED.bodega_id,
-                    currency = EXCLUDED.currency,
-                    updated_at = NOW()
-                RETURNING (xmax = 0) AS inserted
-            """, (user_id, part_id, price, stock, min_order, location, bodega_id, currency))
+            if part_id:
+                # OEM-matched listing
+                cur.execute("""
+                    INSERT INTO warehouse_inventory
+                        (user_id, part_id, seller_part_number, seller_part_name,
+                         price, stock_quantity, min_order_quantity,
+                         warehouse_location, bodega_id, currency, updated_at)
+                    VALUES (%s, %s, NULL, NULL, %s, %s, %s, %s, %s, %s, NOW())
+                    ON CONFLICT (bodega_id, part_id, warehouse_location) WHERE part_id IS NOT NULL
+                    DO UPDATE SET
+                        price = EXCLUDED.price,
+                        stock_quantity = EXCLUDED.stock_quantity,
+                        min_order_quantity = EXCLUDED.min_order_quantity,
+                        user_id = EXCLUDED.user_id,
+                        currency = EXCLUDED.currency,
+                        updated_at = NOW()
+                    RETURNING (xmax = 0) AS inserted
+                """, (user_id, part_id, price, stock, min_order, location, bodega_id, currency))
+                oem_count += 1
+            else:
+                # Seller listing (no catalog match)
+                cur.execute("""
+                    INSERT INTO warehouse_inventory
+                        (user_id, part_id, seller_part_number, seller_part_name,
+                         price, stock_quantity, min_order_quantity,
+                         warehouse_location, bodega_id, currency, updated_at)
+                    VALUES (%s, NULL, %s, %s, %s, %s, %s, %s, %s, %s, NOW())
+                    ON CONFLICT (bodega_id, seller_part_number, warehouse_location) WHERE part_id IS NULL
+                    DO UPDATE SET
+                        price = EXCLUDED.price,
+                        stock_quantity = EXCLUDED.stock_quantity,
+                        min_order_quantity = EXCLUDED.min_order_quantity,
+                        seller_part_name = EXCLUDED.seller_part_name,
+                        user_id = EXCLUDED.user_id,
+                        currency = EXCLUDED.currency,
+                        updated_at = NOW()
+                    RETURNING (xmax = 0) AS inserted
+                """, (user_id, part_number, part_name or part_number, price, stock, min_order, location, bodega_id, currency))
+                seller_count += 1
+
             was_insert = cur.fetchone()[0]
             if was_insert:
                 inserted += 1
@@ -250,6 +284,8 @@ def upload_inventory_csv(master_conn, bodega_id: int, csv_text: str) -> dict:
         'inserted': inserted,
         'updated': updated,
         'skipped': skipped,
+        'oem_count': oem_count,
+        'seller_count': seller_count,
         'errors': errors[:20],  # cap to avoid huge responses
         'total_errors': len(errors),
     }
@@ -262,70 +298,114 @@ def search_inventory(master_conn, *, query: str = None, brand: str = None,
     Returns parts WITH stock > 0 from VERIFIED bodegas only.
     Aggregates identical parts across bodegas so the buyer sees each part once
     with a list of bodegas that have it in stock.
+
+    Includes both OEM-matched parts (part_id IS NOT NULL) and seller listings
+    (part_id IS NULL) in a single unified result set.
     """
     cur = master_conn.cursor()
 
-    clauses = ["wi.stock_quantity > 0", "b.verified = TRUE"]
-    params = []
+    like = f'%{query}%' if query else None
+    city_lower = city.lower() if city else None
+    params_common = []
+
+    # Build city filter once
+    city_clause = ""
+    if city_lower:
+        city_clause = "AND LOWER(b.city) = LOWER(%s)"
+        params_common.append(city)
+
+    # ─── Part A: OEM-matched parts (JOIN with parts catalog) ──────────
+    clauses_oem = ["wi.stock_quantity > 0", "b.verified = TRUE", "wi.part_id IS NOT NULL"]
+    params_oem = []
 
     if query:
-        clauses.append("(p.oem_part_number ILIKE %s OR p.name_part ILIKE %s OR COALESCE(p.name_es, '') ILIKE %s)")
-        like = f'%{query}%'
-        params.extend([like, like, like])
+        clauses_oem.append("(p.oem_part_number ILIKE %s OR p.name_part ILIKE %s OR COALESCE(p.name_es, '') ILIKE %s)")
+        params_oem.extend([like, like, like])
 
     if brand:
-        # Search by vehicle brand via vehicle_parts → model_year_engine → models → brands.
-        # Too slow for this MVP. Instead, match on aftermarket manufacturer name.
-        clauses.append("""
+        clauses_oem.append("""
             EXISTS (
                 SELECT 1 FROM aftermarket_parts ap
                 JOIN manufacturers m ON m.id_manufacture = ap.manufacturer_id
                 WHERE ap.oem_part_id = p.id_part AND UPPER(m.name_manufacture) = UPPER(%s)
             )
         """)
-        params.append(brand)
+        params_oem.append(brand)
 
-    if city:
-        clauses.append("LOWER(b.city) = LOWER(%s)")
-        params.append(city)
+    where_oem = " AND ".join(clauses_oem)
 
-    where_sql = " AND ".join(clauses)
+    # ─── Part B: Seller listings (no parts catalog join) ──────────────
+    clauses_seller = ["wi.stock_quantity > 0", "b.verified = TRUE", "wi.part_id IS NULL"]
+    params_seller = []
 
-    cur.execute(f"""
-        SELECT
-            p.id_part,
-            p.oem_part_number,
-            COALESCE(p.name_es, p.name_part) AS name,
-            p.image_url,
-            COUNT(DISTINCT b.id_bodega) AS bodega_count,
-            MIN(wi.price) AS min_price,
-            MAX(wi.price) AS max_price,
-            SUM(wi.stock_quantity) AS total_stock,
-            -- List of bodega names that have this part in stock
-            ARRAY_AGG(DISTINCT b.name ORDER BY b.name) AS bodega_names
-        FROM warehouse_inventory wi
-        JOIN bodegas b ON b.id_bodega = wi.bodega_id
-        JOIN parts p ON p.id_part = wi.part_id
-        WHERE {where_sql}
-        GROUP BY p.id_part, p.oem_part_number, p.name_es, p.name_part, p.image_url
+    if query:
+        clauses_seller.append("(wi.seller_part_number ILIKE %s OR wi.seller_part_name ILIKE %s)")
+        params_seller.extend([like, like])
+
+    where_seller = " AND ".join(clauses_seller)
+
+    # Combined query with UNION ALL
+    sql = f"""
+        SELECT * FROM (
+            -- OEM-matched parts
+            SELECT
+                p.id_part AS id,
+                p.oem_part_number AS part_number,
+                COALESCE(p.name_es, p.name_part) AS name,
+                p.image_url,
+                COUNT(DISTINCT b.id_bodega) AS bodega_count,
+                MIN(wi.price) AS min_price,
+                MAX(wi.price) AS max_price,
+                SUM(wi.stock_quantity) AS total_stock,
+                ARRAY_AGG(DISTINCT b.name ORDER BY b.name) AS bodega_names,
+                'oem' AS listing_type
+            FROM warehouse_inventory wi
+            JOIN bodegas b ON b.id_bodega = wi.bodega_id
+            JOIN parts p ON p.id_part = wi.part_id
+            WHERE {where_oem} {city_clause}
+            GROUP BY p.id_part, p.oem_part_number, p.name_es, p.name_part, p.image_url
+
+            UNION ALL
+
+            -- Seller listings
+            SELECT
+                wi.id_inventory AS id,
+                wi.seller_part_number AS part_number,
+                wi.seller_part_name AS name,
+                NULL AS image_url,
+                COUNT(DISTINCT b.id_bodega) AS bodega_count,
+                MIN(wi.price) AS min_price,
+                MAX(wi.price) AS max_price,
+                SUM(wi.stock_quantity) AS total_stock,
+                ARRAY_AGG(DISTINCT b.name ORDER BY b.name) AS bodega_names,
+                'seller' AS listing_type
+            FROM warehouse_inventory wi
+            JOIN bodegas b ON b.id_bodega = wi.bodega_id
+            WHERE {where_seller} {city_clause}
+            GROUP BY wi.id_inventory, wi.seller_part_number, wi.seller_part_name
+        ) combined
         ORDER BY total_stock DESC
         LIMIT %s
-    """, params + [limit])
+    """
+
+    all_params = params_oem + params_common + params_seller + params_common + [limit]
+    cur.execute(sql, all_params)
 
     rows = cur.fetchall()
     cur.close()
 
     return [
         {
-            'id_part': r[0],
-            'oem_part_number': r[1],
+            'id': r[0],
+            'part_number': r[1],
             'name': r[2],
             'image_url': r[3],
             'bodega_count': r[4],
             'min_price': float(r[5]) if r[5] is not None else None,
             'max_price': float(r[6]) if r[6] is not None else None,
             'total_stock_hint': 'En stock' if (r[7] or 0) > 0 else 'Consultar',
-            'bodega_names': r[8],  # may expose; adjust if sensitive
+            'bodega_names': r[8],
+            'listing_type': r[9],
         }
         for r in rows
     ]
@@ -358,6 +438,33 @@ def get_bodegas_with_part(master_conn, part_id: int) -> list[dict]:
     ]
 
 
+def get_bodegas_with_listing(master_conn, wi_id: int) -> list[dict]:
+    """Return the list of verified bodegas that have a specific seller listing
+    (warehouse_inventory row with part_id IS NULL) in stock.
+    """
+    cur = master_conn.cursor()
+    cur.execute("""
+        SELECT b.id_bodega, b.name, b.city, b.whatsapp_phone,
+               wi.price, wi.stock_quantity, wi.min_order_quantity, wi.currency
+        FROM warehouse_inventory wi
+        JOIN bodegas b ON b.id_bodega = wi.bodega_id
+        WHERE wi.id_inventory = %s AND wi.stock_quantity > 0 AND b.verified = TRUE
+        ORDER BY wi.price ASC
+    """, (wi_id,))
+    rows = cur.fetchall()
+    cur.close()
+    return [
+        {
+            'id_bodega': r[0], 'name': r[1], 'city': r[2], 'whatsapp_phone': r[3],
+            'price': float(r[4]) if r[4] is not None else None,
+            'stock_hint': 'En stock',
+            'min_order': r[6] or 1,
+            'currency': r[7] or 'MXN',
+        }
+        for r in rows
+    ]
+
+
 # ═══════════════════════════════════════════════════════════════════════════
 # PURCHASE ORDERS
 # ═══════════════════════════════════════════════════════════════════════════
@@ -397,32 +504,60 @@ def create_po_draft(master_conn, *, buyer_tenant_id: int, buyer_user_id: int,
     # Insert items
     total = 0.0
     for item in items:
-        part_id = int(item['part_id'])
+        part_id = item.get('part_id')
+        wi_id = item.get('wi_id')
         quantity = int(item['quantity'])
         if quantity < 1:
             continue
 
-        # Lookup part info + price
-        cur.execute("""
-            SELECT p.oem_part_number, COALESCE(p.name_es, p.name_part), wi.price
-            FROM parts p
-            LEFT JOIN warehouse_inventory wi
-                ON wi.part_id = p.id_part AND wi.bodega_id = %s
-            WHERE p.id_part = %s LIMIT 1
-        """, (bodega_id, part_id))
-        r = cur.fetchone()
-        if not r:
-            continue
-        oem, name, db_price = r
-        unit_price = float(item.get('unit_price') or db_price or 0)
-        subtotal = round(unit_price * quantity, 2)
-        total += subtotal
+        if part_id:
+            # OEM-matched part
+            part_id = int(part_id)
+            cur.execute("""
+                SELECT p.oem_part_number, COALESCE(p.name_es, p.name_part), wi.price
+                FROM parts p
+                LEFT JOIN warehouse_inventory wi
+                    ON wi.part_id = p.id_part AND wi.bodega_id = %s
+                WHERE p.id_part = %s LIMIT 1
+            """, (bodega_id, part_id))
+            r = cur.fetchone()
+            if not r:
+                continue
+            oem, name, db_price = r
+            unit_price = float(item.get('unit_price') or db_price or 0)
+            subtotal = round(unit_price * quantity, 2)
+            total += subtotal
 
-        cur.execute("""
-            INSERT INTO purchase_order_items
-                (po_id, part_id, oem_part_number, part_name, quantity, unit_price, subtotal, notes)
-            VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
-        """, (po_id, part_id, oem, name, quantity, unit_price, subtotal, item.get('notes')))
+            cur.execute("""
+                INSERT INTO purchase_order_items
+                    (po_id, part_id, oem_part_number, part_name, quantity, unit_price, subtotal, notes, is_seller_listing)
+                VALUES (%s, %s, %s, %s, %s, %s, %s, %s, FALSE)
+            """, (po_id, part_id, oem, name, quantity, unit_price, subtotal, item.get('notes')))
+
+        elif wi_id:
+            # Seller listing (no catalog match)
+            wi_id = int(wi_id)
+            cur.execute("""
+                SELECT seller_part_number, seller_part_name, price
+                FROM warehouse_inventory
+                WHERE id_inventory = %s AND bodega_id = %s LIMIT 1
+            """, (wi_id, bodega_id))
+            r = cur.fetchone()
+            if not r:
+                continue
+            seller_pn, seller_name, db_price = r
+            unit_price = float(item.get('unit_price') or db_price or 0)
+            subtotal = round(unit_price * quantity, 2)
+            total += subtotal
+
+            cur.execute("""
+                INSERT INTO purchase_order_items
+                    (po_id, part_id, oem_part_number, part_name, quantity, unit_price, subtotal, notes, is_seller_listing)
+                VALUES (%s, NULL, %s, %s, %s, %s, %s, %s, TRUE)
+            """, (po_id, seller_pn, seller_name or seller_pn, quantity, unit_price, subtotal, item.get('notes')))
+
+        else:
+            continue
 
     # Update header total
     cur.execute("UPDATE purchase_orders SET total_amount = %s WHERE id_po = %s",
diff --git a/pos/services/meli_service.py b/pos/services/meli_service.py
new file mode 100644
index 0000000..15b4fee
--- /dev/null
+++ b/pos/services/meli_service.py
@@ -0,0 +1,327 @@
+"""MercadoLibre API client with OAuth2 auto-refresh.
+
+Endpoints used:
+  - GET  /users/me
+  - POST /items
+  - PUT  /items/{id}
+  - GET  /items/{id}
+  - GET  /orders/search
+  - GET  /orders/{id}
+  - POST /shipments/{id}/dispatch
+  - POST /oauth/token
+
+References:
+  https://developers.mercadolibre.com.ar/es_ar/api-docs-es
+"""
+
+import time
+import requests
+from typing import Optional
+
+BASE_URL = "https://api.mercadolibre.com"
+AUTH_URL = "https://api.mercadolibre.com/oauth/token"
+
+
+class MeliError(Exception):
+    def __init__(self, message, status_code=None, response_body=None):
+        super().__init__(message)
+        self.status_code = status_code
+        self.response_body = response_body
+
+
+class MeliAuthError(MeliError):
+    pass
+
+
+class MeliService:
+    def __init__(
+        self,
+        access_token: str,
+        refresh_token: Optional[str] = None,
+        client_id: Optional[str] = None,
+        client_secret: Optional[str] = None,
+    ):
+        self.access_token = access_token
+        self.refresh_token = refresh_token
+        self.client_id = client_id
+        self.client_secret = client_secret
+        self._session = requests.Session()
+        self._session.headers.update({"Authorization": f"Bearer {access_token}"})
+
+    # ─── Low-level request ───────────────────────────────────────────────
+
+    def _request(
+        self,
+        method: str,
+        path: str,
+        params: Optional[dict] = None,
+        json_payload: Optional[dict] = None,
+        retry_on_401: bool = True,
+    ) -> dict:
+        url = f"{BASE_URL}{path}"
+        resp = self._session.request(
+            method, url, params=params, json=json_payload, timeout=30
+        )
+
+        if resp.status_code == 401 and retry_on_401 and self.refresh_token:
+            self._refresh_token()
+            # Retry once with new token
+            self._session.headers.update(
+                {"Authorization": f"Bearer {self.access_token}"}
+            )
+            resp = self._session.request(
+                method, url, params=params, json=json_payload, timeout=30
+            )
+
+        if resp.status_code == 401:
+            raise MeliAuthError(
+                "Unauthorized. Token may be expired or invalid.",
+                status_code=401,
+                response_body=resp.text,
+            )
+
+        if not resp.ok:
+            raise MeliError(
+                f"Meli API error {resp.status_code}: {resp.text}",
+                status_code=resp.status_code,
+                response_body=resp.text,
+            )
+
+        # Some endpoints return 204 No Content
+        if resp.status_code == 204:
+            return {}
+        try:
+            return resp.json()
+        except Exception:
+            return {"raw": resp.text}
+
+    def _refresh_token(self) -> dict:
+        if not self.client_id or not self.client_secret or not self.refresh_token:
+            raise MeliAuthError("Missing credentials for token refresh")
+        payload = {
+            "grant_type": "refresh_token",
+            "client_id": self.client_id,
+            "client_secret": self.client_secret,
+            "refresh_token": self.refresh_token,
+        }
+        resp = requests.post(AUTH_URL, data=payload, timeout=30)
+        if not resp.ok:
+            raise MeliAuthError(
+                f"Token refresh failed: {resp.status_code} {resp.text}",
+                status_code=resp.status_code,
+                response_body=resp.text,
+            )
+        data = resp.json()
+        self.access_token = data["access_token"]
+        if "refresh_token" in data:
+            self.refresh_token = data["refresh_token"]
+        return data
+
+    # ─── Auth / User ─────────────────────────────────────────────────────
+
+    def get_user(self) -> dict:
+        return self._request("GET", "/users/me")
+
+    @staticmethod
+    def exchange_code(
+        code: str, client_id: str, client_secret: str, redirect_uri: str
+    ) -> dict:
+        """Exchange authorization code for tokens."""
+        payload = {
+            "grant_type": "authorization_code",
+            "client_id": client_id,
+            "client_secret": client_secret,
+            "code": code,
+            "redirect_uri": redirect_uri,
+        }
+        resp = requests.post(AUTH_URL, data=payload, timeout=30)
+        if not resp.ok:
+            raise MeliAuthError(
+                f"Code exchange failed: {resp.status_code} {resp.text}",
+                status_code=resp.status_code,
+                response_body=resp.text,
+            )
+        return resp.json()
+
+    # ─── Images ──────────────────────────────────────────────────────────
+
+    def upload_image(self, image_path_or_url: str) -> dict:
+        """Upload an image to MercadoLibre's image hosting.
+
+        Accepts either a local file path or a URL.
+        Returns the ML picture dict with 'id' and 'secure_url' / 'url' keys.
+        """
+        import os
+        import requests as raw_requests
+
+        # If it's a URL, download it first
+        if image_path_or_url.startswith("http://") or image_path_or_url.startswith("https://"):
+            img_resp = raw_requests.get(image_path_or_url, timeout=30)
+            if not img_resp.ok:
+                raise MeliError(f"Failed to download image from {image_path_or_url}: {img_resp.status_code}")
+            file_bytes = img_resp.content
+            content_type = img_resp.headers.get("Content-Type", "image/jpeg")
+            filename = "image.jpg"
+        else:
+            if not os.path.exists(image_path_or_url):
+                raise MeliError(f"Image file not found: {image_path_or_url}")
+            with open(image_path_or_url, "rb") as f:
+                file_bytes = f.read()
+            content_type = "image/jpeg"
+            filename = os.path.basename(image_path_or_url)
+
+        upload_url = f"{BASE_URL}/pictures"
+        files = {"file": (filename, file_bytes, content_type)}
+        req_headers = {"Authorization": f"Bearer {self.access_token}"}
+        resp = raw_requests.post(upload_url, files=files, headers=req_headers, timeout=60)
+
+        if resp.status_code == 401 and self.refresh_token:
+            self._refresh_token()
+            req_headers["Authorization"] = f"Bearer {self.access_token}"
+            resp = raw_requests.post(upload_url, files=files, headers=req_headers, timeout=60)
+
+        if resp.status_code == 401:
+            raise MeliAuthError("Unauthorized. Token may be expired.", status_code=401, response_body=resp.text)
+        if not resp.ok:
+            raise MeliError(f"Image upload failed: {resp.status_code} {resp.text}", status_code=resp.status_code, response_body=resp.text)
+
+        return resp.json()
+
+    def get_listing_price(self, site_id: str, price: float, listing_type_id: str, category_id: str) -> dict:
+        """Get the exact fee / net amount for a given price, listing type and category.
+
+        ML endpoint: GET /sites/{site_id}/listing_prices
+        Returns dict with sale_fee_amount, net_amount, etc.
+        """
+        return self._request(
+            "GET",
+            f"/sites/{site_id}/listing_prices",
+            params={
+                "price": str(price),
+                "listing_type_id": listing_type_id,
+                "category_id": category_id,
+            },
+        )
+
+    # ─── Items (listings) ────────────────────────────────────────────────
+
+    def validate_item(self, payload: dict) -> dict:
+        """Validate an item payload without creating it."""
+        return self._request("POST", "/items/validate", json_payload=payload)
+
+    def create_item(self, payload: dict) -> dict:
+        return self._request("POST", "/items", json_payload=payload)
+
+    def update_item(self, item_id: str, payload: dict) -> dict:
+        return self._request("PUT", f"/items/{item_id}", json_payload=payload)
+
+    def get_item(self, item_id: str) -> dict:
+        return self._request("GET", f"/items/{item_id}")
+
+    def get_user_items(self, user_id: str, status: str = None, limit: int = 50, offset: int = 0) -> dict:
+        """Get all items published by a seller.
+
+        ML endpoint: GET /users/{user_id}/items/search
+        """
+        params = {"limit": limit, "offset": offset}
+        if status:
+            params["status"] = status
+        return self._request("GET", f"/users/{user_id}/items/search", params=params)
+
+    def pause_item(self, item_id: str) -> dict:
+        return self.update_item(item_id, {"status": "paused"})
+
+    def activate_item(self, item_id: str) -> dict:
+        return self.update_item(item_id, {"status": "active"})
+
+    def close_item(self, item_id: str) -> dict:
+        return self.update_item(item_id, {"status": "closed"})
+
+    # ─── Questions & Answers ─────────────────────────────────────────────
+
+    def get_questions(self, item_id: str, status: str = None, offset: int = 0, limit: int = 50) -> dict:
+        params = {"item_id": item_id, "offset": offset, "limit": limit}
+        if status:
+            params["status"] = status
+        return self._request("GET", "/questions/search", params=params)
+
+    def get_question(self, question_id: str) -> dict:
+        return self._request("GET", f"/questions/{question_id}")
+
+    def answer_question(self, question_id: str, text: str) -> dict:
+        return self._request("POST", "/answers", json_payload={"question_id": question_id, "text": text})
+
+    def delete_question(self, question_id: str) -> dict:
+        return self._request("DELETE", f"/questions/{question_id}")
+
+    # ─── Categories ──────────────────────────────────────────────────────
+
+    def get_category(self, category_id: str) -> dict:
+        return self._request("GET", f"/categories/{category_id}")
+
+    def search_categories(self, site_id: str, query: str) -> dict:
+        # ML does not have a direct category search; we use the predictor
+        return self._request(
+            "GET",
+            f"/sites/{site_id}/domain_discovery/search",
+            params={"q": query},
+        )
+
+    def get_category_attributes(self, category_id: str) -> list:
+        return self._request("GET", f"/categories/{category_id}/attributes")
+
+    def get_shipping_preferences(self, user_id: str) -> dict:
+        return self._request("GET", f"/users/{user_id}/shipping_preferences")
+
+    # ─── Orders ──────────────────────────────────────────────────────────
+
+    def get_orders(
+        self,
+        seller_id: str,
+        status: Optional[str] = None,
+        date_from: Optional[str] = None,
+        limit: int = 50,
+        offset: int = 0,
+    ) -> dict:
+        params = {"seller": seller_id, "limit": limit, "offset": offset}
+        if status:
+            params["order.status"] = status
+        if date_from:
+            params["order.date_created.from"] = date_from
+        return self._request("GET", "/orders/search", params=params)
+
+    def get_order(self, order_id: str) -> dict:
+        return self._request("GET", f"/orders/{order_id}")
+
+    # ─── Shipments ───────────────────────────────────────────────────────
+
+    def get_shipment(self, shipment_id: str) -> dict:
+        return self._request("GET", f"/shipments/{shipment_id}")
+
+    def mark_ready_to_ship(self, shipment_id: str) -> dict:
+        return self._request(
+            "POST",
+            f"/shipments/{shipment_id}/dispatch",
+            json_payload={},
+        )
+
+    # ─── Notifications / Webhooks validation ─────────────────────────────
+
+    @staticmethod
+    def validate_webhook_signature(
+        secret: str, data: bytes, signature_header: str
+    ) -> bool:
+        """Validate MercadoLibre webhook signature.
+
+        ML sends: X-Signature: sha256=<hex_hmac>
+        """
+        import hmac
+        import hashlib
+
+        if not signature_header or "=" not in signature_header:
+            return False
+        _, expected_hex = signature_header.split("=", 1)
+        computed = hmac.new(
+            secret.encode(), data, hashlib.sha256
+        ).hexdigest()
+        return hmac.compare_digest(computed, expected_hex)
diff --git a/pos/services/part_kits.py b/pos/services/part_kits.py
new file mode 100644
index 0000000..57a9e1e
--- /dev/null
+++ b/pos/services/part_kits.py
@@ -0,0 +1,186 @@
+"""
+Smart part kits — automatic cross-sell recommendations.
+
+When a customer adds a part to their quotation, suggest related
+parts that are typically needed together for a complete job.
+"""
+
+# Spanish keywords in part name → related parts to suggest (in Spanish)
+# These appear after a successful "cotizar" command.
+KIT_SUGGESTIONS = {
+    "balata": ["disco de freno", "líquido de frenos", "balero de rueda"],
+    "disco de freno": ["balata", "líquido de frenos"],
+    "alternador": ["banda serpentina", "batería", "regulador de alternador"],
+    "batería": ["alternador", "cable de bujía"],
+    "marcha": ["batería", "solenoide de marcha"],
+    "bujía": ["bobina de encendido", "filtro de aire", "filtro de gasolina"],
+    "bobina": ["bujía", "cable de bujía"],
+    "bomba de agua": ["termostato", "refrigerante", "manguera de radiador"],
+    "radiador": ["manguera de radiador", "termostato", "tapón de radiador"],
+    "termostato": ["refrigerante", "manguera de radiador"],
+    "amortiguador": ["base de amortiguador", "goma de suspensión", "rótula"],
+    "rótula": ["terminal de dirección", "brazo de suspensión", "bujes"],
+    "terminal": ["rótula", "brazo de suspensión"],
+    "filtro de aceite": ["filtro de aire", "filtro de gasolina", "filtro de habitáculo"],
+    "filtro de aire": ["filtro de aceite", "filtro de gasolina", "bujía"],
+    "filtro de gasolina": ["filtro de aire", "filtro de aceite", "inyector"],
+    "clutch": ["collarín", "disco de clutch", "plato de presión"],
+    "collarín": ["clutch", "disco de clutch"],
+    "banda de distribución": ["bomba de agua", "tensor", "polea loca"],
+    "banda serpentina": ["tensor de banda", "polea loca"],
+    "foco": ["foco trasero", "cuarto"],
+    "faro": ["foco trasero", "cuarto"],
+    "aceite": ["filtro de aceite", "filtro de aire"],
+}
+
+
+def get_kit_suggestions(part_name: str) -> list:
+    """Return related part names for a given part (Spanish)."""
+    if not part_name:
+        return []
+    name_lower = part_name.lower()
+    for keyword, related in KIT_SUGGESTIONS.items():
+        if keyword in name_lower:
+            return related
+    return []
+
+
+def build_kit_text(part_name: str) -> str:
+    """Build a WhatsApp-friendly kit suggestion text.
+
+    Returns empty string if no kit is found.
+    """
+    suggestions = get_kit_suggestions(part_name)
+    if not suggestions:
+        return ""
+    items = "\n".join(f"  • {s.title()}" for s in suggestions[:3])
+    return (
+        "\n\n🔧 *¿Ya que estás en eso, checa si también necesitas:*\n"
+        + items
+        + '\n\n_Escribe la parte que te interese y la agregamos._'
+    )
+
+
+# ── Urgency detection ────────────────────────────────────────────────
+URGENCY_KEYWORDS = [
+    "urgente", "urgencia", "emergencia", "ya", "ahora", "hoy",
+    "lo necesito", "se me paro", "no arranca", "no jala",
+    "rapido", "apúrate", "apurate", "prisa", "de volada",
+    "para hoy", "para ahora", "lo mas pronto", "lo más pronto",
+    "inmediato", "express", "exprés",
+]
+
+
+def is_urgent(text: str) -> bool:
+    """Detect if the customer message signals urgency."""
+    if not text:
+        return False
+    t = text.lower()
+    return any(kw in t for kw in URGENCY_KEYWORDS)
+
+
+def urgency_note() -> str:
+    return (
+        "\n\n⚡ NOTA DE URGENCIA: El cliente necesita la pieza lo antes posible. "
+        "Prioriza stock local y ofrece entrega express (2-4 horas) o recolección inmediata en tienda. "
+        "Si no hay stock exacto, ofrece alternativa disponible inmediatamente."
+    )
+
+
+# ── Abandoned quotation follow-up ────────────────────────────────────
+FOLLOW_UP_MINUTES = 15
+
+
+def should_send_followup(phone: str, tenant_conn) -> str:
+    """Check if we should send a follow-up message for an abandoned quotation.
+
+    Returns the follow-up text if yes, empty string if no.
+    """
+    if not tenant_conn or not phone:
+        return ""
+    try:
+        cur = tenant_conn.cursor()
+        # 1. Check if there's an active quotation for this phone
+        cur.execute("""
+            SELECT id FROM quotations
+            WHERE notes LIKE %s AND status = 'active'
+            ORDER BY created_at DESC LIMIT 1
+        """, (f'%WA:{phone}%',))
+        row = cur.fetchone()
+        if not row:
+            cur.close()
+            return ""
+
+        # 2. Check last bot message mentioning "cotización" or "cotizar"
+        cur.execute("""
+            SELECT created_at, message_text
+            FROM whatsapp_messages
+            WHERE phone = %s AND direction = 'outgoing'
+              AND (message_text ILIKE '%cotización%' OR message_text ILIKE '%cotizar%')
+            ORDER BY created_at DESC LIMIT 1
+        """, (phone,))
+        last_quote_msg = cur.fetchone()
+        cur.close()
+
+        if not last_quote_msg:
+            return ""
+
+        from datetime import datetime, timezone
+        last_time = last_quote_msg[0]
+        now = datetime.now(timezone.utc)
+        if last_time.tzinfo is None:
+            last_time = last_time.replace(tzinfo=timezone.utc)
+
+        minutes_since = (now - last_time).total_seconds() / 60
+        if minutes_since >= FOLLOW_UP_MINUTES:
+            return (
+                "👋 *¿Todo bien?*\n\n"
+                "Veo que estabas armando tu cotización. ¿Te falta algo más o quieres que te la envíe ahora?\n\n"
+                "_Escribe *enviar cotización* para ver el total, o dime si necesitas otra parte._"
+            )
+    except Exception as e:
+        print(f"[WA-AI] Follow-up check failed: {e}")
+    return ""
+
+
+# ── Customer purchase history awareness ──────────────────────────────
+def get_purchase_history(phone: str, tenant_conn, limit: int = 3) -> str:
+    """Build a short text summary of recent confirmed quotations for this customer.
+
+    Returns empty string if no history.
+    """
+    if not tenant_conn or not phone:
+        return ""
+    try:
+        cur = tenant_conn.cursor()
+        cur.execute("""
+            SELECT q.id, q.created_at, q.total,
+                   ARRAY_AGG(qi.name ORDER BY qi.name) AS items
+            FROM quotations q
+            JOIN quotation_items qi ON qi.quotation_id = q.id
+            WHERE q.notes LIKE %s AND q.status = 'converted'
+            GROUP BY q.id, q.created_at, q.total
+            ORDER BY q.created_at DESC
+            LIMIT %s
+        """, (f'%WA:{phone}%', limit))
+        rows = cur.fetchall()
+        cur.close()
+
+        if not rows:
+            return ""
+
+        from datetime import datetime, timezone
+        now = datetime.now(timezone.utc)
+        parts = []
+        for qid, created, total, items in rows:
+            if created.tzinfo is None:
+                created = created.replace(tzinfo=timezone.utc)
+            months_ago = (now - created).days // 30
+            time_str = f"hace {months_ago} meses" if months_ago > 0 else "recientemente"
+            item_list = ", ".join(items[:3])
+            parts.append(f"- {time_str}: {item_list} (total ${float(total):,.2f})")
+
+        return "HISTORIAL DE COMPRAS DEL CLIENTE:\n" + "\n".join(parts)
+    except Exception as e:
+        print(f"[WA-AI] Purchase history failed: {e}")
+    return ""
diff --git a/pos/services/pos_engine.py b/pos/services/pos_engine.py
index 94b593e..86a2665 100644
--- a/pos/services/pos_engine.py
+++ b/pos/services/pos_engine.py
@@ -193,9 +193,23 @@ def process_sale(conn, sale_data):
     amount_paid = float(sale_data.get('amount_paid', 0))
     payment_details = sale_data.get('payment_details', [])
     notes = sale_data.get('notes')
-    branch_id = _safe_g('branch_id')
+    branch_id = sale_data.get('branch_id') or _safe_g('branch_id')
     employee_id = _safe_g('employee_id')
 
+    # Fallback to the main branch if none resolved (e.g. token without branch_id)
+    if not branch_id:
+        cur.execute("SELECT id FROM branches WHERE is_main = true AND is_active = true LIMIT 1")
+        row = cur.fetchone()
+        if row:
+            branch_id = row[0]
+        else:
+            cur.execute("SELECT id FROM branches WHERE is_active = true ORDER BY id LIMIT 1")
+            row = cur.fetchone()
+            branch_id = row[0] if row else None
+
+    if not branch_id:
+        raise ValueError("No hay sucursal activa disponible para registrar la venta")
+
     # ── Multi-currency support ───────────────────────────────────────────
     currency = sale_data.get('currency', 'MXN')
     if currency not in ('MXN', 'USD'):
@@ -440,6 +454,42 @@ def process_sale(conn, sale_data):
     except Exception:
         pass  # Savings errors never block sales
 
+    # WhatsApp learning hook (non-blocking)
+    try:
+        from services.wa_learning import check_learning_resolution
+        check_learning_resolution(sale_id, customer_id, conn)
+    except Exception:
+        pass  # Learning errors never block sales
+
+    # Dropshipping webhook hook (non-blocking)
+    try:
+        from services import dropshipping_service as ds_svc
+        from services.webhook_service import dispatch_webhooks_bulk
+        webhook_urls = ds_svc.get_webhook_targets(conn, 'sale_made')
+        if webhook_urls:
+            payload_items = []
+            for item in enriched_items:
+                remaining = item['stock_before'] - item['quantity']
+                payload_items.append({
+                    'sku': item['part_number'],
+                    'name': item['name'],
+                    'quantity_sold': item['quantity'],
+                    'stock_remaining': remaining,
+                    'unit_price': item['unit_price'],
+                })
+            threading.Thread(
+                target=dispatch_webhooks_bulk,
+                args=(webhook_urls, 'sale_made', {
+                    'sale_id': sale_id,
+                    'items': payload_items,
+                    'total': totals['total'],
+                    'created_at': str(created_at),
+                }),
+                daemon=True
+            ).start()
+    except Exception:
+        pass  # Webhook errors never block sales
+
     return {
         'id': sale_id,
         'branch_id': branch_id,
diff --git a/pos/services/quote_image.py b/pos/services/quote_image.py
new file mode 100644
index 0000000..5f2aabb
--- /dev/null
+++ b/pos/services/quote_image.py
@@ -0,0 +1,127 @@
+import io
+import base64
+from PIL import Image, ImageDraw, ImageFont
+
+def generate_quote_image(quote_items, totals, tenant_name="Autopartes", logo_text="NEXUS"):
+    """
+    Generate a visually appealing quote image.
+    
+    quote_items: list of dicts with keys: name, sku, qty, price, total
+    totals: dict with keys: subtotal, tax, total
+    Returns: base64 encoded PNG string
+    """
+    # Dimensions
+    WIDTH = 800
+    HEADER_H = 120
+    FOOTER_H = 100
+    ITEM_H = 60
+    PADDING = 30
+    
+    total_height = HEADER_H + len(quote_items) * ITEM_H + FOOTER_H + PADDING * 3
+    
+    # Colors
+    BG_COLOR = (250, 250, 252)
+    PRIMARY = (0, 82, 155)       # Dark blue
+    ACCENT = (230, 57, 70)       # Red accent
+    TEXT_DARK = (30, 30, 30)
+    TEXT_MED = (80, 80, 80)
+    TEXT_LIGHT = (150, 150, 150)
+    WHITE = (255, 255, 255)
+    ROW_ALT = (245, 247, 250)
+    
+    img = Image.new('RGB', (WIDTH, total_height), BG_COLOR)
+    draw = ImageDraw.Draw(img)
+    
+    # Try to load fonts, fallback to default
+    try:
+        font_title = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf", 32)
+        font_sub = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 18)
+        font_item = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 20)
+        font_bold = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans-Bold.ttf", 22)
+        font_small = ImageFont.truetype("/usr/share/fonts/truetype/dejavu/DejaVuSans.ttf", 14)
+    except Exception:
+        font_title = ImageFont.load_default()
+        font_sub = font_title
+        font_item = font_title
+        font_bold = font_title
+        font_small = font_title
+    
+    # --- Header ---
+    draw.rectangle([0, 0, WIDTH, HEADER_H], fill=PRIMARY)
+    
+    # Logo text
+    draw.text((PADDING, 25), logo_text, font=font_title, fill=WHITE)
+    draw.text((PADDING, 70), tenant_name, font=font_sub, fill=(200, 210, 230))
+    
+    # Date and Quote label
+    from datetime import datetime
+    date_str = datetime.now().strftime("%d/%m/%Y %H:%M")
+    draw.text((WIDTH - PADDING - 200, 30), "COTIZACIÓN", font=font_title, fill=WHITE)
+    draw.text((WIDTH - PADDING - 200, 75), date_str, font=font_sub, fill=(200, 210, 230))
+    
+    # --- Items Header ---
+    y = HEADER_H + PADDING
+    draw.rectangle([PADDING, y, WIDTH - PADDING, y + ITEM_H], fill=(230, 235, 240))
+    draw.text((PADDING + 10, y + 18), "PRODUCTO", font=font_bold, fill=TEXT_DARK)
+    draw.text((WIDTH - PADDING - 220, y + 18), "CANT.", font=font_bold, fill=TEXT_DARK)
+    draw.text((WIDTH - PADDING - 130, y + 18), "P.UNIT", font=font_bold, fill=TEXT_DARK)
+    draw.text((WIDTH - PADDING - 50, y + 18), "TOTAL", font=font_bold, fill=TEXT_DARK)
+    y += ITEM_H
+    
+    # --- Items ---
+    for idx, item in enumerate(quote_items):
+        row_y = y + idx * ITEM_H
+        bg = ROW_ALT if idx % 2 == 0 else WHITE
+        draw.rectangle([PADDING, row_y, WIDTH - PADDING, row_y + ITEM_H], fill=bg)
+        
+        name = item.get('name', 'Producto')
+        sku = item.get('sku', '')
+        qty = str(item.get('qty', 1))
+        price = f"${item.get('price', 0):,.2f}"
+        total = f"${item.get('total', 0):,.2f}"
+        
+        # Truncate name if too long
+        name_display = name
+        if len(name_display) > 35:
+            name_display = name_display[:32] + "..."
+        
+        draw.text((PADDING + 10, row_y + 8), name_display, font=font_item, fill=TEXT_DARK)
+        draw.text((PADDING + 10, row_y + 32), f"SKU: {sku}", font=font_small, fill=TEXT_MED)
+        
+        draw.text((WIDTH - PADDING - 220, row_y + 18), qty, font=font_item, fill=TEXT_DARK)
+        draw.text((WIDTH - PADDING - 130, row_y + 18), price, font=font_item, fill=TEXT_DARK)
+        draw.text((WIDTH - PADDING - 50, row_y + 18), total, font=font_item, fill=TEXT_DARK)
+    
+    y += len(quote_items) * ITEM_H + PADDING
+    
+    # --- Totals ---
+    draw.line([(PADDING, y), (WIDTH - PADDING, y)], fill=(200, 200, 200), width=2)
+    y += 20
+    
+    subtotal = totals.get('subtotal', 0)
+    tax = totals.get('tax', 0)
+    total = totals.get('total', 0)
+    
+    draw.text((WIDTH - PADDING - 300, y), "Subtotal:", font=font_sub, fill=TEXT_MED)
+    draw.text((WIDTH - PADDING - 50, y), f"${subtotal:,.2f}", font=font_sub, fill=TEXT_DARK)
+    y += 30
+    
+    draw.text((WIDTH - PADDING - 300, y), "IVA (16%):", font=font_sub, fill=TEXT_MED)
+    draw.text((WIDTH - PADDING - 50, y), f"${tax:,.2f}", font=font_sub, fill=TEXT_DARK)
+    y += 35
+    
+    draw.text((WIDTH - PADDING - 300, y), "TOTAL:", font=font_bold, fill=ACCENT)
+    draw.text((WIDTH - PADDING - 50, y), f"${total:,.2f}", font=font_bold, fill=ACCENT)
+    y += 50
+    
+    # --- Footer ---
+    draw.rectangle([0, total_height - FOOTER_H, WIDTH, total_height], fill=PRIMARY)
+    footer_text = "Validez: 5 días hábiles | Envíos a todo México | Contacto: ventas@nexusautoparts.com"
+    draw.text((PADDING, total_height - FOOTER_H + 35), footer_text, font=font_small, fill=(200, 210, 230))
+    
+    # Convert to base64
+    buffer = io.BytesIO()
+    img.save(buffer, format='PNG')
+    buffer.seek(0)
+    return base64.b64encode(buffer.read()).decode('utf-8')
+
diff --git a/pos/services/wa_customer.py b/pos/services/wa_customer.py
new file mode 100644
index 0000000..4cc224c
--- /dev/null
+++ b/pos/services/wa_customer.py
@@ -0,0 +1,140 @@
+"""
+WhatsApp Customer Service — identificación y vinculación de clientes.
+
+Funciones para buscar, crear y vincular clientes desde el flujo de WhatsApp.
+"""
+
+import re
+
+
+def find_customer_by_phone(phone, tenant_conn):
+    """Buscar cliente por número de teléfono exacto o parcial."""
+    if not tenant_conn or not phone:
+        return []
+    cur = tenant_conn.cursor()
+    # Limpiar phone de prefijos internacionales para búsqueda flexible
+    clean = phone.replace('+52', '').replace('52', '').lstrip('1')
+    cur.execute("""
+        SELECT id, name, phone, address, rfc
+        FROM customers
+        WHERE phone = %s OR phone LIKE %s OR phone LIKE %s
+        LIMIT 5
+    """, (phone, f'%{clean}', f'%{clean[-10:]}' if len(clean) >= 10 else f'%{clean}'))
+    rows = cur.fetchall()
+    cur.close()
+    return [{'id': r[0], 'name': r[1], 'phone': r[2], 'address': r[3], 'rfc': r[4]} for r in rows]
+
+
+def find_customer_by_name(name, tenant_conn):
+    """Buscar cliente por nombre (ILIKE)."""
+    if not tenant_conn or not name:
+        return []
+    cur = tenant_conn.cursor()
+    # Buscar por nombre completo o primer palabra
+    first_word = name.split()[0] if name else name
+    cur.execute("""
+        SELECT id, name, phone, address, rfc
+        FROM customers
+        WHERE name ILIKE %s OR name ILIKE %s
+        LIMIT 5
+    """, (f'%{name}%', f'%{first_word}%'))
+    rows = cur.fetchall()
+    cur.close()
+    return [{'id': r[0], 'name': r[1], 'phone': r[2], 'address': r[3], 'rfc': r[4]} for r in rows]
+
+
+def search_customers(query, tenant_conn):
+    """Buscar por teléfono o nombre."""
+    if not tenant_conn or not query:
+        return []
+    # Detectar si es número de teléfono
+    digits = re.sub(r'\D', '', query)
+    if len(digits) >= 7:
+        by_phone = find_customer_by_phone(digits, tenant_conn)
+        if by_phone:
+            return by_phone
+    return find_customer_by_name(query, tenant_conn)
+
+
+def get_customer_by_id(tenant_conn, customer_id):
+    """Obtener cliente por ID."""
+    if not tenant_conn or not customer_id:
+        return None
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT id, name, phone, address, rfc, vehicle_info
+        FROM customers WHERE id = %s
+    """, (customer_id,))
+    row = cur.fetchone()
+    cur.close()
+    if row:
+        return {
+            'id': row[0], 'name': row[1], 'phone': row[2],
+            'address': row[3], 'rfc': row[4], 'vehicle_info': row[5]
+        }
+    return None
+
+
+def create_customer(tenant_conn, phone, name, email=None, address=None, rfc=None):
+    """Crear cliente nuevo desde WhatsApp."""
+    if not tenant_conn:
+        return None
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        INSERT INTO customers (name, phone, email, address, rfc, is_active, created_at)
+        VALUES (%s, %s, %s, %s, %s, TRUE, NOW())
+        RETURNING id
+    """, (name, phone, email, address, rfc))
+    cid = cur.fetchone()[0]
+    tenant_conn.commit()
+    cur.close()
+    return cid
+
+
+def link_wa_customer(phone, customer_id, tenant_conn):
+    """Vincular número WA a cliente permanentemente."""
+    if not tenant_conn or not phone or not customer_id:
+        return
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        INSERT INTO wa_customer_links (phone, customer_id, updated_at)
+        VALUES (%s, %s, NOW())
+        ON CONFLICT (phone) DO UPDATE SET customer_id = EXCLUDED.customer_id, updated_at = NOW()
+    """, (phone, customer_id))
+    tenant_conn.commit()
+    cur.close()
+
+
+def get_linked_customer(phone, tenant_conn):
+    """Obtener customer_id vinculado a un número WA."""
+    if not tenant_conn or not phone:
+        return None
+    cur = tenant_conn.cursor()
+    cur.execute("SELECT customer_id FROM wa_customer_links WHERE phone = %s", (phone,))
+    row = cur.fetchone()
+    cur.close()
+    return row[0] if row else None
+
+
+def get_customer_address(tenant_conn, customer_id):
+    """Obtener dirección del cliente."""
+    if not tenant_conn or not customer_id:
+        return None
+    cur = tenant_conn.cursor()
+    cur.execute("SELECT address FROM customers WHERE id = %s", (customer_id,))
+    row = cur.fetchone()
+    cur.close()
+    return row[0] if row and row[0] else None
+
+
+def update_customer_address(tenant_conn, customer_id, address):
+    """Actualizar dirección del cliente."""
+    if not tenant_conn or not customer_id or not address:
+        return
+    cur = tenant_conn.cursor()
+    cur.execute(
+        "UPDATE customers SET address = %s WHERE id = %s",
+        (address, customer_id)
+    )
+    tenant_conn.commit()
+    cur.close()
diff --git a/pos/services/wa_learning.py b/pos/services/wa_learning.py
new file mode 100644
index 0000000..2f587ed
--- /dev/null
+++ b/pos/services/wa_learning.py
@@ -0,0 +1,127 @@
+"""
+WhatsApp Learning Service — ruta de aprendizaje para piezas no resueltas.
+
+Registra sesiones donde el bot no pudo identificar una pieza, y las resuelve
+asíncronamente cuando el cliente realiza una compra futura.
+"""
+
+import json
+
+
+def register_unresolved_search(phone, customer_id, description, offered_parts, tenant_conn):
+    """Registrar una sesión no resuelta para aprendizaje futuro."""
+    if not tenant_conn or not phone or not description:
+        return None
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        INSERT INTO wa_learning_sessions (phone, customer_id, description, offered_parts, status, created_at)
+        VALUES (%s, %s, %s, %s, 'pending', NOW())
+        RETURNING id
+    """, (phone, customer_id, description, json.dumps(offered_parts or [])))
+    sid = cur.fetchone()[0]
+    tenant_conn.commit()
+    cur.close()
+    return sid
+
+
+def find_pending_sessions(phone, tenant_conn):
+    """Buscar sesiones pendientes de aprendizaje para un número WA."""
+    if not tenant_conn or not phone:
+        return []
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT id, description, offered_parts, created_at
+        FROM wa_learning_sessions
+        WHERE phone = %s AND status = 'pending'
+        ORDER BY created_at DESC
+    """, (phone,))
+    rows = cur.fetchall()
+    cur.close()
+    return [{'id': r[0], 'description': r[1], 'offered_parts': r[2], 'created_at': str(r[3])} for r in rows]
+
+
+def find_pending_sessions_by_customer(customer_id, tenant_conn):
+    """Buscar sesiones pendientes por customer_id."""
+    if not tenant_conn or not customer_id:
+        return []
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT id, phone, description, offered_parts, created_at
+        FROM wa_learning_sessions
+        WHERE customer_id = %s AND status = 'pending'
+        ORDER BY created_at DESC
+    """, (customer_id,))
+    rows = cur.fetchall()
+    cur.close()
+    return [{'id': r[0], 'phone': r[1], 'description': r[2], 'offered_parts': r[3], 'created_at': str(r[4])} for r in rows]
+
+
+def resolve_session(session_id, resolved_part_id, sale_id, tenant_conn):
+    """Marcar sesión como resuelta con la pieza comprada."""
+    if not tenant_conn or not session_id:
+        return
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        UPDATE wa_learning_sessions
+        SET status = 'learned', resolved_part_id = %s, resolution_sale_id = %s, resolved_at = NOW()
+        WHERE id = %s
+    """, (resolved_part_id, sale_id, session_id))
+    tenant_conn.commit()
+    cur.close()
+
+
+def get_learning_pairs_for_training(tenant_conn, limit=100):
+    """Obtener pares (descripción del cliente → pieza real) para entrenamiento."""
+    if not tenant_conn:
+        return []
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT l.description, i.name, i.part_number, i.brand
+        FROM wa_learning_sessions l
+        JOIN inventory i ON i.id = l.resolved_part_id
+        WHERE l.status = 'learned' AND l.resolved_at > NOW() - INTERVAL '90 days'
+        ORDER BY l.resolved_at DESC
+        LIMIT %s
+    """, (limit,))
+    rows = cur.fetchall()
+    cur.close()
+    return [{'description': r[0], 'part_name': r[1], 'part_number': r[2], 'brand': r[3]} for r in rows]
+
+
+def check_learning_resolution(sale_id, customer_id, tenant_conn):
+    """
+    Hook para llamar después de completar una venta.
+    Verifica si esta venta resuelve una sesión de aprendizaje pendiente.
+    """
+    if not tenant_conn or not customer_id:
+        return
+
+    sessions = find_pending_sessions_by_customer(customer_id, tenant_conn)
+    if not sessions:
+        return
+
+    # Obtener items de esta venta
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT si.inventory_id, i.name, i.part_number
+        FROM sale_items si
+        JOIN inventory i ON i.id = si.inventory_id
+        WHERE si.sale_id = %s
+    """, (sale_id,))
+    sale_items = cur.fetchall()
+    cur.close()
+
+    if not sale_items:
+        return
+
+    # Matching heurístico
+    for sess in sessions:
+        desc_words = set(sess['description'].lower().split())
+        for inv_id, item_name, part_number in sale_items:
+            item_words = set(item_name.lower().split())
+            # Intersección de palabras significativas
+            common = desc_words & item_words - {'de', 'la', 'el', 'para', 'un', 'una', 'con', 'y', 'o', 'en', 'al', 'del', 'los', 'las'}
+            if len(common) >= 2:
+                resolve_session(sess['id'], inv_id, sale_id, tenant_conn)
+                print(f"[WA-LEARN] Resolved session {sess['id']} with sale {sale_id}, item {inv_id}")
+                break
diff --git a/pos/services/wa_quotation.py b/pos/services/wa_quotation.py
index 70a0437..72ea20e 100644
--- a/pos/services/wa_quotation.py
+++ b/pos/services/wa_quotation.py
@@ -105,7 +105,7 @@ def confirm_quotation(tenant_conn, phone):
     cur.execute("UPDATE quotations SET status = 'converted' WHERE id = %s", (qid,))
     tenant_conn.commit()
     cur.close()
-    clear_last_shown(phone)
+    clear_last_shown(tenant_conn, phone)
     return qid
 
 
@@ -135,41 +135,34 @@ def _ensure_sessions_table(tenant_conn):
     cur.close()
 
 
-def set_last_shown_part(phone, part_info):
+def set_last_shown_part(tenant_conn, phone, part_info):
     """Store the last part shown to this phone number.
 
     part_info: dict with keys inventory_id, part_number, name, brand,
     price, stock, unit
     """
-    # In-memory fallback for when tenant_conn is not available
-    from tenant_db import get_tenant_conn
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         import json
         cur.execute("""
             INSERT INTO whatsapp_sessions (phone, last_shown, updated_at)
             VALUES (%s, %s, NOW())
             ON CONFLICT (phone) DO UPDATE SET last_shown = EXCLUDED.last_shown, updated_at = NOW()
         """, (phone, json.dumps(part_info)))
-        conn.commit()
+        tenant_conn.commit()
         cur.close()
-        conn.close()
     except Exception as e:
         print(f"[WA-SESSION] Failed to persist last_shown for {phone}: {e}")
 
 
-def get_last_shown_part(phone):
-    from tenant_db import get_tenant_conn
+def get_last_shown_part(tenant_conn, phone):
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         cur.execute("SELECT last_shown FROM whatsapp_sessions WHERE phone = %s", (phone,))
         row = cur.fetchone()
         cur.close()
-        conn.close()
         if row and row[0]:
             return row[0]
     except Exception as e:
@@ -177,54 +170,45 @@ def get_last_shown_part(phone):
     return None
 
 
-def clear_last_shown(phone):
-    from tenant_db import get_tenant_conn
+def clear_last_shown(tenant_conn, phone):
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         cur.execute("DELETE FROM whatsapp_sessions WHERE phone = %s", (phone,))
-        conn.commit()
+        tenant_conn.commit()
         cur.close()
-        conn.close()
     except Exception as e:
         print(f"[WA-SESSION] Failed to clear last_shown for {phone}: {e}")
 
 
-def set_vehicle(phone, vehicle):
+def set_vehicle(tenant_conn, phone, vehicle):
     """Store the detected vehicle for this phone number.
 
     vehicle: dict with keys brand, model, year
     """
-    from tenant_db import get_tenant_conn
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         import json
         cur.execute("""
             INSERT INTO whatsapp_sessions (phone, vehicle, updated_at)
             VALUES (%s, %s, NOW())
             ON CONFLICT (phone) DO UPDATE SET vehicle = EXCLUDED.vehicle, updated_at = NOW()
         """, (phone, json.dumps(vehicle)))
-        conn.commit()
+        tenant_conn.commit()
         cur.close()
-        conn.close()
     except Exception as e:
         print(f"[WA-SESSION] Failed to persist vehicle for {phone}: {e}")
 
 
-def get_vehicle(phone):
+def get_vehicle(tenant_conn, phone):
     """Retrieve the stored vehicle for this phone number."""
-    from tenant_db import get_tenant_conn
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         cur.execute("SELECT vehicle FROM whatsapp_sessions WHERE phone = %s", (phone,))
         row = cur.fetchone()
         cur.close()
-        conn.close()
         if row and row[0]:
             return row[0]
     except Exception as e:
@@ -232,17 +216,14 @@ def get_vehicle(phone):
     return None
 
 
-def clear_session(phone):
+def clear_session(tenant_conn, phone):
     """Clear all session data (last_shown + vehicle) for this phone."""
-    from tenant_db import get_tenant_conn
     try:
-        conn = get_tenant_conn(11)
-        _ensure_sessions_table(conn)
-        cur = conn.cursor()
+        _ensure_sessions_table(tenant_conn)
+        cur = tenant_conn.cursor()
         cur.execute("DELETE FROM whatsapp_sessions WHERE phone = %s", (phone,))
-        conn.commit()
+        tenant_conn.commit()
         cur.close()
-        conn.close()
     except Exception as e:
         print(f"[WA-SESSION] Failed to clear session for {phone}: {e}")
 
@@ -361,7 +342,7 @@ def clear_quotation(tenant_conn, phone):
         cur.execute("UPDATE quotations SET status = 'cancelled' WHERE id = %s", (qid,))
         tenant_conn.commit()
         cur.close()
-    clear_last_shown(phone)
+    clear_last_shown(tenant_conn, phone)
     return qid
 
 
diff --git a/pos/services/wa_state_machine.py b/pos/services/wa_state_machine.py
new file mode 100644
index 0000000..97076f6
--- /dev/null
+++ b/pos/services/wa_state_machine.py
@@ -0,0 +1,1366 @@
+"""
+WhatsApp State Machine — motor de estados para el flujo conversacional estructurado.
+
+Reemplaza el flujo de AI libre por una máquina de estados determinista:
+  idle → greeting/menu → [cotización | soporte | facturación]
+
+Cada estado es una función registrada con el decorador @state(name).
+"""
+
+import re
+import json
+from datetime import datetime
+
+# ─── Registro de estados ─────────────────────────────────────────────
+_STATES = {}
+
+
+def state(name):
+    """Decorador para registrar un estado en la máquina de estados."""
+    def decorator(func):
+        _STATES[name] = func
+        return func
+    return decorator
+
+
+class StateContext:
+    """Contenedor de todo el contexto necesario para una transición."""
+    def __init__(self, tenant_conn, master_conn, wa_config, tenant_id,
+                 phone, customer_id=None, branch_id=None, media_kind='text',
+                 media_base64=None, push_name=None):
+        self.tenant_conn = tenant_conn
+        self.master_conn = master_conn
+        self.wa_config = wa_config
+        self.tenant_id = tenant_id
+        self.phone = phone
+        self.customer_id = customer_id
+        self.branch_id = branch_id
+        self.media_kind = media_kind
+        self.media_base64 = media_base64
+        self.push_name = push_name
+
+
+# ─── Punto de entrada principal ──────────────────────────────────────
+
+def process_message(phone, text, current_state, state_data, context):
+    """
+    Procesar un mensaje entrante a través de la máquina de estados.
+
+    Returns:
+        (reply: str|None, next_state: str, next_state_data: dict)
+    """
+    handler = _STATES.get(current_state, _handle_unknown_state)
+    return handler(text, state_data, context)
+
+
+def _handle_unknown_state(text, state_data, ctx):
+    """Fallback para estados corruptos o no registrados."""
+    return _MSG_UNKNOWN_STATE, 'menu', state_data
+
+
+# ─── Mensajes globales ───────────────────────────────────────────────
+
+_MSG_UNKNOWN_STATE = (
+    "Parece que hubo un problema. Volvamos al inicio. 🤔\n\n"
+    "¿En qué puedo ayudarte?\n\n"
+    "1️⃣ *Cotizar* refacciones\n"
+    "2️⃣ *Soporte* — Hablar con la sucursal\n"
+    "3️⃣ *Facturación* — Consultar o generar facturas\n\n"
+    "Responde con el número de la opción."
+)
+
+_MSG_MENU = (
+    "¿En qué puedo ayudarte hoy?\n\n"
+    "1️⃣ *Cotizar* refacciones\n"
+    "2️⃣ *Soporte* — Hablar con la sucursal\n"
+    "3️⃣ *Facturación* — Consultar o generar facturas\n\n"
+    "Responde con el número de la opción que necesites."
+)
+
+_MSG_MENU_INVALID = (
+    "No entendí tu selección. 🤔\n\n"
+    "Por favor responde con:\n"
+    "• *1* para Cotizar\n"
+    "• *2* para Soporte\n"
+    "• *3* para Facturación"
+)
+
+_MSG_GREETING_KNOWN = "¡Hola {name}! 👋\nBienvenido a *{branch}*."
+_MSG_GREETING_UNKNOWN = "¡Hola! 👋\nBienvenido a *{branch}*. Soy tu asistente virtual."
+
+_MSG_IDENTIFY_PROMPT = "Para darte una mejor atención, ¿podrías indicarme tu *nombre* o *número de cliente*?"
+_MSG_IDENTIFY_FOUND = "¡Perfecto! Te encontré en el sistema, {name}. ✅\n\nContinuamos con tu cotización."
+_MSG_IDENTIFY_MULTIPLE = "Encontré varios clientes con datos similares:\n\n{options}\n\nResponde con el número del cliente correcto."
+_MSG_IDENTIFY_NOT_FOUND = (
+    "No te encontré en nuestro sistema. 😕\n\n"
+    "¿Te gustaría registrarte para agilizar futuras compras?\n"
+    "Responde *sí* para registrarte o *no* para continuar como invitado."
+)
+
+_MSG_QUOTE_SEARCH_PROMPT = (
+    "¿Qué refacción estás buscando? 🔧\n\n"
+    "Puedes decirme algo como:\n"
+    "• \"Balatas para Tsuru 2015\"\n"
+    "• \"Filtro de aceite Bosch\"\n"
+    "• O envíame una *foto* de la pieza"
+)
+
+_MSG_EXPLORE_OFFER = (
+    "🔍 Estoy buscando en nuestros catálogos técnicos...\n\n"
+    "¿Te refieres a *{suggestion}*?\n\n"
+    "Responde *sí* para confirmar o *no* para que busque otra opción."
+)
+_MSG_EXPLORE_RETRY = "Entendido. Déjame buscar otra alternativa... 🔎"
+_MSG_EXPLORE_ERROR = (
+    "Estoy teniendo problemas para identificar la pieza. 😕\n\n"
+    "¿Podrías darme más detalles? Por ejemplo: marca del carro, modelo, año, "
+    "o el síntoma que presenta."
+)
+_MSG_EXPLORE_CONFIRM_PROMPT = "¿Confirmas que es esta pieza? Responde *sí* o *no*."
+
+_MSG_LEARNING_TRANSFER = (
+    "No logré identificar la pieza con certeza después de explorar varias opciones. 😔\n\n"
+    "He registrado tu búsqueda para mejorar nuestro servicio en el futuro.\n\n"
+    "Te sugiero llamar directamente a la sucursal para que un asesor especializado te ayude:\n\n"
+    "📞 *{phone}*\n\n"
+    "Ellos podrán orientarte mejor con tu descripción."
+)
+
+_MSG_DELIVERY_PROMPT = "¿Deseas que te enviemos el pedido a domicilio? 🚚\n\nResponde *sí* o *no*."
+_MSG_DELIVERY_ADDRESS_CONFIRM = (
+    "¿Tu dirección de envío es la siguiente?\n\n"
+    "📍 {address}\n\n"
+    "Responde *sí* para confirmar o escribe la nueva dirección."
+)
+_MSG_DELIVERY_ADDRESS_REQUEST = (
+    "¿A qué dirección te gustaría recibir el envío? 📍\n\n"
+    "Por favor escribe la dirección completa incluyendo calle, número, colonia y código postal."
+)
+_MSG_DELIVERY_ADDRESS_SAVED = (
+    "✅ Dirección registrada:\n\n"
+    "📍 {address}\n\n"
+    "Continuamos con tu cotización."
+)
+
+_MSG_SUPPORT = (
+    "📞 *Soporte directo*\n\n"
+    "Para una atención más personalizada, llámanos directamente:\n\n"
+    "*{phone}*\n\n"
+    "Horario: Lunes a Viernes 8:00 - 18:00, Sábados 8:00 - 14:00\n\n"
+    "Un asesor especializado te atenderá con gusto."
+)
+
+_MSG_INVOICE_FISCAL_PROMPT = (
+    "Para generar tu factura necesito tus datos fiscales:\n\n"
+    "1️⃣ RFC\n"
+    "2️⃣ Razón social\n"
+    "3️⃣ Uso CFDI (ej. G03)\n"
+    "4️⃣ Código postal\n\n"
+    "Puedes enviarme los datos en un solo mensaje. Ejemplo:\n\n"
+    "RFC: ABCD010101A12\n"
+    "Razón social: Mi Empresa S.A. de C.V.\n"
+    "Uso CFDI: G03\n"
+    "CP: 45130"
+)
+
+_MSG_ERROR_RETRY = (
+    "Algo salió mal. Volvamos a intentarlo.\n\n"
+    "¿Podrías indicarme tu *nombre* o *número de cliente*?"
+)
+
+
+# ─── Estados ─────────────────────────────────────────────────────────
+
+@state('idle')
+def handle_idle(text, state_data, ctx):
+    """Estado inicial: saludo + menú."""
+    from services.wa_customer import get_linked_customer, get_customer_by_id
+
+    customer_id = get_linked_customer(ctx.phone, ctx.tenant_conn)
+    branch_name = _get_branch_name(ctx.tenant_conn, ctx.branch_id)
+
+    if customer_id:
+        customer = get_customer_by_id(ctx.tenant_conn, customer_id)
+        first_name = customer['name'].split()[0] if customer and customer.get('name') else 'Cliente'
+        greeting = _MSG_GREETING_KNOWN.format(name=first_name, branch=branch_name)
+    else:
+        greeting = _MSG_GREETING_UNKNOWN.format(branch=branch_name)
+
+    reply = greeting + "\n\n" + _MSG_MENU
+    next_data = {'customer_id': customer_id, 'branch_name': branch_name}
+    return reply, 'menu', next_data
+
+
+@state('menu')
+def handle_menu(text, state_data, ctx):
+    """Esperar selección de menú (1, 2, 3)."""
+    if not text:
+        return _MSG_MENU_INVALID, 'menu', state_data
+
+    t = text.strip().lower()
+
+    if t in ('1', 'uno', 'cotizar', 'cotización', 'cotizacion', 'refacciones', 'partes'):
+        return None, 'quote_identify', state_data
+
+    if t in ('2', 'dos', 'soporte', 'ayuda', 'teléfono', 'telefono', 'llamar'):
+        return None, 'support_phone', state_data
+
+    if t in ('3', 'tres', 'facturación', 'facturacion', 'factura', 'cfdi'):
+        return None, 'invoice_identify', state_data
+
+    # Fallback: si parece descripción de parte (no saludo), redirigir a cotización
+    if len(t) > 10 and not _is_greeting(t):
+        state_data['preloaded_search'] = text.strip()
+        return (
+            "Entendido, parece que buscas una refacción. Te ayudo con eso. 🔧\n\n",
+            'quote_identify',
+            state_data
+        )
+
+    return _MSG_MENU_INVALID, 'menu', state_data
+
+
+@state('support_phone')
+def handle_support_phone(text, state_data, ctx):
+    """Proporcionar teléfono de sucursal."""
+    phone = _get_branch_phone(ctx.tenant_conn, ctx.branch_id)
+    reply = _MSG_SUPPORT.format(phone=phone)
+    return reply, 'support_done', state_data
+
+
+@state('support_done')
+def handle_support_done(text, state_data, ctx):
+    """Estado de cierre, permite volver al menú."""
+    if not text:
+        return (
+            "¿Hay algo más en lo que pueda ayudarte?\n\n"
+            "Escribe *menú* para volver al inicio o indícame qué necesitas.",
+            'support_done', state_data
+        )
+
+    t = text.strip().lower()
+
+    if t in ('menu', 'menú', 'inicio', 'principal', 'opciones', 'volver', 'regresar'):
+        return _MSG_MENU, 'menu', state_data
+
+    if t in ('1', 'uno', 'cotizar'):
+        return None, 'quote_identify', state_data
+
+    if t in ('2', 'dos', 'soporte'):
+        return None, 'support_phone', state_data
+
+    if t in ('3', 'tres', 'facturación', 'facturacion'):
+        return None, 'invoice_identify', state_data
+
+    return (
+        "¿Hay algo más en lo que pueda ayudarte?\n\n"
+        "Escribe *menú* para volver al inicio o indícame qué necesitas.",
+        'support_done',
+        state_data
+    )
+
+
+# ─── Estados de Cotización ───────────────────────────────────────────
+
+@state('quote_identify')
+def handle_quote_identify(text, state_data, ctx):
+    """Identificar cliente antes de cotizar."""
+    from services.wa_customer import search_customers, link_wa_customer
+
+    if state_data.get('customer_id'):
+        if state_data.get('preloaded_search'):
+            customer = _get_customer_by_id(ctx.tenant_conn, state_data['customer_id'])
+            first_name = customer['name'].split()[0] if customer and customer.get('name') else 'Cliente'
+            reply = f"Perfecto {first_name}, busco eso para ti... 🔍"
+            return reply, 'quote_search', state_data
+        return None, 'quote_search', state_data
+
+    if text and not state_data.get('identify_prompted'):
+        customers = search_customers(text.strip(), ctx.tenant_conn)
+
+        if len(customers) == 1:
+            state_data['customer_id'] = customers[0]['id']
+            link_wa_customer(ctx.phone, customers[0]['id'], ctx.tenant_conn)
+            return _MSG_IDENTIFY_FOUND.format(name=customers[0]['name']), 'quote_search', state_data
+
+        if len(customers) > 1:
+            state_data['customer_candidates'] = customers
+            state_data['identify_prompted'] = True
+            options = '\n'.join([f"{i+1}. {c['name']} (#{c['id']})" for i, c in enumerate(customers[:5])])
+            return _MSG_IDENTIFY_MULTIPLE.format(options=options), 'quote_select_customer', state_data
+
+        state_data['identify_prompted'] = True
+        # Si el texto es solo dígitos (ej: selección de menú), no usarlo como nombre propuesto
+        if text.strip().isdigit():
+            state_data.pop('proposed_name', None)
+        else:
+            state_data['proposed_name'] = text.strip()
+        return _MSG_IDENTIFY_NOT_FOUND, 'quote_register_new', state_data
+
+    state_data['identify_prompted'] = True
+    return _MSG_IDENTIFY_PROMPT, 'quote_identify', state_data
+
+
+@state('quote_select_customer')
+def handle_quote_select_customer(text, state_data, ctx):
+    """Seleccionar entre múltiples clientes candidatos."""
+    from services.wa_customer import link_wa_customer
+
+    candidates = state_data.get('customer_candidates', [])
+    if not candidates:
+        return _MSG_ERROR_RETRY, 'quote_identify', {'identify_prompted': True}
+
+    try:
+        selection = int(text.strip())
+        if 1 <= selection <= len(candidates):
+            chosen = candidates[selection - 1]
+            state_data['customer_id'] = chosen['id']
+            del state_data['customer_candidates']
+            link_wa_customer(ctx.phone, chosen['id'], ctx.tenant_conn)
+            return _MSG_IDENTIFY_FOUND.format(name=chosen['name']), 'quote_search', state_data
+    except (ValueError, IndexError):
+        pass
+
+    return f"Por favor responde con un número del 1 al {len(candidates)}.", 'quote_select_customer', state_data
+
+
+@state('quote_register_new')
+def handle_quote_register_new(text, state_data, ctx):
+    """Registrar cliente nuevo o continuar como invitado."""
+    from services.wa_customer import create_customer, link_wa_customer
+
+    t = text.strip().lower()
+
+    if t in ('si', 'sí', 'yes', 'ok', 'dale', 'va'):
+        # Si estamos esperando el nombre real del usuario
+        if state_data.get('awaiting_name'):
+            name = text.strip()
+            if len(name) < 2:
+                return "Por favor proporciona un nombre válido (más de 2 caracteres).", 'quote_register_new', state_data
+            state_data.pop('awaiting_name', None)
+            customer_id = create_customer(ctx.tenant_conn, phone=ctx.phone, name=name)
+            if customer_id:
+                state_data['customer_id'] = customer_id
+                link_wa_customer(ctx.phone, customer_id, ctx.tenant_conn)
+            return f"¡Listo! Te registré como *{name}*. ✅\n\nContinuamos con tu cotización.", 'quote_search', state_data
+
+        name = state_data.get('proposed_name', '').strip()
+        # Si no hay nombre propuesto o parece ser un número de menú, pedir el nombre
+        if not name or name.isdigit():
+            state_data['awaiting_name'] = True
+            return "¡Genial! ¿Cuál es tu *nombre completo*?", 'quote_register_new', state_data
+
+        customer_id = create_customer(ctx.tenant_conn, phone=ctx.phone, name=name)
+        if customer_id:
+            state_data['customer_id'] = customer_id
+            link_wa_customer(ctx.phone, customer_id, ctx.tenant_conn)
+        return f"¡Listo! Te registré como *{name}*. ✅\n\nContinuamos con tu cotización.", 'quote_search', state_data
+
+    if t in ('no', 'nope', 'nah', 'paso'):
+        state_data['customer_id'] = None
+        return (
+            "De acuerdo, continuamos como invitado. 🎭\n\n"
+            "Puedes registrarte en cualquier momento si lo deseas.",
+            'quote_search', state_data
+        )
+
+    return "¿Te gustaría registrarte? Responde *sí* o *no*.", 'quote_register_new', state_data
+
+
+@state('quote_search')
+def handle_quote_search(text, state_data, ctx):
+    """Recibir descripción de la pieza."""
+    search_text = state_data.pop('preloaded_search', None) or text
+
+    if not search_text or len(search_text.strip()) < 2:
+        return _MSG_QUOTE_SEARCH_PROMPT, 'quote_search', state_data
+
+    search_text = search_text.strip()
+    state_data['search_description'] = search_text
+
+    try:
+        from services.ai_chat import chat, chat_with_image
+        if ctx.media_kind == 'image' and ctx.media_base64:
+            ai_resp = chat_with_image(
+                user_message=search_text if search_text != '(imagen)' else 'Identifica esta parte automotriz y sugiere terminos de busqueda.',
+                image_base64=ctx.media_base64,
+                conversation_history=[],
+                inventory_context=None,
+            )
+        else:
+            ai_resp = chat(search_text, conversation_history=[], inventory_context=None)
+        search_query = ai_resp.get('search_query')
+        vehicle = ai_resp.get('vehicle')
+
+        if vehicle and vehicle.get('brand'):
+            state_data['vehicle'] = vehicle
+            from services.wa_quotation import set_vehicle
+            set_vehicle(ctx.tenant_conn, ctx.phone, vehicle)
+
+        confidence = _assess_confidence(ai_resp, search_text)
+        state_data['ai_confidence'] = confidence
+        state_data['ai_search_query'] = search_query
+
+        if confidence >= 0.7:
+            return None, 'quote_inventory_check', state_data
+        else:
+            state_data['learning_cycle'] = 1
+            return None, 'quote_explore', state_data
+
+    except Exception as e:
+        print(f"[WA-SM] AI error in quote_search: {e}")
+        state_data['ai_search_query'] = search_text
+        return None, 'quote_inventory_check', state_data
+
+
+@state('quote_explore')
+def handle_quote_explore(text, state_data, ctx):
+    """Ruta de exploración cuando la AI no está segura."""
+    cycle = state_data.get('learning_cycle', 1)
+
+    if not state_data.get('explore_offered'):
+        description = state_data.get('search_description', '')
+        explore_prompt = _build_explore_prompt(description, state_data.get('vehicle'))
+
+        try:
+            from services.ai_chat import chat
+            ai_resp = chat(explore_prompt, conversation_history=[], inventory_context=None)
+            suggested_part = ai_resp.get('message', '')
+            search_query = ai_resp.get('search_query', '')
+
+            state_data['explore_offered'] = True
+            state_data['explore_suggestion'] = suggested_part
+            state_data['explore_search_query'] = search_query
+
+            offered = state_data.get('offered_parts', [])
+            offered.append({
+                'cycle': cycle,
+                'suggestion': suggested_part,
+                'search_query': search_query,
+                'timestamp': datetime.now().isoformat()
+            })
+            state_data['offered_parts'] = offered
+
+            return _MSG_EXPLORE_OFFER.format(suggestion=suggested_part), 'quote_explore', state_data
+
+        except Exception as e:
+            print(f"[WA-SM] Explore AI error: {e}")
+            return _MSG_EXPLORE_ERROR, 'quote_search', state_data
+
+    t = text.strip().lower() if text else ''
+
+    if t in ('si', 'sí', 'yes', 'ese', 'ese mero', 'correcto', 'va', 'dale'):
+        state_data['ai_search_query'] = state_data.get('explore_search_query', '')
+        state_data.pop('explore_offered', None)
+        state_data.pop('explore_suggestion', None)
+        return None, 'quote_inventory_check', state_data
+
+    if t in ('no', 'nope', 'nah', 'otro', 'diferente'):
+        if cycle < 2:
+            state_data['learning_cycle'] = cycle + 1
+            state_data.pop('explore_offered', None)
+            state_data.pop('explore_suggestion', None)
+            return _MSG_EXPLORE_RETRY, 'quote_explore', state_data
+        else:
+            return _trigger_learning_route(state_data, ctx)
+
+    return _MSG_EXPLORE_CONFIRM_PROMPT, 'quote_explore', state_data
+
+
+@state('quote_inventory_check')
+def handle_quote_inventory_check(text, state_data, ctx):
+    """Buscar en inventario y mostrar resultados."""
+    if not state_data.get('inventory_shown'):
+        search_query = state_data.get('ai_search_query', '')
+        vehicle = state_data.get('vehicle')
+
+        enrichment, found_part = _enrich_wa_reply_with_part(
+            search_query, vehicle, ctx.tenant_conn, ctx.master_conn
+        )
+
+        state_data['inventory_shown'] = True
+        state_data['last_found_part'] = found_part
+
+        if enrichment:
+            if found_part:
+                from services.wa_quotation import set_last_shown_part
+                set_last_shown_part(ctx.tenant_conn, ctx.phone, found_part)
+            reply = (
+                "Aquí está lo que encontré en nuestro inventario:\n\n"
+                f"{enrichment}\n\n"
+                "¿Son las refacciones que necesitas?\n"
+                "Responde *sí* para continuar o *no* para buscar otra."
+            )
+            return reply, 'quote_inventory_check', state_data
+        else:
+            reply = (
+                "No tengo esa pieza exacta en stock actualmente. 😕\n\n"
+                "¿Te gustaría que busque una alternativa similar o prefieres que la ordene por encargo?\n\n"
+                "Responde *sí* para ver alternativas o *no* para regresar."
+            )
+            state_data['inventory_empty'] = True
+            return reply, 'quote_inventory_check', state_data
+
+    t = text.strip().lower() if text else ''
+
+    if t in ('si', 'sí', 'yes', 'va', 'dale', 'correcto'):
+        if state_data.get('inventory_empty'):
+            # Si ya exploramos alternativas (quote_explore) y aún no hay stock,
+            # no entrar en loop infinito — transferir a soporte.
+            if state_data.get('offered_parts') and len(state_data['offered_parts']) > 0:
+                return _trigger_learning_route(state_data, ctx)
+
+            state_data.pop('inventory_shown', None)
+            state_data.pop('inventory_empty', None)
+            # Resetear flags de explore para que quote_explore genere una nueva sugerencia
+            state_data.pop('explore_offered', None)
+            state_data.pop('explore_suggestion', None)
+            # Silent transition: el loop en whatsapp_bp.py ejecutará quote_explore
+            # inmediatamente y generará la sugerencia sin esperar otro mensaje del usuario
+            return None, 'quote_explore', state_data
+
+        found_part = state_data.get('last_found_part')
+        if found_part:
+            state_data['confirmed_parts'] = state_data.get('confirmed_parts', [])
+            state_data['confirmed_parts'].append(found_part)
+        return None, 'quote_delivery_check', state_data
+
+    if t in ('no', 'nope', 'nah', 'otro', 'diferente'):
+        state_data.pop('inventory_shown', None)
+        state_data.pop('last_found_part', None)
+        state_data.pop('inventory_empty', None)
+        return "De acuerdo. ¿Qué otra refacción estás buscando?", 'quote_search', state_data
+
+    return "¿Confirmas que son estas refacciones? Responde *sí* o *no*.", 'quote_inventory_check', state_data
+
+
+@state('quote_delivery_check')
+def handle_quote_delivery_check(text, state_data, ctx):
+    """Determinar si el cliente quiere envío a domicilio."""
+    if not state_data.get('delivery_checked'):
+        has_delivery = _check_branch_delivery(ctx.tenant_conn, ctx.branch_id)
+        state_data['delivery_checked'] = True
+        state_data['has_delivery'] = has_delivery
+
+        if not has_delivery:
+            return None, 'quote_emit', state_data
+
+        return _MSG_DELIVERY_PROMPT, 'quote_delivery_check', state_data
+
+    t = text.strip().lower() if text else ''
+
+    if t in ('si', 'sí', 'yes', 'va', 'dale'):
+        state_data['wants_delivery'] = True
+        return None, 'quote_delivery_address', state_data
+
+    if t in ('no', 'nope', 'nah', 'paso', 'recojo'):
+        state_data['wants_delivery'] = False
+        return None, 'quote_emit', state_data
+
+    return "¿Deseas envío a domicilio? Responde *sí* o *no*.", 'quote_delivery_check', state_data
+
+
+@state('quote_delivery_address')
+def handle_quote_delivery_address(text, state_data, ctx):
+    """Obtener o confirmar dirección de envío."""
+    from services.wa_customer import get_customer_address, update_customer_address
+
+    customer_id = state_data.get('customer_id')
+
+    if not state_data.get('address_prompted'):
+        state_data['address_prompted'] = True
+
+        if customer_id:
+            address = get_customer_address(ctx.tenant_conn, customer_id)
+            if address:
+                state_data['saved_address'] = address
+                return _MSG_DELIVERY_ADDRESS_CONFIRM.format(address=address), 'quote_delivery_address', state_data
+
+        return _MSG_DELIVERY_ADDRESS_REQUEST, 'quote_delivery_address', state_data
+
+    t = text.strip().lower() if text else ''
+
+    if state_data.get('saved_address') and t in ('si', 'sí', 'yes', 'correcto', 'va'):
+        state_data['delivery_address'] = state_data['saved_address']
+        return None, 'quote_emit', state_data
+
+    if text and len(text.strip()) > 5:
+        state_data['delivery_address'] = text.strip()
+        if customer_id:
+            update_customer_address(ctx.tenant_conn, customer_id, text.strip())
+        return _MSG_DELIVERY_ADDRESS_SAVED.format(address=text.strip()), 'quote_emit', state_data
+
+    if state_data.get('saved_address'):
+        return "Responde *sí* para confirmar la dirección o escribe la nueva dirección.", 'quote_delivery_address', state_data
+
+    return "Por favor proporciona una dirección válida para el envío.", 'quote_delivery_address', state_data
+
+
+@state('quote_emit')
+def handle_quote_emit(text, state_data, ctx):
+    """Crear/actualizar cotización y presentarla."""
+    if not state_data.get('quote_emitted'):
+        state_data['quote_emitted'] = True
+
+        confirmed_parts = state_data.get('confirmed_parts', [])
+        if not confirmed_parts:
+            return "No tienes refacciones seleccionadas. 😕\n\n¿Qué estás buscando?", 'quote_search', state_data
+
+        from services.wa_quotation import (
+            get_open_quotation, create_quotation, add_item_to_quotation,
+            get_quotation_detail, format_quotation_wa
+        )
+
+        qid = get_open_quotation(ctx.tenant_conn, ctx.phone)
+        if not qid:
+            qid = create_quotation(ctx.tenant_conn, ctx.phone)
+
+        customer_id = state_data.get('customer_id')
+        if customer_id:
+            cur = ctx.tenant_conn.cursor()
+            cur.execute(
+                "UPDATE quotations SET customer_id = %s WHERE id = %s",
+                (customer_id, qid)
+            )
+            ctx.tenant_conn.commit()
+            cur.close()
+
+        for part in confirmed_parts:
+            add_item_to_quotation(ctx.tenant_conn, qid, part, quantity=1)
+
+        if state_data.get('wants_delivery') and state_data.get('delivery_address'):
+            cur = ctx.tenant_conn.cursor()
+            cur.execute(
+                "UPDATE quotations SET notes = CONCAT(COALESCE(notes,''), ' | DELIVERY: ', %s) WHERE id = %s",
+                (state_data['delivery_address'], qid)
+            )
+            ctx.tenant_conn.commit()
+            cur.close()
+
+        detail = get_quotation_detail(ctx.tenant_conn, qid)
+        quote_text = format_quotation_wa(detail)
+
+        reply = (
+            f"{quote_text}\n\n"
+            "¿Qué deseas hacer?\n"
+            "• Escribe *agregar* para más productos\n"
+            "• Escribe *enviar* para recibir tu cotización por imagen\n"
+            "• Escribe *confirmar* para hacer el pedido\n"
+            "• Escribe *limpiar* para empezar de nuevo"
+        )
+        return reply, 'quote_command_created', state_data
+
+    return None, 'quote_command_created', state_data
+
+
+@state('quote_command_created')
+def handle_quote_command_created(text, state_data, ctx):
+    """Escuchar comandos sobre la cotización existente."""
+    t = text.strip().lower() if text else ''
+
+    if t in ('agregar', 'más', 'mas', 'otro', 'otra', 'seguir'):
+        state_data.pop('inventory_shown', None)
+        state_data.pop('last_found_part', None)
+        state_data.pop('inventory_empty', None)
+        state_data.pop('quote_emitted', None)
+        return "¿Qué otra refacción necesitas?", 'quote_search', state_data
+
+    if t in ('enviar', 'mandar', 'pdf', 'imagen', 'foto'):
+        try:
+            from services.wa_quotation import get_open_quotation, get_quotation_detail
+            from services.quote_image import generate_quote_image
+            from services.whatsapp_service import send_image
+
+            qid = get_open_quotation(ctx.tenant_conn, ctx.phone)
+            if qid:
+                detail = get_quotation_detail(ctx.tenant_conn, qid)
+                quote_items = [{
+                    'name': it.get('name', ''),
+                    'sku': it.get('part_number', ''),
+                    'qty': it.get('quantity', 1),
+                    'price': float(it.get('unit_price', 0)),
+                    'total': float(it.get('total', 0)),
+                } for it in detail.get('items', [])]
+                totals = {
+                    'subtotal': float(detail.get('subtotal', 0)),
+                    'tax': float(detail.get('tax_total', 0)),
+                    'total': float(detail.get('total', 0)),
+                }
+                tenant_name = _get_tenant_business_name(ctx.tenant_conn)
+                b64_img = generate_quote_image(quote_items, totals, tenant_name=tenant_name)
+                img_result = send_image(
+                    ctx.phone,
+                    caption="Aquí está tu cotización 👇",
+                    base64_image=b64_img,
+                    bridge_url=ctx.wa_config.get('bridge_url')
+                )
+                if img_result.get('success'):
+                    return (
+                        "📎 *Te envié tu cotización en imagen.*\n\n"
+                        "¿Qué deseas hacer?\n"
+                        "• *agregar* — más productos\n"
+                        "• *confirmar* — hacer el pedido\n"
+                        "• *limpiar* — empezar de nuevo",
+                        'quote_command_created',
+                        state_data
+                    )
+        except Exception as e:
+            print(f"[WA-SM] Quote image failed: {e}")
+
+        from services.wa_quotation import get_open_quotation, get_quotation_detail, format_quotation_wa
+        qid = get_open_quotation(ctx.tenant_conn, ctx.phone)
+        if qid:
+            detail = get_quotation_detail(ctx.tenant_conn, qid)
+            return format_quotation_wa(detail), 'quote_command_created', state_data
+
+    if t in ('confirmar', 'confirmo', 'acepto', 'si', 'sí', 'va', 'ordenar', 'pedir'):
+        from services.wa_quotation import confirm_quotation
+        qid = confirm_quotation(ctx.tenant_conn, ctx.phone)
+        if qid:
+            reply = (
+                "✅ *¡Pedido confirmado!*\n\n"
+                "Tu cotización fue registrada.\n"
+                "Nos pondremos en contacto contigo para coordinar la entrega.\n\n"
+                "¡Gracias por tu compra! 🙏"
+            )
+            clean_data = {
+                'customer_id': state_data.get('customer_id'),
+                'branch_name': state_data.get('branch_name'),
+            }
+            return reply, 'support_done', clean_data
+
+    if t in ('limpiar', 'borrar', 'nueva', 'cancelar', 'reset'):
+        from services.wa_quotation import clear_quotation
+        clear_quotation(ctx.tenant_conn, ctx.phone)
+        clean_data = {
+            'customer_id': state_data.get('customer_id'),
+            'branch_name': state_data.get('branch_name'),
+        }
+        return (
+            "🗑️ Cotización limpiada.\n\n"
+            "¿Qué refacción estás buscando?",
+            'quote_search',
+            clean_data
+        )
+
+    return (
+        "No entendí. Puedes escribir:\n"
+        "• *agregar* — para más productos\n"
+        "• *enviar* — para recibir imagen\n"
+        "• *confirmar* — para hacer el pedido\n"
+        "• *limpiar* — para empezar de nuevo",
+        'quote_command_created',
+        state_data
+    )
+
+
+# ─── Estados de Facturación ──────────────────────────────────────────
+
+@state('invoice_identify')
+def handle_invoice_identify(text, state_data, ctx):
+    """Identificar cliente antes de buscar facturas."""
+    from services.wa_customer import search_customers, link_wa_customer
+
+    if state_data.get('customer_id'):
+        return None, 'invoice_search', state_data
+
+    if not state_data.get('invoice_identify_prompted'):
+        state_data['invoice_identify_prompted'] = True
+        return "Para buscar tus facturas, ¿podrías indicarme tu *nombre* o *número de cliente*?", 'invoice_identify', state_data
+
+    if text:
+        customers = search_customers(text.strip(), ctx.tenant_conn)
+
+        if len(customers) == 1:
+            state_data['customer_id'] = customers[0]['id']
+            link_wa_customer(ctx.phone, customers[0]['id'], ctx.tenant_conn)
+            return f"¡Perfecto, {customers[0]['name']}! Buscando tus facturas... 📋", 'invoice_search', state_data
+
+        if len(customers) > 1:
+            state_data['invoice_customer_candidates'] = customers
+            options = '\n'.join([f"{i+1}. {c['name']} (#{c['id']})" for i, c in enumerate(customers[:5])])
+            return f"Encontré varios clientes:\n\n{options}\n\nResponde con el número correcto.", 'invoice_select_customer', state_data
+
+        return (
+            "No te encontré en el sistema. Sin un cliente registrado no puedo buscar facturas existentes.\n\n"
+            "Si necesitas generar una factura nueva, puedo ayudarte a capturar tus datos fiscales.\n"
+            "Responde *nueva* para generar una factura nueva o *menu* para volver.",
+            'invoice_no_customer',
+            state_data
+        )
+
+    return "Por favor indícame tu nombre o número de cliente.", 'invoice_identify', state_data
+
+
+@state('invoice_select_customer')
+def handle_invoice_select_customer(text, state_data, ctx):
+    """Seleccionar cliente entre múltiples candidatos en facturación."""
+    from services.wa_customer import link_wa_customer
+
+    candidates = state_data.get('invoice_customer_candidates', [])
+    try:
+        selection = int(text.strip())
+        if 1 <= selection <= len(candidates):
+            chosen = candidates[selection - 1]
+            state_data['customer_id'] = chosen['id']
+            del state_data['invoice_customer_candidates']
+            link_wa_customer(ctx.phone, chosen['id'], ctx.tenant_conn)
+            return f"¡Perfecto, {chosen['name']}! Buscando tus facturas...", 'invoice_search', state_data
+    except (ValueError, IndexError):
+        pass
+
+    return f"Responde con un número del 1 al {len(candidates)}.", 'invoice_select_customer', state_data
+
+
+@state('invoice_no_customer')
+def handle_invoice_no_customer(text, state_data, ctx):
+    """Cliente no encontrado en facturación."""
+    t = text.strip().lower() if text else ''
+
+    if t in ('nueva', 'nueva factura', 'generar', 'sí', 'si', 'ok'):
+        return None, 'invoice_capture_fiscal', state_data
+
+    if t in ('menu', 'menú', 'inicio', 'volver'):
+        return _MSG_MENU, 'menu', state_data
+
+    return (
+        "¿Qué deseas hacer?\n"
+        "• *nueva* — Generar factura nueva\n"
+        "• *menú* — Volver al inicio",
+        'invoice_no_customer',
+        state_data
+    )
+
+
+@state('invoice_search')
+def handle_invoice_search(text, state_data, ctx):
+    """Buscar facturas del cliente."""
+    customer_id = state_data.get('customer_id')
+    if not customer_id:
+        return "Error: cliente no identificado.", 'invoice_identify', state_data
+
+    cur = ctx.tenant_conn.cursor()
+    cur.execute("""
+        SELECT s.id, s.created_at, s.total,
+               (SELECT COUNT(*) FROM sale_items WHERE sale_id = s.id) as item_count
+        FROM sales s
+        WHERE s.customer_id = %s AND s.status = 'completed'
+        ORDER BY s.created_at DESC
+        LIMIT 5
+    """, (customer_id,))
+    rows = cur.fetchall()
+    cur.close()
+
+    if not rows:
+        return (
+            "No encontré facturas de compras a tu nombre. 😕\n\n"
+            "Si necesitas generar una factura para una compra reciente, "
+            "puedo ayudarte a capturar tus datos fiscales y el ticket.\n\n"
+            "Responde *sí* para continuar o *menú* para volver.",
+            'invoice_capture_fiscal',
+            state_data
+        )
+
+    lines = ["📋 *Tus facturas recientes:*\n"]
+    for i, row in enumerate(rows, 1):
+        sale_id, created_at, total, item_count = row
+        if hasattr(created_at, 'strftime'):
+            date_str = created_at.strftime('%d/%m/%Y')
+        else:
+            date_str = str(created_at)[:10]
+        lines.append(f"{i}. Folio #{sale_id} — ${float(total):,.2f} — {date_str} ({item_count} artículos)")
+
+    lines.append("\n6. *Otra* — Indicar cuál necesito")
+    lines.append("\nResponde con el número de la factura que necesitas.")
+
+    state_data['invoice_sales'] = [{
+        'id': r[0], 'created_at': str(r[1]), 'total': float(r[2]), 'item_count': r[3]
+    } for r in rows]
+
+    return '\n'.join(lines), 'invoice_select', state_data
+
+
+@state('invoice_select')
+def handle_invoice_select(text, state_data, ctx):
+    """Cliente selecciona una factura de la lista."""
+    sales = state_data.get('invoice_sales', [])
+    t = text.strip().lower() if text else ''
+
+    if t in ('6', 'otra', 'otro', 'otra factura', 'buscar'):
+        return "Indícame el folio, fecha aproximada o monto de la factura que necesitas.", 'invoice_custom_search', state_data
+
+    try:
+        selection = int(t)
+        if 1 <= selection <= len(sales):
+            sale = sales[selection - 1]
+            state_data['selected_sale_id'] = sale['id']
+            return _process_invoice_send(sale['id'], state_data, ctx)
+    except (ValueError, IndexError):
+        pass
+
+    return (
+        f"Por favor responde con un número del 1 al {len(sales)}, o *6* para buscar otra.",
+        'invoice_select',
+        state_data
+    )
+
+
+@state('invoice_custom_search')
+def handle_invoice_custom_search(text, state_data, ctx):
+    """Buscar factura por criterios alternativos."""
+    if not text or len(text.strip()) < 2:
+        return "Indícame el folio, fecha (dd/mm/aaaa) o monto de la factura.", 'invoice_custom_search', state_data
+
+    criteria = text.strip()
+    customer_id = state_data.get('customer_id')
+
+    cur = ctx.tenant_conn.cursor()
+
+    # 1. Buscar por ID exacto
+    try:
+        sale_id = int(criteria)
+        cur.execute(
+            "SELECT id, created_at, total FROM sales WHERE id = %s AND customer_id = %s AND status = 'completed'",
+            (sale_id, customer_id)
+        )
+        row = cur.fetchone()
+        if row:
+            cur.close()
+            state_data['selected_sale_id'] = row[0]
+            return _process_invoice_send(row[0], state_data, ctx)
+    except ValueError:
+        pass
+
+    # 2. Buscar por fecha
+    for fmt in ('%d/%m/%Y', '%d-%m-%Y', '%Y-%m-%d'):
+        try:
+            from datetime import datetime
+            date_obj = datetime.strptime(criteria, fmt)
+            cur.execute(
+                "SELECT id, created_at, total FROM sales WHERE DATE(created_at) = %s AND customer_id = %s AND status = 'completed' LIMIT 5",
+                (date_obj.date(), customer_id)
+            )
+            rows = cur.fetchall()
+            if len(rows) == 1:
+                cur.close()
+                state_data['selected_sale_id'] = rows[0][0]
+                return _process_invoice_send(rows[0][0], state_data, ctx)
+            elif len(rows) > 1:
+                cur.close()
+                lines = ["Encontré varias facturas en esa fecha:\n"]
+                for i, r in enumerate(rows, 1):
+                    lines.append(f"{i}. Folio #{r[0]} — ${float(r[2]):,.2f}")
+                lines.append("\nResponde con el número.")
+                state_data['invoice_custom_results'] = [{'id': r[0]} for r in rows]
+                return '\n'.join(lines), 'invoice_custom_results', state_data
+        except ValueError:
+            continue
+
+    # 3. Buscar por monto aproximado
+    try:
+        amount = float(criteria.replace(',', '').replace('$', ''))
+        cur.execute(
+            "SELECT id, created_at, total FROM sales WHERE ABS(total - %s) < 10 AND customer_id = %s AND status = 'completed' LIMIT 5",
+            (amount, customer_id)
+        )
+        rows = cur.fetchall()
+        if len(rows) == 1:
+            cur.close()
+            state_data['selected_sale_id'] = rows[0][0]
+            return _process_invoice_send(rows[0][0], state_data, ctx)
+        elif len(rows) > 1:
+            cur.close()
+            lines = ["Encontré varias facturas con ese monto:\n"]
+            for i, r in enumerate(rows, 1):
+                if hasattr(r[1], 'strftime'):
+                    date_str = r[1].strftime('%d/%m/%Y')
+                else:
+                    date_str = str(r[1])[:10]
+                lines.append(f"{i}. Folio #{r[0]} — ${float(r[2]):,.2f} — {date_str}")
+            lines.append("\nResponde con el número.")
+            state_data['invoice_custom_results'] = [{'id': r[0]} for r in rows]
+            return '\n'.join(lines), 'invoice_custom_results', state_data
+    except ValueError:
+        pass
+
+    cur.close()
+    return (
+        "No encontré facturas con ese criterio. 😕\n\n"
+        "Intenta con:\n"
+        "• Número de folio exacto\n"
+        "• Fecha (dd/mm/aaaa)\n"
+        "• Monto total (ej. 1234.50)\n\n"
+        "O responde *nueva* si necesitas generar una factura nueva.",
+        'invoice_custom_search',
+        state_data
+    )
+
+
+@state('invoice_custom_results')
+def handle_invoice_custom_results(text, state_data, ctx):
+    """Seleccionar de resultados de búsqueda alternativa."""
+    results = state_data.get('invoice_custom_results', [])
+    try:
+        selection = int(text.strip())
+        if 1 <= selection <= len(results):
+            sale_id = results[selection - 1]['id']
+            state_data['selected_sale_id'] = sale_id
+            return _process_invoice_send(sale_id, state_data, ctx)
+    except (ValueError, IndexError):
+        pass
+
+    return f"Responde con un número del 1 al {len(results)}.", 'invoice_custom_results', state_data
+
+
+@state('invoice_capture_fiscal')
+def handle_invoice_capture_fiscal(text, state_data, ctx):
+    """Capturar datos fiscales para nueva factura."""
+    if not state_data.get('fiscal_prompted'):
+        state_data['fiscal_prompted'] = True
+        return _MSG_INVOICE_FISCAL_PROMPT, 'invoice_capture_fiscal', state_data
+
+    if not text or len(text.strip()) < 5:
+        return "Por favor envíame tus datos fiscales completos.", 'invoice_capture_fiscal', state_data
+
+    fiscal = _parse_fiscal_data(text.strip())
+
+    if not fiscal.get('rfc'):
+        return (
+            "No pude identificar tu RFC. Por favor envíame los datos en este formato:\n\n"
+            "RFC: XXXX000000XXX\n"
+            "Razón social: Tu Empresa S.A. de C.V.\n"
+            "Uso CFDI: G03\n"
+            "CP: 12345",
+            'invoice_capture_fiscal',
+            state_data
+        )
+
+    state_data['fiscal_data'] = fiscal
+    return (
+        f"✅ Datos fiscales capturados:\n\n"
+        f"RFC: {fiscal['rfc']}\n"
+        f"Razón social: {fiscal['razon_social']}\n"
+        f"Uso CFDI: {fiscal.get('uso_cfdi', 'G03')}\n"
+        f"CP: {fiscal.get('cp', 'N/A')}\n\n"
+        f"Ahora envíame una foto del ticket de compra.",
+        'invoice_capture_ticket',
+        state_data
+    )
+
+
+@state('invoice_capture_ticket')
+def handle_invoice_capture_ticket(text, state_data, ctx):
+    """Recibir foto del ticket de compra."""
+    if ctx.media_kind == 'image' and ctx.media_base64:
+        state_data['ticket_image_b64'] = ctx.media_base64
+        return (
+            "✅ Ticket recibido.\n\n"
+            "Procesando tu factura... Esto puede tomar unos momentos.",
+            'invoice_generate',
+            state_data
+        )
+
+    return (
+        "Por favor envíame una *foto* del ticket de compra para validar los datos. 📸\n\n"
+        "Asegúrate de que se vean claramente los productos, montos y fecha.",
+        'invoice_capture_ticket',
+        state_data
+    )
+
+
+@state('invoice_generate')
+def handle_invoice_generate(text, state_data, ctx):
+    """Generar factura vía API SAT (placeholder en fase 1)."""
+    return (
+        "📄 *Factura en proceso*\n\n"
+        "He recibido todos tus datos y el ticket. Tu solicitud fue enviada al área de facturación.\n\n"
+        "Te contactaremos en cuanto tu factura esté lista (usualmente en menos de 24 horas hábiles).\n\n"
+        "¿Necesitas algo más? Escribe *menú* para volver.",
+        'invoice_send',
+        state_data
+    )
+
+
+@state('invoice_send')
+def handle_invoice_send(text, state_data, ctx):
+    """Confirmar envío de factura y cerrar flujo."""
+    return None, 'support_done', state_data
+
+
+# ─── Funciones auxiliares ────────────────────────────────────────────
+
+def _is_greeting(text):
+    """Detectar si el texto es un saludo."""
+    greetings = ('hola', 'buenos dias', 'buenas tardes', 'buenas noches',
+                 'hey', 'que onda', 'saludos', 'buen dia', 'buena tarde',
+                 'buena noche', 'qué tal', 'como estas', 'cómo estás')
+    return text.strip().lower() in greetings
+
+
+def _get_branch_name(tenant_conn, branch_id):
+    """Obtener nombre de la sucursal."""
+    if not tenant_conn:
+        return 'Autopartes'
+    try:
+        cur = tenant_conn.cursor()
+        if branch_id:
+            cur.execute("SELECT name FROM branches WHERE id = %s", (branch_id,))
+            row = cur.fetchone()
+            if row and row[0]:
+                cur.close()
+                return row[0]
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'tenant_business_name'")
+        row = cur.fetchone()
+        cur.close()
+        return row[0] if row and row[0] else 'Autopartes'
+    except Exception as e:
+        print(f"[WA-SM] get_branch_name error: {e}")
+        return 'Autopartes'
+
+
+def _get_branch_phone(tenant_conn, branch_id):
+    """Obtener teléfono de la sucursal."""
+    if not tenant_conn:
+        return '(pendiente)'
+    try:
+        cur = tenant_conn.cursor()
+        if branch_id:
+            cur.execute("SELECT phone FROM branches WHERE id = %s", (branch_id,))
+            row = cur.fetchone()
+            if row and row[0]:
+                cur.close()
+                return row[0]
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'tenant_phone'")
+        row = cur.fetchone()
+        cur.close()
+        return row[0] if row and row[0] else '(pendiente)'
+    except Exception as e:
+        print(f"[WA-SM] get_branch_phone error: {e}")
+        return '(pendiente)'
+
+
+def _get_tenant_business_name(tenant_conn):
+    """Obtener nombre del negocio desde tenant_config."""
+    if not tenant_conn:
+        return 'Autopartes'
+    try:
+        cur = tenant_conn.cursor()
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'tenant_business_name'")
+        row = cur.fetchone()
+        cur.close()
+        return row[0] if row and row[0] else 'Autopartes'
+    except Exception:
+        return 'Autopartes'
+
+
+def _get_customer_by_id(tenant_conn, customer_id):
+    """Wrapper interno para obtener cliente por ID."""
+    from services.wa_customer import get_customer_by_id
+    return get_customer_by_id(tenant_conn, customer_id)
+
+
+def _check_branch_delivery(tenant_conn, branch_id):
+    """Verificar si la sucursal tiene envío activo."""
+    if not tenant_conn:
+        return False
+    try:
+        cur = tenant_conn.cursor()
+        cur.execute(
+            "SELECT is_enabled FROM branch_delivery_config WHERE branch_id = %s",
+            (branch_id,)
+        )
+        row = cur.fetchone()
+        cur.close()
+        if row:
+            return row[0]
+
+        cur = tenant_conn.cursor()
+        cur.execute("SELECT value FROM tenant_config WHERE key = 'delivery_enabled'")
+        row = cur.fetchone()
+        cur.close()
+        return row[0].lower() == 'true' if row and row[0] else False
+    except Exception as e:
+        print(f"[WA-SM] check_branch_delivery error: {e}")
+        return False
+
+
+def _assess_confidence(ai_resp, original_text):
+    """Evaluar confianza de la AI en su interpretación."""
+    search_query = ai_resp.get('search_query', '') or ''
+    if not search_query:
+        return 0.0
+
+    if re.search(r'[A-Z0-9]{5,}', original_text.upper()):
+        return 0.95
+
+    words = search_query.split()
+    if len(words) <= 1:
+        return 0.4
+
+    if ai_resp.get('vehicle', {}).get('brand') and len(words) >= 2:
+        return 0.85
+
+    return 0.6
+
+
+def _build_explore_prompt(description, vehicle=None):
+    """Construir prompt de exploración para la AI."""
+    vehicle_str = ""
+    if vehicle:
+        vehicle_str = f"Vehículo: {vehicle.get('brand','')} {vehicle.get('model','')} {vehicle.get('year','')}. "
+
+    return (
+        f"El cliente busca una refacción automotriz pero la descripción es ambigua.\n"
+        f"{vehicle_str}\n"
+        f"Descripción del cliente: '{description}'\n\n"
+        f"Tu tarea: Identificar la pieza MÁS PROBABLE que el cliente necesita. "
+        f"Responde en JSON: {{\"message\":\"nombre de la pieza sugerida\", "
+        f"\"search_query\":\"términos en inglés para buscar en catálogo\", "
+        f"\"vehicle\":{{\"brand\":\"...\",\"model\":\"...\",\"year\":\"...\"}}}}\n\n"
+        f"La 'message' debe ser una sugerencia clara y específica en español, "
+        f"como 'Balata de freno delantera cerámica' o 'Filtro de aceite Mann W712/80'."
+    )
+
+
+def _trigger_learning_route(state_data, ctx):
+    """Registrar sesión no resuelta y transferir a soporte."""
+    try:
+        from services.wa_learning import register_unresolved_search
+        register_unresolved_search(
+            phone=ctx.phone,
+            customer_id=state_data.get('customer_id'),
+            description=state_data.get('search_description', ''),
+            offered_parts=state_data.get('offered_parts', []),
+            tenant_conn=ctx.tenant_conn
+        )
+    except Exception as e:
+        print(f"[WA-SM] Learning registration failed: {e}")
+
+    phone_branch = _get_branch_phone(ctx.tenant_conn, ctx.branch_id)
+    reply = _MSG_LEARNING_TRANSFER.format(phone=phone_branch)
+
+    clean_data = {
+        'customer_id': state_data.get('customer_id'),
+        'branch_name': state_data.get('branch_name'),
+    }
+    return reply, 'support_done', clean_data
+
+
+def _enrich_wa_reply_with_part(search_query, vehicle, tenant_conn, master_conn):
+    """Wrapper para la función existente en whatsapp_bp (import local para evitar circular)."""
+    from blueprints.whatsapp_bp import _enrich_wa_reply_with_part as enrich
+    return enrich(search_query, vehicle, tenant_conn, master_conn)
+
+
+def _parse_fiscal_data(text):
+    """Extraer RFC, razón social, uso CFDI y CP de texto libre."""
+    result = {}
+
+    rfc_match = re.search(r'[A-ZÑ&]{3,4}[0-9]{6}[A-ZÑ&0-9]{3}', text.upper())
+    if rfc_match:
+        result['rfc'] = rfc_match.group(0)
+
+    rs_patterns = [
+        r'(?:raz[oó]n social|nombre|empresa)[\s:]+([^\n]+)',
+        r'(?:razon social)[\s:]+([^\n]+)',
+    ]
+    for pat in rs_patterns:
+        match = re.search(pat, text, re.IGNORECASE)
+        if match:
+            result['razon_social'] = match.group(1).strip()
+            break
+
+    uso_match = re.search(r'(?:uso\s*cfdi|cfdi)[\s:]+([A-Z0-9]{3})', text, re.IGNORECASE)
+    if uso_match:
+        result['uso_cfdi'] = uso_match.group(1).upper()
+
+    cp_match = re.search(r'(?:cp|c\.p\.|código postal)[\s:]+(\d{5})', text, re.IGNORECASE)
+    if cp_match:
+        result['cp'] = cp_match.group(1)
+
+    if not result.get('razon_social'):
+        lines = [l.strip() for l in text.split('\n') if l.strip()]
+        for line in lines:
+            if not re.search(r'[A-ZÑ&]{3,4}[0-9]{6}', line) and not re.match(r'\d{5}$', line):
+                if len(line) > 3:
+                    result['razon_social'] = line
+                    break
+
+    return result
+
+
+def _process_invoice_send(sale_id, state_data, ctx):
+    """Buscar CFDI existente o encolar generación."""
+    cur = ctx.tenant_conn.cursor()
+
+    cur.execute("""
+        SELECT id, status, xml_signed, uuid_fiscal, provisional_folio
+        FROM cfdi_queue
+        WHERE sale_id = %s AND type = 'ingreso' AND status IN ('stamped', 'signed')
+        ORDER BY created_at DESC LIMIT 1
+    """, (sale_id,))
+    row = cur.fetchone()
+
+    if row and row[2]:
+        cur.close()
+        return (
+            f"📄 *Factura encontrada*\n\n"
+            f"Folio fiscal: {row[4] or row[3] or 'N/A'}\n"
+            f"UUID: {row[3] or 'N/A'}\n\n"
+            f"Te la envío en un momento...\n\n"
+            f"¿Necesitas algo más? Escribe *menú* para volver.",
+            'invoice_send',
+            state_data
+        )
+
+    cur.close()
+    return (
+        "📄 Estoy generando tu factura...\n\n"
+        "Esto puede tomar unos momentos. Te la enviaré en cuanto esté lista.\n\n"
+        "¿Necesitas algo más? Escribe *menú* para volver.",
+        'invoice_send',
+        state_data
+    )
+
+
+# ─── Persistencia de sesión (para uso desde whatsapp_bp) ─────────────
+
+def get_session(tenant_conn, phone):
+    """Cargar sesión WA desde DB."""
+    from services.wa_quotation import _ensure_sessions_table
+    _ensure_sessions_table(tenant_conn)
+
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        SELECT state, state_data, customer_id, updated_at
+        FROM whatsapp_sessions WHERE phone = %s
+    """, (phone,))
+    row = cur.fetchone()
+    cur.close()
+
+    if row:
+        return {
+            'state': row[0] or 'idle',
+            'state_data': row[1] if isinstance(row[1], dict) else (json.loads(row[1]) if row[1] else {}),
+            'customer_id': row[2],
+            'updated_at': row[3],
+        }
+    return {'state': 'idle', 'state_data': {}, 'customer_id': None, 'updated_at': None}
+
+
+def save_session(tenant_conn, phone, state, state_data):
+    """Persistir estado de sesión."""
+    from services.wa_quotation import _ensure_sessions_table
+    _ensure_sessions_table(tenant_conn)
+
+    cur = tenant_conn.cursor()
+    cur.execute("""
+        INSERT INTO whatsapp_sessions (phone, state, state_data, updated_at)
+        VALUES (%s, %s, %s, NOW())
+        ON CONFLICT (phone) DO UPDATE SET
+            state = EXCLUDED.state,
+            state_data = EXCLUDED.state_data,
+            updated_at = NOW()
+    """, (phone, state, json.dumps(state_data)))
+    tenant_conn.commit()
+    cur.close()
diff --git a/pos/services/webhook_service.py b/pos/services/webhook_service.py
new file mode 100644
index 0000000..0dba55a
--- /dev/null
+++ b/pos/services/webhook_service.py
@@ -0,0 +1,65 @@
+"""Webhook dispatch service for dropshipping and external integrations.
+
+Sends POST requests to configured target URLs with retry logic.
+Can be called synchronously or enqueued via Celery.
+"""
+
+import json
+import logging
+import requests
+import threading
+from typing import Optional
+
+logger = logging.getLogger(__name__)
+
+
+def _send_post(url: str, payload: dict, headers: Optional[dict] = None, timeout: int = 10):
+    """Send a POST request and return (success, status_code, response_text)."""
+    default_headers = {"Content-Type": "application/json"}
+    if headers:
+        default_headers.update(headers)
+    try:
+        resp = requests.post(url, json=payload, headers=default_headers, timeout=timeout)
+        success = 200 <= resp.status_code < 300
+        if not success:
+            logger.warning("Webhook %s returned %s: %s", url, resp.status_code, resp.text[:200])
+        return success, resp.status_code, resp.text
+    except requests.exceptions.Timeout:
+        logger.warning("Webhook %s timed out after %ss", url, timeout)
+        return False, 0, "timeout"
+    except Exception as e:
+        logger.warning("Webhook %s failed: %s", url, e)
+        return False, 0, str(e)
+
+
+def dispatch_webhook_sync(target_url: str, event_type: str, payload: dict, secret: Optional[str] = None):
+    """Send webhook synchronously (use inside Celery tasks for async)."""
+    full_payload = {
+        "event": event_type,
+        "data": payload,
+    }
+    headers = {}
+    if secret:
+        headers["X-Webhook-Secret"] = secret
+    success, status, body = _send_post(target_url, full_payload, headers=headers)
+    return {"success": success, "status": status, "body": body[:500]}
+
+
+def dispatch_webhooks_bulk(target_urls: list[str], event_type: str, payload: dict, secret: Optional[str] = None):
+    """Dispatch to multiple URLs concurrently using threads."""
+    results = []
+    threads = []
+
+    def _send(url):
+        result = dispatch_webhook_sync(url, event_type, payload, secret=secret)
+        results.append({"url": url, **result})
+
+    for url in target_urls:
+        t = threading.Thread(target=_send, args=(url,))
+        t.start()
+        threads.append(t)
+
+    for t in threads:
+        t.join(timeout=15)
+
+    return results
diff --git a/pos/services/whatsapp_service.py b/pos/services/whatsapp_service.py
index bb9e151..067b71e 100644
--- a/pos/services/whatsapp_service.py
+++ b/pos/services/whatsapp_service.py
@@ -88,9 +88,19 @@ def process_incoming(webhook_data):
     key = data.get('key', {})
     message = data.get('message', {})
 
-    # remoteJid can be phone@s.whatsapp.net or LID@lid
+    # remoteJid can be phone@s.whatsapp.net or LID:instance@lid
     remote_jid = key.get('remoteJid', '')
-    phone = remote_jid.replace('@s.whatsapp.net', '').replace('@lid', '')
+    # Strip JID suffixes and LID instance suffix (:12)
+    phone = remote_jid.split('@')[0].split(':')[0] if remote_jid else ''
+
+    # DEBUG
+    import json
+    print(f"[WA-DEBUG] key fields: {json.dumps({k: v for k, v in key.items() if k in ('remoteJid', 'senderPn', 'fromMe', 'id')})}")
+
+    # senderPn contains the real phone number when remoteJid is a privacy LID
+    sender_pn = key.get('senderPn', '')
+    if sender_pn:
+        sender_pn = sender_pn.replace('@s.whatsapp.net', '')
 
     # The bridge now classifies and passes these extra fields. Fall back to
     # the old parsing if they're missing (older bridge version).
@@ -105,6 +115,7 @@ def process_incoming(webhook_data):
     #  - For 'text' messages → conversation or extendedTextMessage
     #  - For 'image'/'video' → the caption (may be empty)
     #  - For 'audio' → empty (filled in later by Whisper transcription)
+    #  - For 'location' → synthetic text with coordinates
     if media_kind == 'text':
         text = (
             message.get('conversation', '')
@@ -114,9 +125,14 @@ def process_incoming(webhook_data):
     else:
         text = media_caption
 
+    # Location fields (from bridge classification)
+    latitude = data.get('latitude')
+    longitude = data.get('longitude')
+
     return {
         'phone': phone,
         'jid': remote_jid,
+        'sender_pn': sender_pn,
         'text': text,
         'from_me': key.get('fromMe', False),
         'message_id': key.get('id', ''),
@@ -125,4 +141,20 @@ def process_incoming(webhook_data):
         'media_mimetype': media_mimetype,
         'is_voice_note': is_voice_note,
         'push_name': push_name,
+        'latitude': latitude,
+        'longitude': longitude,
     }
+
+
+def send_image(phone, caption, base64_image, bridge_url=None):
+    """Send an image message via the Baileys bridge."""
+    url = _get_url(bridge_url)
+    try:
+        return requests.post(
+            f'{url}/send-image',
+            headers=HEADERS,
+            json={'phone': phone, 'caption': caption, 'base64': base64_image},
+            timeout=15
+        ).json()
+    except Exception as e:
+        return {'error': str(e)}
diff --git a/pos/static/css/accounting.css b/pos/static/css/accounting.css
index b7b9f13..bdc496f 100644
--- a/pos/static/css/accounting.css
+++ b/pos/static/css/accounting.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/accounting.min.css b/pos/static/css/accounting.min.css
index 3dd521a..c987028 100644
--- a/pos/static/css/accounting.min.css
+++ b/pos/static/css/accounting.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/catalog.css b/pos/static/css/catalog.css
index c38606d..c9fad21 100644
--- a/pos/static/css/catalog.css
+++ b/pos/static/css/catalog.css
@@ -12,8 +12,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/catalog.min.css b/pos/static/css/catalog.min.css
index 0abd791..1854ab8 100644
--- a/pos/static/css/catalog.min.css
+++ b/pos/static/css/catalog.min.css
@@ -12,8 +12,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/config.css b/pos/static/css/config.css
index 37e298a..60227f3 100644
--- a/pos/static/css/config.css
+++ b/pos/static/css/config.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/config.min.css b/pos/static/css/config.min.css
index 539a8a4..471db3d 100644
--- a/pos/static/css/config.min.css
+++ b/pos/static/css/config.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/customers.css b/pos/static/css/customers.css
index a5a2ff2..fe98a56 100644
--- a/pos/static/css/customers.css
+++ b/pos/static/css/customers.css
@@ -20,8 +20,6 @@
       font-weight: var(--font-weight-regular);
       background-color: var(--color-bg-base);
       color: var(--color-text-primary);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       display: flex;
       flex-direction: column;
       overflow: hidden;
diff --git a/pos/static/css/customers.min.css b/pos/static/css/customers.min.css
index 8495a30..1a1ad53 100644
--- a/pos/static/css/customers.min.css
+++ b/pos/static/css/customers.min.css
@@ -20,8 +20,6 @@
       font-weight: var(--font-weight-regular);
       background-color: var(--color-bg-base);
       color: var(--color-text-primary);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       display: flex;
       flex-direction: column;
       overflow: hidden;
diff --git a/pos/static/css/dashboard.css b/pos/static/css/dashboard.css
index e7150e6..1476411 100644
--- a/pos/static/css/dashboard.css
+++ b/pos/static/css/dashboard.css
@@ -23,8 +23,6 @@
       min-height: 100vh;
       display: flex;
       flex-direction: column;
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
     }
 
     /* Modern theme dot-grid on body */
@@ -814,6 +812,18 @@
       box-shadow: var(--shadow-md);
     }
 
+    .chart-canvas-wrap {
+      position: relative;
+      height: 220px;
+      width: 100%;
+    }
+
+    .chart-canvas-wrap canvas {
+      display: block;
+      width: 100% !important;
+      height: 100% !important;
+    }
+
     .rank-list {
       display: flex;
       flex-direction: column;
diff --git a/pos/static/css/dashboard.min.css b/pos/static/css/dashboard.min.css
index e7150e6..e10d14d 100644
--- a/pos/static/css/dashboard.min.css
+++ b/pos/static/css/dashboard.min.css
@@ -23,8 +23,6 @@
       min-height: 100vh;
       display: flex;
       flex-direction: column;
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
     }
 
     /* Modern theme dot-grid on body */
diff --git a/pos/static/css/diagrams.css b/pos/static/css/diagrams.css
index 5327e94..4a2d09c 100644
--- a/pos/static/css/diagrams.css
+++ b/pos/static/css/diagrams.css
@@ -12,8 +12,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/diagrams.min.css b/pos/static/css/diagrams.min.css
index 9df11e0..e73945a 100644
--- a/pos/static/css/diagrams.min.css
+++ b/pos/static/css/diagrams.min.css
@@ -12,8 +12,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/fleet.css b/pos/static/css/fleet.css
index 643e939..f9e644f 100644
--- a/pos/static/css/fleet.css
+++ b/pos/static/css/fleet.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/fleet.min.css b/pos/static/css/fleet.min.css
index 643e939..f9e644f 100644
--- a/pos/static/css/fleet.min.css
+++ b/pos/static/css/fleet.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/inventory.css b/pos/static/css/inventory.css
index f36c4ed..95dc1f0 100644
--- a/pos/static/css/inventory.css
+++ b/pos/static/css/inventory.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
@@ -732,6 +730,20 @@
       font-size: var(--text-caption);
     }
 
+    .btn--meli {
+      background: #FFE600;
+      color: #2D3277;
+      border-color: transparent;
+      font-weight: 700;
+    }
+    .btn--meli:hover {
+      background: #e6cf00;
+      color: #1a1f5c;
+    }
+    .btn--meli svg {
+      stroke: currentColor;
+    }
+
     /* =========================================================================
        DATA TABLE
        ========================================================================= */
@@ -1261,7 +1273,7 @@
     .inv-field label {
       font-size: var(--text-caption);
       font-weight: var(--font-weight-semibold);
-      color: var(--color-text-muted);
+      color: var(--color-text-secondary);
       letter-spacing: var(--tracking-wide);
       text-transform: uppercase;
     }
@@ -1282,6 +1294,23 @@
       box-shadow: 0 0 0 2px var(--color-primary-muted);
     }
 
+    .inv-field select {
+      padding: var(--space-2) var(--space-3);
+      background: var(--color-surface-1);
+      border: 1px solid var(--color-border);
+      border-radius: var(--radius-md);
+      color: var(--color-text-primary);
+      font-family: var(--font-body);
+      font-size: var(--text-body-sm);
+      width: 100%;
+    }
+
+    .inv-field select:focus {
+      outline: none;
+      border-color: var(--color-primary);
+      box-shadow: 0 0 0 2px var(--color-primary-muted);
+    }
+
     .count-row {
       display: flex;
       gap: var(--space-2);
@@ -1301,3 +1330,129 @@
 
     /* History table inside modal */
     .inv-modal .data-table { width: 100%; }
+
+    /* ─── Virtual Scroll fixes ───────────────────────────────────────────── */
+    .vs-container {
+      will-change: transform;
+      contain: layout paint;
+      -webkit-overflow-scrolling: touch;
+    }
+    .vs-container table {
+      will-change: transform;
+    }
+    .vs-container tbody tr {
+      content-visibility: auto;
+      contain-intrinsic-size: auto 48px;
+    }
+
+    /* ─── MercadoLibre Publish Modal Enhancements ────────────────────────── */
+    .meli-preview-card {
+      display: grid;
+      grid-template-columns: 56px 1fr auto auto auto;
+      gap: var(--space-3);
+      align-items: center;
+      padding: var(--space-3);
+      border: 1px solid var(--color-border);
+      border-radius: var(--radius-md);
+      margin-bottom: var(--space-2);
+      background: var(--color-surface-1);
+    }
+    .meli-preview-card img {
+      width: 56px; height: 56px; object-fit: cover; border-radius: var(--radius-sm);
+      background: var(--color-surface-2);
+    }
+    .meli-preview-card .meli-title-input {
+      width: 100%;
+      background: var(--color-surface-2);
+      border: 1px solid var(--color-border);
+      border-radius: var(--radius-sm);
+      color: var(--color-text-primary);
+      padding: 4px 8px;
+      font-size: var(--text-caption);
+    }
+    .meli-preview-card .meli-num-input {
+      width: 80px;
+      background: var(--color-surface-2);
+      border: 1px solid var(--color-border);
+      border-radius: var(--radius-sm);
+      color: var(--color-text-primary);
+      padding: 4px 8px;
+      font-size: var(--text-caption);
+      text-align: right;
+    }
+    .meli-check { font-size: var(--text-caption); display: flex; align-items: center; gap: 4px; }
+    .meli-check.ok { color: var(--color-success); }
+    .meli-check.fail { color: var(--color-error); }
+    .meli-checks-row {
+      display: flex; gap: var(--space-3); flex-wrap: wrap; margin-top: var(--space-1);
+    }
+    .meli-attrs-section {
+      margin-top: var(--space-3);
+      padding: var(--space-3);
+      border: 1px dashed var(--color-border);
+      border-radius: var(--radius-md);
+      background: var(--color-surface-1);
+    }
+    .meli-attrs-grid {
+      display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(200px, 1fr));
+      gap: var(--space-3);
+      margin-top: var(--space-2);
+    }
+    .meli-img-upload {
+      border: 2px dashed var(--color-border);
+      border-radius: var(--radius-md);
+      padding: var(--space-3);
+      text-align: center;
+      color: var(--color-text-muted);
+      font-size: var(--text-caption);
+      cursor: pointer;
+      transition: border-color var(--transition-fast);
+    }
+    .meli-img-upload:hover { border-color: var(--color-primary); }
+    .meli-img-upload input { display: none; }
+
+    /* ─── MercadoLibre Category Autocomplete ─────────────────────────────── */
+    .meli-cat-dropdown {
+      position: absolute;
+      top: 100%;
+      left: 0;
+      right: 0;
+      z-index: 200;
+      background: var(--color-surface-1);
+      border: 1px solid var(--color-border);
+      border-radius: var(--radius-md);
+      box-shadow: var(--shadow-lg);
+      max-height: 240px;
+      overflow-y: auto;
+      margin-top: 4px;
+    }
+    .meli-cat-item {
+      padding: 10px 14px;
+      cursor: pointer;
+      font-size: var(--text-body-sm);
+      color: var(--color-text-primary);
+      border-bottom: 1px solid var(--color-border);
+      transition: background var(--transition-fast);
+      display: flex;
+      justify-content: space-between;
+      align-items: center;
+    }
+    .meli-cat-item:last-child { border-bottom: none; }
+    .meli-cat-item:hover,
+    .meli-cat-item.is-active {
+      background: var(--color-surface-2);
+    }
+    .meli-cat-item .cat-id {
+      font-size: var(--text-caption);
+      color: var(--color-text-muted);
+      margin-left: 8px;
+      font-family: var(--font-mono);
+    }
+    .meli-cat-loading,
+    .meli-cat-empty {
+      padding: 12px 14px;
+      font-size: var(--text-caption);
+      color: var(--color-text-muted);
+      text-align: center;
+    }
diff --git a/pos/static/css/inventory.min.css b/pos/static/css/inventory.min.css
index c15920c..7c820da 100644
--- a/pos/static/css/inventory.min.css
+++ b/pos/static/css/inventory.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/invoicing.css b/pos/static/css/invoicing.css
index aa1ba7b..3f54f60 100644
--- a/pos/static/css/invoicing.css
+++ b/pos/static/css/invoicing.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/invoicing.min.css b/pos/static/css/invoicing.min.css
index a93e282..85441c1 100644
--- a/pos/static/css/invoicing.min.css
+++ b/pos/static/css/invoicing.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/login.css b/pos/static/css/login.css
index d6348a6..d27247c 100644
--- a/pos/static/css/login.css
+++ b/pos/static/css/login.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  color var(--duration-slow) var(--ease-in-out);
       min-height: 100vh;
     }
 
@@ -58,8 +56,6 @@
       background-color: var(--color-bg-elevated);
       border-bottom: 1px solid var(--color-border);
       box-shadow: var(--shadow-sm);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  border-color var(--duration-slow) var(--ease-in-out);
     }
 
     .theme-bar__label {
@@ -657,8 +653,6 @@
       justify-content: space-between;
       gap: var(--space-4);
       background: var(--color-surface-1);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  border-color var(--duration-slow) var(--ease-in-out);
     }
 
     .footer-version {
diff --git a/pos/static/css/login.min.css b/pos/static/css/login.min.css
index d6348a6..d27247c 100644
--- a/pos/static/css/login.min.css
+++ b/pos/static/css/login.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  color var(--duration-slow) var(--ease-in-out);
       min-height: 100vh;
     }
 
@@ -58,8 +56,6 @@
       background-color: var(--color-bg-elevated);
       border-bottom: 1px solid var(--color-border);
       box-shadow: var(--shadow-sm);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  border-color var(--duration-slow) var(--ease-in-out);
     }
 
     .theme-bar__label {
@@ -657,8 +653,6 @@
       justify-content: space-between;
       gap: var(--space-4);
       background: var(--color-surface-1);
-      transition: background-color var(--duration-slow) var(--ease-in-out),
-                  border-color var(--duration-slow) var(--ease-in-out);
     }
 
     .footer-version {
diff --git a/pos/static/css/pos-glass.css b/pos/static/css/pos-glass.css
index fc7943f..770b3c9 100644
--- a/pos/static/css/pos-glass.css
+++ b/pos/static/css/pos-glass.css
@@ -18,14 +18,22 @@ body {
    SIDEBAR — Glass treatment
    ========================================================================== */
 
+/* Prevent flash/stun while sidebar.js replaces static sidebar markup */
 .sidebar,
 .pos-sidebar {
+  opacity: 0;
+  transition: opacity 0.15s ease;
   background: var(--glass-bg-strong) !important;
   backdrop-filter: blur(20px);
   -webkit-backdrop-filter: blur(20px);
   border-right: 1px solid var(--glass-border) !important;
 }
 
+body.sidebar-ready .sidebar,
+body.sidebar-ready .pos-sidebar {
+  opacity: 1;
+}
+
 .sidebar__logo {
   position: relative;
 }
diff --git a/pos/static/css/pos-ui.css b/pos/static/css/pos-ui.css
new file mode 100644
index 0000000..0bf19ea
--- /dev/null
+++ b/pos/static/css/pos-ui.css
@@ -0,0 +1,861 @@
+/**
+ * pos-ui.css — Nexus POS UI Polish Kit
+ * Backlog visual improvements: skeletons, toasts, empty states,
+ * scrollbars, focus rings, badges, tooltips, compact mode, etc.
+ * Load AFTER tokens.css and common.css, BEFORE page-specific CSS.
+ */
+
+/* ═══════════════════════════════════════════════════════════════
+   0. ICON BUTTONS (header bar)
+   ═══════════════════════════════════════════════════════════════ */
+.icon-btn {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 32px;
+  height: 32px;
+  border-radius: var(--radius-md, 8px);
+  background: var(--color-surface-2, #222);
+  border: 1px solid var(--color-border, #2a2a2a);
+  color: var(--color-text-secondary, #aaa);
+  cursor: pointer;
+  transition: all 0.15s;
+  position: relative;
+}
+.icon-btn:hover {
+  background: var(--color-surface-3, #333);
+  color: var(--color-text-primary, #eee);
+  border-color: var(--color-primary, #F5A623);
+}
+.notif-dot {
+  position: absolute;
+  top: 4px;
+  right: 4px;
+  width: 8px;
+  height: 8px;
+  border-radius: 50%;
+  background: var(--color-error, #ef4444);
+  box-shadow: 0 0 4px var(--color-error, #ef4444);
+}
+.notif-dot:empty { display: none; }
+
+/* ═══════════════════════════════════════════════════════════════
+   1. CUSTOM SCROLLBAR (global)
+   ═══════════════════════════════════════════════════════════════ */
+* { scrollbar-width: thin; scrollbar-color: var(--scrollbar-thumb, #444) var(--scrollbar-track, transparent); }
+*::-webkit-scrollbar { width: 6px; height: 6px; }
+*::-webkit-scrollbar-track { background: var(--scrollbar-track, transparent); }
+*::-webkit-scrollbar-thumb { background: var(--scrollbar-thumb, #444); border-radius: var(--radius-full, 999px); }
+*::-webkit-scrollbar-thumb:hover { background: var(--scrollbar-thumb-hover, #666); }
+
+/* ═══════════════════════════════════════════════════════════════
+   2. SKELETON SCREENS
+   ═══════════════════════════════════════════════════════════════ */
+@keyframes skeleton-shimmer {
+  0%   { background-position: -200% 0; }
+  100% { background-position: 200% 0; }
+}
+.skeleton {
+  background: linear-gradient(90deg,
+    var(--color-surface-1, #1a1a1a) 25%,
+    var(--color-surface-2, #2a2a2a) 50%,
+    var(--color-surface-1, #1a1a1a) 75%);
+  background-size: 200% 100%;
+  animation: skeleton-shimmer 1.6s ease-in-out infinite;
+  border-radius: var(--radius-md, 8px);
+  pointer-events: none;
+  user-select: none;
+}
+.skeleton--text  { height: 1em;  width: 100%; }
+.skeleton--text-sm { height: 0.75em; width: 60%; }
+.skeleton--circle { width: 40px; height: 40px; border-radius: var(--radius-full, 999px); }
+.skeleton--rect  { height: 80px; width: 100%; }
+.skeleton--btn   { height: 36px; width: 100px; border-radius: var(--radius-md, 8px); }
+.skeleton--table-row td { border: none !important; background: transparent !important; }
+.skeleton--table-row td .skeleton { height: 16px; }
+.skeleton--table-row td:nth-child(1) .skeleton { width: 40px; }
+.skeleton--table-row td:nth-child(2) .skeleton { width: 90%; }
+.skeleton--table-row td:nth-child(3) .skeleton { width: 70%; }
+.skeleton--table-row td:nth-child(4) .skeleton { width: 50%; }
+.skeleton--table-row td:nth-child(5) .skeleton { width: 60%; }
+
+/* ═══════════════════════════════════════════════════════════════
+   3. EMPTY STATES (illustrated)
+   ═══════════════════════════════════════════════════════════════ */
+.empty-state {
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+  padding: var(--space-8, 2rem);
+  text-align: center;
+  color: var(--color-text-muted, #888);
+}
+.empty-state__icon {
+  width: 80px;
+  height: 80px;
+  margin-bottom: var(--space-4, 1rem);
+  opacity: 0.4;
+  color: var(--color-text-muted, #888);
+}
+.empty-state__icon svg {
+  width: 100%;
+  height: 100%;
+}
+.empty-state__title {
+  font-size: var(--text-lg, 1.125rem);
+  font-weight: var(--font-weight-bold, 700);
+  color: var(--color-text-primary, #eee);
+  margin-bottom: var(--space-2, 0.5rem);
+}
+.empty-state__subtitle {
+  font-size: var(--text-sm, 0.875rem);
+  max-width: 360px;
+  line-height: 1.5;
+  margin-bottom: var(--space-4, 1rem);
+}
+.empty-state__action {
+  margin-top: var(--space-2, 0.5rem);
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   4. UNIFIED INPUT FOCUS RING
+   ═══════════════════════════════════════════════════════════════ */
+input:focus, select:focus, textarea:focus,
+.inv-field input:focus, .inv-field select:focus, .inv-field textarea:focus,
+.search-box:focus-within, .select-filter:focus,
+.form-control:focus {
+  outline: none;
+  border-color: var(--color-primary, #F5A623) !important;
+  box-shadow: 0 0 0 3px var(--color-primary-muted, rgba(245,166,35,0.25)) !important;
+}
+input:disabled, select:disabled, textarea:disabled {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   5. BADGES (enhanced + new variants)
+   ═══════════════════════════════════════════════════════════════ */
+.badge {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 3px 10px;
+  border-radius: var(--radius-full, 999px);
+  font-size: 0.6875rem;
+  font-weight: var(--font-weight-bold, 700);
+  letter-spacing: var(--tracking-wide, 0.05em);
+  text-transform: uppercase;
+  white-space: nowrap;
+  line-height: 1.4;
+}
+.badge::before {
+  content: '';
+  width: 6px;
+  height: 6px;
+  border-radius: var(--radius-full, 999px);
+  background: currentColor;
+  flex-shrink: 0;
+}
+.badge--ok       { background: rgba(34, 197, 94, 0.12);  color: var(--color-success, #22c55e); }
+.badge--low      { background: rgba(239, 68, 68, 0.12);  color: var(--color-error, #ef4444); }
+.badge--over     { background: rgba(234, 179, 8, 0.12);  color: var(--color-warning, #eab308); }
+.badge--pending  { background: var(--color-primary-muted, rgba(245,166,35,0.15)); color: var(--color-primary, #F5A623); }
+.badge--complete { background: rgba(34, 197, 94, 0.12);  color: var(--color-success, #22c55e); }
+.badge--transit  { background: rgba(99, 102, 241, 0.12); color: #818cf8; }
+.badge--cancelled{ background: rgba(115, 115, 115, 0.12);color: var(--color-text-muted, #888); }
+.badge--damage   { background: rgba(239, 68, 68, 0.12);  color: var(--color-error, #ef4444); }
+.badge--shrinkage{ background: rgba(234, 179, 8, 0.12);  color: var(--color-warning, #eab308); }
+.badge--correction{ background: var(--color-primary-muted, rgba(245,166,35,0.15)); color: var(--color-primary, #F5A623); }
+.badge--partial  { background: rgba(234, 179, 8, 0.12);  color: var(--color-warning, #eab308); }
+.badge--ml       { background: rgba(255, 230, 0, 0.15);  color: #2D3277; }
+.badge--ml::before { background: #2D3277; }
+.badge--new      { background: rgba(59, 130, 246, 0.12); color: #3b82f6; }
+.badge--syncing  { background: rgba(245, 166, 35, 0.12); color: var(--color-primary, #F5A623); animation: pulse-dot 1.5s ease-in-out infinite; }
+@keyframes pulse-dot {
+  0%, 100% { opacity: 1; }
+  50% { opacity: 0.4; }
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   6. HOVER STATES (table + cards)
+   ═══════════════════════════════════════════════════════════════ */
+.data-table tbody tr {
+  border-bottom: 1px solid var(--color-border, #2a2a2a);
+  transition: background var(--duration-fast, 150ms) var(--ease-in-out, ease-in-out),
+              transform var(--duration-fast, 150ms) var(--ease-in-out, ease-in-out);
+}
+.data-table tbody tr:hover {
+  background: var(--color-surface-2, #222);
+  transform: translateX(2px);
+}
+.data-table tbody tr:active {
+  transform: translateX(0);
+}
+.card, .glass-card, .stat-card, .info-card {
+  transition: transform var(--duration-fast, 150ms) var(--ease-in-out, ease-in-out),
+              box-shadow var(--duration-fast, 150ms) var(--ease-in-out, ease-in-out);
+}
+.card:hover, .glass-card:hover, .stat-card:hover, .info-card:hover {
+  transform: translateY(-2px);
+  box-shadow: var(--shadow-lg, 0 8px 24px rgba(0,0,0,0.3));
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   7. TOAST NOTIFICATIONS (enhanced)
+   ═══════════════════════════════════════════════════════════════ */
+#toast-container {
+  position: fixed;
+  top: 16px;
+  right: 16px;
+  z-index: 9999;
+  display: flex;
+  flex-direction: column;
+  gap: 8px;
+  pointer-events: none;
+  max-width: 420px;
+}
+.toast {
+  display: flex;
+  align-items: flex-start;
+  gap: 10px;
+  padding: 12px 16px;
+  border-radius: var(--radius-lg, 12px);
+  font-size: 14px;
+  font-weight: 500;
+  line-height: 1.4;
+  box-shadow: 0 8px 24px rgba(0,0,0,0.25);
+  pointer-events: auto;
+  animation: toastSlideIn 0.35s cubic-bezier(0.16, 1, 0.3, 1);
+  position: relative;
+  overflow: hidden;
+  backdrop-filter: blur(8px);
+  border: 1px solid rgba(255,255,255,0.05);
+}
+.toast--ok       { background: rgba(26, 122, 58, 0.95);  color: #fff; }
+.toast--error    { background: rgba(192, 57, 43, 0.95);  color: #fff; }
+.toast--warn     { background: rgba(212, 160, 23, 0.95); color: #000; }
+.toast--info     { background: rgba(40, 40, 45, 0.95);   color: #eee; border-color: rgba(255,255,255,0.08); }
+.toast__icon { flex-shrink: 0; width: 20px; height: 20px; margin-top: 1px; }
+.toast__content { flex: 1; }
+.toast__title { font-weight: 700; margin-bottom: 2px; font-size: 13px; }
+.toast__msg { font-size: 13px; opacity: 0.9; }
+.toast__action { margin-top: 8px; }
+.toast__action button {
+  background: rgba(255,255,255,0.15);
+  border: none;
+  color: inherit;
+  padding: 4px 10px;
+  border-radius: 6px;
+  font-size: 12px;
+  font-weight: 600;
+  cursor: pointer;
+  transition: background 0.15s;
+}
+.toast__action button:hover { background: rgba(255,255,255,0.25); }
+.toast__close {
+  background: none;
+  border: none;
+  color: inherit;
+  opacity: 0.6;
+  cursor: pointer;
+  font-size: 16px;
+  line-height: 1;
+  padding: 0;
+  margin-left: 4px;
+  flex-shrink: 0;
+}
+.toast__close:hover { opacity: 1; }
+.toast__progress {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  height: 3px;
+  background: rgba(255,255,255,0.4);
+  border-radius: 0 0 0 var(--radius-lg, 12px);
+  animation: toastProgress linear forwards;
+}
+@keyframes toastSlideIn {
+  from { opacity: 0; transform: translateX(40px) scale(0.95); }
+  to   { opacity: 1; transform: translateX(0) scale(1); }
+}
+@keyframes toastSlideOut {
+  from { opacity: 1; transform: translateX(0) scale(1); }
+  to   { opacity: 0; transform: translateX(40px) scale(0.95); }
+}
+@keyframes toastProgress {
+  from { width: 100%; }
+  to   { width: 0%; }
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   8. TOOLTIPS
+   ═══════════════════════════════════════════════════════════════ */
+[data-tooltip] {
+  position: relative;
+  cursor: help;
+}
+[data-tooltip]::after {
+  content: attr(data-tooltip);
+  position: absolute;
+  bottom: calc(100% + 6px);
+  left: 50%;
+  transform: translateX(-50%) scale(0.9);
+  padding: 6px 10px;
+  background: var(--color-surface-3, #333);
+  color: var(--color-text-primary, #eee);
+  font-size: 12px;
+  font-weight: 500;
+  white-space: nowrap;
+  border-radius: var(--radius-md, 8px);
+  box-shadow: var(--shadow-md, 0 4px 12px rgba(0,0,0,0.2));
+  opacity: 0;
+  pointer-events: none;
+  transition: opacity 0.15s, transform 0.15s;
+  z-index: 10000;
+  border: 1px solid var(--color-border, #2a2a2a);
+}
+[data-tooltip]:hover::after {
+  opacity: 1;
+  transform: translateX(-50%) scale(1);
+}
+[data-tooltip-pos="bottom"]::after {
+  bottom: auto;
+  top: calc(100% + 6px);
+}
+[data-tooltip-pos="left"]::after {
+  bottom: auto;
+  left: auto;
+  right: calc(100% + 6px);
+  top: 50%;
+  transform: translateY(-50%) scale(0.9);
+}
+[data-tooltip-pos="left"]:hover::after {
+  transform: translateY(-50%) scale(1);
+}
+[data-tooltip-pos="right"]::after {
+  bottom: auto;
+  left: calc(100% + 6px);
+  top: 50%;
+  transform: translateY(-50%) scale(0.9);
+}
+[data-tooltip-pos="right"]:hover::after {
+  transform: translateY(-50%) scale(1);
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   9. COMPACT / DENSE MODE
+   ═══════════════════════════════════════════════════════════════ */
+[data-density="compact"] .data-table th,
+[data-density="compact"] .data-table td {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  font-size: 0.8125rem;
+}
+[data-density="compact"] .data-table tbody tr {
+  height: 36px;
+}
+[data-density="compact"] .sidebar__nav-link {
+  padding: 8px 14px;
+}
+[data-density="compact"] .card, [data-density="compact"] .glass-card {
+  padding: var(--space-3, 0.75rem);
+}
+[data-density="compact"] .form-group {
+  margin-bottom: var(--space-2, 0.5rem);
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   10. STICKY TABLE HEADERS
+   ═══════════════════════════════════════════════════════════════ */
+.data-table thead {
+  position: sticky;
+  top: 0;
+  z-index: 10;
+}
+.data-table thead th {
+  position: sticky;
+  top: 0;
+  background: var(--color-surface-1, #1a1a1a);
+  z-index: 10;
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   11. RESIZABLE COLUMNS (visual cue)
+   ═══════════════════════════════════════════════════════════════ */
+.data-table th {
+  position: relative;
+  user-select: none;
+}
+.data-table th .resize-handle {
+  position: absolute;
+  right: 0;
+  top: 0;
+  bottom: 0;
+  width: 4px;
+  cursor: col-resize;
+  background: transparent;
+  transition: background 0.15s;
+}
+.data-table th .resize-handle:hover,
+.data-table th.is-resizing .resize-handle {
+  background: var(--color-primary, #F5A623);
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   12. BREADCRUMBS
+   ═══════════════════════════════════════════════════════════════ */
+.breadcrumbs {
+  display: flex;
+  align-items: center;
+  gap: var(--space-2, 0.5rem);
+  padding: var(--space-2, 0.5rem) var(--space-4, 1rem);
+  font-size: 0.8125rem;
+  color: var(--color-text-muted, #888);
+  border-bottom: 1px solid var(--color-border, #2a2a2a);
+}
+.breadcrumbs a {
+  color: var(--color-text-secondary, #aaa);
+  text-decoration: none;
+  transition: color 0.15s;
+}
+.breadcrumbs a:hover {
+  color: var(--color-primary, #F5A623);
+}
+.breadcrumbs__sep {
+  opacity: 0.4;
+}
+.breadcrumbs__current {
+  color: var(--color-text-primary, #eee);
+  font-weight: var(--font-weight-semibold, 600);
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   13. USER AVATARS (initials)
+   ═══════════════════════════════════════════════════════════════ */
+.avatar {
+  display: inline-flex;
+  align-items: center;
+  justify-content: center;
+  width: 36px;
+  height: 36px;
+  border-radius: var(--radius-full, 999px);
+  font-size: 14px;
+  font-weight: var(--font-weight-bold, 700);
+  color: #fff;
+  background: var(--color-primary, #F5A623);
+  flex-shrink: 0;
+}
+.avatar--sm { width: 28px; height: 28px; font-size: 12px; }
+.avatar--lg { width: 48px; height: 48px; font-size: 18px; }
+.avatar--circle { border-radius: var(--radius-full, 999px); }
+
+/* ═══════════════════════════════════════════════════════════════
+   14. CONNECTION INDICATOR
+   ═══════════════════════════════════════════════════════════════ */
+.connection-indicator {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  font-size: 12px;
+  font-weight: 600;
+  padding: 4px 10px;
+  border-radius: var(--radius-full, 999px);
+  background: var(--color-surface-2, #222);
+}
+.connection-indicator::before {
+  content: '';
+  width: 8px;
+  height: 8px;
+  border-radius: var(--radius-full, 999px);
+  background: var(--color-success, #22c55e);
+  box-shadow: 0 0 6px var(--color-success, #22c55e);
+}
+.connection-indicator--offline::before {
+  background: var(--color-error, #ef4444);
+  box-shadow: 0 0 6px var(--color-error, #ef4444);
+}
+.connection-indicator--syncing::before {
+  background: var(--color-primary, #F5A623);
+  animation: pulse-dot 1.5s ease-in-out infinite;
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   15. NOTIFICATIONS DROPDOWN
+   ═══════════════════════════════════════════════════════════════ */
+.notif-dropdown {
+  position: absolute;
+  top: calc(100% + 8px);
+  right: 0;
+  width: 360px;
+  max-height: 480px;
+  background: var(--color-surface-1, #1a1a1a);
+  border: 1px solid var(--color-border, #2a2a2a);
+  border-radius: var(--radius-lg, 12px);
+  box-shadow: var(--shadow-lg, 0 8px 24px rgba(0,0,0,0.3));
+  z-index: 1000;
+  overflow: hidden;
+  display: flex;
+  flex-direction: column;
+}
+.notif-dropdown__header {
+  padding: 12px 16px;
+  border-bottom: 1px solid var(--color-border, #2a2a2a);
+  font-weight: 700;
+  font-size: 14px;
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+}
+.notif-dropdown__list {
+  overflow-y: auto;
+  flex: 1;
+}
+.notif-dropdown__item {
+  padding: 12px 16px;
+  border-bottom: 1px solid var(--color-border, #2a2a2a);
+  display: flex;
+  gap: 12px;
+  align-items: flex-start;
+  cursor: pointer;
+  transition: background 0.15s;
+}
+.notif-dropdown__item:hover { background: var(--color-surface-2, #222); }
+.notif-dropdown__item--unread { border-left: 3px solid var(--color-primary, #F5A623); }
+.notif-dropdown__icon { flex-shrink: 0; width: 32px; height: 32px; border-radius: var(--radius-md, 8px); display: flex; align-items: center; justify-content: center; background: var(--color-surface-2, #222); font-size: 14px; }
+.notif-dropdown__content { flex: 1; }
+.notif-dropdown__title { font-size: 13px; font-weight: 600; color: var(--color-text-primary, #eee); margin-bottom: 2px; }
+.notif-dropdown__time { font-size: 11px; color: var(--color-text-muted, #888); }
+.notif-dropdown__empty { padding: 24px; text-align: center; color: var(--color-text-muted, #888); font-size: 13px; }
+
+/* ═══════════════════════════════════════════════════════════════
+   16. CMD+K SEARCH OVERLAY
+   ═══════════════════════════════════════════════════════════════ */
+.cmdk-overlay {
+  position: fixed;
+  inset: 0;
+  background: rgba(0,0,0,0.6);
+  backdrop-filter: blur(4px);
+  z-index: 10000;
+  display: flex;
+  align-items: flex-start;
+  justify-content: center;
+  padding-top: 15vh;
+  opacity: 0;
+  transition: opacity 0.2s;
+  pointer-events: none;
+}
+.cmdk-overlay.is-open { opacity: 1; pointer-events: auto; }
+.cmdk-modal {
+  width: 640px;
+  max-width: 90vw;
+  background: var(--color-surface-1, #1a1a1a);
+  border: 1px solid var(--color-border, #2a2a2a);
+  border-radius: var(--radius-xl, 16px);
+  box-shadow: var(--shadow-xl, 0 16px 48px rgba(0,0,0,0.4));
+  overflow: hidden;
+  transform: scale(0.95);
+  transition: transform 0.2s cubic-bezier(0.16, 1, 0.3, 1);
+}
+.cmdk-overlay.is-open .cmdk-modal { transform: scale(1); }
+.cmdk-input-wrap {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 16px 20px;
+  border-bottom: 1px solid var(--color-border, #2a2a2a);
+}
+.cmdk-input {
+  flex: 1;
+  background: transparent;
+  border: none;
+  color: var(--color-text-primary, #eee);
+  font-size: 16px;
+  outline: none;
+}
+.cmdk-input::placeholder { color: var(--color-text-muted, #888); }
+.cmdk-shortcut { font-size: 11px; color: var(--color-text-muted, #888); background: var(--color-surface-2, #222); padding: 2px 6px; border-radius: 4px; }
+.cmdk-results { max-height: 400px; overflow-y: auto; }
+.cmdk-group { padding: 8px 0; }
+.cmdk-group__label { padding: 4px 20px; font-size: 11px; font-weight: 700; text-transform: uppercase; letter-spacing: 0.08em; color: var(--color-text-muted, #888); }
+.cmdk-item {
+  display: flex;
+  align-items: center;
+  gap: 12px;
+  padding: 10px 20px;
+  cursor: pointer;
+  transition: background 0.12s;
+  font-size: 14px;
+}
+.cmdk-item:hover, .cmdk-item.is-selected { background: var(--color-surface-2, #222); }
+.cmdk-item__icon { width: 28px; height: 28px; border-radius: var(--radius-md, 8px); display: flex; align-items: center; justify-content: center; background: var(--color-surface-2, #222); font-size: 13px; }
+.cmdk-item__meta { margin-left: auto; font-size: 11px; color: var(--color-text-muted, #888); }
+.cmdk-footer { padding: 8px 20px; border-top: 1px solid var(--color-border, #2a2a2a); font-size: 11px; color: var(--color-text-muted, #888); display: flex; justify-content: space-between; }
+
+/* ═══════════════════════════════════════════════════════════════
+   17. ENTRANCE ANIMATIONS
+   ═══════════════════════════════════════════════════════════════ */
+@keyframes fadeInUp {
+  from { opacity: 0; transform: translateY(12px); }
+  to   { opacity: 1; transform: translateY(0); }
+}
+@keyframes fadeIn {
+  from { opacity: 0; }
+  to   { opacity: 1; }
+}
+@keyframes scaleIn {
+  from { opacity: 0; transform: scale(0.95); }
+  to   { opacity: 1; transform: scale(1); }
+}
+.animate-fade-in-up { animation: fadeInUp 0.4s cubic-bezier(0.16, 1, 0.3, 1) both; }
+.animate-fade-in     { animation: fadeIn 0.3s ease both; }
+.animate-scale-in    { animation: scaleIn 0.3s cubic-bezier(0.16, 1, 0.3, 1) both; }
+/* Stagger delays */
+.stagger-1 { animation-delay: 0.05s; }
+.stagger-2 { animation-delay: 0.10s; }
+.stagger-3 { animation-delay: 0.15s; }
+.stagger-4 { animation-delay: 0.20s; }
+.stagger-5 { animation-delay: 0.25s; }
+
+/* ═══════════════════════════════════════════════════════════════
+   18. SPARKLINE (mini charts)
+   ═══════════════════════════════════════════════════════════════ */
+.sparkline { display: flex; align-items: flex-end; gap: 2px; height: 24px; }
+.sparkline__bar { flex: 1; border-radius: 1px; background: var(--color-primary, #F5A623); opacity: 0.6; transition: opacity 0.15s; min-width: 3px; }
+.sparkline__bar:hover { opacity: 1; }
+.sparkline--up .sparkline__bar { background: var(--color-success, #22c55e); }
+.sparkline--down .sparkline__bar { background: var(--color-error, #ef4444); }
+
+/* ═══════════════════════════════════════════════════════════════
+   19. SYNC SPINNER / ANIMATED ICONS
+   ═══════════════════════════════════════════════════════════════ */
+@keyframes spin-slow { to { transform: rotate(360deg); } }
+@keyframes bounce { 0%, 100% { transform: translateY(0); } 50% { transform: translateY(-3px); } }
+.icon-spin { animation: spin-slow 1.2s linear infinite; }
+.icon-bounce { animation: bounce 1s ease-in-out infinite; }
+.icon-pulse { animation: pulse-dot 1.5s ease-in-out infinite; }
+
+/* ═══════════════════════════════════════════════════════════════
+   20. KIOSK / TOUCH MODE
+   ═══════════════════════════════════════════════════════════════ */
+[data-touch="true"] .data-table th,
+[data-touch="true"] .data-table td { padding: 16px 14px; font-size: 1rem; }
+[data-touch="true"] .btn { padding: 14px 24px; font-size: 1rem; min-height: 48px; }
+[data-touch="true"] .sidebar__nav-link { padding: 16px 18px; font-size: 1rem; }
+[data-touch="true"] input, [data-touch="true"] select, [data-touch="true"] textarea { font-size: 16px; padding: 14px 12px; }
+[data-touch="true"] .search-box { min-height: 48px; }
+
+/* ═══════════════════════════════════════════════════════════════
+   21. BULK ACTIONS TOOLBAR
+   ═══════════════════════════════════════════════════════════════ */
+.bulk-toolbar {
+  display: flex;
+  align-items: center;
+  gap: var(--space-3, 0.75rem);
+  padding: var(--space-3, 0.75rem) var(--space-4, 1rem);
+  background: var(--color-surface-2, #222);
+  border: 1px solid var(--color-border, #2a2a2a);
+  border-radius: var(--radius-lg, 12px);
+  margin-bottom: var(--space-4, 1rem);
+  animation: fadeInUp 0.25s ease both;
+}
+.bulk-toolbar__count {
+  font-size: 13px;
+  font-weight: 600;
+  color: var(--color-text-primary, #eee);
+  padding-right: var(--space-3, 0.75rem);
+  border-right: 1px solid var(--color-border, #2a2a2a);
+}
+.bulk-toolbar__actions { display: flex; gap: var(--space-2, 0.5rem); }
+
+/* ═══════════════════════════════════════════════════════════════
+   22. TICKET PREVIEW
+   ═══════════════════════════════════════════════════════════════ */
+.ticket-preview {
+  background: #fff;
+  color: #222;
+  padding: 24px;
+  border-radius: var(--radius-md, 8px);
+  font-family: 'Courier New', monospace;
+  font-size: 12px;
+  line-height: 1.6;
+  max-width: 320px;
+  margin: 0 auto;
+  box-shadow: 0 4px 12px rgba(0,0,0,0.15);
+}
+.ticket-preview__header { text-align: center; border-bottom: 1px dashed #ccc; padding-bottom: 12px; margin-bottom: 12px; }
+.ticket-preview__title { font-size: 16px; font-weight: 700; margin-bottom: 4px; }
+.ticket-preview__meta { font-size: 11px; color: #666; }
+.ticket-preview__row { display: flex; justify-content: space-between; margin-bottom: 4px; }
+.ticket-preview__total { border-top: 1px dashed #ccc; padding-top: 8px; margin-top: 8px; font-size: 14px; font-weight: 700; }
+
+/* ═══════════════════════════════════════════════════════════════
+   23. IMAGE COMPARATOR
+   ═══════════════════════════════════════════════════════════════ */
+.img-compare {
+  position: relative;
+  overflow: hidden;
+  border-radius: var(--radius-lg, 12px);
+  user-select: none;
+}
+.img-compare__img { width: 100%; display: block; }
+.img-compare__overlay {
+  position: absolute;
+  top: 0; left: 0; bottom: 0;
+  width: 50%;
+  overflow: hidden;
+  border-right: 2px solid var(--color-primary, #F5A623);
+}
+.img-compare__overlay img { height: 100%; width: auto; max-width: none; }
+.img-compare__handle {
+  position: absolute;
+  top: 50%; left: 50%;
+  transform: translate(-50%, -50%);
+  width: 36px; height: 36px;
+  background: var(--color-primary, #F5A623);
+  border-radius: var(--radius-full, 999px);
+  display: flex; align-items: center; justify-content: center;
+  cursor: ew-resize;
+  box-shadow: 0 2px 8px rgba(0,0,0,0.3);
+  font-size: 14px;
+  color: #fff;
+}
+
+/* ═══════════════════════════════════════════════════════════════
+   24. CUSTOM LOADER / SPINNER
+   ═══════════════════════════════════════════════════════════════ */
+.nx-loader {
+  position: relative;
+  width: 48px;
+  height: 48px;
+}
+.nx-loader__ring {
+  position: absolute;
+  inset: 0;
+  border: 3px solid transparent;
+  border-top-color: var(--color-primary, #F5A623);
+  border-radius: 50%;
+  animation: spin-slow 1s linear infinite;
+}
+.nx-loader__ring:nth-child(2) {
+  inset: 6px;
+  border-top-color: var(--color-secondary, #3b82f6);
+  animation-duration: 1.3s;
+  animation-direction: reverse;
+}
+.nx-loader__ring:nth-child(3) {
+  inset: 12px;
+  border-top-color: var(--color-success, #22c55e);
+  animation-duration: 0.8s;
+}
+.nx-loader--sm { width: 24px; height: 24px; }
+.nx-loader--sm .nx-loader__ring { border-width: 2px; }
+.nx-loader--sm .nx-loader__ring:nth-child(2) { inset: 4px; }
+.nx-loader--sm .nx-loader__ring:nth-child(3) { inset: 8px; }
+
+/* ═══════════════════════════════════════════════════════════════
+   21. TIMELINE
+   ═══════════════════════════════════════════════════════════════ */
+.timeline { position: relative; padding-left: 24px; }
+.timeline::before { content: ''; position: absolute; left: 7px; top: 4px; bottom: 4px; width: 2px; background: var(--color-border, #2a2a2a); }
+.timeline__item { position: relative; margin-bottom: var(--space-4, 1rem); display: flex; gap: 12px; align-items: flex-start; }
+.timeline__dot { width: 14px; height: 14px; border-radius: 50%; background: var(--color-primary, #F5A623); border: 3px solid var(--color-surface-1, #1a1a1a); flex-shrink: 0; margin-left: -24px; margin-top: 3px; z-index: 1; }
+.timeline__dot--green { background: var(--color-success, #22c55e); }
+.timeline__dot--red { background: var(--color-error, #ef4444); }
+.timeline__dot--blue { background: #3b82f6; }
+.timeline__content { flex: 1; }
+.timeline__date { font-size: 11px; color: var(--color-text-muted, #888); margin-bottom: 2px; }
+.timeline__title { font-size: 13px; font-weight: 600; color: var(--color-text-primary, #eee); }
+.timeline__desc { font-size: 12px; color: var(--color-text-secondary, #aaa); margin-top: 2px; }
+
+/* ═══════════════════════════════════════════════════════════════
+   22. KANBAN BOARD
+   ═══════════════════════════════════════════════════════════════ */
+.kanban { display: flex; gap: var(--space-4, 1rem); overflow-x: auto; padding-bottom: var(--space-2, 0.5rem); }
+.kanban__col { min-width: 280px; max-width: 320px; flex: 1; background: var(--color-surface-2, #222); border-radius: var(--radius-lg, 12px); border: 1px solid var(--color-border, #2a2a2a); display: flex; flex-direction: column; max-height: 70vh; }
+.kanban__col-header { padding: 12px 16px; border-bottom: 1px solid var(--color-border, #2a2a2a); font-size: 13px; font-weight: 700; display: flex; justify-content: space-between; align-items: center; }
+.kanban__col-count { font-size: 11px; padding: 2px 8px; border-radius: var(--radius-full, 999px); background: var(--color-surface-3, #333); color: var(--color-text-muted, #888); }
+.kanban__cards { flex: 1; overflow-y: auto; padding: var(--space-3, 0.75rem); display: flex; flex-direction: column; gap: var(--space-2, 0.5rem); }
+.kanban__card { background: var(--color-surface-1, #1a1a1a); border: 1px solid var(--color-border, #2a2a2a); border-radius: var(--radius-md, 8px); padding: 12px; cursor: grab; transition: all 0.15s; }
+.kanban__card:hover { border-color: var(--color-primary, #F5A623); transform: translateY(-1px); }
+.kanban__card-title { font-size: 13px; font-weight: 600; margin-bottom: 4px; }
+.kanban__card-meta { font-size: 11px; color: var(--color-text-muted, #888); }
+.kanban__card.dragging { opacity: 0.5; cursor: grabbing; }
+.kanban__col.drag-over { background: var(--color-surface-3, #333); border-color: var(--color-primary, #F5A623); }
+
+/* ═══════════════════════════════════════════════════════════════
+   25. SAVED FILTERS CHIPS
+   ═══════════════════════════════════════════════════════════════ */
+.filter-chip {
+  display: inline-flex;
+  align-items: center;
+  gap: 6px;
+  padding: 4px 10px;
+  background: var(--color-surface-2, #222);
+  border: 1px solid var(--color-border, #2a2a2a);
+  border-radius: var(--radius-full, 999px);
+  font-size: 12px;
+  font-weight: 500;
+  color: var(--color-text-secondary, #aaa);
+  cursor: pointer;
+  transition: all 0.15s;
+}
+.filter-chip:hover { border-color: var(--color-primary, #F5A623); color: var(--color-text-primary, #eee); }
+.filter-chip.is-active { background: var(--color-primary-muted, rgba(245,166,35,0.15)); border-color: var(--color-primary, #F5A623); color: var(--color-primary, #F5A623); }
+.filter-chip__remove { background: none; border: none; color: inherit; cursor: pointer; font-size: 14px; line-height: 1; padding: 0; opacity: 0.6; }
+.filter-chip__remove:hover { opacity: 1; }
+
+/* ═══════════════════════════════════════════════════════════════
+   26. DARK MODE REFINEMENTS (subtle borders, depth)
+   ═══════════════════════════════════════════════════════════════ */
+[data-theme="modern"] .data-table thead th {
+  background: linear-gradient(180deg, var(--color-surface-1, #1a1a1a) 0%, var(--color-surface-2, #222) 100%);
+}
+[data-theme="modern"] .card, [data-theme="modern"] .glass-card {
+  border: 1px solid rgba(255,255,255,0.04);
+}
+[data-theme="industrial"] .data-table thead th {
+  background: var(--color-surface-1, #1a1a1a);
+  border-bottom: 2px solid var(--color-primary, #F5A623);
+}
+
+/* Enhanced depth layers for both themes */
+[data-theme="modern"] {
+  --shadow-sm: 0 1px 2px rgba(0,0,0,0.3);
+  --shadow-md: 0 4px 12px rgba(0,0,0,0.4);
+  --shadow-lg: 0 8px 24px rgba(0,0,0,0.5);
+  --shadow-xl: 0 16px 48px rgba(0,0,0,0.6);
+}
+[data-theme="industrial"] {
+  --shadow-sm: 0 1px 2px rgba(0,0,0,0.4);
+  --shadow-md: 0 4px 12px rgba(0,0,0,0.5);
+  --shadow-lg: 0 8px 24px rgba(0,0,0,0.6);
+  --shadow-xl: 0 16px 48px rgba(0,0,0,0.7);
+}
+
+/* Smooth theme transition (only on properties that don't cause flash) */
+.card, .glass-card, .btn, .icon-btn, .kpi-card, .alert-card, .meli-card {
+  transition: background-color 0.2s ease, border-color 0.2s ease, box-shadow 0.2s ease;
+}
+
+/* Improved text rendering in dark */
+body {
+  -webkit-font-smoothing: antialiased;
+  -moz-osx-font-smoothing: grayscale;
+}
+
+/* Focus visible for accessibility */
+*:focus-visible {
+  outline: 2px solid var(--color-primary, #F5A623);
+  outline-offset: 2px;
+}
+
+/* Reduced motion preference */
+@media (prefers-reduced-motion: reduce) {
+  *, *::before, *::after {
+    animation-duration: 0.01ms !important;
+    animation-iteration-count: 1 !important;
+    transition-duration: 0.01ms !important;
+  }
+}
diff --git a/pos/static/css/pos.css b/pos/static/css/pos.css
index c038aef..b741c98 100644
--- a/pos/static/css/pos.css
+++ b/pos/static/css/pos.css
@@ -21,8 +21,6 @@
       font-weight: var(--font-weight-regular);
       background-color: var(--color-bg-base);
       color: var(--color-text-primary);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       display: flex;
       flex-direction: column;
     }
diff --git a/pos/static/css/pos.min.css b/pos/static/css/pos.min.css
index c038aef..b741c98 100644
--- a/pos/static/css/pos.min.css
+++ b/pos/static/css/pos.min.css
@@ -21,8 +21,6 @@
       font-weight: var(--font-weight-regular);
       background-color: var(--color-bg-base);
       color: var(--color-text-primary);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       display: flex;
       flex-direction: column;
     }
diff --git a/pos/static/css/reports.css b/pos/static/css/reports.css
index 4b7ff27..9012e92 100644
--- a/pos/static/css/reports.css
+++ b/pos/static/css/reports.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/reports.min.css b/pos/static/css/reports.min.css
index b869e1f..c36c3e7 100644
--- a/pos/static/css/reports.min.css
+++ b/pos/static/css/reports.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/whatsapp.css b/pos/static/css/whatsapp.css
index 1e3c0d2..9130039 100644
--- a/pos/static/css/whatsapp.css
+++ b/pos/static/css/whatsapp.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/css/whatsapp.min.css b/pos/static/css/whatsapp.min.css
index faf275a..ce360b6 100644
--- a/pos/static/css/whatsapp.min.css
+++ b/pos/static/css/whatsapp.min.css
@@ -19,8 +19,6 @@
       font-size: var(--text-body-sm);
       color: var(--color-text-primary);
       background-color: var(--color-bg-base);
-      transition: background-color var(--duration-normal) var(--ease-in-out),
-                  color var(--duration-normal) var(--ease-in-out);
       overflow: hidden;
     }
 
diff --git a/pos/static/js/accounting.js b/pos/static/js/accounting.js
index 2ff9c13..fae4927 100644
--- a/pos/static/js/accounting.js
+++ b/pos/static/js/accounting.js
@@ -506,4 +506,12 @@ const Accounting = (() => {
         loadIncomeStatement, loadCashFlow, loadReconciliation, loadPeriodClose,
         exportarContabilidad, showNewEntryModal, closeNewEntryModal, addEntryLine, submitNewEntry,
     };
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/app-init.js b/pos/static/js/app-init.js
index 97f2a05..bdae956 100644
--- a/pos/static/js/app-init.js
+++ b/pos/static/js/app-init.js
@@ -167,12 +167,6 @@
         });
     }
 
-    // Also prevent any DOMContentLoaded theme switchers from overriding
-    // by re-applying our saved theme after a tick
-    setTimeout(function() {
-        document.documentElement.setAttribute('data-theme', savedTheme);
-    }, 100);
-
     // ─── Expose globally ───
     window.POS_USER = {
         name: name,
@@ -186,4 +180,31 @@
         permissions: payload.permissions || []
     };
 
+    // ─── Preload enabled modules for sidebar filtering ───
+    try {
+        fetch('/pos/api/config/modules', {
+            headers: { 'Authorization': 'Bearer ' + token }
+        }).then(function(r) {
+            if (r.ok) return r.json();
+        }).then(function(data) {
+            if (data) {
+                localStorage.setItem('pos_modules', JSON.stringify(data));
+                window.POS_USER.modules = data;
+                if (typeof window.renderSidebar === 'function') {
+                    window.renderSidebar(data);
+                }
+            }
+        }).catch(function() {});
+    } catch(e) {}
+
+    // ─── Service Worker update handler ───
+    if ('serviceWorker' in navigator) {
+        navigator.serviceWorker.addEventListener('message', function (event) {
+            if (event.data && event.data.type === 'SW_UPDATED') {
+                console.log('[AppInit] SW updated to', event.data.cacheName, '— reloading...');
+                window.location.reload();
+            }
+        });
+    }
+
 })();
diff --git a/pos/static/js/app-init.min.js b/pos/static/js/app-init.min.js
deleted file mode 100644
index 1f8c0c6..0000000
--- a/pos/static/js/app-init.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e=localStorage.getItem("pos_token");if(e){try{var t=JSON.parse(atob(e.split(".")[1]));if(1e3*t.exp<Date.now())return localStorage.removeItem("pos_token"),localStorage.removeItem("pos_employee"),void(window.location.href="/pos/login")}catch(e){return localStorage.removeItem("pos_token"),void(window.location.href="/pos/login")}var o={};try{o=JSON.parse(localStorage.getItem("pos_employee")||"{}")}catch(e){}var n=o.name||t.name||"Usuario",a=o.role||t.role||"",r="function"==typeof window.t?window.t:function(e){return e},i={owner:r("role_owner"),admin:r("role_admin"),cashier:r("role_cashier"),warehouse:r("role_warehouse"),accountant:r("role_accountant")}[a]||a,c=n.split(" ").map((function(e){return e[0]})).join("").toUpperCase().substring(0,2);document.querySelectorAll(".sidebar__user-name").forEach((function(e){e.textContent=n})),document.querySelectorAll(".sidebar__user-role").forEach((function(e){e.textContent=i})),document.querySelectorAll(".sidebar__user-avatar, .sidebar__avatar").forEach((function(e){e.textContent=c})),document.querySelectorAll(".profile-info__name").forEach((function(e){e.textContent=n})),document.querySelectorAll(".profile-info__role").forEach((function(e){e.textContent=i})),document.querySelectorAll(".theme-bar__label").forEach((function(e){-1===e.textContent.indexOf("Usuario:")&&-1===e.textContent.indexOf("Sucursal")||(e.textContent="Sucursal Principal — "+n)})),document.querySelectorAll(".status-bar .user-name, .status-info span").forEach((function(e){var t=e.textContent;["Hugo M.","Hugo García","J. Ramírez","José Ramírez","Carlos M.","Admin"].forEach((function(o){-1!==t.indexOf(o)&&(e.textContent=t.replace(o,n))}))}));var l=window.location.pathname;document.querySelectorAll(".nav-item, .nav-link").forEach((function(e){e.classList.remove("is-active","active"),(e.getAttribute("href")||"")===l&&(e.classList.add("is-active"),e.classList.add("active"))})),window.posLogout=function(){localStorage.removeItem("pos_token"),localStorage.removeItem("pos_employee"),localStorage.removeItem("pos_tenant_id"),localStorage.removeItem("pos_cart"),window.location.href="/pos/login"},document.querySelectorAll('[data-action="logout"], .btn-logout, .logout-btn').forEach((function(e){e.addEventListener("click",(function(e){e.preventDefault(),posLogout()}))}));var s=localStorage.getItem("pos_theme");s||(s=window.matchMedia&&window.matchMedia("(prefers-color-scheme: dark)").matches?"industrial":"modern"),document.documentElement.setAttribute("data-theme",s),document.querySelectorAll(".theme-bar").forEach((function(e){e.style.display="none"})),window.posSetTheme=function(e){document.documentElement.setAttribute("data-theme",e),localStorage.setItem("pos_theme",e)},window.setTheme=window.posSetTheme,window.matchMedia&&window.matchMedia("(prefers-color-scheme: dark)").addEventListener("change",(function(e){if(!localStorage.getItem("pos_theme")){var t=e.matches?"industrial":"modern";document.documentElement.setAttribute("data-theme",t)}})),setTimeout((function(){document.documentElement.setAttribute("data-theme",s)}),100),window.POS_USER={name:n,role:a,roleLabel:i,initials:c,token:e,tenantId:t.tenant_id,employeeId:t.employee_id,branchId:t.branch_id,permissions:t.permissions||[]}}else window.location.href="/pos/login"}();
\ No newline at end of file
diff --git a/pos/static/js/brand-catalog.js b/pos/static/js/brand-catalog.js
index 47e138f..c26b70b 100644
--- a/pos/static/js/brand-catalog.js
+++ b/pos/static/js/brand-catalog.js
@@ -6,6 +6,7 @@
     _offset: 0,
     _limit: 50,
     _total: 0,
+    _allowedBrands: [],
 
     // Navigation state
     nav: {
@@ -71,7 +72,9 @@
     },
 
     loading: function(on) {
-      this.el('brandCatalogLoading').style.display = on ? 'block' : 'none';
+      var el = this.el('brandCatalogLoading');
+      if (on) el.classList.add('is-visible');
+      else el.classList.remove('is-visible');
     },
 
     setContent: function(html) {
@@ -88,23 +91,23 @@
 
     buildBreadcrumb: function() {
       var parts = [];
-      parts.push('<a href="javascript:void(0)" onclick="BrandCatalog.loadBrands()" style="color:var(--color-primary);text-decoration:none;">Marcas</a>');
+      parts.push('<a href="javascript:void(0)" class="breadcrumb__link" onclick="BrandCatalog.loadBrands()">Marcas</a>');
       if (this.nav.brand) {
-        parts.push('<a href="javascript:void(0)" onclick="BrandCatalog.selectBrand(' + JSON.stringify(this.nav.brand) + ',' + this.nav.brandId + ')" style="color:var(--color-primary);text-decoration:none;">' + escapeHtml(this.nav.brand) + '</a>');
+        parts.push('<a href="javascript:void(0)" class="breadcrumb__link" onclick=\'BrandCatalog.selectBrand(' + JSON.stringify(this.nav.brand) + ',' + this.nav.brandId + ')\'>' + escapeHtml(this.nav.brand) + '</a>');
       }
       if (this.nav.model) {
-        parts.push('<a href="javascript:void(0)" onclick="BrandCatalog.selectModel(' + this.nav.modelId + ',' + JSON.stringify(this.nav.model) + ')" style="color:var(--color-primary);text-decoration:none;">' + escapeHtml(this.nav.model) + '</a>');
+        parts.push('<a href="javascript:void(0)" class="breadcrumb__link" onclick=\'BrandCatalog.selectModel(' + this.nav.modelId + ',' + JSON.stringify(this.nav.model) + ')\'>' + escapeHtml(this.nav.model) + '</a>');
       }
       if (this.nav.year) {
-        parts.push('<a href="javascript:void(0)" onclick="BrandCatalog.selectYear(' + this.nav.yearId + ',' + this.nav.year + ')" style="color:var(--color-primary);text-decoration:none;">' + this.nav.year + '</a>');
+        parts.push('<a href="javascript:void(0)" class="breadcrumb__link" onclick=\'BrandCatalog.selectYear(' + this.nav.yearId + ',' + this.nav.year + ')\'>' + this.nav.year + '</a>');
       }
       if (this.nav.engine) {
-        parts.push('<a href="javascript:void(0)" onclick="BrandCatalog.selectEngine(' + this.nav.myeId + ',' + JSON.stringify(this.nav.engine) + ')" style="color:var(--color-primary);text-decoration:none;">' + escapeHtml(this.nav.engine) + '</a>');
+        parts.push('<a href="javascript:void(0)" class="breadcrumb__link" onclick=\'BrandCatalog.selectEngine(' + this.nav.myeId + ',' + JSON.stringify(this.nav.engine) + ')\'>' + escapeHtml(this.nav.engine) + '</a>');
       }
       if (this.nav.category) {
-        parts.push('<strong>' + escapeHtml(this.nav.category) + '</strong>');
+        parts.push('<span class="breadcrumb__current">' + escapeHtml(this.nav.category) + '</span>');
       }
-      this.setBreadcrumb(parts.join(' &rsaquo; '));
+      this.setBreadcrumb('<nav class="breadcrumb">' + parts.join('<span class="breadcrumb__sep">&rsaquo;</span>') + '</nav>');
     },
 
     // ---------- BRANDS ----------
@@ -112,12 +115,10 @@
       this.loading(true);
       this.state = 'brands';
       this.reset();
-      this.setBreadcrumb('<strong>Marcas de vehiculo</strong>');
+      this.setBreadcrumb('<nav class="breadcrumb"><span class="breadcrumb__current">Marcas de vehiculo</span></nav>');
       this.setSearch(
         '<input type="text" id="brandSearchInput" placeholder="Buscar marca..." ' +
-        'style="width:100%;padding:10px 14px;border:1px solid var(--color-border);border-radius:var(--radius-md);' +
-        'font-size:var(--text-body);background:var(--color-surface);color:var(--color-text-primary);' +
-        'outline:none;" oninput="BrandCatalog.filterBrands(this.value)">'
+        'class="level-filter" oninput="BrandCatalog.filterBrands(this.value)">'
       );
       var self = this;
       fetch('/pos/api/catalog/vehicle-brands', { headers: this._headers() })
@@ -130,24 +131,25 @@
           self.loading(false);
           self._allBrands = data.brands || [];
           if (!self._allBrands.length) {
-            self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">No se encontraron marcas.</p>');
+            self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">No se encontraron marcas.</div></div>');
             return;
           }
           self.renderBrandList(self._allBrands);
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar marcas: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar marcas</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
     renderBrandList: function(brands) {
-      var html = '';
+      var html = '<div class="nav-grid">';
       brands.forEach(function(b) {
-        html += '<div class="catalog-category-card" onclick="BrandCatalog.selectBrand(' + JSON.stringify(b.name) + ',' + b.id + ')">' +
-          '<div style="font-size:var(--text-h4);font-family:var(--font-heading);margin-bottom:4px;">' + escapeHtml(b.name) + '</div>' +
+        html += '<div class="nav-card" onclick=\'BrandCatalog.selectBrand(' + JSON.stringify(b.name) + ',' + b.id + ')\'>' +
+          '<div class="nav-card__name">' + escapeHtml(b.name) + '</div>' +
           '</div>';
       });
+      html += '</div>';
       this.setContent(html);
     },
 
@@ -186,23 +188,28 @@
           self.loading(false);
           var models = data.data || [];
           if (!models.length) {
-            self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">No se encontraron modelos.</p>');
+            self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">No se encontraron modelos.</div></div>');
             return;
           }
-          var html = '';
-          models.forEach(function(m) {
-            html += '<div class="catalog-category-card" onclick="BrandCatalog.selectModel(' + m.id_model + ',' + JSON.stringify(m.display_name || m.name_model) + ')">' +
-              '<div style="font-size:var(--text-h4);font-family:var(--font-heading);margin-bottom:4px;">' + escapeHtml(m.display_name || m.name_model) + '</div>' +
-              '</div>';
-          });
-          self.setContent(html);
+          self.renderModelList(models);
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar modelos: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar modelos</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
+    renderModelList: function(models) {
+      var html = '<div class="nav-grid">';
+      models.forEach(function(m) {
+        html += '<div class="nav-card" onclick=\'BrandCatalog.selectModel(' + m.id_model + ',' + JSON.stringify(m.display_name || m.name_model) + ')\'>' +
+          '<div class="nav-card__name">' + escapeHtml(m.display_name || m.name_model) + '</div>' +
+          '</div>';
+      });
+      html += '</div>';
+      this.setContent(html);
+    },
+
     selectModel: function(modelId, modelName) {
       this.nav.model = modelName;
       this.nav.modelId = modelId;
@@ -226,23 +233,28 @@
           self.loading(false);
           var years = data.data || [];
           if (!years.length) {
-            self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">No se encontraron años.</p>');
+            self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">No se encontraron años.</div></div>');
             return;
           }
-          var html = '';
-          years.forEach(function(y) {
-            html += '<div class="catalog-category-card" onclick="BrandCatalog.selectYear(' + y.id_year + ',' + y.year_car + ')">' +
-              '<div style="font-size:var(--text-h4);font-family:var(--font-heading);margin-bottom:4px;">' + y.year_car + '</div>' +
-              '</div>';
-          });
-          self.setContent(html);
+          self.renderYearList(years);
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar años: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar años</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
+    renderYearList: function(years) {
+      var html = '<div class="nav-grid nav-grid--years">';
+      years.forEach(function(y) {
+        html += '<div class="nav-card nav-card--year" onclick=\'BrandCatalog.selectYear(' + y.id_year + ',' + y.year_car + ')\'>' +
+          '<div class="nav-card__name">' + y.year_car + '</div>' +
+          '</div>';
+      });
+      html += '</div>';
+      this.setContent(html);
+    },
+
     selectYear: function(yearId, yearCar) {
       this.nav.year = yearCar;
       this.nav.yearId = yearId;
@@ -266,24 +278,29 @@
           self.loading(false);
           var engines = data.data || [];
           if (!engines.length) {
-            self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">No se encontraron motores.</p>');
+            self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">No se encontraron motores.</div></div>');
             return;
           }
-          var html = '';
-          engines.forEach(function(e) {
-            html += '<div class="catalog-category-card" onclick="BrandCatalog.selectEngine(' + e.id_mye + ',' + JSON.stringify(e.name_engine) + ')">' +
-              '<div style="font-size:var(--text-h4);font-family:var(--font-heading);margin-bottom:4px;">' + escapeHtml(e.name_engine) + '</div>' +
-              '<div style="font-size:var(--text-body-sm);color:var(--color-text-muted);">' + escapeHtml(e.trim_level || '') + '</div>' +
-              '</div>';
-          });
-          self.setContent(html);
+          self.renderEngineList(engines);
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar motores: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar motores</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
+    renderEngineList: function(engines) {
+      var html = '<div class="nav-grid">';
+      engines.forEach(function(e) {
+        html += '<div class="nav-card" onclick=\'BrandCatalog.selectEngine(' + e.id_mye + ',' + JSON.stringify(e.name_engine) + ')\'>' +
+          '<div class="nav-card__name">' + escapeHtml(e.name_engine) + '</div>' +
+          '<div class="nav-card__sub">' + escapeHtml(e.trim_level || '') + '</div>' +
+          '</div>';
+      });
+      html += '</div>';
+      this.setContent(html);
+    },
+
     selectEngine: function(myeId, engineName) {
       this.nav.engine = engineName;
       this.nav.myeId = myeId;
@@ -305,26 +322,36 @@
         .then(function(data) {
           if (!data) return;
           self.loading(false);
+          self._allowedBrands = data.allowed_brands || [];
           var categories = data.data || [];
           if (!categories.length) {
-            self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">No se encontraron categorias.</p>');
+            var msg = 'No se encontraron categorias.';
+            if (self._allowedBrands.length) {
+              msg = 'Este vehiculo no tiene cobertura de ' + self._allowedBrands.join(', ') + '.';
+            }
+            self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">' + msg + '</div><div class="empty-state__subtitle">Prueba con otro vehiculo o contacta a soporte para ampliar el catalogo.</div></div>');
             return;
           }
-          var html = '';
-          categories.forEach(function(c) {
-            html += '<div class="catalog-category-card" onclick="BrandCatalog.selectCategory(' + c.id_part_category + ',' + JSON.stringify(c.name) + ')">' +
-              '<div style="font-size:var(--text-h4);font-family:var(--font-heading);margin-bottom:4px;">' + escapeHtml(c.name) + '</div>' +
-              '<div style="font-size:var(--text-body-sm);color:var(--color-text-muted);">' + (c.part_count || 0) + ' refacciones</div>' +
-              '</div>';
-          });
-          self.setContent(html);
+          self.renderCategoryList(categories);
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar categorias: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar categorias</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
+    renderCategoryList: function(categories) {
+      var html = '<div class="nav-grid">';
+      categories.forEach(function(c) {
+        html += '<div class="nav-card" onclick=\'BrandCatalog.selectCategory(' + c.id_part_category + ',' + JSON.stringify(c.name) + ')\'>' +
+          '<div class="nav-card__name">' + escapeHtml(c.name) + '</div>' +
+          '<div class="nav-card__sub">' + (c.part_count || 0) + ' refacciones</div>' +
+          '</div>';
+      });
+      html += '</div>';
+      this.setContent(html);
+    },
+
     selectCategory: function(catId, catName) {
       this.nav.category = catName;
       this.nav.categoryId = catId;
@@ -340,11 +367,10 @@
       this.setSearch(
         '<div style="display:flex;gap:var(--space-2);flex-wrap:wrap;align-items:center;">' +
           '<input type="text" id="partsSearchInput" placeholder="Buscar refaccion..." value="' + escapeHtml(searchTerm || '') + '" ' +
-          'style="flex:1;min-width:200px;padding:10px 14px;border:1px solid var(--color-border);border-radius:var(--radius-md);' +
-          'font-size:var(--text-body);background:var(--color-surface);color:var(--color-text-primary);outline:none;" ' +
+          'class="level-filter" ' +
           'onkeydown="if(event.key===\'Enter\')BrandCatalog.searchParts(this.value)">' +
-          '<button class="btn btn--primary btn--sm" onclick="BrandCatalog.searchParts(document.getElementById(\'partsSearchInput\').value)">Buscar</button>' +
-          '<button class="btn btn--secondary btn--sm" onclick="BrandCatalog.clearPartsSearch()">Limpiar</button>' +
+          '<button class="btn btn-primary" onclick="BrandCatalog.searchParts(document.getElementById(\'partsSearchInput\').value)">Buscar</button>' +
+          '<button class="btn btn-ghost" onclick="BrandCatalog.clearPartsSearch()">Limpiar</button>' +
         '</div>'
       );
       var url = '/pos/api/catalog/mye-parts?mye_id=' + encodeURIComponent(myeId) + '&category_id=' + encodeURIComponent(categoryId) +
@@ -361,6 +387,7 @@
         .then(function(data) {
           if (!data) return;
           self.loading(false);
+          self._allowedBrands = data.allowed_brands || [];
           self._lastItems = data.items || [];
           self._total = data.total || 0;
           self._offset = data.offset || 0;
@@ -368,16 +395,20 @@
         })
         .catch(function(err) {
           self.loading(false);
-          self.setContent('<p style="grid-column:1/-1;text-align:center;color:var(--color-error);">Error al cargar refacciones: ' + escapeHtml(err.message) + '</p>');
+          self.setContent('<div class="empty-state is-visible"><div class="empty-state__title">Error al cargar refacciones</div><div class="empty-state__subtitle">' + escapeHtml(err.message) + '</div></div>');
         });
     },
 
     renderPartsList: function(items, searchTerm) {
       var html = '';
       if (!items.length) {
-        html += '<div style="grid-column:1/-1;text-align:center;padding:var(--space-8);">' +
-          '<p style="color:var(--color-text-muted);font-size:var(--text-body-lg);">No se encontraron refacciones.</p>' +
-          '<button class="btn btn--primary" style="margin-top:var(--space-3);" onclick="BrandCatalog.loadCategories(' + this.nav.myeId + ')">Volver a categorias</button>' +
+        var msg = 'No se encontraron refacciones.';
+        if (this._allowedBrands.length) {
+          msg = 'No hay refacciones de ' + this._allowedBrands.join(', ') + ' en esta categoria.';
+        }
+        html += '<div class="empty-state is-visible">' +
+          '<div class="empty-state__title">' + msg + '</div>' +
+          '<div class="empty-state__subtitle"><button class="btn btn-primary" onclick="BrandCatalog.loadCategories(' + this.nav.myeId + ')">Volver a categorias</button></div>' +
           '</div>';
         this.setContent(html);
         return;
@@ -389,40 +420,55 @@
         'Mostrando ' + startIdx + '-' + endIdx + ' de ' + this._total + ' refacciones' +
         '</div>';
 
-      html += '<div style="grid-column:1/-1;display:grid;grid-template-columns:repeat(auto-fill,minmax(280px,1fr));gap:var(--space-3);">';
+      html += '<div class="nav-grid nav-grid--parts">';
       items.forEach(function(p) {
-        var price = p.local_price ? '$' + Number(p.local_price).toFixed(2) : 'Consultar precio';
-        var img = '/pos/static/images/placeholder-part.png';
+        var hasAm = !!p.manufacturer;
+        var price = p.local_price
+          ? '$' + Number(p.local_price).toFixed(2)
+          : (p.price_usd ? '$' + Number(p.price_usd).toFixed(2) : 'Consultar precio');
         var stockBadge = p.local_stock > 0
-          ? '<span style="display:inline-block;background:var(--color-success);color:#fff;font-size:11px;padding:2px 8px;border-radius:var(--radius-sm);margin-left:6px;">' + p.local_stock + ' en stock</span>'
-          : '<span style="display:inline-block;background:var(--color-text-muted);color:#fff;font-size:11px;padding:2px 8px;border-radius:var(--radius-sm);margin-left:6px;">Sin stock local</span>';
-        html += '<div class="catalog-category-card" style="padding:0;overflow:hidden;display:flex;flex-direction:column;">' +
-          '<div style="height:160px;background:#f5f5f5;display:flex;align-items:center;justify-content:center;">' +
-            '<img src="' + escapeHtml(img) + '" alt="" style="max-width:100%;max-height:100%;object-fit:contain;">' +
+          ? '<span class="stock-badge stock-badge--local">En stock</span>'
+          : '<span class="stock-badge stock-badge--none">Sin stock local</span>';
+        var imgHtml = p.image_url
+          ? '<img src="' + escapeHtml(p.image_url) + '" alt="">'
+          : '<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/></svg>';
+        var brandLine = hasAm
+          ? '<div style="font-size:var(--text-caption);color:var(--color-accent);font-weight:600;">' + escapeHtml(p.manufacturer) + '</div>'
+          : '';
+        html += '<div class="part-card">' +
+          '<div class="part-card__image">' + imgHtml + '</div>' +
+          '<div class="part-card__body">' +
+            brandLine +
+            '<div class="part-card__oem">' + escapeHtml(p.oem_part_number || 'N/A') + '</div>' +
+            '<div class="part-card__name">' + escapeHtml(p.name || '') + '</div>' +
           '</div>' +
-          '<div style="padding:var(--space-3);flex:1;display:flex;flex-direction:column;">' +
-            '<div style="font-weight:600;font-size:var(--text-body);margin-bottom:4px;">' + escapeHtml(p.oem_part_number || 'N/A') + stockBadge + '</div>' +
-            '<div style="font-size:var(--text-body-sm);color:var(--color-text-muted);margin-bottom:8px;flex:1;">' + escapeHtml(p.name || '') + '</div>' +
-            '<div style="font-size:var(--text-h5);font-weight:700;color:var(--color-primary);margin-bottom:8px;">' + price + '</div>' +
-            '<button class="btn btn--primary btn--sm" style="width:100%;" onclick="BrandCatalog.addToCart(' + p.id + ', event)">Agregar</button>' +
+          '<div class="part-card__footer">' +
+            stockBadge +
+            '<span class="part-card__price">' + price + '</span>' +
           '</div>' +
+          '<button class="btn btn-primary" onclick="BrandCatalog.addToCart(' + p.id + ', event)">Agregar</button>' +
           '</div>';
       });
       html += '</div>';
 
+      html += this.renderPagination();
+
+      this.setContent(html);
+    },
+
+    renderPagination: function() {
       var hasPrev = this._offset > 0;
       var hasNext = (this._offset + this._limit) < this._total;
       var pageNum = Math.floor(this._offset / this._limit) + 1;
       var totalPages = Math.ceil(this._total / this._limit) || 1;
-      html += '<div style="grid-column:1/-1;display:flex;justify-content:center;align-items:center;gap:var(--space-3);padding:var(--space-4) 0;">' +
-        '<button class="btn btn--secondary" ' + (hasPrev ? '' : 'disabled style="opacity:0.5;cursor:not-allowed;"') +
+      var html = '<div class="pagination">' +
+        '<button class="page-item" ' + (hasPrev ? '' : 'disabled') +
         ' onclick="BrandCatalog.goToPage(' + (this._offset - this._limit) + ')">&larr; Anterior</button>' +
         '<span style="font-size:var(--text-body-sm);color:var(--color-text-muted);">Pagina ' + pageNum + ' de ' + totalPages + '</span>' +
-        '<button class="btn btn--secondary" ' + (hasNext ? '' : 'disabled style="opacity:0.5;cursor:not-allowed;"') +
+        '<button class="page-item" ' + (hasNext ? '' : 'disabled') +
         ' onclick="BrandCatalog.goToPage(' + (this._offset + this._limit) + ')">Siguiente &rarr;</button>' +
         '</div>';
-
-      this.setContent(html);
+      return html;
     },
 
     searchParts: function(term) {
@@ -451,16 +497,17 @@
         return;
       }
       if (window.CatalogApp && CatalogApp.addToCart) {
+        var isAftermarket = !!part.manufacturer;
         CatalogApp.addToCart({
-          id: part.id,
+          id: part.oem_id || part.id,
           part_number: part.oem_part_number || 'N/A',
           name: part.name || 'Refaccion',
-          brand: '',
-          price: part.local_price || 0,
+          brand: part.manufacturer || '',
+          price: part.local_price || part.price_usd || 0,
           tax_rate: 0.16,
           unit: 'PZA',
           stock: part.local_stock || 0,
-          source: 'oem-brand',
+          source: isAftermarket ? 'aftermarket' : 'oem-brand',
           inventory_id: null
         }, 1);
         var btn = event.target;
@@ -482,4 +529,12 @@
   }
 
   window.BrandCatalog = BrandCatalog;
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/catalog.js b/pos/static/js/catalog.js
index f3fb7a9..82d9b83 100644
--- a/pos/static/js/catalog.js
+++ b/pos/static/js/catalog.js
@@ -46,6 +46,11 @@
     var checkoutBtn   = document.getElementById('checkoutBtn');
     var cartFab       = document.getElementById('cartFab');
     var cartCloseBtn  = document.getElementById('cartCloseBtn');
+    // Supplier prices upload
+    var uploadPricesBtn  = document.getElementById('uploadPricesBtn');
+    var uploadPricesModal= document.getElementById('uploadPricesModal');
+    var uploadPricesFile = document.getElementById('uploadPricesFile');
+    var uploadPricesStatus=document.getElementById('uploadPricesStatus');
 
     // ─── Navigation State ───
     var nav = {
@@ -195,7 +200,19 @@
             currentAbort = null;
         }
         var opts = { headers: headers };
-        if (url.indexOf('/pos/api/') === 0 && url.indexOf('mode=') !== -1 || url.indexOf('/years') !== -1 || url.indexOf('/brands') !== -1 || url.indexOf('/models') !== -1 || url.indexOf('/engines') !== -1 || url.indexOf('/categories') !== -1 || url.indexOf('/groups') !== -1 || url.indexOf('/part-types') !== -1 || url.indexOf('/parts') !== -1 || url.indexOf('/search') !== -1) {
+        var isCatalogNav = url.indexOf('/pos/api/') === 0 && (
+            url.indexOf('mode=') !== -1 ||
+            url.indexOf('/years') !== -1 ||
+            url.indexOf('/brands') !== -1 ||
+            url.indexOf('/models') !== -1 ||
+            url.indexOf('/engines') !== -1 ||
+            url.indexOf('/categories') !== -1 ||
+            url.indexOf('/groups') !== -1 ||
+            url.indexOf('/part-types') !== -1 ||
+            url.indexOf('/parts') !== -1 ||
+            url.indexOf('/search') !== -1
+        );
+        if (isCatalogNav) {
             currentAbort = new AbortController();
             opts.signal = currentAbort.signal;
         }
@@ -233,7 +250,7 @@
         if (!s) return '';
         var d = document.createElement('div');
         d.textContent = s;
-        return d.innerHTML;
+        return d.innerHTML.replace(/"/g, '&quot;');
     }
 
     // ─── Breadcrumb ───
@@ -304,9 +321,9 @@
 
     function resetNav() {
         nav.level = 'brands';
-        pushNavState();
         nav.brand = nav.model = nav.year = nav.engine = nav.category = nav.group = nav.partType = null;
         nav.nxGroup = nav.nxSubgroup = nav.nxPartType = null;
+        pushNavState();
     }
 
     function resetNavFrom(level) {
@@ -363,10 +380,14 @@
         var cacheKey = 'nexus:brands:' + catalogMode;
         var cached = sessionStorage.getItem(cacheKey);
         if (cached) {
-            hideLoading();
-            var data = JSON.parse(cached);
-            renderBrands(data);
-            return;
+            try {
+                hideLoading();
+                var data = JSON.parse(cached);
+                renderBrands(data);
+                return;
+            } catch (e) {
+                sessionStorage.removeItem(cacheKey);
+            }
         }
 
         apiFetch(API + '/brands?mode=' + catalogMode).then(function (data) {
@@ -937,9 +958,14 @@
             partsGrid.querySelectorAll('.part-card').forEach(function (card) {
                 card.addEventListener('click', function () {
                     var pid = this.dataset.partId;
+                    var src = this.dataset.source || '';
                     if (typeof pid === 'string' && pid.indexOf('inv:') === 0) {
                         return;
                     }
+                    if (src === 'supplier_catalog' || (typeof pid === 'string' && pid.indexOf('sc:') === 0)) {
+                        openSupplierDetail(pid.replace('sc:', ''));
+                        return;
+                    }
                     openPartDetail(parseInt(pid));
                 });
             });
@@ -998,17 +1024,23 @@
             partsGrid.innerHTML = data.data.map(function (p) {
                 // Stock badge — prefer tenant stock, then warehouse network, else fallback
                 var stockBadge;
-                if (p.local_stock > 0) {
+                var isSupplier = p.source === 'supplier_catalog' || (typeof p.id_part === 'string' && p.id_part.indexOf('sc:') === 0);
+                if (isSupplier) {
+                    stockBadge = '<span class="stock-badge stock-badge--none" style="background:#f59e0b;color:#fff;">Cat. Proveedor</span>';
+                } else if (p.local_stock > 0) {
                     stockBadge = '<span class="stock-badge stock-badge--local">En stock: ' + p.local_stock + '</span>';
                 } else if (p.in_stock_network || p.bodega_count > 0) {
                     stockBadge = '<span class="stock-badge stock-badge--bodega">' + p.bodega_count + ' bodega' + (p.bodega_count > 1 ? 's' : '') + '</span>';
                 } else {
                     stockBadge = '<span class="stock-badge stock-badge--none">Sin stock</span>';
                 }
-                // Local inventory native badge
-                var sourceBadge = p.source === 'local_inventory'
-                    ? '<span class="stock-badge stock-badge--local" style="margin-left:4px;background:#4f46e5;">Stock Local</span>'
-                    : '';
+                // Source badge for local inventory or supplier catalog
+                var sourceBadge = '';
+                if (p.source === 'local_inventory') {
+                    sourceBadge = '<span class="stock-badge stock-badge--local" style="margin-left:4px;background:#4f46e5;">Stock Local</span>';
+                } else if (isSupplier) {
+                    sourceBadge = '<span class="stock-badge stock-badge--local" style="margin-left:4px;background:#f59e0b;color:#fff;">Cat. Proveedor</span>';
+                }
 
                 var imgHtml = p.image_url
                     ? '<img src="' + esc(p.image_url) + '" alt="' + esc(p.name) + '" loading="lazy" decoding="async">'
@@ -1040,6 +1072,7 @@
                     '</div>' +
                     '<div class="part-card__footer">' +
                     (p.local_price ? '<span class="part-card__price">$' + fmt(p.local_price) + '</span>' : '<span class="part-card__price" style="color:var(--color-text-muted);">Sin precio</span>') +
+                    (p.supplier_price ? '<span class="part-card__price" style="color:#2d7d46;font-size:0.85em;">Prov: $' + fmt(p.supplier_price) + '</span>' : '') +
                     stockBadge +
                     '</div>' +
                     '</article>';
@@ -1049,10 +1082,15 @@
             partsGrid.querySelectorAll('.part-card').forEach(function (card) {
                 card.addEventListener('click', function () {
                     var pid = this.dataset.partId;
+                    var src = this.dataset.source || '';
                     if (typeof pid === 'string' && pid.indexOf('inv:') === 0) {
                         // local-inventory item: info already visible on card
                         return;
                     }
+                    if (src === 'supplier_catalog' || (typeof pid === 'string' && pid.indexOf('sc:') === 0)) {
+                        openSupplierDetail(pid.replace('sc:', ''));
+                        return;
+                    }
                     openPartDetail(parseInt(pid));
                 });
             });
@@ -1195,6 +1233,73 @@
         });
     }
 
+    function openSupplierDetail(supplierId) {
+        detailBody.innerHTML = '<div class="loading is-visible"><div class="spinner"></div></div>';
+        detailFooter.style.display = 'none';
+        detailPanel.classList.add('is-open');
+        detailOverlay.classList.add('is-visible');
+
+        apiFetch('/pos/api/supplier-catalog/items/' + supplierId).then(function (data) {
+            if (!data || data.error) {
+                detailBody.innerHTML = '<p style="color:var(--color-error);padding:var(--space-4);">Error al cargar detalle.</p>';
+                return;
+            }
+            var p = data;
+            var html = '';
+
+            html += '<div class="detail-section">';
+            html += '<div style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-1);">' + esc(p.supplier_name) + ' &gt; ' + esc(p.category || '') + '</div>';
+            html += '<div class="detail-oem">' + esc(p.sku) + '</div>';
+            html += '<div class="detail-name">' + esc((p.name || '').replace(/\\n/g, ' ')) + '</div>';
+            if (p.description) html += '<div class="detail-desc">' + esc(p.description) + '</div>';
+            if (p.image_url) html += '<div style="margin-top:var(--space-3);text-align:center;"><img src="' + esc(p.image_url) + '" alt="" loading="lazy" decoding="async" style="max-width:100%;max-height:200px;object-fit:contain;border-radius:var(--radius-sm);"></div>';
+            html += '</div>';
+
+            // Interchanges
+            if (p.interchanges && p.interchanges.length) {
+                html += '<div class="detail-section">';
+                html += '<div class="detail-section__title">Intercambios OEM</div>';
+                var seen = {};
+                p.interchanges.forEach(function(ix) {
+                    var key = (ix.brand || '') + '|' + (ix.interchange_number || '');
+                    if (seen[key]) return;
+                    seen[key] = true;
+                    html += '<div style="display:flex;justify-content:space-between;padding:4px 0;border-bottom:1px solid var(--color-border);">' +
+                        '<span style="font-weight:600;">' + esc(ix.brand || '') + '</span>' +
+                        '<span style="color:var(--color-text-muted);font-family:monospace;">' + esc(ix.interchange_number || '') + '</span>' +
+                        '</div>';
+                });
+                html += '</div>';
+            }
+
+            // Compatibilities — deduplicate by (make, model, year, engine)
+            if (p.compatibilities && p.compatibilities.length) {
+                html += '<div class="detail-section">';
+                html += '<div class="detail-section__title">Vehiculos compatibles</div>';
+                var seenCompat = {};
+                var uniqCompat = [];
+                p.compatibilities.forEach(function(c) {
+                    var key = (c.make || '') + '|' + (c.model || '') + '|' + (c.year || '') + '|' + (c.engine || '');
+                    if (seenCompat[key]) return;
+                    seenCompat[key] = true;
+                    uniqCompat.push(c);
+                });
+                var currentMake = '';
+                uniqCompat.forEach(function(c) {
+                    if (c.make !== currentMake) {
+                        currentMake = c.make;
+                        html += '<div style="font-weight:600;margin-top:8px;">' + esc(c.make) + '</div>';
+                    }
+                    html += '<div style="padding-left:12px;color:var(--color-text-muted);font-size:var(--text-body-sm);">' +
+                        esc(c.model) + ' ' + c.year + ' ' + esc(c.engine || '') + '</div>';
+                });
+                html += '</div>';
+            }
+
+            detailBody.innerHTML = html;
+        });
+    }
+
     function closeDetail() {
         detailPanel.classList.remove('is-open');
         detailOverlay.classList.remove('is-visible');
@@ -1408,17 +1513,22 @@
             }
             searchDropdown.innerHTML = data.data.map(function (r) {
                 var isLocal = r.source === 'local_inventory' || (typeof r.id_part === 'string' && r.id_part.indexOf('inv:') === 0);
+                var isSupplier = r.source === 'supplier_catalog' || (typeof r.id_part === 'string' && r.id_part.indexOf('sc:') === 0);
                 var stockLabel = r.local_stock > 0
                     ? '<span class="stock-badge stock-badge--local" style="margin-left:auto;">Stock: ' + r.local_stock + '</span>'
                     : '';
-                var localBadge = isLocal
-                    ? '<span class="stock-badge stock-badge--local" style="margin-right:4px;background:#4f46e5;">Stock Local</span>'
-                    : '';
+                var sourceBadge = '';
+                if (isLocal) {
+                    sourceBadge = '<span class="stock-badge stock-badge--local" style="margin-right:4px;background:#4f46e5;">Stock Local</span>';
+                } else if (isSupplier) {
+                    sourceBadge = '<span class="stock-badge stock-badge--local" style="margin-right:4px;background:#f59e0b;color:#fff;">Cat. Proveedor</span>';
+                }
                 var oemNum = isLocal ? (r.oem_part_number || r.part_number || '') : (r.oem_part_number || '');
-                return '<div class="search-result-item" data-part-id="' + r.id_part + '" data-name="' + esc(r.name) + '" data-pn="' + esc(oemNum) + '" data-price="' + (r.local_price || '') + '" data-stock="' + (r.local_stock || 0) + '">' +
+                var cleanName = (r.name || '').replace(/\\n/g, ' ');
+                return '<div class="search-result-item" data-part-id="' + r.id_part + '" data-name="' + esc(cleanName) + '" data-pn="' + esc(oemNum) + '" data-price="' + (r.local_price || '') + '" data-stock="' + (r.local_stock || 0) + '" data-source="' + (r.source || '') + '">' +
                     '<div style="flex:1;">' +
-                    '<div class="search-result__oem">' + localBadge + esc(oemNum) + '</div>' +
-                    '<div class="search-result__name">' + esc(r.name) + '</div>' +
+                    '<div class="search-result__oem">' + sourceBadge + esc(oemNum) + '</div>' +
+                    '<div class="search-result__name">' + esc(cleanName) + '</div>' +
                     (r.vehicle_info ? '<div class="search-result__vehicle">' + esc(r.vehicle_info) + '</div>' : '') +
                     '</div>' +
                     stockLabel +
@@ -1430,6 +1540,7 @@
                 el.addEventListener('click', function () {
                     searchDropdown.classList.remove('is-visible');
                     var pid = this.dataset.partId;
+                    var src = this.dataset.source || '';
                     if (typeof pid === 'string' && pid.indexOf('inv:') === 0) {
                         var info = '💠 Stock Local\n\n' +
                             'Parte: ' + (this.dataset.pn || 'N/A') + '\n' +
@@ -1439,6 +1550,10 @@
                         alert(info);
                         return;
                     }
+                    if (src === 'supplier_catalog' || (typeof pid === 'string' && pid.indexOf('sc:') === 0)) {
+                        openSupplierDetail(pid.replace('sc:', ''));
+                        return;
+                    }
                     openPartDetail(parseInt(pid));
                 });
             });
@@ -1645,8 +1760,13 @@
         var cacheKey = 'nexus:years-all';
         var cached = sessionStorage.getItem(cacheKey);
         if (cached) {
-            var data = JSON.parse(cached);
-            var years = data.data || data || [];
+            try {
+                var data = JSON.parse(cached);
+                var years = data.data || data || [];
+            } catch (e) {
+                sessionStorage.removeItem(cacheKey);
+                var years = [];
+            }
             if (!years.length) {
                 years = [];
                 for (var y = 2026; y >= 1990; y--) years.push({ id_year: y, year_car: y });
@@ -2046,6 +2166,53 @@
         });
     }
 
+    // ─── Supplier prices upload ─────────────────────────────────────────────
+    function openUploadPricesModal() {
+        if (uploadPricesModal) uploadPricesModal.style.display = 'flex';
+        if (uploadPricesStatus) uploadPricesStatus.innerHTML = '';
+        if (uploadPricesFile) uploadPricesFile.value = '';
+    }
+    function closeUploadPricesModal() {
+        if (uploadPricesModal) uploadPricesModal.style.display = 'none';
+    }
+    async function submitUploadPrices() {
+        if (!uploadPricesFile || !uploadPricesFile.files || !uploadPricesFile.files[0]) {
+            if (uploadPricesStatus) uploadPricesStatus.innerHTML = '<span style="color:var(--color-error);">Selecciona un archivo primero.</span>';
+            return;
+        }
+        var form = new FormData();
+        form.append('file', uploadPricesFile.files[0]);
+        if (uploadPricesStatus) uploadPricesStatus.innerHTML = 'Subiendo...';
+        try {
+            var res = await fetch('/pos/api/supplier-catalog/prices/upload', {
+                method: 'POST',
+                headers: { 'Authorization': 'Bearer ' + token },
+                body: form
+            });
+            var data = await res.json();
+            if (res.ok && data.success) {
+                if (uploadPricesStatus) uploadPricesStatus.innerHTML = '<span style="color:var(--color-success);">✓ Precios actualizados: ' + data.processed + ' (insertados: ' + data.inserted + ', actualizados: ' + data.updated + ')</span>';
+                uploadPricesFile.value = '';
+            } else {
+                var msg = data.error || 'Error al subir precios';
+                var details = (data.details || []).join('<br>');
+                if (uploadPricesStatus) uploadPricesStatus.innerHTML = '<span style="color:var(--color-error);">' + esc(msg) + '</span>' + (details ? '<div style="margin-top:4px;font-size:0.9em;">' + details + '</div>' : '');
+            }
+        } catch (e) {
+            if (uploadPricesStatus) uploadPricesStatus.innerHTML = '<span style="color:var(--color-error);">Error de red: ' + esc(e.message) + '</span>';
+        }
+    }
+
+    function shouldShowUploadPricesButton() {
+        try {
+            var user = JSON.parse(localStorage.getItem('pos_employee') || '{}');
+            return user.role === 'owner' || user.role === 'admin';
+        } catch (e) { return false; }
+    }
+    if (uploadPricesBtn && shouldShowUploadPricesButton()) {
+        uploadPricesBtn.style.display = 'inline-flex';
+    }
+
     window.CatalogApp = {
         toggleCart: toggleCart,
         goToCheckout: goToCheckout,
@@ -2065,6 +2232,9 @@
         togglePlate: togglePlate,
         lookupPlate: lookupPlate,
         setMode: setCatalogMode,
+        openUploadPricesModal: openUploadPricesModal,
+        closeUploadPricesModal: closeUploadPricesModal,
+        submitUploadPrices: submitUploadPrices,
     };
 
     // ─── INIT ───
diff --git a/pos/static/js/catalog.min.js b/pos/static/js/catalog.min.js
deleted file mode 100644
index 6468fea..0000000
--- a/pos/static/js/catalog.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e="/pos/api/catalog",a=localStorage.getItem("pos_token");if(a){var t={Authorization:"Bearer "+a,"Content-Type":"application/json"},n=document.getElementById("breadcrumb"),o=document.getElementById("searchInput"),i=document.getElementById("searchDropdown"),r=document.getElementById("levelTitle"),s=document.getElementById("levelFilter"),l=document.getElementById("loading"),d=document.getElementById("emptyState"),c=document.getElementById("emptyTitle"),u=document.getElementById("emptySubtitle"),p=document.getElementById("navGrid"),m=document.getElementById("partsGrid"),v=document.getElementById("pagination"),g=document.getElementById("pageBody"),y=document.getElementById("detailPanel"),f=document.getElementById("detailOverlay"),_=document.getElementById("detailBody"),h=document.getElementById("detailFooter"),b=document.getElementById("detailClose"),x=document.getElementById("qtyMinus"),E=document.getElementById("qtyPlus"),k=document.getElementById("qtyDisplay"),I=document.getElementById("addToCartBtn"),T=document.getElementById("cartSidebar"),S=document.getElementById("cartOverlay"),L=document.getElementById("cartItems"),C=document.getElementById("cartEmpty"),M=document.getElementById("cartSubtotal"),B=document.getElementById("cartTax"),w=document.getElementById("cartTotal"),N=document.getElementById("cartBadge"),A=document.getElementById("checkoutBtn"),H=document.getElementById("cartFab"),P=document.getElementById("cartCloseBtn"),j={level:"brands",brand:null,model:null,year:null,engine:null,category:null,group:null,partType:null,nxGroup:null,nxSubgroup:null,nxPartType:null},q="local";localStorage.setItem("catalog_mode","local");var O=1,G=null,U=1,R=!1;window.addEventListener("popstate",(function(e){e.state&&(R=!0,j.level=e.state.level||"brands",j.brand=e.state.brand,j.model=e.state.model,j.year=e.state.year,j.engine=e.state.engine,j.category=e.state.category,j.group=e.state.group,j.partType=e.state.partType||null,j.nxGroup=e.state.nxGroup||null,j.nxSubgroup=e.state.nxSubgroup||null,j.nxPartType=e.state.nxPartType||null,O=e.state.page||1,"brands"===j.level?he():"models"===j.level?be():"years"===j.level?xe():"engines"===j.level?Ee():"categories"===j.level?Te():"groups"===j.level?j.nxGroup?Se():ke():"part_types"===j.level?j.nxSubgroup?Le():Ie():"parts"===j.level?Me(O):he(),R=!1)})),history.replaceState(JSON.parse(JSON.stringify(j)),"","/pos/catalog");var $=JSON.parse(localStorage.getItem("pos_cart")||"[]"),V=null;b.addEventListener("click",Ne),f.addEventListener("click",Ne),x.addEventListener("click",(function(){U>1&&(U--,k.textContent=U)})),E.addEventListener("click",(function(){U++,k.textContent=U})),I.addEventListener("click",(function(){if(G){var e=G.part,a=G.local;a&&(qe({id:e.id_part,part_number:e.oem_part_number,name:e.name,brand:"",price:a.price_1,tax_rate:a.tax_rate||.16,unit:a.unit||"PZA",stock:a.stock,source:"local",inventory_id:a.inventory_id},U),Ne())}}));var z=null,J=null;o.addEventListener("input",(function(){clearTimeout(z);var e=this.value.trim();(He(e.length>=3?Ae(e):null),e.length<2)?i.classList.remove("is-visible"):"keyword"===Ae(e)&&(z=setTimeout((function(){je(e)}),350))})),o.addEventListener("keydown",(function(e){if("Enter"===e.key){e.preventDefault(),clearTimeout(z);var a=this.value.trim();a.length>=2&&Pe(a)}"Escape"===e.key&&(i.classList.remove("is-visible"),He(null))})),document.addEventListener("click",(function(e){i.contains(e.target)||e.target===o||i.classList.remove("is-visible")})),L.addEventListener("click",(function(e){var a=e.target.closest("[data-cart-action]");if(a){var t=parseInt(a.dataset.idx),n=a.dataset.cartAction;"dec"===n?Ge(t,$[t].quantity-1):"inc"===n?Ge(t,$[t].quantity+1):"remove"===n&&Oe(t)}})),H.addEventListener("click",$e),P.addEventListener("click",$e),S.addEventListener("click",$e),A.addEventListener("click",Ve);var D="",Z=null;document.addEventListener("keydown",(function(e){if("F1"===e.key)return e.preventDefault(),void o.focus();if("Escape"===e.key)return Ne(),void(T.classList.contains("open")&&$e());if("INPUT"!==document.activeElement.tagName&&"TEXTAREA"!==document.activeElement.tagName){if("Enter"===e.key&&D.length>=4){var a=D.trim();return D="",o.value=a,void je(a)}1===e.key.length&&(D+=e.key,clearTimeout(Z),Z=setTimeout((function(){D=""}),200))}})),document.querySelectorAll("[data-theme-switch]").forEach((function(e){e.addEventListener("click",(function(){var e=this.dataset.themeSwitch;document.documentElement.setAttribute("data-theme",e),localStorage.setItem("pos_theme",e),document.querySelectorAll("[data-theme-switch]").forEach((function(e){e.classList.remove("is-active"),e.setAttribute("aria-pressed","false")})),this.classList.add("is-active"),this.setAttribute("aria-pressed","true")}));var a=localStorage.getItem("pos_theme")||"industrial";e.dataset.themeSwitch===a?(e.classList.add("is-active"),e.setAttribute("aria-pressed","true")):(e.classList.remove("is-active"),e.setAttribute("aria-pressed","false"))}));var F=document.getElementById("vsYear"),Y=document.getElementById("vsBrand"),Q=document.getElementById("vsModel"),W=document.getElementById("vsEngine"),X=document.getElementById("vsClear"),K=document.getElementById("plateInputWrap"),ee=document.getElementById("plateInput"),ae=document.getElementById("plateStatus"),te=document.getElementById("plateToggle");ee&&ee.addEventListener("keydown",(function(e){"Enter"===e.key&&(e.preventDefault(),Fe())}));var ne=document.getElementById("vinInputWrap"),oe=document.getElementById("vinInput"),ie=document.getElementById("vinStatus"),re=document.getElementById("vinToggle");oe&&oe.addEventListener("keydown",(function(e){"Enter"===e.key&&(e.preventDefault(),Ye())})),window.CatalogApp={toggleCart:$e,goToCheckout:Ve,addToCart:qe,removeFromCart:Oe,updateQty:Ge,clearCart:function(){$=[],Ue(),Re()},loadPage:function(e){Me(e)},vsYearChanged:function(){var a=F.value;Y.innerHTML='<option value="">Marca...</option>',Q.innerHTML='<option value="">Modelo...</option>',W.innerHTML='<option value="">Motor...</option>',Y.disabled=!0,Q.disabled=!0,W.disabled=!0,X.style.display=a?"":"none",a&&(Y.disabled=!1,de(e+"/brands?year_id="+a+"&mode="+q).then((function(e){var a=e.data||e;a&&(Y.innerHTML='<option value="">Marca...</option>'+a.map((function(e){return'<option value="'+e.id_brand+'">'+ve(e.name_brand)+"</option>"})).join(""))})))},vsBrandChanged:function(){var a=Y.value,t=F.value;Q.innerHTML='<option value="">Modelo...</option>',W.innerHTML='<option value="">Motor...</option>',Q.disabled=!0,W.disabled=!0,a&&(Q.disabled=!1,de(e+"/models?brand_id="+a+(t?"&year_id="+t:"")).then((function(e){var a=e.data||e;a&&(Q.innerHTML='<option value="">Modelo...</option>'+a.map((function(e){return'<option value="'+e.id_model+'">'+ve(e.display_name||e.name_model)+"</option>"})).join(""))})))},vsModelChanged:function(){var a=Q.value,t=F.value;W.innerHTML='<option value="">Motor...</option>',W.disabled=!0,a&&t&&(W.disabled=!1,de(e+"/engines?model_id="+a+"&year_id="+t).then((function(e){var a=e.data||e;a&&(W.innerHTML='<option value="">Motor...</option>'+a.map((function(e){var a=e.name_engine+(e.trim_level?" ("+e.trim_level+")":"");return'<option value="'+e.id_mye+'">'+ve(a)+"</option>"})).join(""),1===a.length&&(W.value=a[0].id_mye,Je()))})))},vsEngineChanged:Je,vsClear:De,startBarcodeScan:function(){window.NexusNative?window.NexusNative.scanBarcode().then((function(e){e&&(o.value=e,je(e))})):alert("El modulo de escaneo no esta cargado.")},toggleVin:function(){var e="none"!==ne.style.display;ne.style.display=e?"none":"",re.textContent=e?"Tienes el VIN?":"Ocultar VIN",!e&&oe&&oe.focus()},decodeVin:Ye,togglePlate:function(){var e="none"!==K.style.display;K.style.display=e?"none":"",te.textContent=e?"Tienes las placas?":"Ocultar placas",!e&&ee&&ee.focus()},lookupPlate:Fe,setMode:function(a){if("oem"===a||"local"===a||"supplies"===a)if("oem"!==a){if(a!==q){if(q=a,localStorage.setItem("catalog_mode",a),se(),j.category=j.group=j.partType=null,j.nxGroup=j.nxSubgroup=j.nxPartType=null,O=1,"supplies"===a){try{De()}catch(e){}return j.brand=j.model=j.year=j.engine=null,j.level="categories",j.level="categories",le(),ge(),r.textContent="Shop Supplies (sin vehiculo)",_e(!0),ce(),void de(e+"/shop-supplies/groups").then((function(a){ue(),a&&a.data&&a.data.length?(p.className="nav-grid",p.innerHTML=a.data.map((function(e){return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.subgroup_count+" subgrupos</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(a){a.addEventListener("click",(function(){j.nxGroup={slug:this.dataset.slug,name:this.dataset.name},j.nxSubgroup=null,j.nxPartType=null,j.level="groups",le(),ge(),r.textContent=j.nxGroup.name,_e(!0),ce(),de(e+"/shop-supplies/subgroups?group_slug="+encodeURIComponent(j.nxGroup.slug)).then((function(a){ue(),a&&a.data&&a.data.length?(p.className="nav-grid",p.innerHTML=a.data.map((function(e){return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.part_count+" partes</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(a){a.addEventListener("click",(function(){j.nxSubgroup={slug:this.dataset.slug,name:this.dataset.name},j.nxPartType=null,function(){j.level="part_types",j.nxPartType=null,le(),ge(),r.textContent=j.nxSubgroup.name,_e(!0),ce();var a=e+"/shop-supplies/part-types?group_slug="+encodeURIComponent(j.nxGroup.slug)+"&subgroup_slug="+encodeURIComponent(j.nxSubgroup.slug);de(a).then((function(e){if(ue(),e&&e.data&&e.data.length){if(1===e.data.length){var a=e.data[0];return j.nxPartType={slug:a.slug,name:a.name},void Ce(1)}p.className="nav-grid",p.innerHTML=e.data.map((function(e){var a=e.sample_image?'<img src="'+ve(e.sample_image)+'" alt="" style="width:32px;height:32px;object-fit:contain;margin-right:8px;vertical-align:middle;" onerror="this.style.display=\'none\'">':"";return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+a+ve(e.name)+'</div><div class="nav-card__count">'+e.variant_count+" variante"+(e.variant_count>1?"s":"")+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.nxPartType={slug:this.dataset.slug,name:this.dataset.name},Ce(1)}))}))}else pe("Sin tipos","No hay tipos de parte en este subgrupo.")}))}()}))}))):pe("Sin subgrupos","No hay subgrupos con partes disponibles.")}))}))}))):pe("Sin supplies","No hay grupos de Shop Supplies disponibles.")}))}if(!(!j.engine||!j.engine.id_mye))return j.level="categories",void Te();try{De()}catch(e){}j.level="brands",j.brand=j.model=j.year=j.engine=null,he()}}else alert("Catálogo OEM próximamente. Por favor usa el modo Local o Shop Supplies.")}},Re(),se(),function(){var a="nexus:years-all",t=sessionStorage.getItem(a);if(t){var n=JSON.parse(t),o=n.data||n||[];if(!o.length){o=[];for(var i=2026;i>=1990;i--)o.push({id_year:i,year_car:i})}F.innerHTML='<option value="">Año...</option>'+o.map((function(e){return'<option value="'+e.id_year+'">'+e.year_car+"</option>"})).join("")}else de(e+"/years-all").then((function(e){if(e){var t=e.data||e;if(!t||!t.length){t=[];for(var n=2026;n>=1990;n--)t.push({id_year:n,year_car:n})}sessionStorage.setItem(a,JSON.stringify(e)),F.innerHTML='<option value="">Año...</option>'+t.map((function(e){return'<option value="'+e.id_year+'">'+e.year_car+"</option>"})).join("")}})).catch((function(){for(var e=[],a=2026;a>=1990;a--)e.push(a);F.innerHTML='<option value="">Año...</option>'+e.map((function(e){return'<option value="'+e+'">'+e+"</option>"})).join("")}))}(),he()}else window.location.href="/pos/login";function se(){document.querySelectorAll("#modeToggle button").forEach((function(e){e.getAttribute("data-mode")===q?e.classList.add("is-active"):e.classList.remove("is-active")}))}function le(){if(!R){var e=JSON.parse(JSON.stringify(j));e.page=O,history.pushState(e,"","/pos/catalog")}}function de(e){V&&(V.abort(),V=null);var a={headers:t};return(0===e.indexOf("/pos/api/")&&-1!==e.indexOf("mode=")||-1!==e.indexOf("/years")||-1!==e.indexOf("/brands")||-1!==e.indexOf("/models")||-1!==e.indexOf("/engines")||-1!==e.indexOf("/categories")||-1!==e.indexOf("/groups")||-1!==e.indexOf("/part-types")||-1!==e.indexOf("/parts")||-1!==e.indexOf("/search"))&&(V=new AbortController,a.signal=V.signal),fetch(e,a).then((function(e){return 401===e.status?(localStorage.removeItem("pos_token"),window.location.href="/pos/login",null):e.json()})).catch((function(e){return"AbortError"===e.name||console.error("API error:",e),null}))}function ce(){l.classList.add("is-visible"),p.innerHTML="",m.style.display="none",m.innerHTML="",d.classList.remove("is-visible"),v.innerHTML="";var e=document.getElementById("diagLink");e&&"categories"!==j.level&&(e.style.display="none")}function ue(){l.classList.remove("is-visible")}function pe(e,a){c.textContent=e,u.textContent=a||"",d.classList.add("is-visible"),p.innerHTML="",m.style.display="none"}function me(e){return(parseFloat(e)||0).toFixed(2)}function ve(e){if(!e)return"";var a=document.createElement("div");return a.textContent=e,a.innerHTML}function ge(){var e=[];e.push({label:"Catalogo",action:"loadBrands"}),j.brand&&e.push({label:j.brand.name,action:"loadModels"}),j.model&&e.push({label:j.model.name,action:"loadYears"}),j.year&&e.push({label:String(j.year.year),action:"loadEngines"}),j.engine&&e.push({label:j.engine.name,action:"loadCategories"}),j.nxGroup?e.push({label:j.nxGroup.name,action:"loadNxSubgroups"}):j.category&&e.push({label:j.category.name,action:"loadGroups"}),j.nxSubgroup?e.push({label:j.nxSubgroup.name,action:"loadNxPartTypes"}):j.group&&e.push({label:j.group.name,action:"loadPartTypes"}),j.nxPartType?e.push({label:j.nxPartType.name,action:null}):j.partType&&e.push({label:j.partType.name,action:null});for(var a="",t=0;t<e.length;t++)t>0&&(a+='<span class="breadcrumb__sep" aria-hidden="true">/</span>'),t<e.length-1&&e[t].action?a+='<a class="breadcrumb__link" data-bc-action="'+e[t].action+'">'+ve(e[t].label)+"</a>":a+='<span class="breadcrumb__current">'+ve(e[t].label)+"</span>";n.innerHTML=a,n.querySelectorAll("[data-bc-action]").forEach((function(e){e.addEventListener("click",(function(){var e=this.dataset.bcAction;"loadBrands"===e?(ye(),he()):"loadModels"===e?(fe("models"),be()):"loadYears"===e?(fe("years"),xe()):"loadEngines"===e?(fe("engines"),Ee()):"loadCategories"===e?(fe("categories"),Te()):"loadGroups"===e?(fe("groups"),ke()):"loadPartTypes"===e?(fe("part_types"),Ie()):"loadNxSubgroups"===e?(fe("groups"),Se()):"loadNxPartTypes"===e&&(fe("part_types"),Le())}))}))}function ye(){j.level="brands",le(),j.brand=j.model=j.year=j.engine=j.category=j.group=j.partType=null,j.nxGroup=j.nxSubgroup=j.nxPartType=null}function fe(e){var a=["brands","models","years","engines","categories","groups","part_types","parts"].indexOf(e);if(a<=0)ye();else{j.level=e;for(var t=[null,["model"],["year"],["engine"],["category","nxGroup"],["group","nxSubgroup"],["partType","nxPartType"],null],n=a;n<t.length;n++)if(t[n])for(var o=t[n],i=0;i<o.length;i++)j[o[i]]=null}}function _e(e){if(!e)return s.style.display="none",void(s.value="");s.style.display="",s.value="",s.oninput=function(){var e=this.value.toLowerCase();p.querySelectorAll(".nav-card").forEach((function(a){var t=a.textContent.toLowerCase();a.style.display=t.indexOf(e)>=0?"":"none"}))}}function he(){j.level="brands",le(),ge(),r.textContent="Selecciona una marca",_e(!0),ce();var a="nexus:brands:"+q,t=sessionStorage.getItem(a);if(t)return ue(),void function(e){if(!e||!e.data||!e.data.length)return e?void pe("Sin marcas","El catalogo no tiene marcas con partes disponibles."):void ze();p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-brand-id="'+e.id_brand+'" data-name="'+ve(e.name_brand)+'"><div class="nav-card__name">'+ve(e.name_brand)+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.brand={id:parseInt(this.dataset.brandId),name:this.dataset.name},be()}))}))}(JSON.parse(t));de(e+"/brands?mode="+q).then((function(e){if(ue(),e&&e.data&&sessionStorage.setItem(a,JSON.stringify(e)),!e||!e.data||!e.data.length)return e?void pe("Sin marcas","El catalogo no tiene marcas con partes disponibles."):void ze();p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-brand-id="'+e.id_brand+'" data-name="'+ve(e.name_brand)+'"><div class="nav-card__name">'+ve(e.name_brand)+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.brand={id:parseInt(this.dataset.brandId),name:this.dataset.name},be()}))}))}))}function be(){j.level="models",le(),ge(),r.textContent="Modelos de "+j.brand.name,_e(!0),ce(),de(e+"/models?brand_id="+j.brand.id).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-model-id="'+e.id_model+'" data-name="'+ve(e.display_name||e.name_model)+'"><div class="nav-card__name">'+ve(e.display_name||e.name_model)+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.model={id:parseInt(this.dataset.modelId),name:this.dataset.name},xe()}))}))):pe("Sin modelos","No hay modelos con partes para "+j.brand.name)}))}function xe(){j.level="years",le(),ge(),r.textContent=j.brand.name+" "+j.model.name+" — Anios",_e(!1),ce(),de(e+"/years?model_id="+j.model.id).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid nav-grid--years",p.innerHTML=e.data.map((function(e){return'<div class="nav-card nav-card--year" role="listitem" data-year-id="'+e.id_year+'" data-year="'+e.year_car+'"><div class="nav-card__name">'+e.year_car+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.year={id:parseInt(this.dataset.yearId),year:parseInt(this.dataset.year)},Ee()}))}))):pe("Sin anios","No hay anios con partes para este modelo.")}))}function Ee(){j.level="engines",le(),ge(),r.textContent=j.brand.name+" "+j.model.name+" "+j.year.year+" — Motor",_e(!1),ce(),de(e+"/engines?model_id="+j.model.id+"&year_id="+j.year.id).then((function(e){if(ue(),e&&e.data&&e.data.length){if(1===e.data.length){var a=e.data[0];return j.engine={id_mye:a.id_mye,name:a.name_engine+(a.trim_level?" "+a.trim_level:"")},void Te()}p.className="nav-grid",p.innerHTML=e.data.map((function(e){var a=e.name_engine+(e.trim_level?" — "+e.trim_level:"");return'<div class="nav-card" role="listitem" data-mye-id="'+e.id_mye+'" data-name="'+ve(a)+'"><div class="nav-card__name">'+ve(e.name_engine)+"</div>"+(e.trim_level?'<div class="nav-card__sub">'+ve(e.trim_level)+"</div>":"")+"</div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.engine={id_mye:parseInt(this.dataset.myeId),name:this.dataset.name},Te()}))}))}else pe("Sin motores","No hay configuraciones de motor para esta combinacion.")}))}function ke(){j.level="groups",le(),ge(),r.textContent=j.category.name,_e(!0),ce(),de(e+"/groups?mye_id="+j.engine.id_mye+"&category_id="+j.category.id).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-group-id="'+e.id_part_group+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.part_count+" partes</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.group={id:parseInt(this.dataset.groupId),name:this.dataset.name},j.partType=null,Ie()}))}))):pe("Sin subcategorias","No hay subcategorias para "+j.category.name)}))}function Ie(){j.level="part_types",j.partType=null,le(),ge(),r.textContent=j.group.name,_e(!0),ce(),de(e+"/part-types?mye_id="+j.engine.id_mye+"&group_id="+j.group.id).then((function(e){if(ue(),e&&e.data&&e.data.length){if(1===e.data.length){var a=e.data[0];return j.partType={slug:a.slug,name:a.name},void Me(1)}p.className="nav-grid",p.innerHTML=e.data.map((function(e){var a=e.sample_image?'<img src="'+ve(e.sample_image)+'" alt="" style="width:32px;height:32px;object-fit:contain;margin-right:8px;vertical-align:middle;" onerror="this.style.display=\'none\'">':"";return'<div class="nav-card" role="listitem" data-pt-slug="'+ve(e.slug)+'" data-pt-name="'+ve(e.name)+'"><div class="nav-card__name">'+a+ve(e.name)+'</div><div class="nav-card__count">'+e.variant_count+" variante"+(e.variant_count>1?"s":"")+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.partType={slug:this.dataset.ptSlug,name:this.dataset.ptName},Me(1)}))}))}else Me(1)}))}function Te(){"local"===q?(j.level="categories",le(),ge(),r.textContent="Categorias (Local)",_e(!0),ce(),de(e+"/categories?mode=local&mye_id="+j.engine.id_mye).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.part_count+" partes</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.nxGroup={slug:this.dataset.slug,name:this.dataset.name},j.nxSubgroup=null,j.nxPartType=null,Se()}))}))):pe("Sin categorias Local","Ninguna parte de este vehiculo mapea al catalogo Local.")}))):(j.level="categories",le(),ge(),r.textContent="Categorias de partes",_e(!0),ce(),de(e+"/categories?mye_id="+j.engine.id_mye).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-cat-id="'+e.id_part_category+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.part_count+" partes</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.category={id:parseInt(this.dataset.catId),name:this.dataset.name},ke()}))}))):pe("Sin categorias","No hay partes catalogadas para este vehiculo.")})))}function Se(){j.level="groups",le(),ge(),r.textContent=j.nxGroup.name,_e(!0),ce(),de(e+"/groups?mode=local&mye_id="+j.engine.id_mye+"&category_slug="+encodeURIComponent(j.nxGroup.slug)).then((function(e){ue(),e&&e.data&&e.data.length?(p.className="nav-grid",p.innerHTML=e.data.map((function(e){return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+ve(e.name)+'</div><div class="nav-card__count">'+e.part_count+" partes</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.nxSubgroup={slug:this.dataset.slug,name:this.dataset.name},j.nxPartType=null,Le()}))}))):pe("Sin subcategorias","No hay subcategorias en "+j.nxGroup.name)}))}function Le(){j.level="part_types",j.nxPartType=null,le(),ge(),r.textContent=j.nxSubgroup.name,_e(!0),ce(),de(e+"/part-types?mode=local&mye_id="+j.engine.id_mye+"&group_slug="+encodeURIComponent(j.nxGroup.slug)+"&subgroup_slug="+encodeURIComponent(j.nxSubgroup.slug)).then((function(e){if(ue(),e&&e.data&&e.data.length){if(1===e.data.length){var a=e.data[0];return j.nxPartType={slug:a.slug,name:a.name},void Me(1)}p.className="nav-grid",p.innerHTML=e.data.map((function(e){var a=e.sample_image?'<img src="'+ve(e.sample_image)+'" alt="" style="width:32px;height:32px;object-fit:contain;margin-right:8px;vertical-align:middle;" onerror="this.style.display=\'none\'">':"";return'<div class="nav-card" role="listitem" data-slug="'+ve(e.slug)+'" data-name="'+ve(e.name)+'"><div class="nav-card__name">'+a+ve(e.name)+'</div><div class="nav-card__count">'+e.variant_count+" variante"+(e.variant_count>1?"s":"")+"</div></div>"})).join(""),p.querySelectorAll(".nav-card").forEach((function(e){e.addEventListener("click",(function(){j.nxPartType={slug:this.dataset.slug,name:this.dataset.name},Me(1)}))}))}else pe("Sin tipos de parte","No hay tipos de parte en "+j.nxSubgroup.name)}))}function Ce(a){j.level="parts",le(),O=a||1,ge(),r.textContent=j.nxPartType.name,_e(!1),ce(),p.innerHTML="",de(e+"/shop-supplies/parts?group_slug="+encodeURIComponent(j.nxGroup.slug)+"&subgroup_slug="+encodeURIComponent(j.nxSubgroup.slug)+"&part_type_slug="+encodeURIComponent(j.nxPartType.slug)+"&page="+O+"&per_page=30").then((function(e){ue(),e&&e.data&&e.data.length?(m.style.display="",m.innerHTML=e.data.map((function(e){var a;a=e.in_stock_network||e.bodega_count>0?'<span class="stock-badge stock-badge--bodega">'+e.bodega_count+" bodega"+(e.bodega_count>1?"s":"")+"</span>":'<span class="stock-badge stock-badge--none">Sin stock</span>';var t=e.image_url?'<img src="'+ve(e.image_url)+'" alt="'+ve(e.name)+'" loading="lazy" decoding="async">':'<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M8 7h8M8 12h8M8 17h5"/></svg>',n=1===e.priority_tier?" part-card--tier1":2===e.priority_tier?" part-card--tier2":"",o="";if(e.manufacturer){var i=1===e.priority_tier?'<span class="manu-tier">★</span>':"";o='<div class="part-card__manu"><span class="manu-name">'+ve(e.manufacturer)+"</span>"+i+"</div>"}var r=e.part_number?ve(e.part_number)+'<span class="part-card__oem-sub"> · OEM: '+ve(e.oem_part_number||"")+"</span>":ve(e.oem_part_number||"");return'<article class="part-card'+n+'" role="listitem" data-part-id="'+e.id_part+'"><div class="part-card__image">'+t+'</div><div class="part-card__body">'+o+'<div class="part-card__oem">'+r+'</div><div class="part-card__name">'+ve(e.name)+'</div></div><div class="part-card__footer"><span class="part-card__price" style="color:var(--color-text-muted);">Sin precio</span>'+a+"</div></article>"})).join(""),m.querySelectorAll(".part-card").forEach((function(e){e.addEventListener("click",(function(){var e=this.dataset.partId;"string"==typeof e&&0===e.indexOf("inv:")||we(parseInt(e))}))})),e.pagination&&Be(e.pagination)):pe("Sin partes","No hay partes en este tipo.")}))}function Me(a){var t;if(j.level="parts",le(),O=a||1,ge(),j.nxPartType?r.textContent=j.nxPartType.name:j.partType?r.textContent=j.partType.name:j.group?r.textContent=j.group.name:r.textContent="Partes",_e(!1),ce(),p.innerHTML="",j.nxGroup&&j.nxSubgroup&&j.nxPartType)t=e+"/parts?mode=local&mye_id="+j.engine.id_mye+"&page="+O+"&per_page=30&nexpart_group="+encodeURIComponent(j.nxGroup.slug)+"&nexpart_subgroup="+encodeURIComponent(j.nxSubgroup.slug)+"&nexpart_part_type="+encodeURIComponent(j.nxPartType.slug);else{var n=j.partType?"&part_type="+encodeURIComponent(j.partType.slug):"";t=e+"/parts?mye_id="+j.engine.id_mye+"&group_id="+j.group.id+"&page="+O+"&per_page=30&mode="+q+n}de(t).then((function(e){if(ue(),e&&e.data&&e.data.length){var a="local"===q;m.style.display="",m.innerHTML=e.data.map((function(e){var t;t=e.local_stock>0?'<span class="stock-badge stock-badge--local">En stock: '+e.local_stock+"</span>":e.in_stock_network||e.bodega_count>0?'<span class="stock-badge stock-badge--bodega">'+e.bodega_count+" bodega"+(e.bodega_count>1?"s":"")+"</span>":'<span class="stock-badge stock-badge--none">Sin stock</span>';var n="local_inventory"===e.source?'<span class="stock-badge stock-badge--local" style="margin-left:4px;background:#4f46e5;">Stock Local</span>':"",o=e.image_url?'<img src="'+ve(e.image_url)+'" alt="'+ve(e.name)+'" loading="lazy" decoding="async">':'<svg width="48" height="48" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M8 7h8M8 12h8M8 17h5"/></svg>',i="",r="";if(a&&e.manufacturer){var s="";1===e.priority_tier?(r=" part-card--tier1",s="★"):2===e.priority_tier&&(r=" part-card--tier2",s=""),i='<div class="part-card__manu"><span class="manu-name">'+ve(e.manufacturer)+"</span>"+(s?'<span class="manu-tier">'+s+"</span>":"")+"</div>"}var l=a&&e.part_number?ve(e.part_number)+'<span class="part-card__oem-sub"> · OEM: '+ve(e.oem_part_number)+"</span>":ve(e.oem_part_number);return'<article class="part-card'+r+'" role="listitem" data-part-id="'+e.id_part+'" data-source="'+(e.source||"")+'"><div class="part-card__image">'+o+'</div><div class="part-card__body">'+i+n+'<div class="part-card__oem">'+l+'</div><div class="part-card__name">'+ve(e.name)+'</div></div><div class="part-card__footer">'+(e.local_price?'<span class="part-card__price">$'+me(e.local_price)+"</span>":'<span class="part-card__price" style="color:var(--color-text-muted);">Sin precio</span>')+t+"</div></article>"})).join(""),m.querySelectorAll(".part-card").forEach((function(e){e.addEventListener("click",(function(){var e=this.dataset.partId;"string"==typeof e&&0===e.indexOf("inv:")||we(parseInt(e))}))})),e.pagination&&Be(e.pagination)}else pe("Sin partes","No hay partes en este grupo.")}))}function Be(e){if(!e||e.total_pages<=1)v.innerHTML="";else{var a="";e.page<=1?a+='<button class="page-item page-item--wide is-disabled" disabled>Anterior</button>':a+='<button class="page-item page-item--wide" data-page="'+(e.page-1)+'">Anterior</button>',function(e,a){if(a<=7){for(var t=[],n=1;n<=a;n++)t.push(n);return t}var o=[1];e>3&&o.push("...");for(var i=Math.max(2,e-1);i<=Math.min(a-1,e+1);i++)o.push(i);e<a-2&&o.push("...");return o.push(a),o}(e.page,e.total_pages).forEach((function(t){"..."===t?a+='<span style="padding:0 4px;color:var(--color-text-muted);">...</span>':t===e.page?a+='<button class="page-item is-active">'+t+"</button>":a+='<button class="page-item" data-page="'+t+'">'+t+"</button>"})),e.page>=e.total_pages?a+='<button class="page-item page-item--wide is-disabled" disabled>Siguiente</button>':a+='<button class="page-item page-item--wide" data-page="'+(e.page+1)+'">Siguiente</button>',v.innerHTML=a,v.querySelectorAll("[data-page]").forEach((function(e){e.addEventListener("click",(function(){g.scrollTo({top:0,behavior:"smooth"}),Me(parseInt(this.dataset.page))}))}))}}function we(a){_.innerHTML='<div class="loading is-visible"><div class="spinner"></div></div>',h.style.display="none",y.classList.add("is-open"),f.classList.add("is-visible"),U=1,k.textContent="1",de(e+"/part/"+a).then((function(e){if(e&&!e.error){G=e;var a=e.part,t=e.local,n=e.bodegas||[],o=e.alternatives||[],i="";i+='<div class="detail-section">',a.category_name&&(i+='<div style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-1);">'+ve(a.category_name)+" > "+ve(a.group_name)+"</div>"),i+='<div class="detail-oem">'+ve(a.oem_part_number)+"</div>",i+='<div class="detail-name">'+ve(a.name)+"</div>",a.description&&(i+='<div class="detail-desc">'+ve(a.description)+"</div>"),a.image_url&&(i+='<div style="margin-top:var(--space-3);text-align:center;"><img src="'+ve(a.image_url)+'" alt="" loading="lazy" decoding="async" style="max-width:100%;max-height:200px;object-fit:contain;border-radius:var(--radius-sm);"></div>'),i+="</div>",i+='<div class="detail-section">',i+='<div class="detail-section__title">Mi stock</div>',t&&t.stock>0?(i+='<div class="stock-row"><span class="stock-label">Cantidad</span><span class="stock-value stock-value--ok">'+t.stock+" "+(t.unit||"PZA")+"</span></div>",i+='<div class="stock-row"><span class="stock-label">Precio publico</span><span class="stock-value">$'+me(t.price_1)+"</span></div>",t.price_2&&(i+='<div class="stock-row"><span class="stock-label">Precio mayoreo</span><span class="stock-value">$'+me(t.price_2)+"</span></div>"),t.price_3&&(i+='<div class="stock-row"><span class="stock-label">Precio taller</span><span class="stock-value">$'+me(t.price_3)+"</span></div>"),t.location&&(i+='<div class="stock-row"><span class="stock-label">Ubicacion</span><span class="stock-value">'+ve(t.location)+"</span></div>")):i+='<div style="color:var(--color-text-muted);font-size:var(--text-body-sm);">No tienes esta parte en inventario.</div>',i+="</div>",n.length&&(i+='<div class="detail-section">',i+='<div class="detail-section__title">Disponible en bodegas</div>',i+='<table class="bodega-table"><thead><tr><th>Bodega</th><th>Precio</th><th>Stock</th></tr></thead><tbody>',n.forEach((function(e){i+="<tr><td>"+ve(e.business_name)+"</td><td>"+(e.price?"$"+me(e.price):"--")+"</td><td>"+e.stock+"</td></tr>"})),i+="</tbody></table></div>"),o.length&&(i+='<div class="detail-section">',i+='<div class="detail-section__title">Alternativas / Cross-references</div>',o.forEach((function(e){var a=e.local_stock>0?'<span class="stock-badge stock-badge--local">Stock: '+e.local_stock+"</span>":e.bodega_count>0?'<span class="stock-badge stock-badge--bodega">'+e.bodega_count+" bod.</span>":"";i+='<div class="alt-item"><div><div class="alt-item__pn">'+ve(e.part_number)+'</div><div class="alt-item__mfr">'+ve(e.manufacturer)+(e.name?" — "+ve(e.name):"")+'</div></div><div class="alt-item__stock">'+a+"</div></div>"})),i+="</div>"),_.innerHTML=i,t&&t.stock>0?h.style.display="":h.style.display="none"}else _.innerHTML='<p style="color:var(--color-error);padding:var(--space-4);">Error al cargar detalle.</p>'}))}function Ne(){y.classList.remove("is-open"),f.classList.remove("is-visible"),G=null}function Ae(e){if(!e)return"keyword";var a=e.trim(),t=a.replace(/[\s\-]/g,"").toUpperCase();if(/^[A-HJ-NPR-Z0-9]{17}$/.test(t))return"vin";if(/^[A-Z]{3}[-\s]?\d{3,4}$/.test(a.toUpperCase()))return"plate";if(/[a-z]/.test(a))return"keyword";var n=a.split(/\s+/);if(n.some((function(e){return/^(19|20)\d{2}$/.test(e)}))&&n.length>1)return"keyword";var o=a.toUpperCase();return/^[A-Z0-9]{2,}[\-\/][A-Z0-9]{2,}([\-\/][A-Z0-9]+)*$/.test(o)&&t.length>=6||n.length>=2&&n.every((function(e){return/^[A-Z0-9]{1,}$/.test(e)}))&&t.length>=6||/^[A-Z0-9]{8,}$/.test(t)&&/[A-Z]/.test(t)&&/\d/.test(t)?"part_number":"keyword"}function He(e){var a=J||((J=document.createElement("div")).id="searchHint",J.style.cssText="position:absolute;top:100%;left:0;margin-top:4px;padding:3px 10px;background:var(--color-primary-muted);color:var(--color-text-accent);font-size:var(--text-caption);font-weight:var(--font-weight-semibold);border:1px dashed var(--color-border-accent);border-radius:var(--radius-sm);white-space:nowrap;pointer-events:none;z-index:10;display:none;",o.parentElement.appendChild(J),J),t={vin:"🚗 VIN detectado — decodificando",plate:"🔖 Placa detectada — consultando registro",part_number:"🔩 Numero de parte detectado",keyword:null}[e];t?(a.textContent=t,a.style.display=""):a.style.display="none"}function Pe(e){var a=Ae(e);if("vin"!==a)if("plate"!==a)je(e);else try{!function(e){var a=document.getElementById("plateInput");a?(a.value=e.toUpperCase(),Fe()):je(e)}(e)}catch(a){je(e)}else try{!function(e){var a=document.getElementById("vinInput");a?(a.value=e,Ye()):je(e)}(e)}catch(a){je(e)}}function je(a){de(e+"/search?q="+encodeURIComponent(a)+"&limit=20").then((function(e){if(!e||!e.data||!e.data.length)return i.innerHTML='<div style="padding:var(--space-4);color:var(--color-text-muted);font-size:var(--text-body-sm);">Sin resultados para "'+ve(a)+'"</div>',void i.classList.add("is-visible");i.innerHTML=e.data.map((function(e){var a=e.local_stock>0?'<span class="stock-badge stock-badge--local" style="margin-left:auto;">Stock: '+e.local_stock+"</span>":"";return'<div class="search-result-item" data-part-id="'+e.id_part+'"><div style="flex:1;"><div class="search-result__oem">'+ve(e.oem_part_number)+'</div><div class="search-result__name">'+ve(e.name)+"</div>"+(e.vehicle_info?'<div class="search-result__vehicle">'+ve(e.vehicle_info)+"</div>":"")+"</div>"+a+"</div>"})).join(""),i.classList.add("is-visible"),i.querySelectorAll(".search-result-item").forEach((function(e){e.addEventListener("click",(function(){i.classList.remove("is-visible");var e=this.dataset.partId;"string"==typeof e&&0===e.indexOf("inv:")||we(parseInt(e))}))}))}))}function qe(e,a){a=a||1;var t=$.find((function(a){return a.id===e.id}));t?t.quantity+=a:$.push({id:e.id,part_number:e.part_number,name:e.name,brand:e.brand||"",price:e.price,tax_rate:e.tax_rate||.16,unit:e.unit||"PZA",stock:e.stock,source:e.source||"local",inventory_id:e.inventory_id,quantity:a}),Ue(),Re(),T.classList.contains("open")||$e()}function Oe(e){$.splice(e,1),Ue(),Re()}function Ge(e,a){(a=parseInt(a))<=0?Oe(e):($[e].quantity=a,Ue(),Re())}function Ue(){localStorage.setItem("pos_cart",JSON.stringify($))}function Re(){var e=$.reduce((function(e,a){return e+a.quantity}),0);if(N&&(N.textContent=e,N.style.display=e>0?"flex":"none"),!$.length)return L.innerHTML="",C.style.display="block",A&&(A.disabled=!0),M.textContent="$0.00",B.textContent="$0.00",void(w.textContent="$0.00");C.style.display="none",A&&(A.disabled=!1);var a=0,t=0;L.innerHTML=$.map((function(e,n){var o=e.price*e.quantity,i=o*e.tax_rate;return a+=o,t+=i,'<div class="cart-item"><div style="flex:1;"><div style="font-weight:600;font-size:0.85rem;color:var(--color-text-primary);">'+ve(e.name)+'</div><div style="font-size:0.75rem;color:var(--color-text-muted);">'+ve(e.part_number)+'</div><div style="margin-top:4px;display:flex;align-items:center;gap:6px;"><button data-cart-action="dec" data-idx="'+n+'" style="width:24px;height:24px;border:1px solid var(--color-border);background:var(--color-bg-base);border-radius:var(--radius-sm);cursor:pointer;color:var(--color-text-primary);">-</button><span style="font-weight:600;color:var(--color-text-primary);">'+e.quantity+'</span><button data-cart-action="inc" data-idx="'+n+'" style="width:24px;height:24px;border:1px solid var(--color-border);background:var(--color-bg-base);border-radius:var(--radius-sm);cursor:pointer;color:var(--color-text-primary);">+</button></div></div><div style="text-align:right;"><div style="font-weight:600;color:var(--color-text-primary);">$'+me(o)+'</div><button data-cart-action="remove" data-idx="'+n+'" style="font-size:0.75rem;color:var(--color-error,#ef4444);background:none;border:none;cursor:pointer;margin-top:4px;">Quitar</button></div></div>'})).join(""),M.textContent="$"+me(a),B.textContent="$"+me(t),w.textContent="$"+me(a+t)}function $e(){var e=T.classList.toggle("open");S.classList.toggle("open",e)}function Ve(){$.length&&(localStorage.setItem("pos_cart",JSON.stringify($)),window.location.href="/pos/sale")}function ze(){document.getElementById("offlineBanner").style.display="",document.getElementById("offlineBannerText").innerHTML="<strong>Modo offline</strong> — Mostrando solo tu inventario local.",r.textContent="Inventario local",_e(!1),pe("Sin conexion al catalogo","Verifica tu conexion. El catalogo TecDoc requiere acceso al servidor central.")}function Je(){var e=W.value;if(e){var a=F.options[F.selectedIndex].text,t=Y.options[Y.selectedIndex].text,n=Q.options[Q.selectedIndex].text,o=W.options[W.selectedIndex].text;j.brand={id:parseInt(Y.value),name:t},j.model={id:parseInt(Q.value),name:n},j.year={id:parseInt(F.value),year:a},j.engine={id_mye:parseInt(e),name:o},j.level="categories",le(),Te(),setTimeout((function(){var e=document.getElementById("pageBody");e&&e.scrollIntoView({behavior:"smooth",block:"start"})}),300)}}function De(){F.value="",Y.innerHTML='<option value="">Marca...</option>',Q.innerHTML='<option value="">Modelo...</option>',W.innerHTML='<option value="">Motor...</option>',Y.disabled=!0,Q.disabled=!0,W.disabled=!0,X.style.display="none",j.level="brands",j.brand=null,j.model=null,j.year=null,j.engine=null,j.category=null,j.group=null,j.partType=null,j.nxGroup=null,j.nxSubgroup=null,j.nxPartType=null,O=1,le(),he()}function Ze(e,a){ae.style.display=e?"":"none",ae.textContent=e,ae.style.color=a?"var(--color-error)":"var(--color-text-muted)"}function Fe(){var a=(ee.value||"").trim().toUpperCase();!a||a.length<5?Ze("Ingresa una placa valida (Ej: ABC-1234).",!0):(Ze("Buscando placa...",!1),de(e+"/plate/"+encodeURIComponent(a)).then((function(e){if(e)if(e.error)Ze(e.error,!0);else{if(!e.found)return ae.style.display="",ae.innerHTML='Placa no registrada. <a href="/pos/customers" style="color:var(--color-primary);">Registrar vehiculo</a>',void(ae.style.color="var(--color-warning, #e6a700)");var a=[];e.year&&a.push(e.year),e.make&&a.push(e.make),e.model&&a.push(e.model);var t=a.join(" ")||"Vehiculo encontrado",n=e.catalog_match;n&&n.brand_id?(Ze(t+" — Cargando catalogo...",!1),Qe(n,e)):Ze(t+" — No encontrado en el catalogo TecDoc.",!1)}else Ze("Error de conexion al buscar placa.",!0)})))}function Ye(){var a=(oe.value||"").trim().toUpperCase();17===a.length?(We("Decodificando VIN...",!1),de(e+"/vin/"+encodeURIComponent(a)).then((function(e){if(e)if(!e.error||e.make){var a=[];e.year&&a.push(e.year),e.make&&a.push(e.make),e.model&&a.push(e.model),e.engine&&a.push(e.engine);var t=a.join(" ")||"Vehiculo no reconocido",n=e.catalog_match;n&&n.brand_id?(We(t+" — Encontrado en catalogo, cargando...",!1),Qe(n,e)):We(t+" — No encontrado en el catalogo TecDoc.",!1)}else We(e.error,!0);else We("Error de conexion al decodificar VIN.",!0)}))):We("El VIN debe tener exactamente 17 caracteres.",!0)}function Qe(a,t){a.year_id&&(F.value=String(a.year_id),de(e+"/brands?year_id="+a.year_id).then((function(t){var n=t&&(t.data||t);n&&(Y.innerHTML='<option value="">Marca...</option>'+n.map((function(e){return'<option value="'+e.id_brand+'">'+ve(e.name_brand)+"</option>"})).join(""),Y.disabled=!1,X.style.display="",a.brand_id&&(Y.value=String(a.brand_id),de(e+"/models?brand_id="+a.brand_id+"&year_id="+a.year_id).then((function(t){var n=t&&(t.data||t);n&&(Q.innerHTML='<option value="">Modelo...</option>'+n.map((function(e){return'<option value="'+e.id_model+'">'+ve(e.display_name||e.name_model)+"</option>"})).join(""),Q.disabled=!1,a.model_id&&(Q.value=String(a.model_id),de(e+"/engines?model_id="+a.model_id+"&year_id="+a.year_id).then((function(e){var t=e&&(e.data||e);t&&(W.innerHTML='<option value="">Motor...</option>'+t.map((function(e){var a=e.name_engine+(e.trim_level?" ("+e.trim_level+")":"");return'<option value="'+e.id_mye+'">'+ve(a)+"</option>"})).join(""),W.disabled=!1,a.id_mye?(W.value=String(a.id_mye),Je(),We("Vehiculo cargado desde VIN.",!1)):1===t.length?(W.value=t[0].id_mye,Je(),We("Vehiculo cargado desde VIN.",!1)):We("Selecciona el motor para continuar.",!1))}))))}))))})))}function We(e,a){ie.style.display=e?"":"none",ie.textContent=e,ie.style.color=a?"var(--color-error)":"var(--color-text-muted)"}}();
\ No newline at end of file
diff --git a/pos/static/js/chat.min.js b/pos/static/js/chat.min.js
deleted file mode 100644
index 15a8217..0000000
--- a/pos/static/js/chat.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";let e=!1,t=!1,n=!1,a=null,s=!0,c=null;const i=[],o="webkitSpeechRecognition"in window||"SpeechRecognition"in window,r="speechSynthesis"in window;function l(){const e=document.createElement("button");e.className="chat-fab",e.id="chatFab",e.title="Asistente IA",e.innerHTML="&#x1F4AC;",e.setAttribute("aria-label","Abrir asistente IA");const t=document.createElement("div");t.className="chat-panel",t.id="chatPanel",t.innerHTML=`\n      <div class="chat-header">\n        <h3>Asistente IA — Buscar partes</h3>\n        <div class="chat-header-actions">\n          ${r?'<button class="chat-tts-toggle" id="chatTtsToggle" aria-label="Activar lectura de respuestas" title="Activar lectura de respuestas">&#128266;</button>':""}\n          <button class="chat-header-close" id="chatClose" aria-label="Cerrar">&times;</button>\n        </div>\n      </div>\n      <div class="chat-messages" id="chatMessages">\n        <div class="chat-msg ai">Hola, soy el asistente de Nexus. Dime que refaccion necesitas y te ayudo a encontrarla.</div>\n        <div class="chat-typing" id="chatTyping">\n          <span></span><span></span><span></span>\n        </div>\n      </div>\n      <div class="chat-input-area">\n        <textarea class="chat-input" id="chatInput" placeholder="Ej: Balatas para Tsuru 2015..." rows="1"></textarea>\n        <input type="file" id="chatImageInput" accept="image/*" capture="environment" style="display:none;">\n        <button class="chat-cam-btn" id="chatCam" aria-label="Enviar foto de parte" title="Identificar parte por foto">&#128247;</button>\n        ${o?'<button class="chat-mic-btn" id="chatMic" aria-label="Entrada por voz" title="Entrada por voz">&#127908;</button>':""}\n        <button class="chat-send-btn" id="chatSend" aria-label="Enviar">&#9654;</button>\n      </div>\n    `,document.body.appendChild(e),document.body.appendChild(t),e.addEventListener("click",p),document.getElementById("chatClose").addEventListener("click",p),document.getElementById("chatSend").addEventListener("click",y),document.getElementById("chatInput").addEventListener("keydown",(function(e){"Enter"!==e.key||e.shiftKey||(e.preventDefault(),y())})),document.getElementById("chatCam").addEventListener("click",(function(){document.getElementById("chatImageInput").click()})),document.getElementById("chatImageInput").addEventListener("change",h),o&&document.getElementById("chatMic").addEventListener("click",d),r&&document.getElementById("chatTtsToggle").addEventListener("click",u),document.getElementById("chatClose").addEventListener("click",(function(){r&&m()})),document.getElementById("chatInput").addEventListener("input",(function(){this.style.height="auto",this.style.height=Math.min(this.scrollHeight,80)+"px"}))}function d(){n?function(){a&&(a.abort(),a=null);n=!1;const e=document.getElementById("chatMic");e&&e.classList.remove("listening")}():function(){const e=window.SpeechRecognition||window.webkitSpeechRecognition;if(!e)return;a=new e,a.lang="es-MX",a.continuous=!1,a.interimResults=!0;const t=document.getElementById("chatInput"),s=document.getElementById("chatMic"),c=t.placeholder;a.onstart=function(){n=!0,s.classList.add("listening"),t.placeholder="Escuchando...",t.value=""},a.onresult=function(e){let n="",a="";for(let t=e.resultIndex;t<e.results.length;t++)e.results[t].isFinal?a+=e.results[t][0].transcript:n+=e.results[t][0].transcript;t.value=a||n},a.onend=function(){n=!1,s.classList.remove("listening"),t.placeholder=c,a=null,t.value.trim()&&y()},a.onerror=function(e){n=!1,s.classList.remove("listening"),t.placeholder=c,a=null,"no-speech"!==e.error&&"audio-capture"!==e.error&&"not-allowed"!==e.error||function(e){const t=document.createElement("div");t.className="chat-voice-toast",t.textContent=e,document.body.appendChild(t),setTimeout((function(){t.classList.add("visible")}),10),setTimeout((function(){t.classList.remove("visible"),setTimeout((function(){t.remove()}),300)}),2e3)}("No se detecto voz")},a.start()}()}function u(){s=!s;const e=document.getElementById("chatTtsToggle");e&&(e.classList.toggle("off",!s),e.setAttribute("title",s?"Desactivar lectura de respuestas":"Activar lectura de respuestas")),s||m()}function m(){r&&window.speechSynthesis.speaking&&window.speechSynthesis.cancel(),c=null}function h(e){const n=e.target.files&&e.target.files[0];if(!n)return;if(e.target.value="",!n.type.startsWith("image/"))return void f("Solo se permiten imagenes.","ai");if(n.size>5242880)return void f("La imagen es muy grande (max 5MB).","ai");const a=new FileReader;a.onload=function(e){const n=document.getElementById("chatMessages"),a=document.getElementById("chatTyping"),s=document.createElement("div");s.className="chat-msg user chat-msg-image",s.innerHTML='<img src="'+e.target.result+'" alt="Foto de parte" style="max-width:180px;max-height:140px;border-radius:8px;display:block;margin-bottom:4px;"><span>Identificar esta parte</span>',n.insertBefore(s,a),I();var c=e.target.result,o="Identifica esta parte automotriz y sugiere terminos de busqueda.";i.push({role:"user",content:o}),i.length>20&&i.splice(0,2),t=!0,document.getElementById("chatSend").disabled=!0,b(!0);var r=g();fetch("/pos/api/chat",{method:"POST",headers:{"Content-Type":"application/json",Authorization:"Bearer "+r},body:JSON.stringify({message:o,image:c,history:i.slice(-10)})}).then((function(e){return e.json()})).then((function(e){const t=e.response||"No pude identificar la parte. Intenta describirla con texto.";f(t,"ai"),i.push({role:"assistant",content:t}),e.vehicle&&e.vehicle.brand_id&&v(e.vehicle),e.search_results&&e.search_results.length>0&&E(e.search_results)})).catch((function(e){f("Error al procesar imagen: "+e.message,"ai")})).finally((function(){t=!1,document.getElementById("chatSend").disabled=!1,b(!1)}))},a.readAsDataURL(n)}function p(){e=!e;const t=document.getElementById("chatPanel"),n=document.getElementById("chatFab");e?(t.classList.add("open"),n.style.display="none",document.getElementById("chatInput").focus()):(t.classList.remove("open"),n.style.display="flex")}function g(){return window.__pos&&window.__pos.token?window.__pos.token:localStorage.getItem("pos_token")||""}async function y(){if(t)return;const e=document.getElementById("chatInput"),n=e.value.trim();if(n){e.value="",e.style.height="auto",f(n,"user"),i.push({role:"user",content:n}),i.length>20&&i.splice(0,2),t=!0,document.getElementById("chatSend").disabled=!0,b(!0);try{const e=g(),t=await fetch("/pos/api/chat",{method:"POST",headers:{"Content-Type":"application/json",Authorization:"Bearer "+e},body:JSON.stringify({message:n,history:i.slice(-10)})}),a=await t.json();if(!t.ok)return void f("Error: "+(a.error||t.statusText),"ai");const o=a.response||"Sin respuesta.";f(o,"ai"),i.push({role:"assistant",content:o}),function(e){r&&s&&e&&(m(),c=new SpeechSynthesisUtterance(e),c.lang="es-MX",c.rate=1.1,c.pitch=1,window.speechSynthesis.speak(c))}(o),a.vehicle&&a.vehicle.brand_id&&v(a.vehicle),a.search_results&&a.search_results.length>0&&E(a.search_results)}catch(e){f("Error de conexion: "+e.message,"ai")}finally{t=!1,document.getElementById("chatSend").disabled=!1,b(!1)}}}function f(e,t){const n=document.getElementById("chatMessages"),a=document.getElementById("chatTyping"),s=document.createElement("div");s.className="chat-msg "+t,s.textContent=e,n.insertBefore(s,a),I()}function v(e){const t=document.getElementById("chatMessages"),n=document.getElementById("chatTyping"),a=document.createElement("div");a.className="chat-vehicle-banner";let s="<strong>"+B(e.brand||"")+" "+B(e.model||"")+"</strong>";e.year&&(s+=" "+e.year),e.mye_options&&e.mye_options.length>0&&(s+="<br>Motorizaciones encontradas:",e.mye_options.forEach((function(e){s+="<br>&bull; "+B(e.engine),e.trim&&(s+=" ("+B(e.trim)+")")}))),a.innerHTML=s,t.insertBefore(a,n),I()}function E(e){const t=document.getElementById("chatMessages"),n=document.getElementById("chatTyping"),a=document.createElement("div");a.className="chat-parts",e.slice(0,8).forEach((function(e){const t=document.createElement("div");t.className="chat-part-card";const n="local"===e.source,s=e.local_stock||0,c=s>0?"in-stock":"",i=s>0?s+" en stock":"Sin stock local",o=e.name_es||e.name_part||"",r=e.oem_part_number||e.part_number||"",l=e.brand||"",d=e.price_1?"$"+parseFloat(e.price_1).toFixed(2):"",u=n?'<span style="background:var(--color-success);color:#fff;padding:1px 6px;border-radius:4px;font-size:0.65rem;margin-left:6px;">MI INVENTARIO</span>':'<span style="background:var(--color-primary);color:#fff;padding:1px 6px;border-radius:4px;font-size:0.65rem;margin-left:6px;">CATÁLOGO</span>';t.innerHTML='<div class="part-number">'+B(r)+u+(d?" &mdash; "+d:"")+'</div><div class="part-name">'+B(o)+(l?' <span style="color:var(--color-text-muted);">('+B(l)+")</span>":"")+'</div><div class="part-stock '+c+'">'+B(i)+"</div>",t.addEventListener("click",(function(){e.id_part&&"function"==typeof window.openPartDetail&&(window.openPartDetail(e.id_part),p())})),a.appendChild(t)})),t.insertBefore(a,n),I()}function b(e){const t=document.getElementById("chatTyping");t&&t.classList.toggle("visible",e),e&&I()}function I(){const e=document.getElementById("chatMessages");e&&(e.scrollTop=e.scrollHeight)}function B(e){const t=document.createElement("div");return t.textContent=e,t.innerHTML}"loading"===document.readyState?document.addEventListener("DOMContentLoaded",l):l()}();
\ No newline at end of file
diff --git a/pos/static/js/config.js b/pos/static/js/config.js
index 134f157..836dbd2 100644
--- a/pos/static/js/config.js
+++ b/pos/static/js/config.js
@@ -19,6 +19,11 @@ const Config = (() => {
         return true;
     }
 
+    function escapeHtml(text) {
+        if (!text) return '';
+        return String(text).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g, '&gt;').replace(/"/g, '&quot;');
+    }
+
     function headers() {
         return { 'Authorization': `Bearer ${token()}`, 'Content-Type': 'application/json' };
     }
@@ -156,7 +161,7 @@ const Config = (() => {
 
         _branches.forEach(function(b, idx) {
             var statusBadge = b.is_active
-                ? '<span class="badge badge--ok" style="padding:0 4px;font-size:0.625rem;">' + (idx === 0 ? 'Principal' : 'Activa') + '</span>'
+                ? '<span class="badge badge--ok" style="padding:0 4px;font-size:0.625rem;">' + (b.is_main ? 'Principal' : 'Activa') + '</span>'
                 : '<span class="badge badge--inactive" style="padding:0 4px;font-size:0.625rem;">Inactiva</span>';
 
             html += '<div class="device-card">'
@@ -165,14 +170,20 @@ const Config = (() => {
                 + '</div>'
                 + '<div class="device-card__body">'
                 + '<div class="device-card__name">' + escHtml(b.name) + '</div>'
-                + '<div class="device-card__detail">' + statusBadge + '</div>'
+                + '<div class="device-card__detail">' + statusBadge
+                + (b.rfc ? ' · RFC: ' + escHtml(b.rfc) : '')
+                + (b.cp ? ' · CP: ' + escHtml(b.cp) : '')
+                + '</div>'
                 + (b.address ? '<div class="device-card__detail">' + escHtml(b.address) + '</div>' : '')
                 + (b.phone ? '<div class="device-card__detail">' + escHtml(b.phone) + '</div>' : '')
+                + '</div>'
+                + '<div class="device-card__actions">'
+                + '<button class="btn btn--ghost btn--sm" onclick="Config.editBranch(' + b.id + ')">Editar</button>'
                 + '</div></div>';
         });
 
         // "Agregar Sucursal" card
-        html += '<div class="device-card" style="border-style:dashed;cursor:pointer;" onclick="Config.openModal(\'modal-branch\')">'
+        html += '<div class="device-card" style="border-style:dashed;cursor:pointer;" onclick="Config.openBranchModal()">'
             + '<div class="device-card__icon" style="background:transparent;border:2px dashed var(--color-border);">'
             + '<svg viewBox="0 0 24 24" style="stroke:var(--color-text-muted);"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>'
             + '</div>'
@@ -198,9 +209,36 @@ const Config = (() => {
         });
     }
 
+    function openBranchModal(branch) {
+        document.getElementById('branch-modal-title').textContent = branch ? 'Editar Sucursal' : 'Nueva Sucursal';
+        document.getElementById('branch-id').value = branch ? branch.id : '';
+        document.getElementById('branch-name').value = branch ? branch.name : '';
+        document.getElementById('branch-rfc').value = branch ? (branch.rfc || '') : '';
+        document.getElementById('branch-razon').value = branch ? (branch.razon_social || '') : '';
+        document.getElementById('branch-regimen').value = branch ? (branch.regimen_fiscal || '') : '';
+        document.getElementById('branch-cp').value = branch ? (branch.cp || '') : '';
+        document.getElementById('branch-direccion-fiscal').value = branch ? (branch.direccion_fiscal || '') : '';
+        document.getElementById('branch-serie').value = branch ? (branch.serie_cfdi || '') : '';
+        document.getElementById('branch-folio-inicio').value = branch ? (branch.folio_inicio || '') : '';
+        document.getElementById('branch-folio-actual').value = branch ? (branch.folio_actual || '') : '';
+        document.getElementById('branch-email').value = branch ? (branch.email || '') : '';
+        document.getElementById('branch-address').value = branch ? (branch.address || '') : '';
+        document.getElementById('branch-phone').value = branch ? (branch.phone || '') : '';
+        document.getElementById('branch-main').checked = branch ? !!branch.is_main : false;
+        openModal('modal-branch');
+    }
+
+    function editBranch(branchId) {
+        var b = _branches.find(function(x) { return x.id === branchId; });
+        if (!b) { toast('Sucursal no encontrada', 'error'); return; }
+        openBranchModal(b);
+    }
+
     async function saveBranch(data) {
-        var res = await fetch(API + '/branches', {
-            method: 'POST',
+        var branchId = document.getElementById('branch-id').value;
+        var url = API + '/branches' + (branchId ? '/' + branchId : '');
+        var res = await fetch(url, {
+            method: branchId ? 'PUT' : 'POST',
             headers: headers(),
             body: JSON.stringify(data)
         });
@@ -424,14 +462,36 @@ const Config = (() => {
                 try {
                     await saveBranch({
                         name: name,
-                        address: document.getElementById('branch-address').value.trim(),
-                        phone: document.getElementById('branch-phone').value.trim()
+                        rfc: document.getElementById('branch-rfc').value.trim() || null,
+                        razon_social: document.getElementById('branch-razon').value.trim() || null,
+                        regimen_fiscal: document.getElementById('branch-regimen').value.trim() || null,
+                        cp: document.getElementById('branch-cp').value.trim() || null,
+                        direccion_fiscal: document.getElementById('branch-direccion-fiscal').value.trim() || null,
+                        serie_cfdi: document.getElementById('branch-serie').value.trim() || null,
+                        folio_inicio: document.getElementById('branch-folio-inicio').value ? parseInt(document.getElementById('branch-folio-inicio').value, 10) : null,
+                        folio_actual: document.getElementById('branch-folio-actual').value ? parseInt(document.getElementById('branch-folio-actual').value, 10) : null,
+                        email: document.getElementById('branch-email').value.trim() || null,
+                        address: document.getElementById('branch-address').value.trim() || null,
+                        phone: document.getElementById('branch-phone').value.trim() || null,
+                        is_main: document.getElementById('branch-main').checked,
                     });
-                    toast('Sucursal creada');
+                    toast('Sucursal guardada');
                     closeModal('modal-branch');
+                    // Reset form
+                    document.getElementById('branch-id').value = '';
                     document.getElementById('branch-name').value = '';
+                    document.getElementById('branch-rfc').value = '';
+                    document.getElementById('branch-razon').value = '';
+                    document.getElementById('branch-regimen').value = '';
+                    document.getElementById('branch-cp').value = '';
+                    document.getElementById('branch-direccion-fiscal').value = '';
+                    document.getElementById('branch-serie').value = '';
+                    document.getElementById('branch-folio-inicio').value = '';
+                    document.getElementById('branch-folio-actual').value = '';
+                    document.getElementById('branch-email').value = '';
                     document.getElementById('branch-address').value = '';
                     document.getElementById('branch-phone').value = '';
+                    document.getElementById('branch-main').checked = false;
                     await loadBranches();
                 } catch (e) {
                     toast(e.message, 'error');
@@ -623,6 +683,117 @@ const Config = (() => {
         }
     }
 
+    // -------------------------------------------------------------------------
+    // Allowed Part Brands
+    // -------------------------------------------------------------------------
+    async function loadAllowedBrands() {
+        var container = document.getElementById('allowed-brands-container');
+        if (!container) return;
+        try {
+            var res = await fetch(API + '/available-brands', { headers: headers() });
+            if (!res.ok) throw new Error('Failed to load brands');
+            var d = await res.json();
+            var allBrands = d.brands || [];
+
+            var res2 = await fetch(API + '/allowed-brands', { headers: headers() });
+            if (!res2.ok) throw new Error('Failed to load allowed brands');
+            var d2 = await res2.json();
+            var allowed = d2.brands || [];
+
+            if (!allBrands.length) {
+                container.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-body-sm);">No hay marcas disponibles.</p>';
+                return;
+            }
+
+            var html = '';
+            allBrands.forEach(function(b) {
+                var checked = allowed.indexOf(b) !== -1 ? 'checked' : '';
+                html += '<label style="display:flex;align-items:center;gap:var(--space-2);cursor:pointer;font-size:var(--text-body-sm);color:var(--color-text-primary);padding:var(--space-1);">' +
+                    '<input type="checkbox" value="' + escapeHtml(b) + '" data-brand-checkbox ' + checked + ' style="width:16px;height:16px;cursor:pointer;">' +
+                    escapeHtml(b) + '</label>';
+            });
+            container.innerHTML = html;
+        } catch (e) {
+            console.error('Config.loadAllowedBrands:', e);
+            if (container) container.innerHTML = '<p style="color:var(--color-error);font-size:var(--text-body-sm);">Error al cargar marcas.</p>';
+        }
+    }
+
+    async function saveAllowedBrands() {
+        var btn = document.getElementById('btn-save-allowed-brands');
+        if (btn) { btn.disabled = true; btn.textContent = 'Guardando...'; }
+        try {
+            var checked = [];
+            document.querySelectorAll('[data-brand-checkbox]').forEach(function(cb) {
+                if (cb.checked) checked.push(cb.value);
+            });
+            var res = await fetch(API + '/allowed-brands', {
+                method: 'PUT',
+                headers: headers(),
+                body: JSON.stringify({ brands: checked })
+            });
+            if (!res.ok) {
+                var err = await res.json().catch(function() { return { error: res.statusText }; });
+                throw new Error(err.error || 'Save failed');
+            }
+            toast('Marcas permitidas actualizadas');
+        } catch (e) {
+            toast(e.message, 'error');
+        } finally {
+            if (btn) { btn.disabled = false; btn.textContent = 'Guardar Marcas'; }
+        }
+    }
+
+    // -------------------------------------------------------------------------
+    // Modules / Integrations
+    // -------------------------------------------------------------------------
+    async function loadModules() {
+        try {
+            var res = await fetch(API + '/modules', { headers: headers() });
+            if (!res.ok) return;
+            var data = await res.json();
+            var cbWa = document.getElementById('cfg-module-whatsapp');
+            var cbMp = document.getElementById('cfg-module-marketplace');
+            var cbMeli = document.getElementById('cfg-module-meli');
+            var cbCat = document.getElementById('cfg-module-catalog');
+            if (cbWa) cbWa.checked = data.whatsapp !== false;
+            if (cbMp) cbMp.checked = data.marketplace !== false;
+            if (cbMeli) cbMeli.checked = data.meli !== false;
+            if (cbCat) cbCat.checked = data.catalog !== false;
+            localStorage.setItem('pos_modules', JSON.stringify(data));
+        } catch (e) {
+            console.error('Config.loadModules:', e);
+        }
+    }
+
+    async function saveModules() {
+        var btn = event.target;
+        if (btn) { btn.disabled = true; btn.textContent = 'Guardando...'; }
+        try {
+            var data = {
+                whatsapp: document.getElementById('cfg-module-whatsapp').checked,
+                marketplace: document.getElementById('cfg-module-marketplace').checked,
+                meli: document.getElementById('cfg-module-meli').checked,
+                catalog: document.getElementById('cfg-module-catalog').checked,
+            };
+            var res = await fetch(API + '/modules', {
+                method: 'PUT',
+                headers: headers(),
+                body: JSON.stringify(data)
+            });
+            if (!res.ok) {
+                var err = await res.json().catch(function() { return { error: res.statusText }; });
+                throw new Error(err.error || 'Save failed');
+            }
+            localStorage.setItem('pos_modules', JSON.stringify(data));
+            toast('Módulos actualizados');
+        } catch (e) {
+            toast(e.message, 'error');
+        } finally {
+            if (btn) { btn.disabled = false; btn.textContent = 'Guardar módulos'; }
+        }
+    }
+
     // -------------------------------------------------------------------------
     // Init
     // -------------------------------------------------------------------------
@@ -650,6 +821,12 @@ const Config = (() => {
             btnCompat.addEventListener('click', saveVehicleCompatSource);
         }
 
+        // Allowed brands save button
+        var btnBrands = document.getElementById('btn-save-allowed-brands');
+        if (btnBrands) {
+            btnBrands.addEventListener('click', saveAllowedBrands);
+        }
+
         // Kiosk mode toggle
         var kioskToggle = document.getElementById('cfg-kiosk-mode');
         if (kioskToggle && window.NexusKiosk) {
@@ -671,15 +848,26 @@ const Config = (() => {
         loadBusiness();
         loadCurrency();
         loadVehicleCompatSource();
+        loadAllowedBrands();
+        loadModules();
     }
 
     document.addEventListener('DOMContentLoaded', init);
 
     return {
-        init, setTheme, selectThemeOption,
+        init, setTheme, selectThemeOption, loadAllowedBrands, saveAllowedBrands,
         loadBranches, loadEmployees, saveBranch, saveEmployee, editEmployee,
         loadBusiness, saveBusiness, saveTaxParams,
         loadCurrency, saveCurrency,
-        openModal, closeModal
+        loadModules, saveModules,
+        openModal, closeModal, openBranchModal, editBranch
     };
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/config.min.js b/pos/static/js/config.min.js
deleted file mode 100644
index ea4814b..0000000
--- a/pos/static/js/config.min.js
+++ /dev/null
@@ -1 +0,0 @@
-const Config=(()=>{const e="/pos/api/config";let t=[];function a(){return localStorage.getItem("pos_token")||""}function n(){return!!a()||(window.location.href="/pos/login",!1)}function r(){return{Authorization:`Bearer ${a()}`,"Content-Type":"application/json"}}function o(e,t){var a=document.createElement("div");a.className="cfg-toast cfg-toast--"+(t||"ok"),a.textContent=e,document.body.appendChild(a),setTimeout((function(){a.remove()}),3e3)}function c(e){var t=document.getElementById(e);t&&(t.style.display="flex")}function d(e){var t=document.getElementById(e);t&&(t.style.display="none")}function i(e){document.documentElement.setAttribute("data-theme",e);try{localStorage.setItem("nexus-theme",e)}catch(e){}document.querySelectorAll(".theme-btn").forEach((function(t){t.classList.toggle("is-active",t.dataset.themeTarget===e)})),document.querySelectorAll(".theme-option").forEach((function(e){e.classList.remove("is-selected")}));var t="industrial"===e?0:1,a=document.querySelectorAll(".theme-option");a[t]&&a[t].classList.add("is-selected")}function s(e){i(e)}function l(){var e=new Date,t=String(e.getHours()).padStart(2,"0"),a=String(e.getMinutes()).padStart(2,"0"),n=document.getElementById("live-clock");n&&(n.textContent=t+":"+a)}window.setTheme=i,window.selectThemeOption=s;var u={owner:"Dueno",admin:"Admin",cashier:"Cajero",warehouse:"Almacenista",accountant:"Contador"},m={owner:"badge--owner",admin:"badge--blue",cashier:"badge--green",warehouse:"badge--yellow",accountant:"badge--purple"};function v(e){if(!e)return"";var t=document.createElement("div");return t.textContent=e,t.innerHTML}async function y(){var a=document.getElementById("branches-grid");if(!a)return[];try{var n=await fetch(e+"/branches",{headers:r()});if(!n.ok)throw new Error("Failed");var o=await n.json();t=o.data||[]}catch(e){return console.error("Config.loadBranches:",e),t=[],a.innerHTML='<div class="device-card"><div class="device-card__body" style="text-align:center;color:var(--color-error,red);">Error al cargar sucursales</div></div>',t}return function(){var e=document.getElementById("branches-grid");if(!e)return;var a="";t.forEach((function(e,t){var n=e.is_active?'<span class="badge badge--ok" style="padding:0 4px;font-size:0.625rem;">'+(0===t?"Principal":"Activa")+"</span>":'<span class="badge badge--inactive" style="padding:0 4px;font-size:0.625rem;">Inactiva</span>';a+='<div class="device-card"><div class="device-card__icon"><svg viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg></div><div class="device-card__body"><div class="device-card__name">'+v(e.name)+'</div><div class="device-card__detail">'+n+"</div>"+(e.address?'<div class="device-card__detail">'+v(e.address)+"</div>":"")+(e.phone?'<div class="device-card__detail">'+v(e.phone)+"</div>":"")+"</div></div>"})),a+='<div class="device-card" style="border-style:dashed;cursor:pointer;" onclick="Config.openModal(\'modal-branch\')"><div class="device-card__icon" style="background:transparent;border:2px dashed var(--color-border);"><svg viewBox="0 0 24 24" style="stroke:var(--color-text-muted);"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg></div><div class="device-card__body"><div class="device-card__name" style="color:var(--color-text-muted);">Agregar Sucursal</div><div class="device-card__detail">Configura una nueva ubicacion</div></div></div>',e.innerHTML=a}(),function(){var e=document.getElementById("emp-branch");if(!e)return;e.innerHTML='<option value="">-- Todas --</option>',t.forEach((function(t){if(t.is_active){var a=document.createElement("option");a.value=t.id,a.textContent=t.name,e.appendChild(a)}}))}(),t}async function g(t){var a=await fetch(e+"/branches",{method:"POST",headers:r(),body:JSON.stringify(t)});if(!a.ok){var n=await a.json().catch((function(){return{error:a.statusText}}));throw new Error(n.error||"Save failed")}return a.json()}async function f(){var t=document.getElementById("employees-tbody"),a=document.getElementById("employees-count");if(!t)return[];var n=[];try{var o=await fetch(e+"/employees",{headers:r()});if(!o.ok)throw new Error("Failed");n=(await o.json()).data||[]}catch(e){return console.error("Config.loadEmployees:",e),t.innerHTML='<tr><td colspan="7" style="text-align:center;padding:var(--space-5);color:var(--color-error,red);">Error al cargar empleados</td></tr>',[]}var c=n.filter((function(e){return e.is_active})).length;if(a&&(a.textContent=c+" empleado"+(1!==c?"s":"")+" activo"+(1!==c?"s":"")),0===n.length)return t.innerHTML='<tr><td colspan="7" style="text-align:center;padding:var(--space-5);color:var(--color-text-muted);">Sin empleados registrados</td></tr>',n;var d="";return n.forEach((function(e){var t,a=function(e){if(!e)return"??";var t=e.trim().split(/\s+/);return t.length>=2?(t[0][0]+t[t.length-1][0]).toUpperCase():t[0].substring(0,2).toUpperCase()}(e.name),n=e.is_active?'<span class="badge badge--ok">Activo</span>':'<span class="badge badge--inactive">Inactivo</span>';d+='<tr><td><div class="user-cell"><div class="user-cell__avatar">'+a+'</div><span class="user-cell__name">'+v(e.name)+"</span></div></td><td>"+v(e.email||"-")+"</td><td>"+(t=e.role,'<span class="badge '+(m[t]||"badge--ok")+'">'+v(u[t]||t)+"</span></td><td>")+v(e.branch_name||"Todas")+"</td><td>"+n+"</td><td>"+(e.max_discount_pct||0)+'%</td><td><button class="btn btn--ghost btn--sm" onclick="Config.editEmployee('+e.id+')">Editar</button></td></tr>'})),t.innerHTML=d,n}async function p(t){var a=document.getElementById("employee-modal"),n=a?a.dataset.editId:null,o=e+"/employees",c="POST";n&&(o=e+"/employees/"+n,c="PUT",delete a.dataset.editId);var d=await fetch(o,{method:c,headers:r(),body:JSON.stringify(t)});if(!d.ok){var i=await d.json().catch((function(){return{error:d.statusText}}));throw new Error(i.error||"Save failed")}return d.json()}async function h(){try{var t=await fetch(e+"/business",{headers:r()});if(!t.ok)return;var a=await t.json();b("biz-razon-social",a.razon_social),b("biz-nombre",a.nombre),b("biz-rfc",a.rfc),b("biz-regimen",a.regimen_fiscal),b("biz-direccion",a.direccion),b("biz-telefono",a.telefono),b("biz-email",a.email)}catch(e){console.error("Config.loadBusiness:",e)}}function b(e,t){var a=document.getElementById(e);a&&(a.value=t||"")}function E(e){var t=document.getElementById(e);return t?t.value.trim():""}async function w(){try{var t=await fetch(e+"/currency",{headers:r()});if(!t.ok)return;var a=await t.json(),n=document.getElementById("cfg-currency"),o=document.getElementById("cfg-exchange-rate");n&&(n.value=a.currency||"MXN"),o&&(o.value=a.exchange_rate||17.5),localStorage.setItem("pos_currency",a.currency||"MXN"),localStorage.setItem("pos_exchange_rate",a.exchange_rate||17.5)}catch(e){console.error("Config.loadCurrency:",e)}}async function I(){var t=document.getElementById("cfg-compat-source"),a=document.getElementById("btn-save-compat-source");if(t){a&&(a.disabled=!0,a.textContent="Guardando...");try{var n=await fetch(e+"/vehicle-compat-source",{method:"PUT",headers:r(),body:JSON.stringify({source:t.value})});if(!n.ok){var c=await n.json().catch((function(){return{error:n.statusText}}));throw new Error(c.error||"Save failed")}o("Fuente de compatibilidad actualizada")}catch(e){o(e.message,"error")}finally{a&&(a.disabled=!1,a.textContent="Guardar")}}}function x(){if(n()){try{var t=localStorage.getItem("nexus-theme");"industrial"!==t&&"modern"!==t||i(t)}catch(e){}l(),setInterval(l,3e4),function(){document.querySelector("#branches-grid");var e=document.getElementById("btn-save-branch");e&&e.addEventListener("click",(async function(){var t=document.getElementById("branch-name").value.trim();if(t){e.disabled=!0,e.textContent="Guardando...";try{await g({name:t,address:document.getElementById("branch-address").value.trim(),phone:document.getElementById("branch-phone").value.trim()}),o("Sucursal creada"),d("modal-branch"),document.getElementById("branch-name").value="",document.getElementById("branch-address").value="",document.getElementById("branch-phone").value="",await y()}catch(e){o(e.message,"error")}finally{e.disabled=!1,e.textContent="Guardar Sucursal"}}else o("Nombre de sucursal requerido","error")}));var t=document.getElementById("btn-new-employee");t&&t.addEventListener("click",(function(){c("modal-employee")}));var a=document.getElementById("btn-save-employee");a&&a.addEventListener("click",(async function(){var e=document.getElementById("emp-name").value.trim(),t=document.getElementById("emp-role").value,n=document.getElementById("emp-pin").value.trim();if(e)if(t)if(n&&4===n.length&&/^\d{4}$/.test(n)){var r=document.getElementById("emp-branch").value;a.disabled=!0,a.textContent="Guardando...";try{await p({name:e,email:document.getElementById("emp-email").value.trim()||null,phone:document.getElementById("emp-phone").value.trim()||null,role:t,pin:n,branch_id:r?parseInt(r,10):null,max_discount_pct:parseFloat(document.getElementById("emp-discount").value)||0}),o("Empleado creado"),d("modal-employee"),document.getElementById("emp-name").value="",document.getElementById("emp-email").value="",document.getElementById("emp-phone").value="",document.getElementById("emp-role").value="",document.getElementById("emp-pin").value="",document.getElementById("emp-branch").value="",document.getElementById("emp-discount").value="0",await f()}catch(e){o(e.message,"error")}finally{a.disabled=!1,a.textContent="Guardar Empleado"}}else o("PIN debe ser 4 digitos","error");else o("Selecciona un rol","error");else o("Nombre requerido","error")})),document.querySelectorAll(".cfg-modal-overlay").forEach((function(e){e.addEventListener("click",(function(t){t.target===e&&(e.style.display="none")}))})),document.addEventListener("keydown",(function(e){"Escape"===e.key&&document.querySelectorAll(".cfg-modal-overlay").forEach((function(e){e.style.display="none"}))}))}();var a=document.getElementById("btn-save-compat-source");a&&a.addEventListener("click",I);var s=document.getElementById("cfg-kiosk-mode");s&&window.NexusKiosk&&(s.checked=window.NexusKiosk.isEnabled(),s.addEventListener("change",(function(){this.checked?(window.NexusKiosk.enable(),o("Modo Kiosko activado")):(window.NexusKiosk.disable(),o("Modo Kiosko desactivado"))}))),y(),f(),h(),w(),async function(){try{var t=await fetch(e+"/vehicle-compat-source",{headers:r()});if(!t.ok)return;var a=await t.json(),n=document.getElementById("cfg-compat-source");n&&(n.value=a.source||"both")}catch(e){console.error("Config.loadVehicleCompatSource:",e)}}()}}return document.addEventListener("DOMContentLoaded",x),{init:x,setTheme:i,selectThemeOption:s,loadBranches:y,loadEmployees:f,saveBranch:g,saveEmployee:p,editEmployee:async function(t){if(n())try{var a=await fetch(e+"/employees",{headers:r()});if(!a.ok)throw new Error("Failed to load employees");var d=((await a.json()).data||[]).find((function(e){return e.id===t}));if(!d)return void o("Empleado no encontrado","error");b("new-emp-name",d.name),b("new-emp-email",d.email||"");var i=document.getElementById("new-emp-role");i&&(i.value=d.role||"cashier");var s=document.getElementById("new-emp-branch");s&&(s.value=d.branch_id||""),b("new-emp-discount",d.max_discount_pct||""),b("new-emp-pin","");var l=document.getElementById("employee-modal");if(l){l.dataset.editId=t;var u=l.querySelector(".modal-title, h3");u&&(u.textContent="Editar Empleado")}c("employee-modal")}catch(e){o("Error: "+e.message,"error")}},loadBusiness:h,saveBusiness:async function(){if(n()){var t={razon_social:E("biz-razon-social"),nombre:E("biz-nombre"),rfc:E("biz-rfc"),regimen_fiscal:E("biz-regimen"),direccion:E("biz-direccion"),telefono:E("biz-telefono"),email:E("biz-email")};try{var a=await fetch(e+"/business",{method:"PUT",headers:r(),body:JSON.stringify(t)});if(!a.ok){var c=await a.json().catch((function(){return{error:a.statusText}}));throw new Error(c.error||"Error al guardar")}o("Datos de empresa guardados","ok")}catch(e){o(e.message,"error")}}},saveTaxParams:async function(){if(n()){var t={tax_iva:E("tax-iva")||"16",tax_ieps:E("tax-ieps")||"0",invoice_serie:E("tax-serie")||"FA",invoice_folio:E("tax-folio")||"1",default_currency:document.getElementById("tax-moneda")?document.getElementById("tax-moneda").value:"MXN",default_payment_method:document.getElementById("tax-forma-pago")?document.getElementById("tax-forma-pago").value:"01"};try{if(!(await fetch(e+"/business",{method:"PUT",headers:r(),body:JSON.stringify(t)})).ok)throw new Error("Error al guardar");o("Parámetros de impuestos guardados","ok")}catch(e){o(e.message,"error")}}},loadCurrency:w,saveCurrency:async function(){var t=document.getElementById("cfg-currency"),a=document.getElementById("cfg-exchange-rate"),n=document.getElementById("currency-status"),c=document.getElementById("btn-save-currency");if(t&&a){var d=t.value,i=parseFloat(a.value);if(!i||i<=0)o("Tipo de cambio invalido","error");else{c&&(c.disabled=!0,c.textContent="Guardando...");try{var s=await fetch(e+"/currency",{method:"PUT",headers:r(),body:JSON.stringify({currency:d,exchange_rate:i})});if(!s.ok){var l=await s.json().catch((function(){return{error:s.statusText}}));throw new Error(l.error||"Save failed")}localStorage.setItem("pos_currency",d),localStorage.setItem("pos_exchange_rate",i),o("Moneda actualizada"),n&&(n.textContent=d+" — TC: "+i)}catch(e){o(e.message,"error")}finally{c&&(c.disabled=!1,c.textContent="Guardar Moneda")}}}},openModal:c,closeModal:d}})();
\ No newline at end of file
diff --git a/pos/static/js/customers.js b/pos/static/js/customers.js
index 4cd24d4..0ab14d1 100644
--- a/pos/static/js/customers.js
+++ b/pos/static/js/customers.js
@@ -94,6 +94,8 @@ const Customers = (() => {
         }
     }
 
+    var selectedCustomers = new Set();
+
     function renderCustomerRow(c) {
         const tier = tierMap[c.price_tier] || 'Mostrador';
         const tClass = tierClass[c.price_tier] || 'mostrador';
@@ -104,11 +106,13 @@ const Customers = (() => {
         const creditClass = usedPct >= 80 ? 'none' : usedPct >= 60 ? 'low' : '';
         const num = String(c.id).padStart(5, '0');
         const selClass = (currentCustomer && currentCustomer.id === c.id) ? 'selected' : '';
-        return '<tr class="' + selClass + '" onclick="selectCustomer(' + c.id + ')">' +
+        const isChecked = selectedCustomers.has(c.id) ? 'checked' : '';
+        return '<tr class="' + selClass + '">' +
+            '<td onclick="event.stopPropagation();"><input type="checkbox" ' + isChecked + ' onchange="Customers.toggleCustomerSelection(' + c.id + ')"></td>' +
             '<td class="cell-num">' + num + '</td>' +
             '<td>' +
                 '<div class="cell-name">' + (c.name || '') + '</div>' +
-                '<div class="cell-name-sub hide-mobile">' + (c.email || '') + '</div>' +
+                '<div class="cell-name-sub hide-mobile">' + (c.razon_social || c.email || '') + '</div>' +
             '</td>' +
             '<td class="cell-rfc hide-mobile">' + (c.rfc || '-') + '</td>' +
             '<td class="hide-mobile">' + (c.phone || '-') + '</td>' +
@@ -127,7 +131,12 @@ const Customers = (() => {
         if (!tbody) return;
 
         if (!customers || customers.length === 0) {
-            tbody.innerHTML = '<tr><td colspan="9" style="text-align:center;padding:var(--space-8);color:var(--color-text-muted);">Sin resultados.</td></tr>';
+            tbody.innerHTML = '<tr><td colspan="9">' + renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75"/></svg>',
+                title: 'Sin clientes',
+                subtitle: 'No se encontraron clientes registrados.',
+                action: '<button class="btn btn--primary btn--sm" onclick="Customers.openCreateModal()">Nuevo cliente</button>'
+            }) + '</td></tr>';
             return;
         }
 
@@ -137,7 +146,7 @@ const Customers = (() => {
                 rowHeight: 52,
                 buffer: 3,
                 renderRow: renderCustomerRow,
-                emptyHtml: '<tr><td colspan="9" style="text-align:center;padding:var(--space-8);color:var(--color-text-muted);">Sin resultados.</td></tr>'
+                emptyHtml: '<tr><td colspan="9">' + renderEmptyState({ title: 'Sin clientes', subtitle: 'No hay clientes registrados.' }) + '</td></tr>'
             });
         }
         customersVS.setData(customers);
@@ -240,7 +249,9 @@ const Customers = (() => {
 
             // Contact
             const set = (id, val) => { const el = document.getElementById(id); if (el) el.textContent = val || '-'; };
+            set('detailRazonSocial', c.razon_social);
             set('detailAddress', c.address);
+            set('detailCp', c.cp);
             set('detailPhone', c.phone);
             set('detailEmail', c.email);
             set('detailSince', formatDate(c.created_at));
@@ -263,6 +274,13 @@ const Customers = (() => {
                 bar.className = `progress-bar__fill ${pct < 40 ? 'low' : pct > 75 ? 'high' : ''}`;
             }
 
+            // Discount
+            const discountEl = document.getElementById('detailMaxDiscount');
+            if (discountEl) discountEl.textContent = (c.max_discount_pct || 0) + '%';
+
+            // Re-wire action buttons after detail panel is visible
+            wireActionButtons();
+
             // Purchase History
             const hbody = document.getElementById('historyBody');
             if (hbody) {
@@ -363,7 +381,7 @@ const Customers = (() => {
         const btns = document.querySelectorAll('.quick-actions .action-btn');
         // Order: Nueva Venta, Editar, Estado de Cuenta, Historial
         if (btns.length >= 1) btns[0].onclick = () => {
-            if (currentCustomer) window.location.href = '/pos/?customer=' + currentCustomer.id;
+            if (currentCustomer) window.location.href = '/pos/sale?customer=' + currentCustomer.id;
         };
         if (btns.length >= 2) btns[1].onclick = () => editCurrent();
         if (btns.length >= 3) btns[2].onclick = () => showStatement();
@@ -378,17 +396,19 @@ const Customers = (() => {
         if (!modal) return;
         document.getElementById('modalTitle').textContent = 'Nuevo Cliente';
         document.getElementById('editId').value = '';
-        document.getElementById('fName').value = '';
-        document.getElementById('fRfc').value = '';
-        document.getElementById('fRazonSocial').value = '';
-        document.getElementById('fRegimenFiscal').value = '';
-        document.getElementById('fUsoCfdi').value = 'G03';
-        document.getElementById('fCp').value = '';
-        document.getElementById('fPhone').value = '';
-        document.getElementById('fEmail').value = '';
-        document.getElementById('fAddress').value = '';
-        document.getElementById('fPriceTier').value = '1';
-        document.getElementById('fCreditLimit').value = '0';
+        const safeSet = (id, v) => { const el = document.getElementById(id); if (el) el.value = v; };
+        safeSet('fName', '');
+        safeSet('fRfc', '');
+        safeSet('fRazonSocial', '');
+        safeSet('fRegimenFiscal', '');
+        safeSet('fUsoCfdi', 'G03');
+        safeSet('fCp', '');
+        safeSet('fPhone', '');
+        safeSet('fEmail', '');
+        safeSet('fAddress', '');
+        safeSet('fPriceTier', '1');
+        safeSet('fCreditLimit', '0');
+        safeSet('fMaxDiscountPct', '0');
         modal.classList.add('active');
         document.getElementById('fName').focus();
     }
@@ -400,17 +420,19 @@ const Customers = (() => {
         if (!modal) return;
         document.getElementById('modalTitle').textContent = 'Editar Cliente';
         document.getElementById('editId').value = c.id;
-        document.getElementById('fName').value = c.name || '';
-        document.getElementById('fRfc').value = c.rfc || '';
-        document.getElementById('fRazonSocial').value = c.razon_social || '';
-        document.getElementById('fRegimenFiscal').value = c.regimen_fiscal || '';
-        document.getElementById('fUsoCfdi').value = c.uso_cfdi || 'G03';
-        document.getElementById('fCp').value = c.cp || '';
-        document.getElementById('fPhone').value = c.phone || '';
-        document.getElementById('fEmail').value = c.email || '';
-        document.getElementById('fAddress').value = c.address || '';
-        document.getElementById('fPriceTier').value = c.price_tier || '1';
-        document.getElementById('fCreditLimit').value = c.credit_limit || 0;
+        const safeSet = (id, v) => { const el = document.getElementById(id); if (el) el.value = v; };
+        safeSet('fName', c.name || '');
+        safeSet('fRfc', c.rfc || '');
+        safeSet('fRazonSocial', c.razon_social || '');
+        safeSet('fRegimenFiscal', c.regimen_fiscal || '');
+        safeSet('fUsoCfdi', c.uso_cfdi || 'G03');
+        safeSet('fCp', c.cp || '');
+        safeSet('fPhone', c.phone || '');
+        safeSet('fEmail', c.email || '');
+        safeSet('fAddress', c.address || '');
+        safeSet('fPriceTier', c.price_tier || '1');
+        safeSet('fCreditLimit', c.credit_limit || 0);
+        safeSet('fMaxDiscountPct', c.max_discount_pct || 0);
         modal.classList.add('active');
     }
 
@@ -438,6 +460,7 @@ const Customers = (() => {
             address: val('fAddress') || null,
             price_tier: parseInt(val('fPriceTier')) || 1,
             credit_limit: parseFloat(val('fCreditLimit')) || 0,
+            max_discount_pct: parseFloat(val('fMaxDiscountPct')) || 0,
         };
 
         const editId = val('editId');
@@ -474,7 +497,7 @@ const Customers = (() => {
         if (nameEl) nameEl.textContent = currentCustomer.name;
 
         const content = document.getElementById('statementContent');
-        if (content) content.innerHTML = '<div style="text-align:center;padding:20px;color:var(--color-text-muted);">Cargando...</div>';
+        if (content) content.innerHTML = '<div style="padding:20px;"><div class="skeleton skeleton--text"></div><div class="skeleton skeleton--text-sm" style="width:70%;"></div><div class="skeleton skeleton--text" style="width:50%;"></div></div>';
         modal.classList.add('active');
 
         try {
@@ -586,7 +609,9 @@ const Customers = (() => {
 
     function injectModals() {
         // Customer Create/Edit Modal
-        if (!document.getElementById('customerModal')) {
+        // Always remove and re-inject to ensure latest fields are present
+        const existingModal = document.getElementById('customerModal');
+        if (existingModal) existingModal.remove();
             const div = document.createElement('div');
             div.innerHTML = `
             <div id="customerModal" class="modal-overlay" style="display:none;">
@@ -646,6 +671,7 @@ const Customers = (() => {
                                 </select>
                             </div>
                             <div class="form-group"><label>Limite de Credito</label><input type="number" id="fCreditLimit" class="form-input" value="0" min="0" step="1000" /></div>
+                            <div class="form-group"><label>Descuento Max (%)</label><input type="number" id="fMaxDiscountPct" class="form-input" value="0" min="0" max="100" step="0.5" /></div>
                         </div>
                     </div>
                     <div class="modal-footer">
@@ -655,9 +681,10 @@ const Customers = (() => {
                 </div>
             </div>`;
             document.body.appendChild(div);
-        }
 
         // Statement Modal
+        const existingStatement = document.getElementById('statementModal');
+        if (existingStatement) existingStatement.remove();
         if (!document.getElementById('statementModal')) {
             const div = document.createElement('div');
             div.innerHTML = `
@@ -772,11 +799,58 @@ const Customers = (() => {
     // Run init
     init();
 
-    return {
+    const publicApi = {
         search, goToPage, loadCustomers,
         showDetail, selectCustomer, closeDetail,
         showCreateModal, editCurrent, closeModal, save,
         showStatement, closeStatement,
         showPaymentModal, closePayment, recordPayment,
     };
+
+    // Bulk selection
+    publicApi.toggleCustomerSelection = function(id) {
+        if (selectedCustomers.has(id)) selectedCustomers.delete(id);
+        else selectedCustomers.add(id);
+        updateBulkToolbar();
+    };
+    publicApi.toggleSelectAll = function() {
+        var cb = document.getElementById('selectAllCustomers');
+        var allChecked = cb.checked;
+        if (customersVS && customersVS.data) {
+            customersVS.data.forEach(function(c) {
+                if (allChecked) selectedCustomers.add(c.id);
+                else selectedCustomers.delete(c.id);
+            });
+            customersVS.refresh();
+        }
+        updateBulkToolbar();
+    };
+    function updateBulkToolbar() {
+        var container = document.getElementById('customersBulkToolbar');
+        if (!container) return;
+        var count = selectedCustomers.size;
+        if (count === 0) { container.innerHTML = ''; return; }
+        container.innerHTML = renderBulkToolbar(count,
+            '<button class="btn btn--primary btn--sm" onclick="Customers.featureProximamente(\'Exportar seleccionados\')">📥 Exportar</button>' +
+            '<button class="btn btn--ghost btn--sm" onclick="Customers.clearSelection()">Limpiar</button>'
+        );
+    }
+    publicApi.clearSelection = function() {
+        selectedCustomers.clear();
+        document.getElementById('selectAllCustomers').checked = false;
+        if (customersVS) customersVS.refresh();
+        updateBulkToolbar();
+    };
+
+    // Expose globally for inline HTML onclick handlers
+    window.Customers = publicApi;
+    return publicApi;
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/customers.min.js b/pos/static/js/customers.min.js
deleted file mode 100644
index 4bbc9b2..0000000
--- a/pos/static/js/customers.min.js
+++ /dev/null
@@ -1 +0,0 @@
-const Customers=(()=>{let e=localStorage.getItem("pos_token")||"",t=1,n=1,o=null,a=null;const i=e=>"$"+parseFloat(e||0).toLocaleString("es-MX",{minimumFractionDigits:2,maximumFractionDigits:2});async function l(t,n={}){n.headers={"Content-Type":"application/json",Authorization:"Bearer "+e};const o=await fetch(t,n);if(401===o.status)return void(window.location.href="/pos/login");const a=await o.json();if(!o.ok)throw new Error(a.error||`HTTP ${o.status}`);return a}const d={1:"Mostrador",2:"Taller",3:"Mayoreo"},r={1:"mostrador",2:"taller",3:"mayoreo"};function s(e){return e.credit_balance>0&&e.credit_limit>0&&e.credit_balance>e.credit_limit?'<span class="badge badge--warning"><span class="badge-dot"></span>Mora</span>':'<span class="badge badge--active"><span class="badge-dot"></span>Activo</span>'}function c(e){if(!e)return"--";const t=e.trim().split(/\s+/);return t.length>=2?(t[0][0]+t[1][0]).toUpperCase():e.substring(0,2).toUpperCase()}function m(e){if(!e)return"-";try{return new Date(e).toLocaleDateString("es-MX",{day:"2-digit",month:"short",year:"numeric"})}catch(t){return e}}async function p(e,o){e=e||t;const a=document.getElementById("searchInput");o=void 0!==o?o:a&&a.value||"";try{const a=new URLSearchParams({page:e,per_page:50});o&&a.append("q",o);const i=await l(`/pos/api/customers?${a}`);!function(e){const t=document.getElementById("customersBody");if(!t)return;if(!e||0===e.length)return void(t.innerHTML='<tr><td colspan="9" style="text-align:center;padding:var(--space-8);color:var(--color-text-muted);">Sin resultados.</td></tr>');g||(g=new VirtualScroll({container:t,rowHeight:52,buffer:3,renderRow:u,emptyHtml:'<tr><td colspan="9" style="text-align:center;padding:var(--space-8);color:var(--color-text-muted);">Sin resultados.</td></tr>'}));g.setData(e)}(i.data||[]),function(e){const o=document.querySelector(".pagination"),a=document.getElementById("tableInfo");if(!e||!e.total_pages)return o&&(o.innerHTML=""),void(a&&(a.textContent=""));n=e.total_pages,t=e.page;const i=e.total||0,l=e.per_page||50,d=(e.page-1)*l+1,r=Math.min(e.page*l,i);a&&(a.textContent=`Mostrando ${d}–${r} de ${i.toLocaleString("es-MX")} clientes`);if(!o)return;if(n<=1)return void(o.innerHTML="");let s="";s+=`<button class="page-btn" ${e.page<=1?"disabled":""} onclick="Customers.goToPage(${e.page-1})">&#8249;</button>`;const c=7;let m=Math.max(1,e.page-3),p=Math.min(n,m+c-1);p-m<c-1&&(m=Math.max(1,p-c+1));for(let t=m;t<=p;t++)s+=`<button class="page-btn ${t===e.page?"active":""}" onclick="Customers.goToPage(${t})">${t}</button>`;p<n&&(s+='<span style="color:var(--color-text-muted);font-size:var(--text-caption);padding:0 4px;">...</span>',s+=`<button class="page-btn" onclick="Customers.goToPage(${n})">${n}</button>`);s+=`<button class="page-btn" ${e.page>=n?"disabled":""} onclick="Customers.goToPage(${e.page+1})">&#8250;</button>`,o.innerHTML=s}(i.pagination||{})}catch(e){console.error("Load customers failed:",e)}}function u(e){const t=d[e.price_tier]||"Mostrador",n=r[e.price_tier]||"mostrador",a=parseFloat(e.credit_limit||0),l=parseFloat(e.credit_balance||0),c=Math.max(0,a-l),p=a>0?Math.round(l/a*100):0,u=p>=80?"none":p>=60?"low":"",g=String(e.id).padStart(5,"0");return'<tr class="'+(o&&o.id===e.id?"selected":"")+'" onclick="selectCustomer('+e.id+')"><td class="cell-num">'+g+'</td><td><div class="cell-name">'+(e.name||"")+'</div><div class="cell-name-sub hide-mobile">'+(e.email||"")+'</div></td><td class="cell-rfc hide-mobile">'+(e.rfc||"-")+'</td><td class="hide-mobile">'+(e.phone||"-")+'</td><td class="hide-mobile" style="font-size:var(--text-caption);color:var(--color-text-secondary);">'+(e.email||"-")+'</td><td><span class="tipo-chip tipo-chip--'+n+'">'+t+'</span></td><td class="cell-credit '+u+'">'+i(c)+'</td><td class="cell-date hide-mobile">'+m(e.last_purchase||e.created_at)+"</td><td>"+s(e)+"</td></tr>"}var g=null;function v(){clearTimeout(a),a=setTimeout((()=>{t=1,p(1)}),300)}async function f(e){try{const n=await l(`/pos/api/customers/${e}`);o=n;const a=document.getElementById("detailEmpty"),u=document.getElementById("detailContent");a&&(a.style.display="none"),u&&(u.style.display="flex");const g=document.getElementById("detailAvatar");g&&(g.textContent=c(n.name));const v=document.getElementById("detailName");v&&(v.textContent=(n.name||"").toUpperCase());const f=document.getElementById("detailRFC");f&&(f.textContent=n.rfc||"-");const y=document.getElementById("detailTipo");if(y){const e=d[n.price_tier]||"Mostrador",t=r[n.price_tier]||"mostrador";y.textContent=e,y.className=`tipo-chip tipo-chip--${t}`}const b=document.getElementById("detailStatus");b&&(b.innerHTML=s(n));const h=(e,t)=>{const n=document.getElementById(e);n&&(n.textContent=t||"-")};h("detailAddress",n.address),h("detailPhone",n.phone),h("detailEmail",n.email),h("detailSince",m(n.created_at)),h("detailLastPurchase",m(n.last_purchase));const x=parseFloat(n.credit_limit||0),C=parseFloat(n.credit_balance||0),E=Math.max(0,x-C),I=x>0?Math.round(C/x*100):0;h("detailCreditLimit",i(x)),h("detailCreditAvail",i(E)),h("detailCreditUsed",i(C)),h("detailCreditPct",I+"%");const B=document.getElementById("detailCreditBar");B&&(B.style.width=I+"%",B.className="progress-bar__fill "+(I<40?"low":I>75?"high":""));const w=document.getElementById("historyBody");if(w){const e=n.recent_purchases||[];0===e.length?w.innerHTML='<tr><td colspan="4" style="text-align:center;color:var(--color-text-muted);padding:var(--space-4);">Sin compras recientes</td></tr>':(w.innerHTML="",e.forEach((e=>{const t="paid"===e.status?"mbadge--paid":"overdue"===e.status?"mbadge--overdue":"mbadge--pending",n="paid"===e.status?"Pagado":"overdue"===e.status?"Vencido":"Pendiente",o=document.createElement("tr");o.innerHTML=`\n                            <td class="date">${m(e.created_at)}</td>\n                            <td class="folio">NX-${String(e.id).padStart(5,"0")}</td>\n                            <td class="total">${i(e.total)}</td>\n                            <td><span class="mbadge ${t}">${n}</span></td>\n                        `,w.appendChild(o)})))}!function(e){const t=(e,t)=>{const n=document.getElementById(e);n&&(n.textContent=t||"--")};t("panelAvatar",c(e.name)),t("panelName",e.name),t("panelRfc","RFC: "+(e.rfc||"-"));const n=parseFloat(e.credit_limit||0),o=parseFloat(e.credit_balance||0),a=Math.max(0,n-o),l=n>0?Math.round(o/n*100):0;t("panelCreditLimit",i(n)),t("panelCreditUsed",i(o)),t("panelCreditAvail",i(a));const d=document.getElementById("panelCreditBar");d&&(d.style.width=l+"%");const r=document.getElementById("panelVehicles");if(r){const t=e.vehicle_info||[];0===t.length?r.innerHTML='<span style="color:var(--color-text-muted);font-size:var(--text-body-sm);">Sin vehiculos registrados</span>':r.innerHTML=t.map((e=>`<div style="padding:4px 0;border-bottom:1px solid var(--color-border);">\n                        <strong>${e.make||""} ${e.model||""} ${e.year||""}</strong>\n                        ${e.plates?` <span style="color:var(--color-text-muted);">Placas: ${e.plates}</span>`:""}\n                    </div>`)).join("")}const s=document.getElementById("panelPurchases");if(s){const t=e.recent_purchases||[];0===t.length?s.innerHTML='<span style="color:var(--color-text-muted);font-size:var(--text-body-sm);">Sin compras recientes</span>':s.innerHTML=t.slice(0,5).map((e=>`<div style="display:flex;justify-content:space-between;padding:4px 0;border-bottom:1px solid var(--color-border);font-size:var(--text-body-sm);">\n                        <span>NX-${String(e.id).padStart(5,"0")} — ${m(e.created_at)}</span>\n                        <span>${i(e.total)}</span>\n                    </div>`)).join("")}}(n),p(t)}catch(e){console.error("Error loading customer:",e)}}function y(){const e=document.getElementById("customerModal");e&&(document.getElementById("modalTitle").textContent="Nuevo Cliente",document.getElementById("editId").value="",document.getElementById("fName").value="",document.getElementById("fRfc").value="",document.getElementById("fRazonSocial").value="",document.getElementById("fRegimenFiscal").value="",document.getElementById("fUsoCfdi").value="G03",document.getElementById("fCp").value="",document.getElementById("fPhone").value="",document.getElementById("fEmail").value="",document.getElementById("fAddress").value="",document.getElementById("fPriceTier").value="1",document.getElementById("fCreditLimit").value="0",e.classList.add("active"),document.getElementById("fName").focus())}function b(){if(!o)return;const e=o,t=document.getElementById("customerModal");t&&(document.getElementById("modalTitle").textContent="Editar Cliente",document.getElementById("editId").value=e.id,document.getElementById("fName").value=e.name||"",document.getElementById("fRfc").value=e.rfc||"",document.getElementById("fRazonSocial").value=e.razon_social||"",document.getElementById("fRegimenFiscal").value=e.regimen_fiscal||"",document.getElementById("fUsoCfdi").value=e.uso_cfdi||"G03",document.getElementById("fCp").value=e.cp||"",document.getElementById("fPhone").value=e.phone||"",document.getElementById("fEmail").value=e.email||"",document.getElementById("fAddress").value=e.address||"",document.getElementById("fPriceTier").value=e.price_tier||"1",document.getElementById("fCreditLimit").value=e.credit_limit||0,t.classList.add("active"))}function h(){const e=document.getElementById("customerModal");e&&e.classList.remove("active")}async function x(){if(!o)return;const e=document.getElementById("statementModal");if(!e)return;const t=document.getElementById("statementName");t&&(t.textContent=o.name);const n=document.getElementById("statementContent");n&&(n.innerHTML='<div style="text-align:center;padding:20px;color:var(--color-text-muted);">Cargando...</div>'),e.classList.add("active");try{const e=await l(`/pos/api/customers/${o.id}/statement`);let t=`<div style="margin-bottom:12px;font-size:14px;">\n                <strong>Saldo actual: ${i(e.balance)}</strong> |\n                Limite: ${i(e.customer?e.customer.credit_limit:0)}\n            </div>`;e.entries&&0!==e.entries.length?(t+='<table style="width:100%;border-collapse:collapse;font-size:13px;">',t+='<tr style="background:var(--color-surface-2);"><th style="padding:8px;text-align:left;">Fecha</th><th style="text-align:left;">Concepto</th><th style="text-align:right;padding:8px;">Cargo</th><th style="text-align:right;padding:8px;">Abono</th><th style="text-align:right;padding:8px;">Saldo</th></tr>',e.entries.forEach((e=>{t+=`<tr style="border-bottom:1px solid var(--color-border);">\n                        <td style="padding:6px 8px;">${m(e.date)}</td>\n                        <td>${e.description||""}</td>\n                        <td style="text-align:right;padding:6px 8px;">${"charge"===e.type?i(e.amount):""}</td>\n                        <td style="text-align:right;padding:6px 8px;">${"payment"===e.type?i(e.amount):""}</td>\n                        <td style="text-align:right;padding:6px 8px;">${i(e.running_balance)}</td>\n                    </tr>`})),t+="</table>"):t+='<div style="color:var(--color-text-muted);padding:20px;text-align:center;">Sin movimientos</div>',n&&(n.innerHTML=t)}catch(e){n&&(n.innerHTML=`<div style="color:var(--color-error);padding:20px;text-align:center;">Error: ${e.message}</div>`)}}function C(){const e=document.getElementById("paymentModal");e&&e.classList.remove("active")}function E(e){f(e),"function"==typeof openSlidePanel&&openSlidePanel()}return window.filterCustomers=function(){v()},e?(window.openNewCustomerModal=y,function(){const e=document.querySelectorAll(".quick-actions .action-btn");e.length>=1&&(e[0].onclick=()=>{o&&(window.location.href="/pos/?customer="+o.id)}),e.length>=2&&(e[1].onclick=()=>b()),e.length>=3&&(e[2].onclick=()=>x()),e.length>=4&&(e[3].onclick=()=>{o&&f(o.id)})}(),window.viewCustomer=E,function(){if(!document.getElementById("customerModal")){const e=document.createElement("div");e.innerHTML='\n            <div id="customerModal" class="modal-overlay" style="display:none;">\n                <div class="modal-box">\n                    <div class="modal-header">\n                        <h3 id="modalTitle">Nuevo Cliente</h3>\n                        <button class="btn-close" onclick="Customers.closeModal()">&times;</button>\n                    </div>\n                    <div class="modal-body">\n                        <input type="hidden" id="editId" />\n                        <div class="form-row">\n                            <div class="form-group"><label>Nombre *</label><input type="text" id="fName" class="form-input" placeholder="Nombre del cliente" /></div>\n                            <div class="form-group"><label>RFC</label><input type="text" id="fRfc" class="form-input" placeholder="RFC" maxlength="13" /></div>\n                        </div>\n                        <div class="form-row">\n                            <div class="form-group"><label>Razon Social</label><input type="text" id="fRazonSocial" class="form-input" placeholder="Razon Social" /></div>\n                            <div class="form-group"><label>Regimen Fiscal</label>\n                                <select id="fRegimenFiscal" class="form-input">\n                                    <option value="">-- Seleccionar --</option>\n                                    <option value="601">601 - General de Ley PM</option>\n                                    <option value="603">603 - Personas Morales Fines No Lucrativos</option>\n                                    <option value="605">605 - Sueldos y Salarios</option>\n                                    <option value="606">606 - Arrendamiento</option>\n                                    <option value="608">608 - Demas Ingresos</option>\n                                    <option value="612">612 - Personas Fisicas Empresariales</option>\n                                    <option value="616">616 - Sin Obligaciones Fiscales</option>\n                                    <option value="621">621 - Incorporacion Fiscal</option>\n                                    <option value="625">625 - RESICO</option>\n                                    <option value="626">626 - RESICO PM</option>\n                                </select>\n                            </div>\n                        </div>\n                        <div class="form-row">\n                            <div class="form-group"><label>Uso CFDI</label>\n                                <select id="fUsoCfdi" class="form-input">\n                                    <option value="G01">G01 - Adquisicion de mercancias</option>\n                                    <option value="G03" selected>G03 - Gastos en general</option>\n                                    <option value="I01">I01 - Construcciones</option>\n                                    <option value="I08">I08 - Otra maquinaria</option>\n                                    <option value="P01">P01 - Por definir</option>\n                                    <option value="S01">S01 - Sin efectos fiscales</option>\n                                </select>\n                            </div>\n                            <div class="form-group"><label>Codigo Postal</label><input type="text" id="fCp" class="form-input" placeholder="C.P." maxlength="5" /></div>\n                        </div>\n                        <div class="form-row">\n                            <div class="form-group"><label>Telefono</label><input type="text" id="fPhone" class="form-input" placeholder="Telefono" /></div>\n                            <div class="form-group"><label>Email</label><input type="email" id="fEmail" class="form-input" placeholder="correo@ejemplo.com" /></div>\n                        </div>\n                        <div class="form-group"><label>Direccion</label><input type="text" id="fAddress" class="form-input" placeholder="Direccion" /></div>\n                        <div class="form-row">\n                            <div class="form-group"><label>Tipo Precio</label>\n                                <select id="fPriceTier" class="form-input">\n                                    <option value="1">Mostrador</option>\n                                    <option value="2">Taller</option>\n                                    <option value="3">Mayoreo</option>\n                                </select>\n                            </div>\n                            <div class="form-group"><label>Limite de Credito</label><input type="number" id="fCreditLimit" class="form-input" value="0" min="0" step="1000" /></div>\n                        </div>\n                    </div>\n                    <div class="modal-footer">\n                        <button class="btn btn-secondary" onclick="Customers.closeModal()">Cancelar</button>\n                        <button class="btn btn-primary" onclick="Customers.save()">Guardar</button>\n                    </div>\n                </div>\n            </div>',document.body.appendChild(e)}if(!document.getElementById("statementModal")){const e=document.createElement("div");e.innerHTML='\n            <div id="statementModal" class="modal-overlay" style="display:none;">\n                <div class="modal-box modal-box--wide">\n                    <div class="modal-header">\n                        <h3>Estado de Cuenta — <span id="statementName"></span></h3>\n                        <button class="btn-close" onclick="Customers.closeStatement()">&times;</button>\n                    </div>\n                    <div class="modal-body" id="statementContent" style="max-height:60vh;overflow-y:auto;">\n                    </div>\n                    <div class="modal-footer">\n                        <button class="btn btn-primary" onclick="Customers.showPaymentModal()">Registrar Abono</button>\n                        <button class="btn btn-secondary" onclick="Customers.closeStatement()">Cerrar</button>\n                    </div>\n                </div>\n            </div>',document.body.appendChild(e)}if(!document.getElementById("paymentModal")){const e=document.createElement("div");e.innerHTML='\n            <div id="paymentModal" class="modal-overlay" style="display:none;">\n                <div class="modal-box">\n                    <div class="modal-header">\n                        <h3>Registrar Abono</h3>\n                        <button class="btn-close" onclick="Customers.closePayment()">&times;</button>\n                    </div>\n                    <div class="modal-body">\n                        <p style="margin-bottom:var(--space-4);color:var(--color-text-secondary);">Cliente: <strong id="paymentCustomerName"></strong></p>\n                        <div class="form-row">\n                            <div class="form-group"><label>Monto</label><input type="number" id="paymentAmount" class="form-input" placeholder="0.00" min="0" step="0.01" /></div>\n                            <div class="form-group"><label>Metodo</label>\n                                <select id="paymentMethod" class="form-input">\n                                    <option value="cash">Efectivo</option>\n                                    <option value="transfer">Transferencia</option>\n                                    <option value="card">Tarjeta</option>\n                                    <option value="check">Cheque</option>\n                                </select>\n                            </div>\n                        </div>\n                        <div class="form-group"><label>Referencia</label><input type="text" id="paymentRef" class="form-input" placeholder="Num. referencia (opcional)" /></div>\n                    </div>\n                    <div class="modal-footer">\n                        <button class="btn btn-secondary" onclick="Customers.closePayment()">Cancelar</button>\n                        <button class="btn btn-primary" onclick="Customers.recordPayment()">Registrar</button>\n                    </div>\n                </div>\n            </div>',document.body.appendChild(e)}if(!document.getElementById("modalStyles")){const e=document.createElement("style");e.id="modalStyles",e.textContent="\n                .modal-overlay {\n                    position: fixed; top: 0; left: 0; right: 0; bottom: 0;\n                    background: rgba(0,0,0,0.5); z-index: 9000;\n                    display: flex; align-items: center; justify-content: center;\n                    backdrop-filter: blur(2px);\n                }\n                .modal-overlay.active { display: flex !important; }\n                .modal-box {\n                    background: var(--color-bg-elevated); border: 1px solid var(--color-border);\n                    border-radius: var(--radius-lg); width: 90%; max-width: 600px;\n                    max-height: 85vh; overflow-y: auto;\n                    box-shadow: var(--shadow-xl);\n                }\n                .modal-box--wide { max-width: 800px; }\n                .modal-header {\n                    display: flex; align-items: center; justify-content: space-between;\n                    padding: var(--space-4) var(--space-5);\n                    border-bottom: 1px solid var(--color-border);\n                }\n                .modal-header h3 {\n                    font-family: var(--font-heading); font-size: var(--text-h6);\n                    font-weight: var(--heading-weight-primary); color: var(--color-text-primary);\n                    letter-spacing: var(--tracking-wide); text-transform: uppercase;\n                }\n                .modal-body { padding: var(--space-5); }\n                .modal-footer {\n                    display: flex; justify-content: flex-end; gap: var(--space-3);\n                    padding: var(--space-4) var(--space-5);\n                    border-top: 1px solid var(--color-border);\n                }\n                .form-row { display: flex; gap: var(--space-4); margin-bottom: var(--space-4); }\n                .form-row > .form-group { flex: 1; }\n                .form-group { margin-bottom: var(--space-4); }\n                .form-group label {\n                    display: block; font-size: var(--text-caption); font-weight: var(--font-weight-semibold);\n                    color: var(--color-text-muted); text-transform: uppercase; letter-spacing: var(--tracking-wider);\n                    margin-bottom: var(--space-1);\n                }\n                .form-input {\n                    width: 100%; height: 38px; padding: 0 var(--space-3);\n                    background: var(--color-bg-overlay); border: 1.5px solid var(--color-border);\n                    border-radius: var(--radius-md); font-family: var(--font-body);\n                    font-size: var(--text-body-sm); color: var(--color-text-primary); outline: none;\n                    transition: var(--transition-fast);\n                }\n                .form-input:focus { border-color: var(--color-border-focus); box-shadow: var(--shadow-focus); }\n                select.form-input { cursor: pointer; }\n            ",document.head.appendChild(e)}}(),p(),async function(){try{const e=await l("/pos/api/customers?page=1&per_page=1"),t=e.pagination?e.pagination.total:0,n=document.querySelectorAll(".summary-card__value");n.length>=1&&(n[0].textContent=t.toLocaleString("es-MX"))}catch(e){}}()):window.location.href="/pos/login",{search:v,goToPage:function(e){e<1||e>n||(t=e,p(e))},loadCustomers:p,showDetail:E,selectCustomer:f,closeDetail:function(){o=null;const e=document.getElementById("detailEmpty"),n=document.getElementById("detailContent");e&&(e.style.display="flex"),n&&(n.style.display="none"),p(t)},showCreateModal:y,editCurrent:b,closeModal:h,save:async function(){const e=document.getElementById("fName"),t=e?e.value.trim():"";if(!t)return void alert("Nombre es requerido");const n=e=>{const t=document.getElementById(e);return t?t.value.trim():""},a={name:t,rfc:n("fRfc")||null,razon_social:n("fRazonSocial")||null,regimen_fiscal:n("fRegimenFiscal")||null,uso_cfdi:n("fUsoCfdi")||"G03",cp:n("fCp")||null,phone:n("fPhone")||null,email:n("fEmail")||null,address:n("fAddress")||null,price_tier:parseInt(n("fPriceTier"))||1,credit_limit:parseFloat(n("fCreditLimit"))||0},i=n("editId");try{i?await l(`/pos/api/customers/${i}`,{method:"PUT",body:JSON.stringify(a)}):await l("/pos/api/customers",{method:"POST",body:JSON.stringify(a)}),h(),p(),i&&o&&f(i)}catch(e){alert("Error: "+e.message)}},showStatement:x,closeStatement:function(){const e=document.getElementById("statementModal");e&&e.classList.remove("active")},showPaymentModal:function(){if(!o)return;const e=document.getElementById("paymentModal");e&&(document.getElementById("paymentCustomerName").textContent=o.name,document.getElementById("paymentAmount").value="",document.getElementById("paymentMethod").value="cash",document.getElementById("paymentRef").value="",e.classList.add("active"),document.getElementById("paymentAmount").focus())},closePayment:C,recordPayment:async function(){if(!o)return;const e=parseFloat(document.getElementById("paymentAmount").value);if(!e||e<=0)return void alert("Ingresa un monto valido");const t=document.getElementById("paymentMethod").value,n=document.getElementById("paymentRef").value.trim();try{await l(`/pos/api/customers/${o.id}/payment`,{method:"POST",body:JSON.stringify({amount:e,method:t,reference:n})}),C(),f(o.id)}catch(e){alert("Error: "+e.message)}}}})();
\ No newline at end of file
diff --git a/pos/static/js/dashboard-stats.js b/pos/static/js/dashboard-stats.js
index f4092b1..a6a9778 100644
--- a/pos/static/js/dashboard-stats.js
+++ b/pos/static/js/dashboard-stats.js
@@ -8,6 +8,9 @@
   const token = localStorage.getItem('pos_token') || '';
   if (!token) return;
 
+  let hourlyChart = null;
+  let topProductsChart = null;
+
   function headers() {
     return { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' };
   }
@@ -31,10 +34,11 @@
   function renderHourlyChart(hourly) {
     const ctx = document.getElementById('hourlySalesChart');
     if (!ctx) return;
+    if (hourlyChart) { hourlyChart.destroy(); hourlyChart = null; }
     const labels = hourly.map(function (h) { return h.hour + ':00'; });
     const totals = hourly.map(function (h) { return h.total; });
 
-    new Chart(ctx, {
+    hourlyChart = new Chart(ctx, {
       type: 'bar',
       data: {
         labels: labels,
@@ -62,10 +66,38 @@
   function renderTopProductsChart(topProducts) {
     const ctx = document.getElementById('topProductsChart');
     if (!ctx) return;
+    if (topProductsChart) { topProductsChart.destroy(); topProductsChart = null; }
+    if (!topProducts || topProducts.length === 0) {
+      // No sales today — render a friendly empty-state mini chart so the canvas
+      // doesn't collapse or leave a blank hole.
+      topProductsChart = new Chart(ctx, {
+        type: 'doughnut',
+        data: {
+          labels: ['Sin ventas hoy'],
+          datasets: [{
+            data: [1],
+            backgroundColor: ['rgba(136, 136, 136, 0.25)'],
+            borderWidth: 0,
+          }]
+        },
+        options: {
+          responsive: true,
+          maintainAspectRatio: false,
+          plugins: {
+            legend: {
+              position: 'right',
+              labels: { color: '#888', font: { size: 10 }, boxWidth: 10 }
+            }
+          }
+        }
+      });
+      return;
+    }
+
     const labels = topProducts.map(function (p) { return p.name.substring(0, 20); });
     const revenues = topProducts.map(function (p) { return p.revenue; });
 
-    new Chart(ctx, {
+    topProductsChart = new Chart(ctx, {
       type: 'doughnut',
       data: {
         labels: labels,
diff --git a/pos/static/js/dashboard.js b/pos/static/js/dashboard.js
index 79611a9..fd42637 100644
--- a/pos/static/js/dashboard.js
+++ b/pos/static/js/dashboard.js
@@ -208,7 +208,7 @@ const Dashboard = (() => {
     function setKpiError(valueId, metaId) {
         const v = document.getElementById(valueId);
         const m = document.getElementById(metaId);
-        if (v) v.textContent = '--';
+        if (v) v.innerHTML = '<span style="color:var(--color-error)">--</span>';
         if (m) m.innerHTML = '<span class="kpi-meta-text" style="color:var(--color-error)">Error al cargar</span>';
     }
 
@@ -225,7 +225,12 @@ const Dashboard = (() => {
         if (!container) return;
 
         if (!registers || registers.length === 0) {
-            container.innerHTML = '<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin cajas registradas hoy</div>';
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Sin cajas hoy',
+                subtitle: 'Ninguna caja ha sido abierta el día de hoy.',
+                action: '<a href="/pos/sale" class="btn btn--primary btn--sm">Abrir POS</a>'
+            });
             return;
         }
 
@@ -326,7 +331,12 @@ const Dashboard = (() => {
         if (!container) return;
 
         if (!data || !data.data || data.data.length === 0) {
-            container.innerHTML = '<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin ventas hoy</div>';
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Sin ventas hoy',
+                subtitle: 'Aún no hay transacciones registradas el día de hoy.',
+                action: '<a href="/pos/sale" class="btn btn--primary btn--sm">Nueva venta</a>'
+            });
             return;
         }
 
@@ -353,7 +363,11 @@ const Dashboard = (() => {
         const sorted = Object.values(productMap).sort((a, b) => b.revenue - a.revenue).slice(0, 5);
 
         if (sorted.length === 0) {
-            container.innerHTML = '<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin productos vendidos</div>';
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M6 2L3 6v14a2 2 0 002 2h14a2 2 0 002-2V6l-3-4z"/><line x1="3" y1="6" x2="21" y2="6"/><path d="M16 10a4 4 0 01-8 0"/></svg>',
+                title: 'Sin productos vendidos',
+                subtitle: 'No hay suficiente información para mostrar el ranking.'
+            });
             return;
         }
 
@@ -444,7 +458,12 @@ const Dashboard = (() => {
         if (!tbody) return;
 
         if (!data || !data.data || data.data.length === 0) {
-            tbody.innerHTML = '<tr><td colspan="5" style="text-align:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin ventas hoy</td></tr>';
+            tbody.innerHTML = '<tr><td colspan="5">' + renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Sin ventas hoy',
+                subtitle: 'Aún no hay transacciones registradas.',
+                action: '<a href="/pos/sale" class="btn btn--primary btn--sm">Nueva venta</a>'
+            }) + '</td></tr>';
             return;
         }
 
@@ -526,6 +545,17 @@ const Dashboard = (() => {
         }, 120000);
     }
 
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === 'function') {
+        registerCmdKItem({ group: 'Principal', label: 'Dashboard', href: '/pos/dashboard', icon: '📊' });
+        registerCmdKItem({ group: 'Principal', label: 'POS Ventas', href: '/pos/sale', icon: '🛒' });
+        registerCmdKItem({ group: 'Principal', label: 'Catálogo', href: '/pos/catalog', icon: '📁' });
+        registerCmdKItem({ group: 'Principal', label: 'Clientes', href: '/pos/customers', icon: '👤' });
+        registerCmdKItem({ group: 'Principal', label: 'Facturación', href: '/pos/invoicing', icon: '📄' });
+        registerCmdKItem({ group: 'Principal', label: 'Reportes', href: '/pos/reports', icon: '📈' });
+        registerCmdKItem({ group: 'Principal', label: 'Configuración', href: '/pos/config', icon: '⚙️' });
+    }
+
     document.addEventListener('DOMContentLoaded', init);
 
     return { init, setTheme };
diff --git a/pos/static/js/dashboard.min.js b/pos/static/js/dashboard.min.js
deleted file mode 100644
index 971c765..0000000
--- a/pos/static/js/dashboard.min.js
+++ /dev/null
@@ -1 +0,0 @@
-const Dashboard=(()=>{function t(){return localStorage.getItem("pos_token")||""}function e(t){return"$"+parseFloat(t||0).toLocaleString("es-MX",{minimumFractionDigits:2,maximumFractionDigits:2})}function n(t){return parseInt(t||0).toLocaleString("es-MX")}function a(){return(new Date).toISOString().slice(0,10)}function s(t){const e=new Date;return e.setDate(e.getDate()-t),e.toISOString().slice(0,10)}const o=["Dom","Lun","Mar","Mie","Jue","Vie","Sab"],r=["enero","febrero","marzo","abril","mayo","junio","julio","agosto","septiembre","octubre","noviembre","diciembre"],i=["Domingo","Lunes","Martes","Miercoles","Jueves","Viernes","Sabado"];function l(t){document.documentElement.setAttribute("data-theme",t);try{localStorage.setItem("nexus-theme",t)}catch(t){}const e=document.getElementById("btn-industrial"),n=document.getElementById("btn-modern");e&&e.classList.toggle("active","industrial"===t),n&&n.classList.toggle("active","modern"===t)}function c(){const t=document.getElementById("sidebar"),e=document.getElementById("sidebar-overlay");t&&t.classList.remove("open"),e&&e.classList.remove("open"),document.body.style.overflow=""}async function d(e){try{const n=await fetch(e,{headers:{Authorization:`Bearer ${t()}`,"Content-Type":"application/json"}});return 401===n.status?(window.location.href="/pos/login",null):n.ok?await n.json():null}catch(t){return console.error("Dashboard fetch error:",e,t),null}}async function m(){const t=a(),s=await d(`/pos/api/register/daily-summary?date=${t}`);if(!s)return u("kpi-ventas-total","kpi-ventas-meta"),u("kpi-tickets-count","kpi-tickets-meta"),u("kpi-promedio-value","kpi-promedio-meta"),null;const o=document.getElementById("kpi-ventas-total"),r=document.getElementById("kpi-ventas-meta");if(o&&(o.textContent=e(s.total_sales)),r){const t=Object.entries(s.sales_by_method||{}).map((([t,n])=>`${p(t)}: ${e(n.amount)}`)).join(" | ");r.innerHTML=t?`<span class="kpi-meta-text">${t}</span>`:'<span class="kpi-meta-text">Sin ventas aun</span>'}const i=document.getElementById("kpi-tickets-count"),l=document.getElementById("kpi-tickets-meta");if(i&&(i.textContent=n(s.total_sales_count)),l){const t=s.cancelled_count||0;l.innerHTML=t>0?`<span class="kpi-tag kpi-tag--neutral">${t} cancelada${t>1?"s":""}</span><span class="kpi-meta-text">de ${s.total_sales_count+t} totales</span>`:`<span class="kpi-meta-text">${s.total_sales_count} completada${1!==s.total_sales_count?"s":""}</span>`}const c=document.getElementById("kpi-promedio-value"),m=document.getElementById("kpi-promedio-meta"),v=s.total_sales_count>0?s.total_sales/s.total_sales_count:0;c&&(c.textContent=e(v)),m&&(m.innerHTML=`<span class="kpi-meta-text">sobre ${n(s.total_sales_count)} ventas</span>`);const g=document.getElementById("kpi-cajas-count"),y=document.getElementById("kpi-cajas-meta"),f=s.registers||[],h=f.filter((t=>"open"===t.status)),k=f.filter((t=>"closed"===t.status));return g&&(g.textContent=f.length),y&&(y.innerHTML=`<span class="kpi-tag kpi-tag--up">${h.length} abierta${1!==h.length?"s":""}</span><span class="kpi-meta-text">${k.length} cerrada${1!==k.length?"s":""}</span>`),function(t){const n=document.getElementById("registers-list");if(!n)return;if(!t||0===t.length)return void(n.innerHTML='<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin cajas registradas hoy</div>');const a=Math.max(...t.map((t=>t.sale_total||0)),1);n.innerHTML=t.map(((t,n)=>{const s="open"===t.status?"kpi-tag--up":"kpi-tag--neutral",o="open"===t.status?"Abierta":"Cerrada",r=a>0?Math.round(t.sale_total/a*100):0;return`\n                <div class="rank-item">\n                    <div class="rank-num ${0===n?"rank-num--1":1===n?"rank-num--2":""}">${n+1}</div>\n                    <div class="rank-item__info">\n                        <div class="rank-item__name">Caja ${t.register_number||t.id}</div>\n                        <div class="rank-item__sub">${t.employee_name||"Sin cajero"} &nbsp;&middot;&nbsp; ${t.sale_count||0} ventas &nbsp;<span class="kpi-tag ${s}" style="font-size:9px;padding:1px 6px;">${o}</span></div>\n                        <div class="rank-item__bar-bg">\n                            <div class="rank-item__bar-fill" style="width:${r}%"></div>\n                        </div>\n                    </div>\n                    <div class="rank-item__value">${e(t.sale_total)}</div>\n                </div>`})).join("")}(f),s}function u(t,e){const n=document.getElementById(t),a=document.getElementById(e);n&&(n.textContent="--"),a&&(a.innerHTML='<span class="kpi-meta-text" style="color:var(--color-error)">Error al cargar</span>')}function p(t){return t?t.charAt(0).toUpperCase()+t.slice(1):""}function v(t,e,n,a,s){return`\n            <div class="alert-item alert-item--${t}">\n                <div class="alert-icon-wrap alert-icon-wrap--${t}">${s}</div>\n                <div class="alert-content">\n                    <div style="display:flex;align-items:center;gap:var(--space-2);margin-bottom:3px;">\n                        <span class="alert-title">${e}</span>\n                        <span class="alert-badge alert-badge--${t}">${n}</span>\n                    </div>\n                    <div class="alert-desc">${a}</div>\n                </div>\n                <a href="/pos/inventory#alertas" class="alert-action" style="text-decoration:none;">Ver</a>\n            </div>`}function g(t){const e=document.createElement("div");return e.textContent=t||"",e.innerHTML}async function y(){const t=a(),n=await d(`/pos/api/sales?date_from=${t}&date_to=${t}&per_page=10`),s=document.getElementById("recent-sales-tbody");if(!s)return;if(!n||!n.data||0===n.data.length)return void(s.innerHTML='<tr><td colspan="5" style="text-align:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin ventas hoy</td></tr>');const o=n.data.slice(0,5),r=await Promise.all(o.map((t=>d(`/pos/api/sales/${t.id}`))));s.innerHTML=o.map(((t,n)=>{const a=r[n],s=t.created_at?t.created_at.slice(11,16):"--:--",o=t.customer_name||"Publico General",i=t.total||0,l=t.payment_method||"efectivo";let c="";a&&a.items&&a.items.length>0&&(c=a.items.slice(0,3).map((t=>`${g(t.name)}${t.quantity>1?" (x"+t.quantity+")":""}`)).join(", "),a.items.length>3&&(c+="..."));const d=function(t){const e=(t||"").toLowerCase();return e.includes("efectivo")||"cash"===e?"efectivo":e.includes("tarjeta")||"card"===e?"tarjeta":e.includes("transferencia")||"transfer"===e?"transferencia":e.includes("credito")||"credit"===e?"credito":"efectivo"}(l),m=p(l),u="cancelled"===t.status?' <span style="color:var(--color-error);font-size:10px;font-weight:700;">[CANCELADA]</span>':"";return`\n                <tr>\n                    <td><span class="td-time">${s}</span></td>\n                    <td><span class="td-client">${g(o)}</span>${u}</td>\n                    <td class="td-products">${c}</td>\n                    <td><span class="td-mono">${e(i)}</span></td>\n                    <td><span class="pago-badge pago-badge--${d}">${m}</span></td>\n                </tr>`})).join("")}function f(){if(t()||(window.location.href="/pos/login",0)){try{const t=localStorage.getItem("nexus-theme");"industrial"!==t&&"modern"!==t||l(t)}catch(t){}!function(){const e=new Date,n=e.getHours();let a="Buenos dias";n>=12&&n<19?a="Buenas tardes":n>=19&&(a="Buenas noches");let s="";try{const e=JSON.parse(atob(t().split(".")[1]));s=e.name||e.sub||""}catch(t){}const o=document.getElementById("header-greeting");o&&(o.textContent=s?`${a}, ${s}`:a);const l=document.getElementById("header-subtitle");if(l){const t=i[e.getDay()],n=e.getDate(),a=r[e.getMonth()],s=e.getFullYear();l.textContent=`${t}, ${n} de ${a} de ${s}`}}(),m(),async function(){const t=await d("/pos/api/inventory/alerts"),e=document.getElementById("alerts-grid");if(!e)return;if(!t||!t.data||0===t.data.length)return void(e.innerHTML='\n                <div class="alert-item" style="border-left:4px solid var(--color-success);justify-content:center;">\n                    <div class="alert-icon-wrap" style="background-color:rgba(34,197,94,0.1);color:var(--color-success);">\n                        <svg width="18" height="18" viewBox="0 0 18 18" fill="none"><circle cx="9" cy="9" r="7" stroke="currentColor" stroke-width="1.5"/><path d="M6 9l2 2 4-4" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"/></svg>\n                    </div>\n                    <div class="alert-content">\n                        <span class="alert-title">Sin alertas</span>\n                        <div class="alert-desc">Todo el inventario dentro de parametros normales.</div>\n                    </div>\n                </div>');const n=t.data,a=n.filter((t=>"zero"===t.type)),s=n.filter((t=>"low"===t.type)),o=n.filter((t=>"over"===t.type));let r="";if(a.length>0){const t=a.slice(0,5).map((t=>`${t.name}: <strong>${t.stock} uds</strong>`)).join(" &middot; ");r+=v("error","Stock Agotado",`${a.length} items`,t,'<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M9 3L16.5 15H1.5L9 3z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M9 8v3M9 12.5v.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>')}if(s.length>0){const t=s.slice(0,5).map((t=>`${t.name}: <strong>${t.stock} uds</strong> (min ${t.min_stock})`)).join(" &middot; ");r+=v("warning","Stock Bajo",`${s.length} items`,t,'<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><path d="M9 3L16.5 15H1.5L9 3z" stroke="currentColor" stroke-width="1.5" stroke-linejoin="round"/><path d="M9 8v3M9 12.5v.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>')}if(o.length>0){const t=o.slice(0,5).map((t=>`${t.name}: <strong>${t.stock} uds</strong> (max ${t.max_stock})`)).join(" &middot; ");r+=v("orange","Sobrestock",`${o.length} items`,t,'<svg width="18" height="18" viewBox="0 0 18 18" fill="none"><rect x="2" y="2" width="14" height="14" rx="2" stroke="currentColor" stroke-width="1.5"/><path d="M9 6v3M9 11v.5" stroke="currentColor" stroke-width="1.5" stroke-linecap="round"/></svg>')}e.innerHTML=r||'<div class="alert-item" style="border-left:none;justify-content:center;color:var(--color-text-muted);">Sin alertas</div>'}(),async function(){const t=a(),n=await d(`/pos/api/sales?date_from=${t}&date_to=${t}&status=completed&per_page=200`),s=document.getElementById("top-products-list");if(!s)return;if(!n||!n.data||0===n.data.length)return void(s.innerHTML='<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin ventas hoy</div>');const o=n.data.slice(0,20),r=await Promise.all(o.map((t=>d(`/pos/api/sales/${t.id}`)))),i={};for(const t of r)if(t&&t.items)for(const e of t.items){const t=e.part_number||e.name;i[t]||(i[t]={name:e.name,part_number:e.part_number||"",qty:0,revenue:0}),i[t].qty+=e.quantity||0,i[t].revenue+=e.subtotal||0}const l=Object.values(i).sort(((t,e)=>e.revenue-t.revenue)).slice(0,5);if(0===l.length)return void(s.innerHTML='<div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Sin productos vendidos</div>');const c=l[0].revenue||1;s.innerHTML=l.map(((t,n)=>{const a=Math.round(t.revenue/c*100);return`\n                <div class="rank-item">\n                    <div class="rank-num ${0===n?"rank-num--1":1===n?"rank-num--2":""}">${n+1}</div>\n                    <div class="rank-item__info">\n                        <div class="rank-item__name">${g(t.name)}</div>\n                        <div class="rank-item__sub">${g(t.part_number)} &nbsp;&middot;&nbsp; ${t.qty} pzas vendidas</div>\n                        <div class="rank-item__bar-bg">\n                            <div class="rank-item__bar-fill" style="width:${a}%"></div>\n                        </div>\n                    </div>\n                    <div class="rank-item__value">${e(t.revenue)}</div>\n                </div>`})).join("")}(),async function(){const t=document.getElementById("bar-chart"),n=document.getElementById("chart-week-total");if(!t)return;const r=[];for(let t=6;t>=0;t--)r.push(s(t));const i=await Promise.all(r.map((t=>d(`/pos/api/register/daily-summary?date=${t}`))));let l=0;const c=r.map(((t,e)=>{const n=i[e],s=n&&n.total_sales||0;l+=s;const r=new Date(t+"T12:00:00");return{label:o[r.getDay()],total:s,isToday:t===a()}}));n&&(n.innerHTML=`Total semana: <strong style="color:var(--color-primary);font-family:var(--font-mono);">${e(l)}</strong>`);const m=Math.max(...c.map((t=>t.total)),1);t.innerHTML=c.map((t=>{const n=Math.max(Math.round(t.total/m*100),2),a=t.isToday?" today":"",s=t.isToday?' style="color:var(--color-primary);font-weight:700;"':"";return`\n                <div class="bar-chart__col">\n                    <div class="bar-chart__bar-wrap">\n                        <div class="bar-chart__bar${a}" style="height:${n}%" data-value="${t.isToday?`${e(t.total)} ← Hoy`:e(t.total)}"></div>\n                    </div>\n                    <span class="bar-chart__label"${s}>${t.label}</span>\n                </div>`})).join("")}(),y(),setInterval((()=>{m(),y()}),12e4)}}return window.setTheme=l,window.toggleSidebar=function(){const t=document.getElementById("sidebar"),e=document.getElementById("sidebar-overlay");if(!t)return;const n=t.classList.contains("open");t.classList.toggle("open",!n),e&&e.classList.toggle("open",!n),document.body.style.overflow=n?"":"hidden"},window.closeSidebar=c,window.addEventListener("resize",(function(){window.innerWidth>=768&&c()})),window.setPeriod=function(t){t.closest(".period-selector").querySelectorAll(".period-btn").forEach((function(t){t.classList.remove("active")})),t.classList.add("active")},document.addEventListener("DOMContentLoaded",f),{init:f,setTheme:l}})();
\ No newline at end of file
diff --git a/pos/static/js/diagrams.min.js b/pos/static/js/diagrams.min.js
deleted file mode 100644
index 7b1ee1f..0000000
--- a/pos/static/js/diagrams.min.js
+++ /dev/null
@@ -1 +0,0 @@
-!function(){"use strict";var e="/pos/api/diagrams",t=localStorage.getItem("pos_token");if(t){var a={Authorization:"Bearer "+t,"Content-Type":"application/json"},n={view:"list",diagrams:[],categories:[],currentDiagram:null,hotspots:[],selectedHotspot:null,scale:1,panX:0,panY:0,isPanning:!1,lastPointer:null},i=document.getElementById("diagramList"),o=document.getElementById("diagramViewer"),r=document.getElementById("svgContainer"),s=document.getElementById("svgWrapper"),c=document.getElementById("backBtn"),l=document.getElementById("zoomInBtn"),d=document.getElementById("zoomOutBtn"),u=document.getElementById("zoomResetBtn"),m=document.getElementById("diagramTitle"),p=document.getElementById("hotspotPanel"),g=document.getElementById("hotspotBody"),v=document.getElementById("hotspotClose"),f=document.getElementById("partsList"),y=document.getElementById("loading"),h=document.getElementById("emptyState"),_=document.getElementById("diagramFilter"),b=document.getElementById("profileAvatar"),E=document.getElementById("profileName"),L=document.getElementById("profileRole");window.DiagramsApp={openDiagram:function(t){k(e+"/"+t,(function(t,r){t||!r||r.error||(n.currentDiagram=r,n.hotspots=r.hotspots||[],function(){n.view="viewer",i.style.display="none",o.style.display="flex",A();var t=n.currentDiagram;m&&(m.textContent=t.name_es||t.name);M(),r=t.id_diagram,s.innerHTML='<div class="svg-loading">Cargando diagrama...</div>',fetch(e+"/"+r+"/svg",{headers:a}).then((function(e){return e.text()})).then((function(e){s.innerHTML=e;var t=s.querySelector("svg");t&&(t.style.width="100%",t.style.height="100%",t.setAttribute("preserveAspectRatio","xMidYMid meet"),function(e){var t=e.querySelectorAll("[data-hotspot]");t.forEach((function(e){var t=parseInt(e.getAttribute("data-hotspot"));e.style.cursor="pointer",e.addEventListener("click",(function(e){e.stopPropagation(),C(t)})),e.addEventListener("mouseenter",(function(){x(t,!0)})),e.addEventListener("mouseleave",(function(){x(t,!1)}))}))}(t))})).catch((function(){s.innerHTML='<div class="svg-error">Error al cargar el diagrama</div>'})),function(){if(!f)return;var e='<h4 class="parts-list__title">Partes en diagrama</h4>';n.hotspots.forEach((function(t){var a=P(t.callout_number),n=t.part_name_es||t.part_name||a.name,i=t.part_number||"";e+='<div class="part-item" data-callout="'+t.callout_number+'" onclick="DiagramsApp.selectHotspot('+t.callout_number+')">',e+='<span class="part-item__callout">'+t.callout_number+"</span>",e+='<div class="part-item__info">',e+='<div class="part-item__name">'+Y(n)+"</div>",i&&(e+='<div class="part-item__number">'+Y(i)+"</div>"),e+="</div>",e+="</div>"})),0===n.hotspots.length&&(e+='<div class="parts-list__empty">Sin partes definidas</div>');f.innerHTML=e}();var r}())}))},selectHotspot:C,viewPart:function(e){window.open("/pos/catalog?part="+e,"_blank")},searchPart:function(e){window.open("/pos/catalog?search="+encodeURIComponent(e),"_blank")},addToCart:function(e){alert("Funcion disponible desde el catalogo. Busca la parte para agregarla al carrito.")}},"loading"===document.readyState?document.addEventListener("DOMContentLoaded",B):B()}else window.location.href="/pos/login";function B(){!function(){try{var e=JSON.parse(localStorage.getItem("pos_user")||"{}");if(E&&(E.textContent=e.name||"--"),L&&(L.textContent=e.role||"--"),b){var t=e.name||"--";b.textContent=t.split(" ").map((function(e){return e[0]||""})).join("").substring(0,2).toUpperCase()}}catch(e){}}(),k(e+"/",(function(e,t){if(!e&&t&&t.data){n.diagrams=t.data;var a={};t.data.forEach((function(e){var t=e.category_name||"Other";a[t]||(a[t]={name:t,name_es:e.category_name_es||t,diagrams:[]}),a[t].diagrams.push(e)})),n.categories=Object.values(a),w()}else h.style.display="flex"})),function(){c&&c.addEventListener("click",I);l&&l.addEventListener("click",(function(){D(1.25)}));d&&d.addEventListener("click",(function(){D(.8)}));u&&u.addEventListener("click",M);v&&v.addEventListener("click",A);_&&_.addEventListener("input",w);r&&(r.addEventListener("wheel",(function(e){e.preventDefault(),D(e.deltaY<0?1.1:.9)}),{passive:!1}),r.addEventListener("mousedown",H),r.addEventListener("mousemove",q),r.addEventListener("mouseup",O),r.addEventListener("mouseleave",O),r.addEventListener("touchstart",(function(e){1===e.touches.length&&H({clientX:e.touches[0].clientX,clientY:e.touches[0].clientY,preventDefault:function(){}})})),r.addEventListener("touchmove",(function(e){1===e.touches.length&&(e.preventDefault(),q({clientX:e.touches[0].clientX,clientY:e.touches[0].clientY}))}),{passive:!1}),r.addEventListener("touchend",O));document.addEventListener("keydown",(function(e){"viewer"===n.view&&("Escape"===e.key&&(n.selectedHotspot?A():I()),"+"!==e.key&&"="!==e.key||D(1.15),"-"===e.key&&D(.87),"0"===e.key&&M())}))}()}function k(e,t){y.style.display="flex",h.style.display="none",fetch(e,{headers:a}).then((function(e){return e.json()})).then((function(e){y.style.display="none",t(null,e)})).catch((function(e){y.style.display="none",t(e)}))}function w(){n.view="list",o.style.display="none",i.style.display="block";var e=(_&&_.value||"").toLowerCase(),t="";n.categories.forEach((function(a){var n=a.diagrams.filter((function(t){return!e||(-1!==(t.name_es||t.name||"").toLowerCase().indexOf(e)||-1!==(t.category_name_es||"").toLowerCase().indexOf(e)||-1!==(t.group_name_es||"").toLowerCase().indexOf(e))}));0!==n.length&&(t+='<div class="diagram-category">',t+='<h3 class="category-title">'+Y(a.name_es||a.name)+"</h3>",t+='<div class="diagram-grid">',n.forEach((function(e){t+='<div class="diagram-card" data-id="'+e.id_diagram+'" onclick="DiagramsApp.openDiagram('+e.id_diagram+')">',t+='<div class="diagram-card__preview">',t+='<img src="/pos/static/'+Y(e.image_path)+'" alt="'+Y(e.name_es||e.name)+'" loading="lazy" />',t+="</div>",t+='<div class="diagram-card__info">',t+='<div class="diagram-card__name">'+Y(e.name_es||e.name)+"</div>",t+='<div class="diagram-card__group">'+Y(e.group_name_es||e.group_name||"")+"</div>",t+="</div>",t+="</div>"})),t+="</div></div>")})),h.style.display=t?"none":"flex",i.innerHTML=t}function I(){n.view="list",n.currentDiagram=null,n.selectedHotspot=null,o.style.display="none",i.style.display="block",A()}function x(e,t){f.querySelectorAll(".part-item").forEach((function(a){parseInt(a.dataset.callout)===e&&a.classList.toggle("is-highlighted",t)}))}function C(e){var t=n.hotspots.find((function(t){return t.callout_number===e}));if(t){n.selectedHotspot=t;var a=s.querySelector("svg");a&&a.querySelectorAll("[data-hotspot]").forEach((function(t){parseInt(t.getAttribute("data-hotspot"))===e?(t.style.fill="rgba(245, 166, 35, 0.25)",t.style.stroke="#F5A623",t.style.strokeWidth="3"):(t.style.fill="transparent",t.style.stroke="none")})),f.querySelectorAll(".part-item").forEach((function(t){t.classList.toggle("is-active",parseInt(t.dataset.callout)===e)})),function(e){p.classList.add("is-open");e.part_name_es||e.part_name||e.callout_number;var t=e.part_number||"",a=e.description_es||e.description||"",n=P(e.callout_number),i=e.part_name_es||e.part_name||n.name,o=a||n.desc,r="";r+='<div class="hotspot-detail">',r+='<div class="hotspot-callout">'+e.callout_number+"</div>",r+='<h4 class="hotspot-name">'+Y(i)+"</h4>",t&&(r+='<div class="hotspot-partnumber">No. Parte: '+Y(t)+"</div>");o&&(r+='<p class="hotspot-desc">'+Y(o)+"</p>");r+='<div class="hotspot-actions">',e.part_id?(r+='<button class="btn btn-primary btn-sm" onclick="DiagramsApp.viewPart('+e.part_id+')">Ver detalle</button>',r+='<button class="btn btn-accent btn-sm" onclick="DiagramsApp.addToCart('+e.part_id+')"><svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/><path d="M1 1h4l2.68 13.39a2 2 0 002 1.61h9.72a2 2 0 002-1.61L23 6H6"/></svg> Agregar</button>'):r+='<button class="btn btn-primary btn-sm" onclick="DiagramsApp.searchPart(\''+Y(i)+"')\">Buscar en catalogo</button>";r+="</div>",r+="</div>",g.innerHTML=r}(t)}}function P(e){var t=n.currentDiagram;if(!t)return{name:"Parte "+e,desc:""};var a=(t.name||"").toLowerCase();return-1!==a.indexOf("brak")||-1!==a.indexOf("freno")?{1:{name:"Disco de freno",desc:"Disco ventilado de freno delantero. Se recomienda cambiar en pares."},2:{name:"Caliper de freno",desc:"Caliper con pistones, incluye purga. Verificar compatibilidad con tipo de pastilla."},3:{name:"Pastillas de freno",desc:"Juego de pastillas con indicador de desgaste. Material ceramico o semi-metalico."},4:{name:"Manguera de freno",desc:"Manguera flexible de alta presion. Revisar por grietas cada 40,000 km."},5:{name:"Cilindro maestro",desc:"Cilindro maestro con deposito de liquido de frenos. Incluye empaques."}}[e]||{name:"Parte "+e,desc:""}:-1!==a.indexOf("susp")?{1:{name:"Amortiguador",desc:"Amortiguador delantero de gas. Se recomienda cambiar en pares."},2:{name:"Resorte helicoidal",desc:"Resorte de suspension delantera. Verificar altura libre."},3:{name:"Brazo de control",desc:"Brazo inferior de control con bujes. Incluye herraje de montaje."},4:{name:"Rotula",desc:"Rotula inferior de suspension. Incluye guardapolvo y seguros."},5:{name:"Barra de acoplamiento",desc:"Barra de acoplamiento de direccion con terminales. Requiere alineacion."}}[e]||{name:"Parte "+e,desc:""}:(-1!==a.indexOf("engine")||-1!==a.indexOf("motor"))&&{1:{name:"Filtro de aire",desc:"Filtro de aire del motor. Cambiar cada 15,000-20,000 km."},2:{name:"Bujias",desc:"Juego de bujias. Verificar tipo (platino, iridio) segun especificacion del motor."},3:{name:"Banda serpentina",desc:"Banda de accesorios. Revisar tension y desgaste. Incluye alternador, A/C y direccion."},4:{name:"Junta de culata",desc:"Junta de cabeza de cilindros. Material MLS multicapa. Requiere torque especifico."},5:{name:"Filtro de aceite",desc:"Filtro de aceite del motor. Cambiar en cada servicio de aceite."}}[e]||{name:"Parte "+e,desc:""}}function A(){p.classList.remove("is-open"),n.selectedHotspot=null;var e=s.querySelector("svg");e&&e.querySelectorAll("[data-hotspot]").forEach((function(e){e.style.fill="transparent",e.style.stroke="none"})),f&&f.querySelectorAll(".part-item").forEach((function(e){e.classList.remove("is-active")}))}function D(e){n.scale=Math.max(.3,Math.min(5,n.scale*e)),S()}function M(){n.scale=1,n.panX=0,n.panY=0,S()}function S(){s&&(s.style.transform="translate("+n.panX+"px, "+n.panY+"px) scale("+n.scale+")")}function H(e){e.button&&0!==e.button||(n.isPanning=!0,n.lastPointer={x:e.clientX,y:e.clientY})}function q(e){if(n.isPanning&&n.lastPointer){var t=e.clientX-n.lastPointer.x,a=e.clientY-n.lastPointer.y;n.panX+=t,n.panY+=a,n.lastPointer={x:e.clientX,y:e.clientY},S()}}function O(){n.isPanning=!1,n.lastPointer=null}function Y(e){if(!e)return"";var t=document.createElement("div");return t.appendChild(document.createTextNode(e)),t.innerHTML}}();
\ No newline at end of file
diff --git a/pos/static/js/fleet.min.js b/pos/static/js/fleet.min.js
deleted file mode 100644
index fce058d..0000000
--- a/pos/static/js/fleet.min.js
+++ /dev/null
@@ -1 +0,0 @@
-var Fleet=function(){"use strict";var e="/pos/api/fleet",t=localStorage.getItem("pos_token"),n=[],a=1,o=null;function l(){return{"Content-Type":"application/json",Authorization:"Bearer "+t}}function c(e){return null==e?"0":parseFloat(e).toLocaleString("es-MX")}function i(e){return null==e?"$0.00":"$"+parseFloat(e).toLocaleString("es-MX",{minimumFractionDigits:2,maximumFractionDigits:2})}function r(e){return e?new Date(e).toLocaleDateString("es-MX",{day:"2-digit",month:"short",year:"numeric"}):"—"}function d(e){if(!e)return"";var t=document.createElement("div");return t.textContent=e,t.innerHTML}function u(){fetch(e+"/stats",{headers:l()}).then((function(e){return e.json()})).then((function(e){document.getElementById("statTotal").textContent=c(e.total_vehicles),document.getElementById("statOverdue").textContent=c(e.overdue_count),document.getElementById("statUpcoming").textContent=c(e.upcoming_this_month),document.getElementById("statCost").textContent=i(e.total_cost_month)})).catch((function(){}))}function s(){var t=(document.getElementById("searchInput")||{}).value||"",o=e+"/vehicles?page="+a+"&per_page=50";t&&(o+="&q="+encodeURIComponent(t)),fetch(o,{headers:l()}).then((function(e){return e.json()})).then((function(e){var t;(function(e){var t=document.getElementById("vehicleGrid");if(!e.length)return void(t.innerHTML='<div class="empty-state"><div class="empty-state__icon">&#x1F69A;</div><div class="empty-state__text">No hay vehiculos registrados</div><button class="btn btn--primary" onclick="Fleet.openVehicleModal()">+ Agregar Vehiculo</button></div>');var n="";e.forEach((function(e){var t=(e.make||"")+" "+(e.model||"");e.year&&(t+=" "+e.year),n+='<div class="vehicle-card" onclick="Fleet.viewVehicle('+e.id+')"><div class="vehicle-card__header"><span class="vehicle-card__plate">'+d(e.plate||"SIN PLACA")+'</span><span class="badge '+(e.is_active?"badge--active":"badge--inactive")+'">'+(e.is_active?"Activo":"Inactivo")+'</span></div><div class="vehicle-card__info"><div><strong>'+d(t.trim())+"</strong></div>"+(e.owner_name?"<div>"+d(e.owner_name)+"</div>":"")+(e.color?"<div>Color: "+d(e.color)+"</div>":"")+'</div><div class="vehicle-card__footer"><span>'+c(e.current_mileage)+" km</span><span>"+d(e.fuel_type||"")+"</span></div></div>"})),t.innerHTML=n})(n=e.data||[]),function(e){var t=document.getElementById("vehiclePagination");if(!e||e.total_pages<=1)return void(t.innerHTML="");t.innerHTML='<button class="pagination__btn" '+(e.page<=1?"disabled":"")+' onclick="Fleet.goPage('+(e.page-1)+')">&laquo; Anterior</button><span class="pagination__info">Pagina '+e.page+" de "+e.total_pages+" ("+e.total+' vehiculos)</span><button class="pagination__btn" '+(e.page>=e.total_pages?"disabled":"")+' onclick="Fleet.goPage('+(e.page+1)+')">Siguiente &raquo;</button>'}(e.pagination),t='<option value="">-- Seleccionar vehiculo --</option>',n.forEach((function(e){var n=(e.plate||"S/P")+" - "+(e.make||"")+" "+(e.model||"");t+='<option value="'+e.id+'">'+d(n.trim())+"</option>"})),["schedVehicleSelect","logVehicleSelect"].forEach((function(e){var n=document.getElementById(e);n&&(n.innerHTML=t)}))})).catch((function(){document.getElementById("vehicleGrid").innerHTML='<div class="empty-state"><div class="empty-state__text">Error al cargar vehiculos</div></div>'}))}function m(e){var t=document.getElementById("vehicleModal"),n=document.getElementById("vehicleModalTitle");e&&e.id?(n.textContent="Editar Vehiculo",document.getElementById("vehEditId").value=e.id,document.getElementById("vehPlate").value=e.plate||"",document.getElementById("vehVin").value=e.vin||"",document.getElementById("vehMake").value=e.make||"",document.getElementById("vehModel").value=e.model||"",document.getElementById("vehYear").value=e.year||"",document.getElementById("vehMileage").value=e.current_mileage||0,document.getElementById("vehFuel").value=e.fuel_type||"gasolina",document.getElementById("vehColor").value=e.color||"",document.getElementById("vehOwner").value=e.owner_name||"",document.getElementById("vehNotes").value=e.notes||""):(n.textContent="Nuevo Vehiculo",document.getElementById("vehEditId").value="",["vehPlate","vehVin","vehMake","vehModel","vehYear","vehColor","vehOwner","vehNotes"].forEach((function(e){document.getElementById(e).value=""})),document.getElementById("vehMileage").value="0",document.getElementById("vehFuel").value="gasolina"),t.classList.add("is-open")}function v(){document.getElementById("vehicleModal").classList.remove("is-open")}function h(){fetch(e+"/vehicles?per_page=200",{headers:l()}).then((function(e){return e.json()})).then((function(t){var n=(t.data||[]).map((function(t){return fetch(e+"/vehicles/"+t.id+"/schedules",{headers:l()}).then((function(e){return e.json()})).then((function(e){return{vehicle:t,schedules:e.data||[]}}))}));return Promise.all(n)})).then((function(e){!function(e){var t=document.getElementById("maintBody"),n=[];if(e.forEach((function(e){e.schedules.forEach((function(t){n.push({vehicle:e.vehicle,schedule:t})}))})),!n.length)return void(t.innerHTML='<tr><td colspan="7" style="text-align:center;padding:var(--space-6);color:var(--color-text-muted);">No hay programas de mantenimiento.<br><button class="btn btn--primary btn--sm" style="margin-top:var(--space-3);" onclick="Fleet.openScheduleModal()">+ Crear Programa</button></td></tr>');p||(p=new VirtualScroll({container:t,rowHeight:64,buffer:3,renderRow:g,emptyHtml:'<tr><td colspan="7" style="text-align:center;padding:var(--space-6);color:var(--color-text-muted);">No hay programas de mantenimiento.</td></tr>'}));p.setData(n)}(e)})).catch((function(){document.getElementById("maintBody").innerHTML='<tr><td colspan="7" style="text-align:center;color:var(--color-text-muted);">Error al cargar</td></tr>'}))}function g(e){var t=e.vehicle,n=e.schedule,a=new Date,o=!1;n.next_due_at&&new Date(n.next_due_at)<a&&(o=!0),n.next_due_km&&n.next_due_km<=t.current_mileage&&(o=!0);var l="";n.interval_km&&(l+=c(n.interval_km)+" km"),n.interval_km&&n.interval_months&&(l+=" / "),n.interval_months&&(l+=n.interval_months+" meses");var i="";return n.next_due_at&&(i+=r(n.next_due_at)),n.next_due_at&&n.next_due_km&&(i+=" / "),n.next_due_km&&(i+=c(n.next_due_km)+" km"),"<tr><td><strong>"+d(t.plate||"S/P")+'</strong><br><span style="font-size:var(--text-caption);color:var(--color-text-muted);">'+d((t.make||"")+" "+(t.model||""))+"</span></td><td>"+d(n.maintenance_type)+'</td><td class="mono">'+(l||"—")+"</td><td>"+r(n.last_done_at)+(n.last_done_km?'<br><span class="mono" style="font-size:var(--text-caption);">'+c(n.last_done_km)+" km</span>":"")+"</td><td>"+(i||"—")+'</td><td><span class="badge '+(o?"badge--overdue":"badge--active")+'">'+(o?"Vencido":"Al dia")+'</span></td><td><button class="btn btn--sm btn--ghost" onclick="Fleet.openLogModalFor('+t.id+","+n.id+",'"+d(n.maintenance_type)+"')\">Registrar</button></td></tr>"}var p=null;function y(){fetch(e+"/vehicles?per_page=200",{headers:l()}).then((function(e){return e.json()})).then((function(t){var n=(t.data||[]).map((function(t){return fetch(e+"/vehicles/"+t.id,{headers:l()}).then((function(e){return e.json()})).then((function(e){return{vehicle:t,logs:e.recent_logs||[]}}))}));return Promise.all(n)})).then((function(e){!function(e){var t=document.getElementById("historyBody"),n=[];if(e.forEach((function(e){e.logs.forEach((function(t){t._plate=e.vehicle.plate||"S/P",t._make=(e.vehicle.make||"")+" "+(e.vehicle.model||""),n.push(t)}))})),n.sort((function(e,t){return new Date(t.created_at)-new Date(e.created_at)})),!n.length)return void(t.innerHTML='<tr><td colspan="7" style="text-align:center;padding:var(--space-6);color:var(--color-text-muted);">No hay registros de mantenimiento</td></tr>');_||(_=new VirtualScroll({container:t,rowHeight:48,buffer:3,renderRow:f,emptyHtml:'<tr><td colspan="7" style="text-align:center;padding:var(--space-6);color:var(--color-text-muted);">No hay registros de mantenimiento</td></tr>'}));_.setData(n)}(e)})).catch((function(){document.getElementById("historyBody").innerHTML='<tr><td colspan="7" style="text-align:center;color:var(--color-text-muted);">Error al cargar</td></tr>'}))}function f(e){return"<tr><td>"+r(e.created_at)+"</td><td><strong>"+d(e._plate)+'</strong><br><span style="font-size:var(--text-caption);color:var(--color-text-muted);">'+d(e._make)+"</span></td><td>"+d(e.maintenance_type)+'</td><td class="mono">'+c(e.mileage_at)+'</td><td class="mono">'+i(e.cost)+"</td><td>"+d(e.employee_name||"—")+'</td><td style="max-width:200px;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;">'+d(e.notes||"—")+"</td></tr>"}var _=null;function E(){fetch(e+"/alerts",{headers:l()}).then((function(e){return e.json()})).then((function(e){!function(e){var t=document.getElementById("alertsList");if(!e.length)return void(t.innerHTML='<div class="empty-state"><div class="empty-state__icon" style="color:#3FB950;">&#10003;</div><div class="empty-state__text">No hay mantenimientos vencidos</div></div>');var n="";e.forEach((function(e){var t="";e.next_due_at&&(t+="Vencio: "+r(e.next_due_at)),e.next_due_km&&(t+=(t?" | ":"")+"Limite: "+c(e.next_due_km)+" km (actual: "+c(e.current_mileage)+" km)"),n+='<div class="alert-card"><div class="alert-card__info"><div class="alert-card__vehicle">'+d(e.plate||"S/P")+" — "+d((e.make||"")+" "+(e.model||""))+(e.year?" "+e.year:"")+'</div><div class="alert-card__detail"><span class="badge badge--overdue">'+d(e.maintenance_type)+"</span> &nbsp; "+t+'</div></div><button class="btn btn--sm btn--primary" onclick="Fleet.openLogModalFor('+e.vehicle_id+","+e.schedule_id+",'"+d(e.maintenance_type)+"')\">Registrar Mant.</button></div>"})),t.innerHTML=n}(e.data||[])})).catch((function(){document.getElementById("alertsList").innerHTML='<div class="empty-state"><div class="empty-state__text">Error al cargar alertas</div></div>'}))}function I(){document.getElementById("scheduleModal").classList.remove("is-open")}function B(){var e=document.getElementById("logModal");document.getElementById("logScheduleSelect").innerHTML='<option value="">-- Sin programa --</option>',document.getElementById("logType").value="",document.getElementById("logMileage").value="",document.getElementById("logCost").value="",document.getElementById("logParts").value="",document.getElementById("logNotes").value="",e.classList.add("is-open")}function b(){document.getElementById("logModal").classList.remove("is-open")}return document.addEventListener("DOMContentLoaded",(function(){document.querySelectorAll(".tab-btn").forEach((function(e){e.addEventListener("click",(function(){var e=this.getAttribute("data-tab");document.querySelectorAll(".tab-btn").forEach((function(e){e.classList.remove("is-active")})),document.querySelectorAll(".tab-panel").forEach((function(e){e.classList.remove("is-active")})),this.classList.add("is-active"),document.getElementById("tab-"+e).classList.add("is-active"),"maintenance"===e&&h(),"history"===e&&y(),"alerts"===e&&E()}))}));var e=document.getElementById("searchInput");e&&e.addEventListener("input",(function(){clearTimeout(o),o=setTimeout((function(){a=1,s()}),300)})),document.getElementById("btnNewVehicle").addEventListener("click",(function(){m()})),u(),s()})),{openVehicleModal:m,closeVehicleModal:v,saveVehicle:function(){var t=document.getElementById("vehEditId").value,n={plate:document.getElementById("vehPlate").value.trim(),vin:document.getElementById("vehVin").value.trim(),make:document.getElementById("vehMake").value.trim(),model:document.getElementById("vehModel").value.trim(),year:parseInt(document.getElementById("vehYear").value)||null,current_mileage:parseInt(document.getElementById("vehMileage").value)||0,fuel_type:document.getElementById("vehFuel").value,color:document.getElementById("vehColor").value.trim(),owner_name:document.getElementById("vehOwner").value.trim(),notes:document.getElementById("vehNotes").value.trim()};if(n.plate||n.vin){var a=e+"/vehicles",o="POST";t&&(a+="/"+t,o="PUT"),fetch(a,{method:o,headers:l(),body:JSON.stringify(n)}).then((function(e){return e.json()})).then((function(e){e.error?alert(e.error):(v(),s(),u())})).catch((function(e){alert("Error: "+e.message)}))}else alert("Se requiere placa o VIN")},viewVehicle:function(t){fetch(e+"/vehicles/"+t,{headers:l()}).then((function(e){return e.json()})).then((function(e){m(e)}))},goPage:function(e){a=e,s()},openScheduleModal:function(e){var t=document.getElementById("scheduleModal");document.getElementById("schedType").value="",document.getElementById("schedIntervalKm").value="",document.getElementById("schedIntervalMonths").value="",document.getElementById("schedNextDate").value="",document.getElementById("schedNextKm").value="",document.getElementById("schedNotes").value="",e&&(document.getElementById("schedVehicleSelect").value=e),t.classList.add("is-open")},closeScheduleModal:I,saveSchedule:function(){var t=document.getElementById("schedVehicleSelect").value;if(t){var n=document.getElementById("schedType").value.trim();if(n){var a={maintenance_type:n,interval_km:parseInt(document.getElementById("schedIntervalKm").value)||null,interval_months:parseInt(document.getElementById("schedIntervalMonths").value)||null,next_due_at:document.getElementById("schedNextDate").value||null,next_due_km:parseInt(document.getElementById("schedNextKm").value)||null,notes:document.getElementById("schedNotes").value.trim()};fetch(e+"/vehicles/"+t+"/schedules",{method:"POST",headers:l(),body:JSON.stringify(a)}).then((function(e){return e.json()})).then((function(e){e.error?alert(e.error):(I(),h(),u())})).catch((function(e){alert("Error: "+e.message)}))}else alert("Ingrese el tipo de mantenimiento")}else alert("Seleccione un vehiculo")},openLogModal:B,openLogModalFor:function(t,a,o){B(),document.getElementById("logVehicleSelect").value=t,o&&(document.getElementById("logType").value=o),fetch(e+"/vehicles/"+t+"/schedules",{headers:l()}).then((function(e){return e.json()})).then((function(e){var t='<option value="">-- Sin programa --</option>';(e.data||[]).forEach((function(e){var n=e.id==a?" selected":"";t+='<option value="'+e.id+'"'+n+">"+d(e.maintenance_type)+"</option>"})),document.getElementById("logScheduleSelect").innerHTML=t}));var c=n.find((function(e){return e.id==t}));c&&(document.getElementById("logMileage").value=c.current_mileage||"")},closeLogModal:b,saveLog:function(){var t=document.getElementById("logVehicleSelect").value;if(t){var n=document.getElementById("logType").value.trim();if(n){var a={schedule_id:parseInt(document.getElementById("logScheduleSelect").value)||null,maintenance_type:n,mileage_at:parseInt(document.getElementById("logMileage").value)||null,cost:parseFloat(document.getElementById("logCost").value)||0,parts_used:document.getElementById("logParts").value.trim(),notes:document.getElementById("logNotes").value.trim()};fetch(e+"/vehicles/"+t+"/log",{method:"POST",headers:l(),body:JSON.stringify(a)}).then((function(e){return e.json()})).then((function(e){if(e.error)alert(e.error);else{b(),u();var t=document.querySelector(".tab-btn.is-active");if(t){var n=t.getAttribute("data-tab");"maintenance"===n&&h(),"history"===n&&y(),"alerts"===n&&E(),"vehicles"===n&&s()}}})).catch((function(e){alert("Error: "+e.message)}))}else alert("Ingrese el tipo de mantenimiento")}else alert("Seleccione un vehiculo")}}}();
\ No newline at end of file
diff --git a/pos/static/js/inventory.js b/pos/static/js/inventory.js
index ea326a1..75b66bb 100644
--- a/pos/static/js/inventory.js
+++ b/pos/static/js/inventory.js
@@ -47,6 +47,95 @@
         return d.innerHTML;
     }
 
+    // --- Dashboard summary badges ---
+    function loadSummary() {
+        var skeletonHtml = '<div class="skeleton skeleton--text" style="width:80%;"></div>';
+        ['inv-total-skus','inv-total-value','inv-low-stock','inv-no-movement'].forEach(function(id) {
+            var el = document.getElementById(id);
+            if (el) el.innerHTML = skeletonHtml;
+        });
+        apiFetch(API + '/summary').then(function(data) {
+            if (!data) return;
+            var totalSkusEl = document.getElementById('inv-total-skus');
+            var totalValueEl = document.getElementById('inv-total-value');
+            var lowStockEl = document.getElementById('inv-low-stock');
+            var noMovementEl = document.getElementById('inv-no-movement');
+            if (totalSkusEl) totalSkusEl.textContent = (data.total_skus || 0).toLocaleString('es-MX');
+            if (totalValueEl) totalValueEl.textContent = '$' + (data.total_value || 0).toLocaleString('es-MX', {minimumFractionDigits: 2, maximumFractionDigits: 2});
+            if (lowStockEl) lowStockEl.textContent = (data.low_stock || 0).toLocaleString('es-MX');
+            if (noMovementEl) noMovementEl.textContent = (data.no_movement || 0).toLocaleString('es-MX');
+        }).catch(function(err) {
+            console.error('Inventory summary load failed:', err);
+        });
+    }
+    loadSummary();
+
+    // --- Global tier discounts ---
+    var globalDiscounts = { 2: 15, 3: 25 };
+    function loadTierDiscounts() {
+        apiFetch(API + '/tier-discounts').then(function(data) {
+            if (data && data.data) {
+                data.data.forEach(function(d) {
+                    globalDiscounts[d.tier_id] = d.discount_pct;
+                });
+            }
+            var discEl = document.getElementById('tierDiscountBadge');
+            if (discEl) {
+                discEl.textContent = 'Taller -' + globalDiscounts[2] + '% · Mayoreo -' + globalDiscounts[3] + '%';
+            }
+        });
+    }
+    loadTierDiscounts();
+
+    function showTierDiscountModal() {
+        document.getElementById('tierDisc2').value = globalDiscounts[2];
+        document.getElementById('tierDisc3').value = globalDiscounts[3];
+        document.getElementById('tierDiscountModal').classList.add('is-open');
+    }
+    function closeTierDiscountModal() {
+        document.getElementById('tierDiscountModal').classList.remove('is-open');
+    }
+    function saveTierDiscounts() {
+        var d2 = parseFloat(document.getElementById('tierDisc2').value) || 0;
+        var d3 = parseFloat(document.getElementById('tierDisc3').value) || 0;
+        fetch(API + '/tier-discounts', {
+            method: 'PUT',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ discount_pct_2: d2, discount_pct_3: d3 })
+        }).then(function(r) { return r.json(); })
+          .then(function(res) {
+              showToast(res.message || 'Guardado', 'ok');
+              globalDiscounts[2] = d2;
+              globalDiscounts[3] = d3;
+              var discEl = document.getElementById('tierDiscountBadge');
+              if (discEl) {
+                  discEl.textContent = 'Taller -' + d2 + '% · Mayoreo -' + d3 + '%';
+              }
+              closeTierDiscountModal();
+          }).catch(function() {
+              showToast('Error al guardar descuentos', 'error');
+          });
+    }
+
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === 'function') {
+        registerCmdKItem({ group: 'Inventario', label: 'Ver stock', href: '/pos/inventory#stock', icon: '📦' });
+        registerCmdKItem({ group: 'Inventario', label: 'Alertas de stock', href: '/pos/inventory#alertas', icon: '⚠️' });
+        registerCmdKItem({ group: 'Inventario', label: 'Entradas de mercancía', href: '/pos/inventory#entradas', icon: '📥' });
+        registerCmdKItem({ group: 'Inventario', label: 'Salidas / Ventas', href: '/pos/inventory#salidas', icon: '📤' });
+        registerCmdKItem({ group: 'Inventario', label: 'Traspasos', href: '/pos/inventory#traspasos', icon: '🚚' });
+        registerCmdKItem({ group: 'Inventario', label: 'Ajustes', href: '/pos/inventory#ajustes', icon: '⚙️' });
+        registerCmdKItem({ group: 'Inventario', label: 'Conteos físicos', href: '/pos/inventory#conteos', icon: '🔢' });
+    }
+
+    // Handle hash-based tab switching (e.g. /pos/inventory#alertas)
+    (function handleHashTab() {
+        var hash = window.location.hash.replace('#', '');
+        if (hash && ['stock', 'entradas', 'salidas', 'traspasos', 'ajustes', 'conteos', 'alertas'].indexOf(hash) !== -1) {
+            setTimeout(function() { switchTab(hash); }, 100);
+        }
+    })();
+
     // =====================================================================
     //  TAB SWITCHING — uses design-system switchTab() already in the HTML.
     //  We hook into it to trigger data loads when tabs are activated.
@@ -63,8 +152,12 @@
     //  STOCK / PRODUCTS  (panel-stock)
     // =====================================================================
 
+    var selectedItems = new Set();
+
     function renderInventoryRow(it) {
+        var isChecked = selectedItems.has(it.id) ? 'checked' : '';
         return '<tr style="cursor:pointer;" onclick="viewProductDetail(' + it.id + ')">' +
+            '<td onclick="event.stopPropagation();"><input type="checkbox" class="item-checkbox" data-id="' + it.id + '" ' + isChecked + ' onclick="event.stopPropagation();toggleItemSelection(' + it.id + ')"></td>' +
             '<td class="td--mono" style="font-size:var(--text-caption);color:var(--color-text-muted);">' + it.id + '</td>' +
             '<td class="td--mono">' + esc(it.barcode) + '</td>' +
             '<td class="td--mono">' + esc(it.part_number) + '</td>' +
@@ -79,23 +172,70 @@
             '<td>' +
             '<button class="btn btn--ghost btn--sm" onclick="event.stopPropagation();viewHistory(' + it.id + ')">Historial</button> ' +
             '<button class="btn btn--ghost btn--sm" style="color:var(--color-accent);" onclick="event.stopPropagation();showPurchaseModalForItem(' + it.id + ')">Entrada</button> ' +
-            '<button class="btn btn--ghost btn--sm" onclick="event.stopPropagation();printBarcode(\'' + esc(it.barcode) + '\',\'' + esc(it.part_number) + '\',\'' + esc(it.name) + '\')">Etiqueta</button>' +
+            '<button class="btn btn--sm btn--meli" onclick="event.stopPropagation();publishToMeli(' + it.id + ')">ML</button> ' +
+            '<button class="btn btn--ghost btn--sm" onclick="event.stopPropagation();printBarcode(\'' + esc(it.barcode) + '\',\'' + esc(it.part_number) + '\',\'' + esc(it.name) + '\')">Etiqueta</button> ' +
+            '<button class="btn btn--ghost btn--sm" style="color:var(--color-error);" onclick="event.stopPropagation();deleteItem(' + it.id + ')">Eliminar</button>' +
             '</td></tr>';
     }
 
+    window.toggleItemSelection = function(id) {
+        if (selectedItems.has(id)) {
+            selectedItems.delete(id);
+        } else {
+            selectedItems.add(id);
+        }
+        updateSelectionUI();
+    };
+
+    window.toggleSelectAllItems = function() {
+        var cb = document.getElementById('selectAllItems');
+        var allChecked = cb.checked;
+        // We need to get all visible items from inventoryVS
+        if (inventoryVS && inventoryVS.data) {
+            inventoryVS.data.forEach(function(it) {
+                if (allChecked) selectedItems.add(it.id);
+                else selectedItems.delete(it.id);
+            });
+            inventoryVS.refresh();
+        }
+        updateSelectionUI();
+    };
+
+    function updateSelectionUI() {
+        var count = selectedItems.size;
+        var btn = document.getElementById('btnPublishML');
+        var badge = document.getElementById('meliSelectedCountBadge');
+        if (btn) btn.style.display = count > 0 ? 'inline-flex' : 'none';
+        if (badge) badge.textContent = count;
+        // Update select-all checkbox state
+        var selectAll = document.getElementById('selectAllItems');
+        if (selectAll && inventoryVS && inventoryVS.data) {
+            var visibleIds = inventoryVS.data.map(function(it) { return it.id; });
+            var allSelected = visibleIds.length > 0 && visibleIds.every(function(id) { return selectedItems.has(id); });
+            selectAll.checked = allSelected;
+        }
+    }
+
     function loadItems(page, search) {
         currentPage = page || 1;
         currentSearch = search !== undefined ? search : currentSearch;
         var params = new URLSearchParams({ page: currentPage, per_page: 50 });
         if (currentSearch) params.set('q', currentSearch);
 
+        var tbody = document.getElementById('productTableBody');
+        if (tbody) tbody.innerHTML = renderSkeletonRows(12, 8);
+
         apiFetch(API + '/items?' + params.toString()).then(function (data) {
             if (!data) return;
 
-            var tbody = document.getElementById('productTableBody');
             var items = data.data || [];
             if (!items.length) {
-                tbody.innerHTML = '<tr><td colspan="12" style="text-align:center;padding:30px;color:var(--color-text-muted);">Sin productos</td></tr>';
+                tbody.innerHTML = '<tr><td colspan="12">' + renderEmptyState({
+                    icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/></svg>',
+                    title: 'Sin productos',
+                    subtitle: currentSearch ? 'No se encontraron resultados para "' + esc(currentSearch) + '". Intenta con otro término.' : 'El inventario está vacío. Crea tu primer producto para empezar.',
+                    action: currentSearch ? '<button class="btn btn--ghost btn--sm" onclick="document.getElementById(\'productSearch\').value=\'\';loadItems(1,\'\')">Limpiar búsqueda</button>' : '<button class="btn btn--primary btn--sm" onclick="openCreateModal()">Crear producto</button>'
+                }) + '</td></tr>';
                 document.getElementById('productPagination').innerHTML = '';
                 return;
             }
@@ -106,10 +246,14 @@
                     rowHeight: 48,
                     buffer: 3,
                     renderRow: renderInventoryRow,
-                    emptyHtml: '<tr><td colspan="12" style="text-align:center;padding:30px;color:var(--color-text-muted);">Sin productos</td></tr>'
+                    emptyHtml: '<tr><td colspan="12">' + renderEmptyState({ title: 'Sin productos', subtitle: 'El inventario está vacío.' }) + '</td></tr>'
                 });
             }
             inventoryVS.setData(items);
+            // Make columns resizable
+            if (typeof makeTableResizable === 'function') {
+                makeTableResizable('#stockTable');
+            }
 
             // Pagination
             var pg = data.pagination || {};
@@ -143,8 +287,41 @@
     //  CREATE ITEM  (createModal)
     // =====================================================================
 
+    function loadCategories() {
+        var sel = document.getElementById('newCategory');
+        if (!sel) return;
+        apiFetch(API + '/categories').then(function(data) {
+            if (!data || !data.categories) return;
+            sel.innerHTML = '<option value="">Selecciona categoría</option>';
+            data.categories.forEach(function(c) {
+                sel.innerHTML += '<option value="' + c.id + '">' + esc(c.name) + '</option>';
+            });
+        });
+    }
+    window.loadCategories = loadCategories;
+
+    function onCategoryChange(categoryId) {
+        var subSel = document.getElementById('newSubcategory');
+        if (!subSel) return;
+        if (!categoryId) {
+            subSel.innerHTML = '<option value="">Selecciona categoría primero</option>';
+            subSel.disabled = true;
+            return;
+        }
+        apiFetch(API + '/categories/' + categoryId + '/subcategories').then(function(data) {
+            if (!data || !data.subcategories) return;
+            subSel.innerHTML = '<option value="">Selecciona subcategoría</option>';
+            data.subcategories.forEach(function(s) {
+                subSel.innerHTML += '<option value="' + s.id + '">' + esc(s.name) + '</option>';
+            });
+            subSel.disabled = false;
+        });
+    }
+    window.onCategoryChange = onCategoryChange;
+
     function showCreateModal() {
         document.getElementById('createModal').classList.add('is-open');
+        loadCategories();
         // Attach AI classification on part number blur
         var pnInput = document.getElementById('newPartNumber');
         if (pnInput && !pnInput._classifyBound) {
@@ -190,9 +367,15 @@
     function closeCreateModal() {
         document.getElementById('createModal').classList.remove('is-open');
         document.getElementById('createResult').innerHTML = '';
+        var catSel = document.getElementById('newCategory');
+        var subSel = document.getElementById('newSubcategory');
+        if (catSel) catSel.innerHTML = '<option value="">Selecciona categoría</option>';
+        if (subSel) { subSel.innerHTML = '<option value="">Selecciona categoría primero</option>'; subSel.disabled = true; }
     }
 
     function createItem() {
+        var elPrice2 = document.getElementById('newPrice2');
+        var elPrice3 = document.getElementById('newPrice3');
         var data = {
             part_number: document.getElementById('newPartNumber').value.trim(),
             name: document.getElementById('newName').value.trim(),
@@ -200,12 +383,24 @@
             barcode: document.getElementById('newBarcode').value.trim() || undefined,
             cost: parseFloat(document.getElementById('newCost').value) || 0,
             price_1: parseFloat(document.getElementById('newPrice1').value) || 0,
-            price_2: parseFloat(document.getElementById('newPrice2').value) || 0,
-            price_3: parseFloat(document.getElementById('newPrice3').value) || 0,
+            price_2: elPrice2 ? (parseFloat(elPrice2.value) || 0) : 0,
+            price_3: elPrice3 ? (parseFloat(elPrice3.value) || 0) : 0,
             min_stock: parseInt(document.getElementById('newMinStock').value) || 0,
             initial_stock: parseInt(document.getElementById('newInitialStock').value) || 0,
-            location: document.getElementById('newLocation').value.trim()
+            location: document.getElementById('newLocation').value.trim(),
+            sku_aliases: []
         };
+        var sku2 = document.getElementById('newSku2').value.trim();
+        var sku3 = document.getElementById('newSku3').value.trim();
+        var categoryId = document.getElementById('newCategory').value;
+        var subcategoryId = document.getElementById('newSubcategory').value;
+        if (sku2) data.sku_aliases.push({sku: sku2, label: 'Alternativo 1'});
+        if (sku3) data.sku_aliases.push({sku: sku3, label: 'Alternativo 2'});
+        if (subcategoryId) {
+            data.category_id = parseInt(subcategoryId);
+        } else if (categoryId) {
+            data.category_id = parseInt(categoryId);
+        }
         if (!data.part_number || !data.name) {
             document.getElementById('createResult').innerHTML = '<span style="color:var(--color-error);">Numero de parte y nombre son obligatorios</span>';
             return;
@@ -220,7 +415,7 @@
                 loadItems(currentPage);
                 // Close modal, clear form, refresh badges
                 closeCreateModal();
-                ['newPartNumber','newName','newBrand','newBarcode','newCost','newPrice1','newPrice2','newPrice3','newMinStock','newInitialStock','newLocation'].forEach(function(id) {
+                ['newPartNumber','newName','newBrand','newBarcode','newSku2','newSku3','newCost','newPrice1','newMinStock','newInitialStock','newLocation'].forEach(function(id) {
                     var el = document.getElementById(id);
                     if (el) el.value = '';
                 });
@@ -231,6 +426,54 @@
         });
     }
 
+    function submitBulkImport() {
+        var fileInput = document.getElementById('bulkImportFile');
+        var resultEl = document.getElementById('bulkImportResult');
+        var mode = document.getElementById('bulkImportMode').value;
+        var strategy = document.getElementById('bulkImportStrategy').value;
+        if (!fileInput.files || !fileInput.files[0]) {
+            resultEl.style.display = 'block';
+            resultEl.innerHTML = '<span style="color:var(--color-error);">Selecciona un archivo CSV o Excel.</span>';
+            return;
+        }
+        var file = fileInput.files[0];
+        var formData = new FormData();
+        formData.append('file', file);
+        resultEl.style.display = 'block';
+        resultEl.innerHTML = '<span style="color:var(--color-text-muted);">Importando...</span>';
+        fetch(API + '/items/bulk-import', {
+            method: 'POST',
+            headers: {
+                'Authorization': 'Bearer ' + token,
+                'X-Import-Mode': mode,
+                'X-Import-Strategy': strategy
+            },
+            body: formData
+        }).then(function(resp) { return resp.json(); }).then(function(data) {
+            if (data.error) {
+                resultEl.innerHTML = '<span style="color:var(--color-error);">' + esc(data.error) + '</span>';
+                return;
+            }
+            var html = '<div style="color:var(--color-success);">Importacion completada: <strong>' + data.created + '</strong> producto(s) creado(s)';
+            if (data.skipped > 0) html += ', <strong>' + data.skipped + '</strong> saltado(s)';
+            html += '</div>';
+            if (data.warnings && data.warnings.length) {
+                html += '<div style="margin-top:8px;max-height:160px;overflow:auto;background:var(--color-surface);padding:8px;border-radius:6px;font-size:var(--text-caption);">';
+                html += '<strong style="color:var(--color-warning);">Advertencias (' + data.warnings.length + '):</strong><ul style="margin:4px 0 0 16px;padding:0;">';
+                data.warnings.forEach(function(w) {
+                    html += '<li>' + esc(w) + '</li>';
+                });
+                html += '</ul></div>';
+            }
+            resultEl.innerHTML = html;
+            loadItems(currentPage);
+            if (window.loadInventoryStats) window.loadInventoryStats();
+        }).catch(function(err) {
+            resultEl.innerHTML = '<span style="color:var(--color-error);">Error de red: ' + esc(err.message) + '</span>';
+        });
+    }
+    window.submitBulkImport = submitBulkImport;
+
     // =====================================================================
     //  PURCHASE / ENTRADA  (purchaseModal)
     // =====================================================================
@@ -536,56 +779,78 @@
     // =====================================================================
 
     function loadAlerts() {
+        var container = document.getElementById('alertsContent');
+        if (container) container.innerHTML = '<div style="padding:var(--space-6);">' + renderEmptyState({
+            icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 0 0 1.71 3h16.94a2 2 0 0 0 1.71-3L13.71 3.86a2 2 0 0 0-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>',
+            title: 'Cargando alertas...',
+            subtitle: 'Revisando el estado del inventario'
+        }) + '</div>';
+
         apiFetch(API + '/alerts').then(function (data) {
             if (!data) return;
             var alerts = data.data || [];
-            var container = document.getElementById('alertsContent');
+            var counts = data.counts || {};
             if (!container) return;
 
             if (!alerts.length) {
-                container.innerHTML = '<p style="padding:var(--space-6);text-align:center;color:var(--color-text-muted);">Sin alertas activas</p>';
+                container.innerHTML = renderEmptyState({
+                    icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><path d="M22 11.08V12a10 10 0 1 1-5.93-9.14"/><polyline points="22 4 12 14.01 9 11.01"/></svg>',
+                    title: 'Todo en orden',
+                    subtitle: 'No hay alertas activas en el inventario. Los niveles de stock están dentro de los límites configurados.'
+                });
                 return;
             }
 
-            var html = '';
+            // Summary bar
+            var html = '<div style="display:flex;gap:var(--space-3);flex-wrap:wrap;margin-bottom:var(--space-6);padding:var(--space-4);background:var(--color-surface-2);border-radius:var(--radius-lg);">' +
+                '<div style="font-size:var(--text-sm);font-weight:700;">Resumen de alertas</div>' +
+                (counts.critical ? '<span class="badge badge--low">' + counts.critical + ' crítica' + (counts.critical !== 1 ? 's' : '') + '</span>' : '') +
+                (counts.warning ? '<span class="badge badge--over">' + counts.warning + ' advertencia' + (counts.warning !== 1 ? 's' : '') + '</span>' : '') +
+                (counts.info ? '<span class="badge badge--ok">' + counts.info + ' informativa' + (counts.info !== 1 ? 's' : '') + '</span>' : '') +
+                '</div>';
 
             // Group by severity
             var critical = alerts.filter(function (a) { return a.severity === 'critical'; });
             var warning = alerts.filter(function (a) { return a.severity === 'warning'; });
             var info = alerts.filter(function (a) { return a.severity !== 'critical' && a.severity !== 'warning'; });
 
-            if (critical.length) {
-                html += '<div class="section-heading"><span class="section-heading__title">Criticas</span><div class="section-heading__line"></div><span class="badge badge--low">' + critical.length + '</span></div>';
-                html += '<div class="alerts-grid" style="margin-bottom:var(--space-6);">';
-                critical.forEach(function (a) {
-                    var icon = a.type === 'zero' ? 'AGOTADO' : (a.type === 'low' ? 'BAJO' : a.type.toUpperCase());
-                    html += buildAlertCard(a, icon, 'critical');
-                });
-                html += '</div>';
-            }
-
-            if (warning.length) {
-                html += '<div class="section-heading"><span class="section-heading__title">Advertencias</span><div class="section-heading__line"></div><span class="badge badge--over">' + warning.length + '</span></div>';
-                html += '<div class="alerts-grid" style="margin-bottom:var(--space-6);">';
-                warning.forEach(function (a) {
-                    html += buildAlertCard(a, 'EXCESO', 'warning');
-                });
-                html += '</div>';
-            }
-
-            if (info.length) {
-                html += '<div class="section-heading"><span class="section-heading__title">Informativas</span><div class="section-heading__line"></div><span class="badge badge--ok">' + info.length + '</span></div>';
-                html += '<div class="alerts-grid" style="margin-bottom:var(--space-6);">';
-                info.forEach(function (a) {
-                    html += buildAlertCard(a, 'INFO', 'info');
-                });
-                html += '</div>';
-            }
+            html += renderAlertSection('Criticas', critical, 'critical', 'badge--low');
+            html += renderAlertSection('Advertencias', warning, 'warning', 'badge--over');
+            html += renderAlertSection('Informativas', info, 'info', 'badge--ok');
 
             container.innerHTML = html;
         });
     }
 
+    function renderAlertSection(title, alerts, level, badgeClass) {
+        if (!alerts.length) return '';
+        var initialLimit = 30;
+        var showAll = window._alertsShowAll && window._alertsShowAll[level];
+        var display = showAll ? alerts : alerts.slice(0, initialLimit);
+        var remaining = alerts.length - display.length;
+
+        var html = '<div class="section-heading"><span class="section-heading__title">' + title + '</span><div class="section-heading__line"></div><span class="badge ' + badgeClass + '">' + alerts.length + '</span></div>';
+        html += '<div class="alerts-grid" style="margin-bottom:var(--space-6);">';
+        display.forEach(function (a) {
+            var icon = a.type === 'zero' ? 'AGOTADO' : (a.type === 'low' ? 'BAJO' : a.type.toUpperCase());
+            html += buildAlertCard(a, icon, level);
+        });
+        html += '</div>';
+
+        if (remaining > 0) {
+            html += '<div style="text-align:center;margin-bottom:var(--space-6);">' +
+                '<button class="btn btn--ghost btn--sm" onclick="window._showMoreAlerts(\'' + level + '\')">Ver ' + remaining + ' más</button>' +
+                '</div>';
+        }
+        return html;
+    }
+
+    window._showMoreAlerts = function(level) {
+        window._alertsShowAll = window._alertsShowAll || {};
+        window._alertsShowAll[level] = true;
+        loadAlerts();
+    };
+
     function buildAlertCard(a, icon, level) {
         var cls = level === 'critical' ? 'alert-card--critical' : (level === 'warning' ? 'alert-card--warning' : 'alert-card--info');
         return '<div class="alert-card ' + cls + '">' +
@@ -609,7 +874,11 @@
             var history = data.data || [];
             var html = '';
             if (!history.length) {
-                html = '<p style="color:var(--color-text-muted);text-align:center;padding:var(--space-4);">Sin movimientos</p>';
+                html = renderEmptyState({
+                    icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="4" width="18" height="18" rx="2" ry="2"/><line x1="16" y1="2" x2="16" y2="6"/><line x1="8" y1="2" x2="8" y2="6"/><line x1="3" y1="10" x2="21" y2="10"/></svg>',
+                    title: 'Sin movimientos',
+                    subtitle: 'Este producto aún no tiene historial de entradas, salidas ni ajustes.'
+                });
             } else {
                 html = '<table class="data-table"><thead><tr><th>Fecha</th><th>Tipo</th><th>Cantidad</th><th>Costo</th><th>Empleado</th><th>Notas</th></tr></thead><tbody>';
                 history.forEach(function (h) {
@@ -634,6 +903,474 @@
         document.getElementById('historyModal').classList.remove('is-open');
     }
 
+    // =====================================================================
+    //  DELETE ITEM
+    // =====================================================================
+
+    function deleteItem(itemId) {
+        if (!confirm('¿Eliminar este artículo del inventario? Se mantendrán los registros históricos.')) return;
+        var token = localStorage.getItem('pos_token') || '';
+        fetch(API + '/items/' + itemId, {
+            method: 'DELETE',
+            headers: token ? { 'Authorization': 'Bearer ' + token } : {}
+        }).then(function(r) { return r.json(); })
+          .then(function(data) {
+              if (data.error) { showToast(data.error, 'error', { title: 'Error al eliminar' }); return; }
+              showToast('El artículo fue eliminado correctamente.', 'ok', { title: 'Eliminado' });
+              loadItems(currentPage);
+              if (window.loadInventoryStats) window.loadInventoryStats();
+          }).catch(function() { showToast('No se pudo eliminar el artículo. Intenta de nuevo.', 'error', { title: 'Error' }); });
+    }
+
+    // =====================================================================
+    //  MERCADOLIBRE PUBLISH
+    // =====================================================================
+
+    function publishToMeli(itemId) {
+        selectedItems.clear();
+        selectedItems.add(itemId);
+        updateSelectionUI();
+        openMeliPublishModal();
+    }
+    window.publishToMeli = publishToMeli;
+
+    // ─── MercadoLibre Bulk Publish Modal ───────────────────────────────────
+
+    var meliPreviewData = {};
+    var meliCategoryAttrs = [];
+
+    window.openMeliPublishModal = function() {
+        if (selectedItems.size === 0) { showToast('Selecciona al menos un producto', 'warn'); return; }
+        document.getElementById('meliPublishModal').classList.add('is-open');
+        document.getElementById('meliPublishResult').innerHTML = '';
+        document.getElementById('meliCategoryId').value = '';
+        document.getElementById('meliCategorySearch').value = '';
+        document.getElementById('meliCategoryResults').innerHTML = '';
+        document.getElementById('meliAttrsSection').style.display = 'none';
+        document.getElementById('meliAttrsGrid').innerHTML = '';
+        meliCategoryAttrs = [];
+        refreshMeliPublishPreview();
+    };
+
+    window.closeMeliPublishModal = function() {
+        document.getElementById('meliPublishModal').classList.remove('is-open');
+    };
+
+    function refreshMeliPublishPreview() {
+        var container = document.getElementById('meliPublishItemsPreview');
+        var countEl = document.getElementById('meliPublishSelectedCount');
+        countEl.textContent = selectedItems.size + ' producto(s) seleccionado(s)';
+        container.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Cargando verificaciones...</p>';
+
+        var ids = Array.from(selectedItems);
+        fetch('/pos/api/marketplace-ext/inventory-check', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ inventory_ids: ids })
+        }).then(function(r){ return r.json(); })
+          .then(function(data) {
+              if (!data.items) { container.innerHTML = '<p style="color:var(--color-error);">Error cargando preview</p>'; return; }
+              var html = '';
+              data.items.forEach(function(it) {
+                  if (!it.exists) {
+                      html += '<div class="meli-preview-card" style="opacity:0.6;"><div style="color:var(--color-error);">Item #' + it.inventory_id + ' no encontrado</div></div>';
+                      return;
+                  }
+                  meliPreviewData[it.inventory_id] = it;
+                  var checks = '';
+                  checks += '<span class="meli-check ' + (it.has_image ? 'ok' : 'fail') + '">' + (it.has_image ? '✅' : '❌') + ' Imagen</span>';
+                  checks += '<span class="meli-check ' + (it.has_stock ? 'ok' : 'fail') + '">' + (it.has_stock ? '✅' : '❌') + ' Stock</span>';
+                  checks += '<span class="meli-check ' + (it.has_price ? 'ok' : 'fail') + '">' + (it.has_price ? '✅' : '❌') + ' Precio</span>';
+                  if (it.already_published) {
+                      checks += '<span class="meli-check ok">✅ <a href="' + esc(it.existing_listing.permalink || '#') + '" target="_blank" style="color:var(--color-success);text-decoration:underline;">Ya publicado (' + esc(it.existing_listing.status) + ')</a></span>';
+                  }
+                  var imgSrc = it.image_url || '';
+                  var imgHtml = imgSrc ? '<img src="' + esc(imgSrc) + '" alt="" onerror="this.style.display=\'none\'">' : '<div style="width:56px;height:56px;background:var(--color-surface-2);border-radius:var(--radius-sm);display:flex;align-items:center;justify-content:center;font-size:10px;color:var(--color-text-muted);">Sin img</div>';
+                  if (!it.has_image) {
+                      imgHtml = '<div class="meli-img-upload" onclick="document.getElementById(\'meliImgUpload-' + it.inventory_id + '\').click()">' +
+                          '<div style="font-size:10px;">+ Subir</div>' +
+                          '<input type="file" id="meliImgUpload-' + it.inventory_id + '" accept="image/*" onchange="handleMeliImageUpload(' + it.inventory_id + ', this)">' +
+                          '</div>';
+                  }
+                  html += '<div class="meli-preview-card" id="meliCard-' + it.inventory_id + '">' +
+                      imgHtml +
+                      '<div>' +
+                          '<input type="text" class="meli-title-input" id="meliTitle-' + it.inventory_id + '" value="' + esc(it.title) + '" maxlength="60" oninput="updateMeliTitleCount(' + it.inventory_id + ')">' +
+                          '<div style="font-size:10px;color:var(--color-text-muted);text-align:right;" id="meliTitleCount-' + it.inventory_id + '">' + it.title.length + '/60</div>' +
+                          '<div class="meli-checks-row">' + checks + '</div>' +
+                      '</div>' +
+                      '<div><label style="font-size:10px;color:var(--color-text-muted);">Precio</label><input type="number" class="meli-num-input" id="meliPrice-' + it.inventory_id + '" value="' + it.price + '"></div>' +
+                      '<div><label style="font-size:10px;color:var(--color-text-muted);">Stock</label><input type="number" class="meli-num-input" id="meliStock-' + it.inventory_id + '" value="' + it.stock + '"></div>' +
+                      '</div>';
+              });
+              container.innerHTML = html;
+          }).catch(function() { container.innerHTML = '<p style="color:var(--color-error);">Error de red</p>'; });
+    }
+
+    window.updateMeliTitleCount = function(id) {
+        var el = document.getElementById('meliTitle-' + id);
+        var countEl = document.getElementById('meliTitleCount-' + id);
+        if (el && countEl) countEl.textContent = el.value.length + '/60';
+    };
+
+    window.handleMeliImageUpload = function(itemId, input) {
+        if (!input.files || !input.files[0]) return;
+        var file = input.files[0];
+        var formData = new FormData();
+        formData.append('file', file);
+        fetch('/pos/api/inventory/items/' + itemId + '/image', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token },
+            body: formData
+        }).then(function(r){ return r.json(); })
+          .then(function(data) {
+              if (data.image_url) {
+                  showToast('Imagen subida', 'success');
+                  refreshMeliPublishPreview();
+                  if (inventoryVS) inventoryVS.refresh();
+              } else {
+                  showToast(data.error || 'Error subiendo imagen', 'error');
+              }
+          }).catch(function(){ showToast('Error de red', 'error'); });
+    };
+
+    var meliCategorySearchTimeout;
+    var meliCatItems = [];
+    var meliCatActiveIndex = -1;
+
+    window.searchMeliCategories = function() {
+        var q = document.getElementById('meliCategorySearch').value.trim();
+        var resultsDiv = document.getElementById('meliCategoryResults');
+        if (q.length < 2) { resultsDiv.innerHTML = ''; meliCatItems = []; meliCatActiveIndex = -1; return; }
+        clearTimeout(meliCategorySearchTimeout);
+        resultsDiv.innerHTML = '<div class="meli-cat-dropdown"><div class="meli-cat-loading">Buscando...</div></div>';
+        meliCategorySearchTimeout = setTimeout(function() {
+            fetch('/pos/api/marketplace-ext/categories?q=' + encodeURIComponent(q), { headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' } })
+                .then(function(r) { return r.json(); })
+                .then(function(data) {
+                    var cats = data.categories || [];
+                    meliCatItems = cats.slice(0, 10);
+                    meliCatActiveIndex = -1;
+                    if (!meliCatItems.length) { resultsDiv.innerHTML = '<div class="meli-cat-dropdown"><div class="meli-cat-empty">Sin resultados</div></div>'; return; }
+                    var html = '<div class="meli-cat-dropdown">';
+                    meliCatItems.forEach(function(c, idx) {
+                        html += '<div class="meli-cat-item" data-idx="' + idx + '" onmouseenter="highlightMeliCat(' + idx + ')" onmousedown="selectMeliCategoryIdx(' + idx + ')">' +
+                            '<span>' + esc(c.category_name || c.category_id) + '</span>' +
+                            '<span class="cat-id">' + esc(c.category_id) + '</span>' +
+                            '</div>';
+                    });
+                    html += '</div>';
+                    resultsDiv.innerHTML = html;
+                })
+                .catch(function() { resultsDiv.innerHTML = ''; meliCatItems = []; meliCatActiveIndex = -1; });
+        }, 300);
+    };
+
+    window.highlightMeliCat = function(idx) {
+        meliCatActiveIndex = idx;
+        var items = document.querySelectorAll('.meli-cat-item');
+        items.forEach(function(el, i) { el.classList.toggle('is-active', i === idx); });
+    };
+
+    window.selectMeliCategoryIdx = function(idx) {
+        var c = meliCatItems[idx];
+        if (!c) return;
+        selectMeliCategory(c.category_id, c.category_name || c.category_id);
+    };
+
+    window.selectMeliCategory = function(id, name) {
+        document.getElementById('meliCategoryId').value = id;
+        document.getElementById('meliCategorySearch').value = name;
+        document.getElementById('meliCategoryResults').innerHTML = '';
+        meliCatItems = [];
+        meliCatActiveIndex = -1;
+        loadCategoryAttributes(id);
+    };
+
+    window.loadCategoryAttributes = function(categoryId) {
+        var grid = document.getElementById('meliAttrsGrid');
+        var section = document.getElementById('meliAttrsSection');
+        grid.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Cargando atributos...</p>';
+        section.style.display = 'block';
+        fetch('/pos/api/marketplace-ext/categories/' + encodeURIComponent(categoryId) + '/attributes', { headers: { 'Authorization': 'Bearer ' + token } })
+            .then(function(r){ return r.json(); })
+            .then(function(data) {
+                meliCategoryAttrs = data.attributes || [];
+                if (!meliCategoryAttrs.length) { grid.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">No hay atributos obligatorios adicionales.</p>'; return; }
+                var html = '';
+                meliCategoryAttrs.forEach(function(attr) {
+                    var attrId = esc(attr.id);
+                    var attrName = esc(attr.name || attr.id);
+                    var inputHtml = '<input type="text" class="meli-title-input" id="meliAttr-' + attrId + '" placeholder="' + attrName + '">';
+                    if (attr.values && attr.values.length) {
+                        // Some ML attributes (like BRAND) have a closed list but the API still
+                        // accepts free-text via value_name. Provide a select + "Other" fallback.
+                        var selectId = 'meliAttrSel-' + attrId;
+                        var otherId = 'meliAttrOther-' + attrId;
+                        inputHtml = '<select class="meli-title-input" id="' + selectId + '" onchange="onMeliAttrSelectChange(\'' + attrId + '\')">' +
+                            '<option value="">Selecciona ' + attrName + '</option>' +
+                            attr.values.map(function(v) { return '<option value="' + esc(v.name) + '">' + esc(v.name) + '</option>'; }).join('') +
+                            '<option value="__other__">Otra marca (escribir)...</option>' +
+                            '</select>' +
+                            '<input type="text" class="meli-title-input" id="' + otherId + '" placeholder="Escribe la ' + attrName + '" style="display:none;margin-top:6px;">';
+                    }
+                    html += '<div class="inv-field" id="meliAttrWrap-' + attrId + '"><label>' + attrName + (attr.tags && attr.tags.required ? ' *' : '') + '</label>' + inputHtml + '</div>';
+                });
+                grid.innerHTML = html;
+            }).catch(function() { grid.innerHTML = '<p style="color:var(--color-error);font-size:var(--text-caption);">Error cargando atributos</p>'; });
+    };
+
+    window.onMeliAttrSelectChange = function(attrId) {
+        var sel = document.getElementById('meliAttrSel-' + attrId);
+        var other = document.getElementById('meliAttrOther-' + attrId);
+        if (!sel || !other) return;
+        if (sel.value === '__other__') {
+            other.style.display = 'block';
+            other.focus();
+        } else {
+            other.style.display = 'none';
+            other.value = '';
+        }
+    };
+
+    window.handleMeliCatKeydown = function(e) {
+        if (!meliCatItems.length) return;
+        if (e.key === 'ArrowDown') {
+            e.preventDefault();
+            meliCatActiveIndex = Math.min(meliCatActiveIndex + 1, meliCatItems.length - 1);
+            highlightMeliCat(meliCatActiveIndex);
+        } else if (e.key === 'ArrowUp') {
+            e.preventDefault();
+            meliCatActiveIndex = Math.max(meliCatActiveIndex - 1, -1);
+            highlightMeliCat(meliCatActiveIndex);
+        } else if (e.key === 'Enter') {
+            e.preventDefault();
+            if (meliCatActiveIndex >= 0) selectMeliCategoryIdx(meliCatActiveIndex);
+        } else if (e.key === 'Escape') {
+            document.getElementById('meliCategoryResults').innerHTML = '';
+            meliCatItems = [];
+            meliCatActiveIndex = -1;
+        }
+    };
+
+    /* Cerrar dropdown al hacer click fuera */
+    document.addEventListener('click', function(e) {
+        var field = document.getElementById('meliCategorySearch');
+        var results = document.getElementById('meliCategoryResults');
+        if (field && results && !field.contains(e.target) && !results.contains(e.target)) {
+            results.innerHTML = '';
+            meliCatItems = [];
+            meliCatActiveIndex = -1;
+        }
+    });
+
+    window.onMeliShippingChange = function() {
+        var mode = document.getElementById('meliShippingMode').value;
+        var costField = document.getElementById('meliShippingCostField');
+        if (costField) costField.style.display = (mode === 'custom') ? 'block' : 'none';
+    };
+
+    function _collectMeliCustomData() {
+        var ids = Array.from(selectedItems);
+        var customData = { titles: {}, prices: {}, stocks: {}, attributes: {} };
+        var mode = document.getElementById('meliShippingMode').value;
+        if (mode === 'custom') {
+            var costEl = document.getElementById('meliShippingCost');
+            if (costEl) customData.shipping_cost = parseFloat(costEl.value) || 0;
+        }
+        ids.forEach(function(id) {
+            var titleEl = document.getElementById('meliTitle-' + id);
+            var priceEl = document.getElementById('meliPrice-' + id);
+            var stockEl = document.getElementById('meliStock-' + id);
+            if (titleEl) customData.titles[id] = titleEl.value;
+            if (priceEl) customData.prices[id] = parseFloat(priceEl.value);
+            if (stockEl) customData.stocks[id] = parseInt(stockEl.value);
+            var attrs = [];
+            meliCategoryAttrs.forEach(function(attr) {
+                var val = '';
+                var sel = document.getElementById('meliAttrSel-' + attr.id);
+                if (sel) {
+                    if (sel.value === '__other__') {
+                        var otherEl = document.getElementById('meliAttrOther-' + attr.id);
+                        val = otherEl ? otherEl.value : '';
+                    } else {
+                        val = sel.value;
+                    }
+                } else {
+                    var el = document.getElementById('meliAttr-' + attr.id);
+                    if (el) val = el.value;
+                }
+                if (val) {
+                    attrs.push({ id: attr.id, value_name: val });
+                }
+            });
+            if (attrs.length) customData.attributes[id] = attrs;
+        });
+        return customData;
+    }
+
+    window.validateMeliPublish = function() {
+        var categoryId = document.getElementById('meliCategoryId').value.trim();
+        if (!categoryId) { document.getElementById('meliPublishResult').innerHTML = '<span style="color:var(--color-error);">Selecciona una categoría de MercadoLibre</span>'; return; }
+        var listingType = document.getElementById('meliListingType').value;
+        var shippingMode = document.getElementById('meliShippingMode').value;
+        var ids = Array.from(selectedItems);
+        var resultEl = document.getElementById('meliPublishResult');
+        var btn = document.getElementById('meliValidateBtn');
+        btn.disabled = true;
+        resultEl.innerHTML = '<span style="color:var(--color-text-muted);">Validando con MercadoLibre...</span>';
+        fetch('/pos/api/marketplace-ext/listings/validate', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                inventory_ids: ids,
+                category_id: categoryId,
+                listing_type: listingType,
+                shipping_mode: shippingMode,
+                custom_data: _collectMeliCustomData()
+            })
+        }).then(function(r){ return r.json(); })
+          .then(function(data) {
+              btn.disabled = false;
+              if (data.error) { resultEl.innerHTML = '<span style="color:var(--color-error);">Error: ' + esc(data.error) + '</span>'; return; }
+              var valid = (data.valid || []);
+              var invalid = (data.invalid || []);
+              var html = '<div style="margin-bottom:var(--space-2);"><span style="color:var(--color-success);">✅ ' + valid.length + ' válido(s)</span> · <span style="color:var(--color-error);">❌ ' + invalid.length + ' inválido(s)</span></div>';
+
+              // Show earnings estimate table for valid items
+              if (valid.length > 0) {
+                  html += '<div style="margin:var(--space-3) 0;border:1px solid var(--color-border);border-radius:var(--radius-md);overflow:hidden;">';
+                  html += '<div style="background:var(--color-surface-2);padding:var(--space-2) var(--space-3);font-size:var(--text-caption);font-weight:600;color:var(--color-text-primary);">💰 Estimado de ganancia (después de comisiones ML)</div>';
+                  html += '<table style="width:100%;border-collapse:collapse;font-size:var(--text-caption);">';
+                  html += '<tr style="background:var(--color-surface-1);"><th style="padding:6px 8px;text-align:left;">Item</th><th style="padding:6px 8px;text-align:right;">Precio</th><th style="padding:6px 8px;text-align:right;">Comisión</th><th style="padding:6px 8px;text-align:right;">Recibes</th></tr>';
+                  valid.forEach(function(v) {
+                      var price = v.price || 0;
+                      var fee = v.fee_amount || 0;
+                      var net = v.net_amount || 0;
+                      var feePct = v.fee_pct || 0;
+                      html += '<tr style="border-top:1px solid var(--color-border);">';
+                      html += '<td style="padding:6px 8px;">#' + esc(v.inventory_id) + '</td>';
+                      html += '<td style="padding:6px 8px;text-align:right;">$' + price.toFixed(2) + '</td>';
+                      html += '<td style="padding:6px 8px;text-align:right;color:var(--color-error);">-$' + fee.toFixed(2) + ' (' + feePct.toFixed(1) + '%)</td>';
+                      html += '<td style="padding:6px 8px;text-align:right;color:var(--color-success);font-weight:600;">$' + net.toFixed(2) + '</td>';
+                      html += '</tr>';
+                  });
+                  html += '</table>';
+                  if (valid.some(function(v){ return v.fee_source === 'approximation'; })) {
+                      html += '<div style="padding:var(--space-2) var(--space-3);font-size:10px;color:var(--color-text-muted);background:var(--color-surface-0);">* Comisión estimada. El monto real puede variar según ML.</div>';
+                  }
+                  html += '</div>';
+              }
+
+              if (invalid.length) {
+                  html += '<ul style="margin:0;padding-left:var(--space-4);font-size:var(--text-caption);color:var(--color-text-secondary);">';
+                  invalid.forEach(function(f) {
+                      html += '<li>Item #' + esc(f.inventory_id) + ': ' + esc(f.error) + '</li>';
+                  });
+                  html += '</ul>';
+              }
+              resultEl.innerHTML = html;
+          }).catch(function(e) { btn.disabled = false; resultEl.innerHTML = '<span style="color:var(--color-error);">Error: ' + esc(e.message) + '</span>'; });
+    };
+
+    function _renderPublishResult(data, resultEl) {
+        var success = (data.success || []).length;
+        var failedList = data.failed || [];
+        var failed = failedList.length;
+        var hasModeError = failedList.some(function(f) { return (f.error || '').toLowerCase().indexOf('user has not mode') !== -1; });
+        var html = '<div style="margin-bottom:var(--space-2);"><span style="color:var(--color-success);">✅ ' + success + ' publicado(s)</span> · <span style="color:var(--color-error);">❌ ' + failed + ' fallo(s)</span></div>';
+        if (hasModeError) {
+            html += '<div style="background:var(--color-surface-2);border:1px solid var(--color-error);border-radius:var(--radius-md);padding:var(--space-3);margin:var(--space-2) 0;font-size:var(--text-caption);color:var(--color-text-primary);">' +
+                '<strong>⚠️ Tu cuenta de MercadoLibre no tiene modos de envío configurados.</strong><br>' +
+                'Esto es un requisito de MercadoLibre, no de Nexus.<br>' +
+                'Pasos para solucionarlo:<br>' +
+                '1. Entrá a <a href="https://www.mercadolibre.com.mx" target="_blank" style="color:var(--color-primary);text-decoration:underline;">mercadolibre.com.mx</a> con la cuenta de vendedor<br>' +
+                '2. Andá a <strong>Vender &gt; Configuración de envíos</strong><br>' +
+                '3. Completá tu dirección de retiro y activá al menos un método de envío<br>' +
+                '4. Si no te aparece la opción, contactá a <a href="https://www.mercadolibre.com.mx/ayuda" target="_blank" style="color:var(--color-primary);text-decoration:underline;">soporte de MercadoLibre</a><br>' +
+                '<em>Nota: Algunas cuentas nuevas necesitan verificar identidad antes de poder configurar envíos.</em>' +
+                '</div>';
+        }
+        if (failedList.length) {
+            html += '<ul style="margin:0;padding-left:var(--space-4);font-size:var(--text-caption);color:var(--color-text-secondary);">';
+            failedList.forEach(function(f) {
+                html += '<li>Item #' + esc(f.inventory_id) + ': ' + esc(f.error) + '</li>';
+            });
+            html += '</ul>';
+        }
+        resultEl.innerHTML = html;
+        if (success > 0) {
+            selectedItems.clear();
+            updateSelectionUI();
+            if (inventoryVS) inventoryVS.refresh();
+        }
+    }
+
+    function _pollMeliAsync(taskId, resultEl, btn) {
+        var attempts = 0;
+        var maxAttempts = 60; // 2 min
+        var interval = setInterval(function() {
+            attempts++;
+            fetch('/pos/api/marketplace-ext/listings/async/' + encodeURIComponent(taskId), { headers: { 'Authorization': 'Bearer ' + token } })
+                .then(function(r){ return r.json(); })
+                .then(function(data) {
+                    if (data.status === 'done') {
+                        clearInterval(interval);
+                        btn.disabled = false;
+                        _renderPublishResult(data.result || {}, resultEl);
+                        setTimeout(function() { closeMeliPublishModal(); }, 3000);
+                    } else if (attempts >= maxAttempts) {
+                        clearInterval(interval);
+                        btn.disabled = false;
+                        resultEl.innerHTML = '<span style="color:var(--color-error);">Timeout esperando resultado. Revisa la pestaña Publicaciones más tarde.</span>';
+                    } else {
+                        resultEl.innerHTML = '<span style="color:var(--color-text-muted);">Publicando en segundo plano... (' + attempts + 's)</span>';
+                    }
+                }).catch(function() {
+                    clearInterval(interval);
+                    btn.disabled = false;
+                    resultEl.innerHTML = '<span style="color:var(--color-error);">Error consultando progreso</span>';
+                });
+        }, 2000);
+    }
+
+    window.executeMeliPublish = function() {
+        var categoryId = document.getElementById('meliCategoryId').value.trim();
+        if (!categoryId) { document.getElementById('meliPublishResult').innerHTML = '<span style="color:var(--color-error);">Selecciona una categoría de MercadoLibre</span>'; return; }
+        var listingType = document.getElementById('meliListingType').value;
+        var shippingMode = document.getElementById('meliShippingMode').value;
+        var ids = Array.from(selectedItems);
+        var resultEl = document.getElementById('meliPublishResult');
+        var btn = document.getElementById('meliPublishBtn');
+        btn.disabled = true;
+        var useAsync = ids.length > 3;
+        var endpoint = useAsync ? '/pos/api/marketplace-ext/listings/async' : '/pos/api/marketplace-ext/listings';
+        resultEl.innerHTML = '<span style="color:var(--color-text-muted);">' + (useAsync ? 'Encolando ' : 'Publicando ') + ids.length + ' producto(s)...</span>';
+        fetch(endpoint, {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({
+                inventory_ids: ids,
+                category_id: categoryId,
+                listing_type: listingType,
+                shipping_mode: shippingMode,
+                custom_data: _collectMeliCustomData()
+            })
+        }).then(function(r) { return r.json(); })
+          .then(function(data) {
+              if (data.error) { btn.disabled = false; resultEl.innerHTML = '<span style="color:var(--color-error);">Error: ' + esc(data.error) + '</span>'; return; }
+              if (useAsync && data.task_id) {
+                  _pollMeliAsync(data.task_id, resultEl, btn);
+              } else {
+                  btn.disabled = false;
+                  _renderPublishResult(data, resultEl);
+                  if ((data.success || []).length > 0) {
+                      setTimeout(function() { closeMeliPublishModal(); }, 2500);
+                  }
+              }
+          }).catch(function(e) { btn.disabled = false; resultEl.innerHTML = '<span style="color:var(--color-error);">Error: ' + esc(e.message) + '</span>'; });
+    };
+
     // =====================================================================
     //  BARCODE LABEL PRINT
     // =====================================================================
@@ -715,6 +1452,26 @@
             var history = data.history || [];
             var html = '';
 
+            // Tab styles
+            html += '<style>';
+            html += '.compat-tabs{display:flex;gap:4px;border-bottom:1px solid var(--color-border);margin-bottom:16px;}';
+            html += '.compat-tab-btn{padding:8px 16px;font-size:var(--text-body-sm);font-weight:600;cursor:pointer;border:none;background:transparent;color:var(--color-text-muted);border-bottom:2px solid transparent;margin-bottom:-1px;}';
+            html += '.compat-tab-btn.is-active{color:var(--color-primary);border-bottom-color:var(--color-primary);background:var(--color-surface-0);border-radius:var(--radius-sm) var(--radius-sm) 0 0;}';
+            html += '.compat-tab-panel{display:none;}';
+            html += '.compat-tab-panel.is-active{display:block;}';
+            html += '.compat-form{display:grid;grid-template-columns:1fr 1fr;gap:12px;margin-bottom:16px;}';
+            html += '.compat-form label{font-size:var(--text-caption);color:var(--color-text-muted);display:block;margin-bottom:4px;}';
+            html += '</style>';
+
+            // Tabs
+            html += '<div class="compat-tabs">';
+            html += '<button class="compat-tab-btn is-active" onclick="switchCompatTab(\'detail\',this)">Detalle</button>';
+            html += '<button class="compat-tab-btn" onclick="switchCompatTab(\'compat\',this)">Compatibilidad</button>';
+            html += '</div>';
+
+            // Detail panel
+            html += '<div id="compatTab-detail" class="compat-tab-panel is-active">';
+
             // Product image section
             html += '<div style="text-align:center;margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
             if (data.image_url) {
@@ -733,23 +1490,39 @@
             html += '<span id="imgUploadStatus" style="display:block;margin-top:4px;font-size:var(--text-caption);color:var(--color-text-muted);"></span>';
             html += '</div>';
 
+            // Action buttons
+            html += '<div style="display:flex;gap:8px;justify-content:center;margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
+            html += '<button class="btn btn--ghost btn--sm" onclick="showProductTimeline(' + data.id + ')">📅 Timeline</button>';
+            if (data.image_url) {
+                html += '<button class="btn btn--ghost btn--sm" onclick="showImageCompare(\'' + esc(data.image_url) + '\')">🖼️ Comparar</button>';
+            }
+            html += '<button class="btn btn--ghost btn--sm" onclick="viewHistory(' + data.id + ')">📜 Historial</button>';
+            html += '</div>';
+
             // Product info header
             html += '<div style="display:grid;grid-template-columns:1fr 1fr;gap:12px;margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">ID Inventario</span><strong style="font-family:var(--font-mono);">' + data.id + '</strong></div>';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">No. Parte</span><strong>' + esc(data.part_number) + '</strong></div>';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Nombre</span><strong>' + esc(data.name) + '</strong></div>';
-            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Marca</span>' + esc(data.brand) + '</div>';
+            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Marca</span>' + esc(data.brand || '-') + '</div>';
+            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Categoría</span>' + esc(data.category_name || '-') + '</div>';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Codigo de Barras</span><span style="font-family:var(--font-mono);">' + esc(data.barcode) + '</span></div>';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Ubicacion</span>' + esc(data.location || '-') + '</div>';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Stock</span><strong style="font-size:1.2em;">' + (data.stock || 0) + '</strong></div>';
             html += '</div>';
 
+            // SKU Aliases section
+            html += '<div style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;letter-spacing:var(--tracking-widest);margin-bottom:8px;">SKU Alternativos</div>';
+            html += '<div id="skuAliasContent" style="margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
+            html += '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Cargando SKU alternativos...</p>';
+            html += '</div>';
+
             // Prices
             html += '<div style="display:grid;grid-template-columns:repeat(4,1fr);gap:12px;margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
             html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Costo</span><span class="td--amount">$' + fmt(data.cost) + '</span></div>';
-            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Precio 1</span><span class="td--amount">$' + fmt(data.price_1) + '</span></div>';
-            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Precio 2</span><span class="td--amount">$' + fmt(data.price_2) + '</span></div>';
-            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Precio 3</span><span class="td--amount">$' + fmt(data.price_3) + '</span></div>';
+            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Mostrador</span><span class="td--amount">$' + fmt(data.price_1) + '</span></div>';
+            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Taller</span><span class="td--amount">$' + fmt(data.price_2) + '</span><span style="font-size:var(--text-caption);color:var(--color-text-muted);"> (-' + globalDiscounts[2] + '%)</span></div>';
+            html += '<div><span style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;display:block;">Mayoreo</span><span class="td--amount">$' + fmt(data.price_3) + '</span><span style="font-size:var(--text-caption);color:var(--color-text-muted);"> (-' + globalDiscounts[3] + '%)</span></div>';
             html += '</div>';
 
             // Cross-references section
@@ -823,14 +1596,67 @@
                 el.innerHTML = html2;
             }
 
-            // Vehicle compatibility section
-            html += '<div style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;letter-spacing:var(--tracking-widest);margin-bottom:8px;">Vehiculos Compatibles</div>';
+            // Close detail panel
+            html += '</div>';
+
+            // Compatibility panel
+            html += '<div id="compatTab-compat" class="compat-tab-panel">';
+
+            // Existing compatibilities
             html += '<div id="compatContent" style="margin-bottom:16px;padding-bottom:16px;border-bottom:1px solid var(--color-border);">';
             html += '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Cargando compatibilidades...</p>';
             html += '</div>';
 
-            // Load vehicle compatibilities
-            (function loadCompat() {
+            // Manual add form
+            html += '<div style="font-size:var(--text-caption);color:var(--color-text-muted);text-transform:uppercase;letter-spacing:var(--tracking-widest);margin-bottom:8px;">Agregar Manualmente</div>';
+            html += '<div class="compat-form">';
+            html += '<div><label>Marca</label><select class="select-filter" id="manualMake" onchange="onManualMakeChange(' + itemId + ')" style="width:100%;"><option value="">Cargando...</option></select></div>';
+            html += '<div><label>Modelo</label><select class="select-filter" id="manualModel" onchange="onManualModelChange(' + itemId + ')" style="width:100%;" disabled><option value="">Selecciona marca</option></select></div>';
+            html += '<div><label>Ano</label><select class="select-filter" id="manualYear" onchange="onManualYearChange(' + itemId + ')" style="width:100%;" disabled><option value="">Selecciona modelo</option></select></div>';
+            html += '<div><label>Motor</label><select class="select-filter" id="manualEngine" style="width:100%;" disabled><option value="">Selecciona ano</option></select></div>';
+            html += '</div>';
+            html += '<button class="btn btn--primary btn--sm" onclick="submitManualCompat(' + itemId + ')">Agregar compatibilidad</button>';
+
+            // Auto-match button
+            var btnLabel = compatSource === 'qwen' ? 'Auto-Match con IA (QWEN)' : (compatSource === 'both' ? 'Auto-Match (TecDoc + IA)' : 'Auto-Match por TecDoc');
+            html += '<div style="margin-top:16px;"><button class="btn btn--ghost btn--sm" onclick="autoMatchCompat(' + itemId + ')">' + btnLabel + '</button></div>';
+
+            html += '</div>';
+
+            // Load SKU aliases
+            (function loadSkuAliases() {
+                fetch('/pos/api/inventory/items/' + itemId + '/skus', { headers: { 'Authorization': 'Bearer ' + token } })
+                    .then(function(r) { return r.json(); })
+                    .then(function(d) {
+                        var el = document.getElementById('skuAliasContent');
+                        if (!el) return;
+                        var list = d.aliases || [];
+                        var html2 = '';
+                        if (list.length > 0) {
+                            html2 += '<table class="data-table"><thead><tr><th>SKU</th><th>Etiqueta</th><th></th></tr></thead><tbody>';
+                            list.forEach(function(a) {
+                                html2 += '<tr><td class="td--mono">' + esc(a.sku) + '</td><td>' + esc(a.label || '-') + '</td>';
+                                html2 += '<td><button class="btn btn--ghost btn--sm" style="color:var(--color-error);" onclick="removeSkuAlias(' + itemId + ',' + a.id + ')">Quitar</button></td></tr>';
+                            });
+                            html2 += '</tbody></table>';
+                        } else {
+                            html2 += '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Sin SKU alternativos.</p>';
+                        }
+                        html2 += '<div style="margin-top:8px;display:flex;gap:8px;">';
+                        html2 += '<input type="text" class="meli-title-input" id="newAliasSku-' + itemId + '" placeholder="Nuevo SKU" style="flex:1;">';
+                        html2 += '<input type="text" class="meli-title-input" id="newAliasLabel-' + itemId + '" placeholder="Etiqueta (opcional)" style="flex:1;">';
+                        html2 += '<button class="btn btn--primary btn--sm" onclick="addSkuAlias(' + itemId + ')">Agregar</button>';
+                        html2 += '</div>';
+                        el.innerHTML = html2;
+                    })
+                    .catch(function() {
+                        var el = document.getElementById('skuAliasContent');
+                        if (el) el.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Error al cargar SKU alternativos.</p>';
+                    });
+            })();
+
+            // Load vehicle compatibilities and makes
+            (function loadCompatPanel() {
                 fetch('/pos/api/inventory/items/' + itemId + '/vehicles', { headers: { 'Authorization': 'Bearer ' + token } })
                     .then(function(r) { return r.json(); })
                     .then(function(d) {
@@ -849,15 +1675,28 @@
                         } else {
                             html2 += '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Sin vehiculos vinculados.</p>';
                         }
-                        var btnLabel = compatSource === 'qwen' ? 'Auto-Match con IA (QWEN)' : (compatSource === 'both' ? 'Auto-Match (TecDoc + IA)' : 'Auto-Match por TecDoc');
-                        var btnDesc = compatSource === 'qwen' ? 'Busca compatibilidad usando inteligencia artificial' : (compatSource === 'both' ? 'Busca en catalogo central y con IA' : 'Busca en catalogo central y vincula automaticamente');
-                        html2 += '<div style="margin-top:8px;"><button class="btn btn--primary btn--sm" onclick="autoMatchCompat(' + itemId + ')">' + btnLabel + '</button> <span style="font-size:var(--text-caption);color:var(--color-text-muted);">' + btnDesc + '</span></div>';
                         el.innerHTML = html2;
                     })
                     .catch(function() {
                         var el = document.getElementById('compatContent');
                         if (el) el.innerHTML = '<p style="color:var(--color-text-muted);font-size:var(--text-caption);">Error al cargar compatibilidades.</p>';
                     });
+
+                // Load makes
+                fetch('/pos/api/inventory/vehicles/makes', { headers: { 'Authorization': 'Bearer ' + token } })
+                    .then(function(r) { return r.json(); })
+                    .then(function(d) {
+                        var sel = document.getElementById('manualMake');
+                        if (!sel) return;
+                        var opts = '<option value="">Selecciona marca</option>';
+                        (d.makes || []).forEach(function(m) { opts += '<option value="' + esc(m.name) + '" data-id="' + m.id + '">' + esc(m.name) + '</option>'; });
+                        sel.innerHTML = opts;
+                        sel.disabled = false;
+                    })
+                    .catch(function() {
+                        var sel = document.getElementById('manualMake');
+                        if (sel) { sel.innerHTML = '<option value="">Error al cargar</option>'; }
+                    });
             })();
 
             // Movement history
@@ -918,6 +1757,150 @@
           }).catch(function() { alert('Error al quitar compatibilidad'); });
     }
 
+    // Manual compatibility tab functions
+    window.switchCompatTab = function(tab, btn) {
+        document.querySelectorAll('.compat-tab-btn').forEach(function(b) { b.classList.remove('is-active'); });
+        document.querySelectorAll('.compat-tab-panel').forEach(function(p) { p.classList.remove('is-active'); });
+        btn.classList.add('is-active');
+        document.getElementById('compatTab-' + tab).classList.add('is-active');
+    };
+
+    window.onManualMakeChange = function(itemId) {
+        var sel = document.getElementById('manualMake');
+        var modelSel = document.getElementById('manualModel');
+        var yearSel = document.getElementById('manualYear');
+        var engineSel = document.getElementById('manualEngine');
+        if (!sel || !modelSel) return;
+        var opt = sel.options[sel.selectedIndex];
+        var brandId = opt ? opt.getAttribute('data-id') : null;
+        modelSel.innerHTML = '<option value="">Cargando...</option>';
+        modelSel.disabled = true;
+        yearSel.innerHTML = '<option value="">Selecciona modelo</option>';
+        yearSel.disabled = true;
+        engineSel.innerHTML = '<option value="">Selecciona ano</option>';
+        engineSel.disabled = true;
+        if (!brandId) {
+            modelSel.innerHTML = '<option value="">Selecciona marca</option>';
+            return;
+        }
+        fetch('/pos/api/inventory/vehicles/models?brand_id=' + brandId, { headers: { 'Authorization': 'Bearer ' + token } })
+            .then(function(r) { return r.json(); })
+            .then(function(d) {
+                var opts = '<option value="">Selecciona modelo</option>';
+                (d.models || []).forEach(function(m) { opts += '<option value="' + esc(m.name) + '" data-id="' + m.id + '">' + esc(m.name) + '</option>'; });
+                modelSel.innerHTML = opts;
+                modelSel.disabled = false;
+            })
+            .catch(function() { modelSel.innerHTML = '<option value="">Error</option>'; });
+    };
+
+    window.onManualModelChange = function(itemId) {
+        var modelSel = document.getElementById('manualModel');
+        var yearSel = document.getElementById('manualYear');
+        var engineSel = document.getElementById('manualEngine');
+        if (!modelSel || !yearSel) return;
+        var opt = modelSel.options[modelSel.selectedIndex];
+        var modelId = opt ? opt.getAttribute('data-id') : null;
+        yearSel.innerHTML = '<option value="">Cargando...</option>';
+        yearSel.disabled = true;
+        engineSel.innerHTML = '<option value="">Selecciona ano</option>';
+        engineSel.disabled = true;
+        if (!modelId) {
+            yearSel.innerHTML = '<option value="">Selecciona modelo</option>';
+            return;
+        }
+        fetch('/pos/api/inventory/vehicles/years?model_id=' + modelId, { headers: { 'Authorization': 'Bearer ' + token } })
+            .then(function(r) { return r.json(); })
+            .then(function(d) {
+                var opts = '<option value="">Selecciona ano</option>';
+                (d.years || []).forEach(function(y) { opts += '<option value="' + y.year + '" data-id="' + y.id + '">' + y.year + '</option>'; });
+                yearSel.innerHTML = opts;
+                yearSel.disabled = false;
+            })
+            .catch(function() { yearSel.innerHTML = '<option value="">Error</option>'; });
+    };
+
+    window.onManualYearChange = function(itemId) {
+        var modelSel = document.getElementById('manualModel');
+        var yearSel = document.getElementById('manualYear');
+        var engineSel = document.getElementById('manualEngine');
+        if (!modelSel || !yearSel || !engineSel) return;
+        var mOpt = modelSel.options[modelSel.selectedIndex];
+        var yOpt = yearSel.options[yearSel.selectedIndex];
+        var modelId = mOpt ? mOpt.getAttribute('data-id') : null;
+        var yearId = yOpt ? yOpt.getAttribute('data-id') : null;
+        engineSel.innerHTML = '<option value="">Cargando...</option>';
+        engineSel.disabled = true;
+        if (!modelId || !yearId) {
+            engineSel.innerHTML = '<option value="">Selecciona ano</option>';
+            return;
+        }
+        fetch('/pos/api/inventory/vehicles/engines?model_id=' + modelId + '&year_id=' + yearId, { headers: { 'Authorization': 'Bearer ' + token } })
+            .then(function(r) { return r.json(); })
+            .then(function(d) {
+                var opts = '<option value="">Selecciona motor</option>';
+                (d.engines || []).forEach(function(e) { opts += '<option value="' + esc(e.name) + '" data-code="' + esc(e.code || '') + '">' + esc(e.name + (e.code ? ' (' + e.code + ')' : '')) + '</option>'; });
+                engineSel.innerHTML = opts;
+                engineSel.disabled = false;
+            })
+            .catch(function() { engineSel.innerHTML = '<option value="">Error</option>'; });
+    };
+
+    window.submitManualCompat = function(itemId) {
+        var makeSel = document.getElementById('manualMake');
+        var modelSel = document.getElementById('manualModel');
+        var yearSel = document.getElementById('manualYear');
+        var engineSel = document.getElementById('manualEngine');
+        if (!makeSel || !modelSel || !yearSel) return;
+        var make = makeSel.value;
+        var model = modelSel.value;
+        var year = yearSel.value;
+        var engine = engineSel ? engineSel.value : '';
+        var engineCode = engineSel && engineSel.selectedIndex > 0 ? (engineSel.options[engineSel.selectedIndex].getAttribute('data-code') || '') : '';
+        if (!make || !model || !year) {
+            alert('Selecciona al menos marca, modelo y ano');
+            return;
+        }
+        fetch('/pos/api/inventory/items/' + itemId + '/vehicles/manual', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ make: make, model: model, year: parseInt(year), engine: engine, engine_code: engineCode })
+        }).then(function(r) { return r.json(); })
+          .then(function(d) {
+              if (d.error) { alert(d.error); return; }
+              viewProductDetail(itemId);
+          }).catch(function() { alert('Error al agregar compatibilidad'); });
+    };
+
+    // SKU alias actions
+    window.addSkuAlias = function(itemId) {
+        var skuEl = document.getElementById('newAliasSku-' + itemId);
+        var labelEl = document.getElementById('newAliasLabel-' + itemId);
+        var sku = skuEl ? skuEl.value.trim() : '';
+        var label = labelEl ? labelEl.value.trim() : '';
+        if (!sku) { alert('Ingresa un SKU'); return; }
+        fetch('/pos/api/inventory/items/' + itemId + '/skus', {
+            method: 'POST',
+            headers: { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' },
+            body: JSON.stringify({ sku: sku, label: label })
+        }).then(function(r) { return r.json(); })
+          .then(function(d) {
+              if (d.error) { alert(d.error); return; }
+              viewProductDetail(itemId);
+          }).catch(function() { alert('Error al agregar SKU'); });
+    };
+
+    window.removeSkuAlias = function(itemId, aliasId) {
+        if (!confirm('Eliminar este SKU alternativo?')) return;
+        fetch('/pos/api/inventory/items/' + itemId + '/skus/' + aliasId, {
+            method: 'DELETE',
+            headers: { 'Authorization': 'Bearer ' + token }
+        }).then(function(r) { return r.json(); })
+          .then(function() {
+              viewProductDetail(itemId);
+          }).catch(function() { alert('Error al eliminar SKU'); });
+    };
+
     // =====================================================================
     //  EXPOSE GLOBALS (for onclick handlers in HTML)
     // =====================================================================
@@ -950,12 +1933,80 @@
     window.cancelDraft = cancelDraft;
     window.loadAlerts = loadAlerts;
     window.printBarcode = printBarcode;
+    window.deleteItem = deleteItem;
     window.autoMatchCompat = autoMatchCompat;
     window.removeCompat = removeCompat;
 
+    // ─── Product Timeline ──────────────────────────────────────────
+    window.showProductTimeline = function(itemId) {
+        var modal = document.getElementById('productTimelineModal');
+        var body = document.getElementById('productTimelineBody');
+        body.innerHTML = '<div style="padding:20px;"><div class="skeleton skeleton--text"></div><div class="skeleton skeleton--text-sm"></div></div>';
+        modal.classList.add('is-open');
+
+        apiFetch(API + '/items/' + itemId + '/history').then(function(data) {
+            var history = (data && data.data) ? data.data : [];
+            var html = '<div class="timeline">';
+            html += '<div class="timeline__item"><div class="timeline__dot timeline__dot--green"></div><div class="timeline__content"><div class="timeline__date">Producto creado</div><div class="timeline__title">Registro inicial en inventario</div></div></div>';
+            history.forEach(function(h) {
+                var color = h.quantity > 0 ? 'timeline__dot--green' : (h.quantity < 0 ? 'timeline__dot--red' : 'timeline__dot--blue');
+                var title = (h.type || 'Movimiento') + ' · ' + (h.quantity > 0 ? '+' : '') + h.quantity + ' unidades';
+                html += '<div class="timeline__item"><div class="timeline__dot ' + color + '"></div><div class="timeline__content">' +
+                    '<div class="timeline__date">' + esc(h.date) + ' · ' + esc(h.employee) + '</div>' +
+                    '<div class="timeline__title">' + esc(title) + '</div>' +
+                    (h.notes ? '<div class="timeline__desc">' + esc(h.notes) + '</div>' : '') +
+                    '</div></div>';
+            });
+            html += '</div>';
+            body.innerHTML = html;
+        });
+    };
+
+    // ─── Image Comparator ──────────────────────────────────────────
+    window.showImageCompare = function(imageUrl) {
+        var modal = document.getElementById('imageCompareModal');
+        document.getElementById('imgCompareNew').src = imageUrl + '?t=' + Date.now();
+        document.getElementById('imgCompareOld').src = imageUrl + '?t=' + (Date.now() - 1);
+        modal.classList.add('is-open');
+        setTimeout(function() { if (typeof initImageComparator === 'function') initImageComparator('#imgCompareContainer'); }, 100);
+    };
+
+    // ─── Infinite Scroll ───────────────────────────────────────────
+    var _infiniteScrollInstance = null;
+    function setupInfiniteScroll() {
+        if (_infiniteScrollInstance) _infiniteScrollInstance.disconnect();
+        var sentinel = document.createElement('div');
+        sentinel.id = 'inventoryScrollSentinel';
+        sentinel.style.cssText = 'height:1px;';
+        var wrapper = document.querySelector('.table-wrapper');
+        if (wrapper) wrapper.appendChild(sentinel);
+        _infiniteScrollInstance = new InfiniteScroll({
+            sentinelParent: wrapper,
+            onLoad: function(done) {
+                if (!currentSearch && currentPage < (window._inventoryTotalPages || 999)) {
+                    loadItems(currentPage + 1);
+                }
+                if (done) done();
+            }
+        });
+    }
+
+    // ─── Saved Filters ─────────────────────────────────────────────
+    function renderSavedFilters() {
+        var container = document.getElementById('savedFiltersContainer');
+        if (!container) return;
+        SavedFilters.renderChips('savedFiltersContainer', function(filters) {
+            if (filters.search) {
+                var el = document.getElementById('productSearch');
+                if (el) { el.value = filters.search; loadItems(1, filters.search); }
+            }
+        });
+    }
+
     // =====================================================================
     //  INIT — load stock on page load
     // =====================================================================
 
     loadItems(1);
+    renderSavedFilters();
 })();
diff --git a/pos/static/js/invoicing.js b/pos/static/js/invoicing.js
index bd65a73..4ff65b3 100644
--- a/pos/static/js/invoicing.js
+++ b/pos/static/js/invoicing.js
@@ -478,6 +478,51 @@ const Invoicing = (() => {
         alert('Nota de credito: proximamente');
     }
 
+    // ---- Global Invoice ----
+    function openGlobalInvoiceModal() {
+        const now = new Date();
+        document.getElementById('global-year').value = now.getFullYear();
+        document.getElementById('global-month').value = now.getMonth() + 1;
+        document.getElementById('global-preview').innerHTML = 'Presiona "Vista previa" para ver ventas elegibles.';
+        document.getElementById('modalGlobalInvoice').style.display = 'flex';
+    }
+
+    async function previewGlobalInvoice() {
+        const year = document.getElementById('global-year').value;
+        const month = document.getElementById('global-month').value;
+        const preview = document.getElementById('global-preview');
+        preview.innerHTML = 'Cargando...';
+        try {
+            const res = await api(`/global-invoice/eligible-sales?year=${year}&month=${month}`);
+            preview.innerHTML = `<strong>${res.count} ventas elegibles</strong> — Total: $${fmt(res.total)}<br><small>${res.sales.map(s => '#' + s.id).join(', ')}</small>`;
+        } catch (e) {
+            preview.innerHTML = '<span style="color:var(--color-error);">Error: ' + e.message + '</span>';
+        }
+    }
+
+    async function generateGlobalInvoice() {
+        const year = parseInt(document.getElementById('global-year').value, 10);
+        const month = parseInt(document.getElementById('global-month').value, 10);
+        const btn = document.querySelector('#modalGlobalInvoice .btn--primary');
+        const originalText = btn.textContent;
+        btn.disabled = true;
+        btn.textContent = 'Generando...';
+        try {
+            const res = await api('/global-invoice', {
+                method: 'POST',
+                body: JSON.stringify({ year, month })
+            });
+            alert(`Factura global generada: ${res.provisional_folio} (${res.sales_count} ventas, $${fmt(res.total)})`);
+            document.getElementById('modalGlobalInvoice').style.display = 'none';
+            loadFacturas();
+        } catch (e) {
+            alert('Error: ' + e.message);
+        } finally {
+            btn.disabled = false;
+            btn.textContent = originalText;
+        }
+    }
+
     // Expose switchTab globally for onclick handlers in HTML
     window.switchTab = switchTab;
     window.showNewInvoiceModal = showNewInvoiceModal;
@@ -489,5 +534,14 @@ const Invoicing = (() => {
         switchTab, loadFacturas, loadNotas, loadComplementos, loadCancelaciones,
         showDetail, showCancelModal, confirmCancel, processQueue,
         showNewInvoiceModal, closeNewInvoiceModal, submitNewInvoice, notaCreditoPlaceholder,
+        openGlobalInvoiceModal, previewGlobalInvoice, generateGlobalInvoice,
     };
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/kiosk.js b/pos/static/js/kiosk.js
index 1db5e33..3ac626b 100644
--- a/pos/static/js/kiosk.js
+++ b/pos/static/js/kiosk.js
@@ -154,6 +154,9 @@
     }
   };
 
+  // Expose for other scripts
+  window.isKioskEnabled = isKioskEnabled;
+
   // ─── Init ───
   if (isKioskEnabled()) {
     activate();
diff --git a/pos/static/js/marketplace_external.js b/pos/static/js/marketplace_external.js
new file mode 100644
index 0000000..7263e53
--- /dev/null
+++ b/pos/static/js/marketplace_external.js
@@ -0,0 +1,608 @@
+/**
+ * marketplace_external.js — MercadoLibre integration UI
+ */
+(function() {
+    'use strict';
+
+    var API = '/pos/api/marketplace-ext';
+    var TOKEN = localStorage.getItem('pos_token') || '';
+
+    function headers() {
+        return {
+            'Authorization': 'Bearer ' + TOKEN,
+            'Content-Type': 'application/json',
+            'X-Device-Id': localStorage.getItem('pos_device_id') || 'web',
+        };
+    }
+
+    // ─── Tabs ──────────────────────────────────────────────────────────────
+
+    window.switchTab = function(tab) {
+        document.querySelectorAll('.tab-btn').forEach(function(b) {
+            b.classList.toggle('is-active', b.dataset.tab === tab);
+            b.setAttribute('aria-selected', b.dataset.tab === tab ? 'true' : 'false');
+        });
+        document.querySelectorAll('.tab-panel').forEach(function(p) {
+            p.classList.toggle('is-active', p.id === 'panel-' + tab);
+        });
+        if (tab === 'listings') loadListings();
+        if (tab === 'orders') loadOrders();
+        if (tab === 'questions') loadQuestions();
+    };
+
+    function closeModal(id) {
+        document.getElementById(id).classList.remove('is-open');
+    }
+    window.closeModal = closeModal;
+
+    // ─── Config / Connection ───────────────────────────────────────────────
+
+    async function loadConfig() {
+        try {
+            var res = await fetch(API + '/config', { headers: headers() });
+            if (!res.ok) throw new Error('Failed to load config');
+            var cfg = await res.json();
+
+            var statusDiv = document.getElementById('configStatus');
+            var formDiv = document.getElementById('configForm');
+            var connectedDiv = document.getElementById('configConnected');
+
+            if (cfg.connected) {
+                statusDiv.innerHTML = '<span class="meli-status meli-status--active">● Conectado</span>';
+                formDiv.style.display = 'none';
+                connectedDiv.style.display = 'block';
+                document.getElementById('connectedNickname').textContent = cfg.meli_user_id || 'Usuario ML';
+                document.getElementById('connectedSite').textContent = cfg.meli_site_id || 'MLM';
+            } else {
+                statusDiv.innerHTML = '<span class="meli-status meli-status--pending">● No conectado</span>';
+                formDiv.style.display = 'block';
+                connectedDiv.style.display = 'none';
+            }
+        } catch (e) {
+            console.error(e);
+            document.getElementById('configStatus').innerHTML = '<p style="color:var(--color-danger);">Error cargando configuración</p>';
+        }
+    }
+
+    window.startOAuth = function() {
+        var clientId = document.getElementById('cfgClientId').value.trim();
+        var clientSecret = document.getElementById('cfgClientSecret').value.trim();
+        var category = document.getElementById('cfgCategory').value.trim();
+        var shipping = document.getElementById('cfgShipping').value;
+
+        if (!clientId || !clientSecret) {
+            alert('Client ID y Client Secret son requeridos');
+            return;
+        }
+
+        // Save config locally for the callback
+        localStorage.setItem('meli_client_id', clientId);
+        localStorage.setItem('meli_client_secret', clientSecret);
+        localStorage.setItem('meli_category', category);
+        localStorage.setItem('meli_shipping', shipping);
+
+        var redirectUri = window.location.origin + '/pos/marketplace-external/callback';
+        var authUrl = 'https://auth.mercadolibre.com.mx/authorization?response_type=code&client_id=' + encodeURIComponent(clientId) + '&redirect_uri=' + encodeURIComponent(redirectUri) + '&scope=read+write+offline_access';
+        window.location.href = authUrl;
+    };
+
+    window.disconnectMeli = async function() {
+        if (!confirm('¿Desconectar MercadoLibre? Las publicaciones existentes no se eliminarán de ML.')) return;
+        try {
+            var res = await fetch(API + '/connect', { method: 'DELETE', headers: headers() });
+            if (res.ok) {
+                loadConfig();
+            } else {
+                alert('Error desconectando');
+            }
+        } catch (e) {
+            alert('Error: ' + e.message);
+        }
+    };
+
+    // ─── Listings ──────────────────────────────────────────────────────────
+
+    var listingsData = [];
+
+    window.loadListings = async function() {
+        var container = document.getElementById('listingsContainer');
+        container.innerHTML = '<div class="meli-card"><div class="skeleton skeleton--text"></div><div class="skeleton skeleton--text-sm" style="width:70%;"></div></div>'
+            + '<div class="meli-card"><div class="skeleton skeleton--text"></div><div class="skeleton skeleton--text-sm" style="width:60%;"></div></div>'
+            + '<div class="meli-card"><div class="skeleton skeleton--text"></div><div class="skeleton skeleton--text-sm" style="width:80%;"></div></div>';
+        try {
+            var res = await fetch(API + '/listings?page=1&per_page=50', { headers: headers() });
+            if (!res.ok) throw new Error('Failed to load listings');
+            var data = await res.json();
+            listingsData = data.items || [];
+            renderListings();
+        } catch (e) {
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Error cargando publicaciones',
+                subtitle: 'No se pudieron obtener las publicaciones de MercadoLibre. Intenta de nuevo.'
+            });
+        }
+    };
+
+    function renderListings() {
+        var container = document.getElementById('listingsContainer');
+        var statusFilter = document.getElementById('listingStatusFilter').value;
+        var search = document.getElementById('listingSearch').value.toLowerCase();
+
+        var filtered = listingsData.filter(function(l) {
+            if (statusFilter && l.external_status !== statusFilter) return false;
+            if (search && !((l.title || '').toLowerCase().includes(search))) return false;
+            return true;
+        });
+
+        if (!filtered.length) {
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Sin publicaciones',
+                subtitle: 'Aún no hay publicaciones en MercadoLibre. Ve a Inventario y publica un producto.',
+                action: '<a href="/pos/inventory" class="btn btn--meli btn--sm">Ir a Inventario</a>'
+            });
+            return;
+        }
+
+        container.innerHTML = filtered.map(function(l) {
+            var statusClass = 'meli-status--' + (l.external_status || 'pending');
+            return '<div class="meli-card">'
+                + '<div style="display:flex;justify-content:space-between;align-items:start;margin-bottom:var(--space-3);">'
+                +   '<a href="' + escapeHtml(l.external_permalink || '#') + '" target="_blank" rel="noopener" style="font-weight:700;font-size:var(--text-body-sm);line-height:1.3;color:var(--color-primary);text-decoration:none;">' + escapeHtml(l.title || l.inventory_name || 'Sin título') + ' ↗</a>'
+                +   '<span class="meli-status ' + statusClass + '">' + (l.external_status || '—') + '</span>'
+                + '</div>'
+                + '<div style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-2);">'
+                +   'SKU: ' + escapeHtml(l.part_number || '—') + ' · ID ML: <a href="' + escapeHtml(l.external_permalink || '#') + '" target="_blank" rel="noopener" style="color:var(--color-primary);">' + escapeHtml(l.external_item_id || '—') + '</a>'
+                + '</div>'
+                + '<div style="display:flex;gap:var(--space-2);margin-top:var(--space-3);">'
+                +   '<button class="btn btn--ghost btn--xs" onclick="syncListing(' + l.id + ')">Sync</button>'
+                +   (l.external_status === 'active' ? '<button class="btn btn--ghost btn--xs" onclick="pauseListing(' + l.id + ')">Pausar</button>' : '<button class="btn btn--ghost btn--xs" onclick="activateListing(' + l.id + ')">Activar</button>')
+                +   (l.external_status === 'closed' || !l.is_active
+                        ? '<button class="btn btn--danger btn--xs" onclick="deleteListingPermanently(' + l.id + ')">Eliminar</button>'
+                        : '<button class="btn btn--danger btn--xs" onclick="deleteListing(' + l.id + ')">Cerrar</button>')
+                + '</div>'
+                + '</div>';
+        }).join('');
+    }
+
+    window.filterListings = renderListings;
+
+    window.syncListing = async function(id) {
+        try {
+            var res = await fetch(API + '/listings/' + id + '/sync', { method: 'POST', headers: headers() });
+            var data = await res.json();
+            if (res.ok) {
+                showToast('Sincronizado: $' + data.price + ' · Stock: ' + data.stock, 'ok', { title: 'Publicación actualizada' });
+                loadListings();
+            } else {
+                showToast(data.error || 'Error desconocido', 'error', { title: 'Error de sincronización' });
+            }
+        } catch (e) {
+            showToast(e.message, 'error', { title: 'Error de red' });
+        }
+    };
+
+    window.pauseListing = async function(id) {
+        try {
+            var res = await fetch(API + '/listings/' + id + '/pause', { method: 'POST', headers: headers() });
+            if (res.ok) { loadListings(); } else { alert('Error'); }
+        } catch (e) { alert('Error: ' + e.message); }
+    };
+
+    window.activateListing = async function(id) {
+        try {
+            var res = await fetch(API + '/listings/' + id + '/activate', { method: 'POST', headers: headers() });
+            if (res.ok) { loadListings(); } else { alert('Error'); }
+        } catch (e) { alert('Error: ' + e.message); }
+    };
+
+    window.deleteListing = async function(id) {
+        if (!confirm('¿Cerrar esta publicación en MercadoLibre?')) return;
+        try {
+            var res = await fetch(API + '/listings/' + id, { method: 'DELETE', headers: headers() });
+            if (res.ok) { loadListings(); } else { alert('Error'); }
+        } catch (e) { alert('Error: ' + e.message); }
+    };
+
+    window.deleteListingPermanently = async function(id) {
+        if (!confirm('¿Eliminar permanentemente esta publicación del listado local? Esta acción no se puede deshacer.')) return;
+        try {
+            var res = await fetch(API + '/listings/' + id + '/permanent', { method: 'DELETE', headers: headers() });
+            if (res.ok) { loadListings(); } else { alert('Error al eliminar'); }
+        } catch (e) { alert('Error: ' + e.message); }
+    };
+
+    // ─── Orders ────────────────────────────────────────────────────────────
+
+    var ordersData = [];
+
+    window.loadOrders = async function() {
+        var tbody = document.getElementById('ordersTableBody');
+        tbody.innerHTML = renderSkeletonRows(6, 5);
+        try {
+            var res = await fetch(API + '/orders?page=1&per_page=50', { headers: headers() });
+            if (!res.ok) throw new Error('Failed to load orders');
+            var data = await res.json();
+            ordersData = data.items || [];
+            renderOrders();
+        } catch (e) {
+            tbody.innerHTML = '<tr><td colspan="6">' + renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Error cargando órdenes',
+                subtitle: 'No se pudieron obtener las órdenes de MercadoLibre.'
+            }) + '</td></tr>';
+        }
+    };
+
+    function renderOrders() {
+        var tbody = document.getElementById('ordersTableBody');
+        var statusFilter = document.getElementById('orderStatusFilter').value;
+        var search = document.getElementById('orderSearch').value.toLowerCase();
+
+        var filtered = ordersData.filter(function(o) {
+            if (statusFilter && o.status !== statusFilter) return false;
+            if (search && !((o.buyer_name || '').toLowerCase().includes(search) || (o.external_order_id || '').includes(search))) return false;
+            return true;
+        });
+
+        if (!filtered.length) {
+            tbody.innerHTML = '<tr><td colspan="6">' + renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2" ry="2"/><path d="M8 21h8M12 17v4"/></svg>',
+                title: 'Sin órdenes',
+                subtitle: 'No hay órdenes de MercadoLibre en este momento.'
+            }) + '</td></tr>';
+            return;
+        }
+
+        tbody.innerHTML = filtered.map(function(o) {
+            var statusClass = 'meli-status--' + (o.status || 'pending');
+            return '<tr>'
+                + '<td><a href="#" onclick="showOrderDetail(' + o.id + ');return false;">' + escapeHtml(o.external_order_id) + '</a></td>'
+                + '<td>' + escapeHtml(o.buyer_name || o.buyer_nickname || '—') + '</td>'
+                + '<td style="text-align:right">$' + (o.total_amount || 0).toFixed(2) + '</td>'
+                + '<td><span class="meli-status ' + statusClass + '">' + (o.status || '—') + '</span></td>'
+                + '<td>' + (o.created_at ? o.created_at.split('T')[0] : '—') + '</td>'
+                + '<td>'
+                +   (o.status === 'pending' ? '<button class="btn btn--primary btn--xs" onclick="convertOrder(' + o.id + ')">Convertir a Venta</button> ' : '')
+                +   '<button class="btn btn--ghost btn--xs" onclick="showOrderDetail(' + o.id + ')">Ver</button>'
+                + '</td>'
+                + '</tr>';
+        }).join('');
+    }
+
+    window.filterOrders = renderOrders;
+
+    window.showOrderDetail = async function(id) {
+        var modal = document.getElementById('orderModal');
+        var body = document.getElementById('orderModalBody');
+        var footer = document.getElementById('orderModalFooter');
+        body.innerHTML = 'Cargando...';
+        footer.innerHTML = '';
+        modal.classList.add('is-open');
+
+        try {
+            var res = await fetch(API + '/orders/' + id, { headers: headers() });
+            var o = await res.json();
+            if (!res.ok) throw new Error(o.error || 'Error');
+
+            var itemsHtml = (o.items || []).map(function(it) {
+                return '<tr><td>' + escapeHtml(it.title || '—') + '</td><td>' + it.quantity + '</td><td style="text-align:right">$' + (it.unit_price || 0).toFixed(2) + '</td></tr>';
+            }).join('');
+
+            body.innerHTML = '<div style="margin-bottom:var(--space-4);">'
+                + '<p><strong>Comprador:</strong> ' + escapeHtml(o.buyer_name || '—') + ' (' + escapeHtml(o.buyer_nickname || '—') + ')</p>'
+                + '<p><strong>Email:</strong> ' + escapeHtml(o.buyer_email || '—') + '</p>'
+                + '<p><strong>Teléfono:</strong> ' + escapeHtml(o.buyer_phone || '—') + '</p>'
+                + '<p><strong>Total:</strong> $' + (o.total_amount || 0).toFixed(2) + '</p>'
+                + '<p><strong>Estado ML:</strong> ' + escapeHtml(o.external_status || '—') + '</p>'
+                + '<p><strong>Estado Nexus:</strong> ' + escapeHtml(o.status || '—') + '</p>'
+                + '</div>'
+                + '<h4 style="margin:var(--space-3) 0;">Items</h4>'
+                + '<table class="data-table"><thead><tr><th>Producto</th><th>Cantidad</th><th style="text-align:right">Precio</th></tr></thead><tbody>' + itemsHtml + '</tbody></table>';
+
+            footer.innerHTML = '';
+            if (o.status === 'pending') {
+                footer.innerHTML += '<button class="btn btn--primary" onclick="convertOrder(' + o.id + ');closeModal(\'orderModal\')">Convertir a Venta</button> ';
+            }
+            if (o.status === 'confirmed') {
+                footer.innerHTML += '<button class="btn btn--primary" onclick="updateOrderStatus(' + o.id + ', \'packed\')">Marcar Empacada</button> ';
+            }
+            if (o.status === 'packed') {
+                footer.innerHTML += '<button class="btn btn--primary" onclick="updateOrderStatus(' + o.id + ', \'shipped\')">Marcar Enviada</button> ';
+            }
+            footer.innerHTML += '<button class="btn btn--ghost" onclick="closeModal(\'orderModal\')">Cerrar</button>';
+        } catch (e) {
+            body.innerHTML = '<p style="color:var(--color-danger)">Error: ' + escapeHtml(e.message) + '</p>';
+        }
+    };
+
+    window.convertOrder = async function(id) {
+        try {
+            var res = await fetch(API + '/orders/' + id + '/convert', {
+                method: 'POST',
+                headers: headers(),
+                body: JSON.stringify({})
+            });
+            var data = await res.json();
+            if (res.ok) {
+                showToast('Orden convertida a venta #' + data.sale_id, 'ok', { title: 'Venta creada' });
+                loadOrders();
+            } else {
+                showToast(data.error || 'Error desconocido', 'error', { title: 'Error al convertir' });
+            }
+        } catch (e) {
+            showToast(e.message, 'error', { title: 'Error de red' });
+        }
+    };
+
+    window.updateOrderStatus = async function(id, status) {
+        try {
+            var res = await fetch(API + '/orders/' + id + '/status', {
+                method: 'POST',
+                headers: headers(),
+                body: JSON.stringify({ status: status })
+            });
+            if (res.ok) { loadOrders(); } else { alert('Error'); }
+        } catch (e) { alert('Error: ' + e.message); }
+    };
+
+    // ─── Utils ─────────────────────────────────────────────────────────────
+
+    function escapeHtml(text) {
+        if (!text) return '';
+        var div = document.createElement('div');
+        div.textContent = text;
+        return div.innerHTML;
+    }
+
+    // ─── Init ──────────────────────────────────────────────────────────────
+
+    // Handle OAuth callback
+    var urlParams = new URLSearchParams(window.location.search);
+    var authCode = urlParams.get('code');
+    if (authCode && window.location.pathname.includes('marketplace-external')) {
+        (async function() {
+            var clientId = localStorage.getItem('meli_client_id');
+            var clientSecret = localStorage.getItem('meli_client_secret');
+            var redirectUri = window.location.origin + '/pos/marketplace-external/callback';
+            try {
+                var res = await fetch(API + '/connect', {
+                    method: 'POST',
+                    headers: headers(),
+                    body: JSON.stringify({
+                        code: authCode,
+                        client_id: clientId,
+                        client_secret: clientSecret,
+                        redirect_uri: redirectUri,
+                    })
+                });
+                var data = await res.json();
+                if (res.ok) {
+                    alert('¡Conectado exitosamente con MercadoLibre!');
+                    window.history.replaceState({}, document.title, '/pos/marketplace-external');
+                    loadConfig();
+                } else {
+                    alert('Error conectando: ' + (data.error || 'Unknown'));
+                }
+            } catch (e) {
+                alert('Error: ' + e.message);
+            }
+        })();
+    }
+
+    // ML Status Cards (sparkline simulation)
+    window.loadMeliStats = async function() {
+        var container = document.getElementById('meliStatsBar');
+        if (!container) return;
+        try {
+            var res = await fetch(API + '/listings?page=1&per_page=200', { headers: headers() });
+            if (!res.ok) throw new Error('Failed');
+            var data = await res.json();
+            var items = data.items || [];
+            var active = items.filter(function(l) { return l.external_status === 'active'; }).length;
+            var paused = items.filter(function(l) { return l.external_status === 'paused'; }).length;
+            var closed = items.filter(function(l) { return l.external_status === 'closed'; }).length;
+            var total = items.length;
+
+            var html = '<div style="display:flex;gap:var(--space-4);flex-wrap:wrap;margin-bottom:var(--space-4);">' +
+                '<div class="kpi-card" style="flex:1;min-width:160px;"><div class="kpi-card__label">Activas</div><div class="kpi-card__value" style="color:var(--color-success);">' + active + '</div></div>' +
+                '<div class="kpi-card" style="flex:1;min-width:160px;"><div class="kpi-card__label">Pausadas</div><div class="kpi-card__value" style="color:var(--color-warning);">' + paused + '</div></div>' +
+                '<div class="kpi-card" style="flex:1;min-width:160px;"><div class="kpi-card__label">Cerradas</div><div class="kpi-card__value" style="color:var(--color-error);">' + closed + '</div></div>' +
+                '<div class="kpi-card" style="flex:1;min-width:160px;"><div class="kpi-card__label">Total</div><div class="kpi-card__value">' + total + '</div></div>';
+            // Sparkline simulation
+            html += '<div class="kpi-card" style="flex:1;min-width:200px;"><div class="kpi-card__label">Tendencia</div><div id="meliSparkline"></div></div>';
+            html += '</div>';
+            container.innerHTML = html;
+            if (typeof renderSparkline === 'function') {
+                renderSparkline('#meliSparkline', [active, paused, closed, total % 50, active - 2, paused + 1, closed, active], { prefix: '' });
+            }
+        } catch(e) {
+            container.innerHTML = '';
+        }
+    };
+
+    // Kanban Order View
+    var _orderViewMode = 'table';
+    window.toggleOrderView = function() {
+        _orderViewMode = _orderViewMode === 'table' ? 'kanban' : 'table';
+        document.getElementById('ordersTableView').style.display = _orderViewMode === 'table' ? '' : 'none';
+        document.getElementById('ordersKanbanView').style.display = _orderViewMode === 'kanban' ? '' : 'none';
+        document.getElementById('btnKanbanView').textContent = _orderViewMode === 'table' ? '📋 Kanban' : '📄 Tabla';
+        if (_orderViewMode === 'kanban') renderKanbanOrders();
+    };
+
+    function renderKanbanOrders() {
+        var container = document.getElementById('ordersKanbanView');
+        if (!container) return;
+        var columns = [
+            { key: 'pending', label: 'Pendientes', badge: 'badge--pending' },
+            { key: 'confirmed', label: 'Confirmadas', badge: 'badge--ok' },
+            { key: 'packed', label: 'Empacadas', badge: 'badge--transit' },
+            { key: 'shipped', label: 'Enviadas', badge: 'badge--transit' },
+            { key: 'delivered', label: 'Entregadas', badge: 'badge--complete' },
+            { key: 'cancelled', label: 'Canceladas', badge: 'badge--cancelled' },
+        ];
+        var html = '<div class="kanban">';
+        columns.forEach(function(col) {
+            var items = ordersData.filter(function(o) { return o.status === col.key; });
+            html += '<div class="kanban__col" data-status="' + col.key + '">';
+            html += '<div class="kanban__col-header">' + col.label + '<span class="kanban__col-count ' + col.badge + '">' + items.length + '</span></div>';
+            html += '<div class="kanban__cards">';
+            items.slice(0, 20).forEach(function(o) {
+                html += '<div class="kanban__card" draggable="true" data-id="' + o.id + '">' +
+                    '<div class="kanban__card-title">' + escapeHtml(o.buyer_name || o.buyer_nickname || '—') + '</div>' +
+                    '<div class="kanban__card-meta">$' + (o.total_amount || 0).toFixed(2) + ' · ' + escapeHtml(o.external_order_id || '') + '</div>' +
+                    '</div>';
+            });
+            if (items.length > 20) html += '<div style="text-align:center;font-size:11px;color:var(--color-text-muted);padding:8px;">+' + (items.length - 20) + ' más</div>';
+            html += '</div></div>';
+        });
+        html += '</div>';
+        container.innerHTML = html;
+    }
+
+    // ─── Questions ─────────────────────────────────────────────────────────
+
+    var questionsData = [];
+
+    window.loadQuestions = async function() {
+        var container = document.getElementById('questionsContainer');
+        container.innerHTML = '<div class="skeleton-grid">' + Array(6).fill('<div class="skeleton skeleton--card"></div>').join('') + '</div>';
+        try {
+            var res = await fetch(API + '/questions', { headers: headers() });
+            if (!res.ok) throw new Error('Failed to load questions');
+            var data = await res.json();
+            questionsData = data.items || [];
+            renderQuestions();
+        } catch (e) {
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>',
+                title: 'Sin preguntas',
+                subtitle: 'No hay preguntas de compradores pendientes. Sincroniza con MercadoLibre para obtenerlas.',
+                action: '<button class="btn btn--meli btn--sm" onclick="syncQuestions()">Sincronizar con ML</button>'
+            });
+        }
+    };
+
+    function renderQuestions() {
+        var container = document.getElementById('questionsContainer');
+        var statusFilter = document.getElementById('questionStatusFilter').value;
+        var search = document.getElementById('questionSearch').value.toLowerCase();
+
+        var filtered = questionsData.filter(function(q) {
+            if (statusFilter && q.status !== statusFilter) return false;
+            if (search && !((q.question_text || '').toLowerCase().includes(search)) && !((q.listing_title || '').toLowerCase().includes(search))) return false;
+            return true;
+        });
+
+        // Stats bar
+        var unanswered = questionsData.filter(function(q) { return q.status === 'unanswered'; }).length;
+        var answered = questionsData.filter(function(q) { return q.status === 'answered'; }).length;
+        var total = questionsData.length;
+        var statsHtml = '<div style="display:flex;gap:var(--space-4);flex-wrap:wrap;margin-bottom:var(--space-4);">' +
+            '<div class="meli-card" style="flex:1;min-width:140px;text-align:center;"><div style="font-size:28px;font-weight:800;color:var(--color-primary);">' + total + '</div><div style="font-size:var(--text-caption);color:var(--color-text-muted);">Total preguntas</div></div>' +
+            '<div class="meli-card" style="flex:1;min-width:140px;text-align:center;"><div style="font-size:28px;font-weight:800;color:var(--color-error);">' + unanswered + '</div><div style="font-size:var(--text-caption);color:var(--color-text-muted);">Sin responder</div></div>' +
+            '<div class="meli-card" style="flex:1;min-width:140px;text-align:center;"><div style="font-size:28px;font-weight:800;color:var(--color-success);">' + answered + '</div><div style="font-size:var(--text-caption);color:var(--color-text-muted);">Respondidas</div></div>' +
+            '</div>';
+        document.getElementById('questionsStatsBar').innerHTML = statsHtml;
+
+        if (!filtered.length) {
+            container.innerHTML = renderEmptyState({
+                icon: '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>',
+                title: 'Sin preguntas',
+                subtitle: statusFilter ? 'No hay preguntas con el filtro seleccionado.' : 'No hay preguntas sincronizadas.',
+                action: ''
+            });
+            return;
+        }
+
+        container.innerHTML = filtered.map(function(q) {
+            var statusClass = 'meli-status--' + (q.status || 'pending');
+            var statusLabel = q.status === 'unanswered' ? 'Sin responder' : (q.status === 'answered' ? 'Respondida' : (q.status || '—'));
+            var answerHtml = '';
+            if (q.status === 'unanswered') {
+                answerHtml = '<div style="margin-top:var(--space-2);">' +
+                    '<textarea class="meli-title-input" id="qAnswer-' + q.id + '" rows="2" placeholder="Escribe tu respuesta..."></textarea>' +
+                    '<button class="btn btn--primary btn--xs" style="margin-top:6px;" onclick="submitAnswer(' + q.id + ')">Enviar respuesta</button>' +
+                    '</div>';
+            } else if (q.answer_text) {
+                answerHtml = '<div style="margin-top:var(--space-2);padding:var(--space-2);background:var(--color-surface-0);border-radius:var(--radius-sm);font-size:var(--text-caption);color:var(--color-text-secondary);">' +
+                    '<strong>Respuesta:</strong> ' + escapeHtml(q.answer_text) +
+                    '</div>';
+            }
+            return '<div class="meli-card">'
+                + '<div style="display:flex;justify-content:space-between;align-items:start;margin-bottom:var(--space-3);">'
+                +   '<div style="font-weight:700;font-size:var(--text-body-sm);line-height:1.3;">' + escapeHtml(q.listing_title || 'Artículo sin título') + '</div>'
+                +   '<span class="meli-status ' + statusClass + '">' + statusLabel + '</span>'
+                + '</div>'
+                + '<div style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-2);">'
+                +   'Comprador: ' + escapeHtml(q.buyer_nickname || '—') + ' · ' + (q.question_date ? new Date(q.question_date).toLocaleString('es-MX') : '—')
+                + '</div>'
+                + '<div style="font-size:var(--text-body-sm);color:var(--color-text-primary);margin-bottom:var(--space-2);">'
+                +   '<strong>Pregunta:</strong> ' + escapeHtml(q.question_text)
+                + '</div>'
+                + answerHtml
+                + '</div>';
+        }).join('');
+    }
+
+    window.filterQuestions = renderQuestions;
+
+    window.syncQuestions = async function() {
+        var btn = document.querySelector('#panel-questions .btn--primary');
+        if (btn) { btn.disabled = true; btn.textContent = 'Sincronizando...'; }
+        try {
+            var res = await fetch(API + '/questions/sync', { method: 'POST', headers: headers() });
+            var data = await res.json();
+            if (res.ok) {
+                showToast('Sincronizadas ' + (data.synced || 0) + ' preguntas', 'ok', { title: 'Sincronización' });
+                loadQuestions();
+            } else {
+                showToast(data.error || 'Error al sincronizar', 'error', { title: 'Error' });
+            }
+        } catch (e) {
+            showToast(e.message, 'error', { title: 'Error de red' });
+        } finally {
+            if (btn) { btn.disabled = false; btn.textContent = '🔄 Actualizar'; }
+        }
+    };
+
+    window.submitAnswer = async function(questionId) {
+        var textarea = document.getElementById('qAnswer-' + questionId);
+        if (!textarea) return;
+        var text = textarea.value.trim();
+        if (!text) {
+            showToast('Escribe una respuesta antes de enviar', 'error', { title: 'Respuesta vacía' });
+            return;
+        }
+        try {
+            var res = await fetch(API + '/questions/' + questionId + '/answer', {
+                method: 'POST',
+                headers: headers(),
+                body: JSON.stringify({ text: text })
+            });
+            var data = await res.json();
+            if (res.ok) {
+                showToast('Respuesta enviada correctamente', 'ok', { title: 'Pregunta respondida' });
+                loadQuestions();
+            } else {
+                showToast(data.error || 'Error al enviar respuesta', 'error', { title: 'Error' });
+            }
+        } catch (e) {
+            showToast(e.message, 'error', { title: 'Error de red' });
+        }
+    };
+
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === 'function') {
+        registerCmdKItem({ group: 'MercadoLibre', label: 'Configuración ML', href: '/pos/marketplace-external', icon: '⚙️' });
+        registerCmdKItem({ group: 'MercadoLibre', label: 'Publicaciones ML', href: '/pos/marketplace-external#listings', icon: '📦' });
+        registerCmdKItem({ group: 'MercadoLibre', label: 'Órdenes ML', href: '/pos/marketplace-external#orders', icon: '🛒' });
+        registerCmdKItem({ group: 'MercadoLibre', label: 'Preguntas ML', href: '/pos/marketplace-external#questions', icon: '❓' });
+    }
+
+    document.addEventListener('DOMContentLoaded', function() {
+        loadConfig();
+    });
+})();
diff --git a/pos/static/js/pos-utils.js b/pos/static/js/pos-utils.js
index 7c89971..c13aeaf 100644
--- a/pos/static/js/pos-utils.js
+++ b/pos/static/js/pos-utils.js
@@ -76,38 +76,245 @@
         window.print();
     };
 
-    // ── Toast (simple, non-blocking notification) ──────────────────
-    // Only creates its own toast if the page doesn't already have one.
-    window.showToast = function(msg, type) {
+    // ── Toast (enhanced with icons, progress bar, close button, actions) ──
+    var _toastIcons = {
+        ok: '<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><polyline points="20 6 9 17 4 12"/></svg>',
+        error: '<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><line x1="18" y1="6" x2="6" y2="18"/><line x1="6" y1="6" x2="18" y2="18"/></svg>',
+        warn: '<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><path d="M10.29 3.86L1.82 18a2 2 0 001.71 3h16.94a2 2 0 001.71-3L13.71 3.86a2 2 0 00-3.42 0z"/><line x1="12" y1="9" x2="12" y2="13"/><line x1="12" y1="17" x2="12.01" y2="17"/></svg>',
+        info: '<svg width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round"><circle cx="12" cy="12" r="10"/><line x1="12" y1="16" x2="12" y2="12"/><line x1="12" y1="8" x2="12.01" y2="8"/></svg>'
+    };
+    var _toastTitles = { ok: 'Éxito', error: 'Error', warn: 'Advertencia', info: 'Información' };
+
+    window.showToast = function(msg, type, opts) {
         type = type || 'info';
+        opts = opts || {};
         var container = document.getElementById('toast-container');
         if (!container) {
             container = document.createElement('div');
             container.id = 'toast-container';
-            container.style.cssText = 'position:fixed;top:16px;right:16px;z-index:9999;display:flex;flex-direction:column;gap:8px;pointer-events:none;';
             document.body.appendChild(container);
         }
 
-        var colors = {
-            ok: 'background:#1a7a3a;color:#fff;',
-            error: 'background:#c0392b;color:#fff;',
-            warn: 'background:#d4a017;color:#000;',
-            info: 'background:var(--color-surface-3,#333);color:var(--color-text-primary,#fff);',
-        };
-
         var toast = document.createElement('div');
-        toast.style.cssText = (colors[type] || colors.info) +
-            'padding:10px 20px;border-radius:8px;font-size:14px;font-weight:500;' +
-            'box-shadow:0 4px 12px rgba(0,0,0,0.3);pointer-events:auto;' +
-            'animation:slideInRight 0.3s ease;max-width:400px;';
-        toast.textContent = msg;
+        toast.className = 'toast toast--' + type;
+
+        var iconHtml = '<div class="toast__icon">' + (_toastIcons[type] || _toastIcons.info) + '</div>';
+        var titleHtml = opts.title ? '<div class="toast__title">' + opts.title + '</div>' : '';
+        var actionHtml = '';
+        if (opts.action && opts.action.text) {
+            actionHtml = '<div class="toast__action"><button onclick="this.closest(\'.toast\').__toastAction()">' + opts.action.text + '</button></div>';
+            toast.__toastAction = function() {
+                if (opts.action.callback) opts.action.callback();
+                _removeToast(toast);
+            };
+        }
+        var progressHtml = '<div class="toast__progress" style="animation-duration:' + (opts.duration || 4000) + 'ms;"></div>';
+
+        toast.innerHTML = iconHtml +
+            '<div class="toast__content">' + titleHtml + '<div class="toast__msg">' + msg + '</div>' + actionHtml + '</div>' +
+            '<button class="toast__close" onclick="_removeToast(this.closest(\'.toast\'))">✕</button>' +
+            progressHtml;
+
         container.appendChild(toast);
 
-        setTimeout(function() {
-            toast.style.opacity = '0';
-            toast.style.transition = 'opacity 0.3s';
-            setTimeout(function() { toast.remove(); }, 300);
-        }, 3000);
+        var timer = setTimeout(function() { _removeToast(toast); }, opts.duration || 4000);
+        toast.__toastTimer = timer;
+
+        toast.addEventListener('mouseenter', function() { clearTimeout(timer); var p = toast.querySelector('.toast__progress'); if (p) p.style.animationPlayState = 'paused'; });
+        toast.addEventListener('mouseleave', function() { var p = toast.querySelector('.toast__progress'); if (p) p.style.animationPlayState = 'running'; timer = setTimeout(function() { _removeToast(toast); }, 2000); toast.__toastTimer = timer; });
+    };
+
+    window._removeToast = function(toast) {
+        if (!toast || toast.__toastRemoved) return;
+        toast.__toastRemoved = true;
+        if (toast.__toastTimer) clearTimeout(toast.__toastTimer);
+        toast.style.animation = 'toastSlideOut 0.25s ease forwards';
+        setTimeout(function() { toast.remove(); }, 260);
+    };
+
+    // ── Skeleton helpers ──────────────────────────────────────────
+    window.renderSkeletonRows = function(cols, rows) {
+        rows = rows || 6;
+        var html = '';
+        for (var i = 0; i < rows; i++) {
+            html += '<tr class="skeleton--table-row">';
+            for (var j = 0; j < cols; j++) {
+                html += '<td><div class="skeleton"></div></td>';
+            }
+            html += '</tr>';
+        }
+        return html;
+    };
+
+    window.showSkeleton = function(containerSelector, cols, rows) {
+        var el = typeof containerSelector === 'string' ? document.querySelector(containerSelector) : containerSelector;
+        if (!el) return;
+        el.dataset.originalContent = el.innerHTML;
+        el.innerHTML = renderSkeletonRows(cols || 6, rows || 6);
+    };
+
+    window.hideSkeleton = function(containerSelector) {
+        var el = typeof containerSelector === 'string' ? document.querySelector(containerSelector) : containerSelector;
+        if (!el || el.dataset.originalContent === undefined) return;
+        el.innerHTML = el.dataset.originalContent;
+        delete el.dataset.originalContent;
+    };
+
+    // ── Empty state helper ────────────────────────────────────────
+    window.renderEmptyState = function(opts) {
+        opts = opts || {};
+        var icon = opts.icon || '<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5" stroke-linecap="round" stroke-linejoin="round"><rect x="3" y="3" width="18" height="18" rx="2" ry="2"/><line x1="9" y1="9" x2="15" y2="15"/><line x1="15" y1="9" x2="9" y2="15"/></svg>';
+        var title = opts.title || 'Sin datos';
+        var subtitle = opts.subtitle || 'No hay información disponible en este momento.';
+        var action = opts.action ? '<div class="empty-state__action">' + opts.action + '</div>' : '';
+        return '<div class="empty-state">' +
+            '<div class="empty-state__icon">' + icon + '</div>' +
+            '<div class="empty-state__title">' + title + '</div>' +
+            '<div class="empty-state__subtitle">' + subtitle + '</div>' +
+            action + '</div>';
+    };
+
+    // ── Cmd+K Global Search ───────────────────────────────────────
+    (function() {
+        var cmdkOverlay = null, cmdkInput = null, cmdkResults = null, cmdkSelected = -1;
+        var cmdkItems = [];
+
+        function buildCmdK() {
+            if (cmdkOverlay) return;
+            cmdkOverlay = document.createElement('div');
+            cmdkOverlay.className = 'cmdk-overlay';
+            cmdkOverlay.innerHTML =
+                '<div class="cmdk-modal" role="dialog" aria-label="Búsqueda global">' +
+                '  <div class="cmdk-input-wrap">' +
+                '    <svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2.5" stroke-linecap="round" stroke-linejoin="round" style="color:var(--color-text-muted);flex-shrink:0;"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>' +
+                '    <input type="text" class="cmdk-input" placeholder="Buscar módulos, productos, clientes..." autocomplete="off">' +
+                '    <span class="cmdk-shortcut">ESC</span>' +
+                '  </div>' +
+                '  <div class="cmdk-results"></div>' +
+                '  <div class="cmdk-footer"><span>↑↓ navegar · ↵ seleccionar</span><span>' + cmdkItems.length + ' resultados</span></div>' +
+                '</div>';
+            document.body.appendChild(cmdkOverlay);
+            cmdkInput = cmdkOverlay.querySelector('.cmdk-input');
+            cmdkResults = cmdkOverlay.querySelector('.cmdk-results');
+
+            cmdkOverlay.addEventListener('click', function(e) { if (e.target === cmdkOverlay) closeCmdK(); });
+            cmdkInput.addEventListener('input', function() { filterCmdK(this.value); });
+            cmdkInput.addEventListener('keydown', function(e) {
+                if (e.key === 'Escape') { closeCmdK(); return; }
+                if (e.key === 'ArrowDown') { e.preventDefault(); moveCmdK(1); }
+                if (e.key === 'ArrowUp') { e.preventDefault(); moveCmdK(-1); }
+                if (e.key === 'Enter') { e.preventDefault(); activateCmdK(); }
+            });
+        }
+
+        function openCmdK() {
+            buildCmdK();
+            cmdkOverlay.classList.add('is-open');
+            cmdkInput.value = '';
+            cmdkInput.focus();
+            filterCmdK('');
+        }
+
+        function closeCmdK() {
+            if (cmdkOverlay) cmdkOverlay.classList.remove('is-open');
+        }
+
+        function moveCmdK(dir) {
+            var items = cmdkResults.querySelectorAll('.cmdk-item');
+            if (!items.length) return;
+            cmdkSelected += dir;
+            if (cmdkSelected < 0) cmdkSelected = items.length - 1;
+            if (cmdkSelected >= items.length) cmdkSelected = 0;
+            items.forEach(function(it, i) { it.classList.toggle('is-selected', i === cmdkSelected); });
+            var sel = items[cmdkSelected];
+            if (sel) sel.scrollIntoView({ block: 'nearest' });
+        }
+
+        function activateCmdK() {
+            var items = cmdkResults.querySelectorAll('.cmdk-item');
+            var sel = items[cmdkSelected];
+            if (sel && sel.dataset.href) { closeCmdK(); window.location.href = sel.dataset.href; }
+        }
+
+        function filterCmdK(q) {
+            q = (q || '').toLowerCase().trim();
+            var groups = {};
+            cmdkItems.forEach(function(item) {
+                if (!q || item.label.toLowerCase().indexOf(q) !== -1 || (item.keywords || '').toLowerCase().indexOf(q) !== -1) {
+                    groups[item.group] = groups[item.group] || [];
+                    groups[item.group].push(item);
+                }
+            });
+            var html = '';
+            var total = 0;
+            Object.keys(groups).forEach(function(g) {
+                html += '<div class="cmdk-group"><div class="cmdk-group__label">' + g + '</div>';
+                groups[g].forEach(function(item) {
+                    total++;
+                    html += '<div class="cmdk-item" data-href="' + (item.href || '') + '">' +
+                        '<div class="cmdk-item__icon">' + (item.icon || '→') + '</div>' +
+                        '<div>' + item.label + '</div>' +
+                        (item.meta ? '<div class="cmdk-item__meta">' + item.meta + '</div>' : '') +
+                        '</div>';
+                });
+                html += '</div>';
+            });
+            if (!total) html = '<div style="padding:24px;text-align:center;color:var(--color-text-muted);">Sin resultados</div>';
+            cmdkResults.innerHTML = html;
+            cmdkSelected = 0;
+            var first = cmdkResults.querySelector('.cmdk-item');
+            if (first) first.classList.add('is-selected');
+            var footer = cmdkOverlay.querySelector('.cmdk-footer span:last-child');
+            if (footer) footer.textContent = total + ' resultados';
+        }
+
+        document.addEventListener('keydown', function(e) {
+            if ((e.metaKey || e.ctrlKey) && e.key === 'k') { e.preventDefault(); openCmdK(); }
+        });
+
+        window.registerCmdKItem = function(item) {
+            if (!item || !item.label) return;
+            cmdkItems.push(item);
+        };
+
+        window.openCmdK = openCmdK;
+        window.closeCmdK = closeCmdK;
+    })();
+
+    // ── Connection indicator helper ───────────────────────────────
+    window.ConnectionStatus = {
+        online: function() { return navigator.onLine; },
+        render: function(containerId) {
+            var el = document.getElementById(containerId);
+            if (!el) return;
+            function update() {
+                var isOnline = navigator.onLine;
+                el.className = 'connection-indicator' + (isOnline ? '' : ' connection-indicator--offline');
+                el.innerHTML = '<span></span>' + (isOnline ? 'En línea' : 'Sin conexión');
+            }
+            update();
+            window.addEventListener('online', update);
+            window.addEventListener('offline', update);
+        }
+    };
+
+    // ── Bulk toolbar helper ───────────────────────────────────────
+    window.renderBulkToolbar = function(count, actionsHtml) {
+        return '<div class="bulk-toolbar">' +
+            '<div class="bulk-toolbar__count">' + count + ' seleccionado' + (count !== 1 ? 's' : '') + '</div>' +
+            '<div class="bulk-toolbar__actions">' + actionsHtml + '</div>' +
+            '</div>';
+    };
+
+    // ── Entrance animation helper ─────────────────────────────────
+    window.animateEntrance = function(selector, animClass, stagger) {
+        animClass = animClass || 'animate-fade-in-up';
+        stagger = stagger || 0.05;
+        var els = document.querySelectorAll(selector);
+        els.forEach(function(el, i) {
+            el.style.animationDelay = (i * stagger) + 's';
+            el.classList.add(animClass);
+        });
     };
 
     // ── "Próximamente" placeholder for features not yet built ──────
@@ -392,4 +599,275 @@
         }
     }
 
+    // ── Barcode Scanner Feedback ──────────────────────────────────
+    window.BarcodeFeedback = {
+        _audioCtx: null,
+        success: function() {
+            this._beep(800, 0.1, 'sine');
+            this._flash('#22c55e');
+            if (navigator.vibrate) navigator.vibrate(50);
+        },
+        error: function() {
+            this._beep(200, 0.15, 'square');
+            this._flash('#ef4444');
+            if (navigator.vibrate) navigator.vibrate([80, 50, 80]);
+        },
+        _beep: function(freq, duration, type) {
+            try {
+                if (!this._audioCtx) this._audioCtx = new (window.AudioContext || window.webkitAudioContext)();
+                var osc = this._audioCtx.createOscillator();
+                var gain = this._audioCtx.createGain();
+                osc.type = type || 'sine';
+                osc.frequency.value = freq;
+                gain.gain.value = 0.1;
+                osc.connect(gain);
+                gain.connect(this._audioCtx.destination);
+                osc.start();
+                osc.stop(this._audioCtx.currentTime + duration);
+            } catch(e) {}
+        },
+        _flash: function(color) {
+            var el = document.createElement('div');
+            el.style.cssText = 'position:fixed;inset:0;z-index:99999;opacity:0.3;background:' + color + ';pointer-events:none;transition:opacity 0.2s;';
+            document.body.appendChild(el);
+            setTimeout(function() { el.style.opacity = '0'; }, 50);
+            setTimeout(function() { el.remove(); }, 300);
+        }
+    };
+
+    // ── Saved Filters ─────────────────────────────────────────────
+    window.SavedFilters = {
+        _key: function(page) { return 'pos_filters_' + (page || window.location.pathname); },
+        save: function(name, filters) {
+            var key = this._key();
+            var saved = this.list();
+            saved.push({ name: name, filters: filters, created: Date.now() });
+            localStorage.setItem(key, JSON.stringify(saved));
+        },
+        list: function() {
+            try { return JSON.parse(localStorage.getItem(this._key()) || '[]'); } catch(e) { return []; }
+        },
+        remove: function(name) {
+            var saved = this.list().filter(function(f) { return f.name !== name; });
+            localStorage.setItem(this._key(), JSON.stringify(saved));
+        },
+        renderChips: function(containerId, onApply) {
+            var container = document.getElementById(containerId);
+            if (!container) return;
+            var saved = this.list();
+            if (!saved.length) { container.innerHTML = ''; return; }
+            var html = '';
+            saved.forEach(function(f) {
+                html += '<span class="filter-chip">' + esc(f.name) +
+                    '<button class="filter-chip__remove" onclick="SavedFilters.remove(\'' + esc(f.name) + '\');SavedFilters.renderChips(\'' + containerId + '\');">&times;</button></span>';
+            });
+            container.innerHTML = html;
+            container.querySelectorAll('.filter-chip').forEach(function(chip, i) {
+                chip.addEventListener('click', function(e) {
+                    if (e.target.classList.contains('filter-chip__remove')) return;
+                    if (onApply) onApply(saved[i].filters);
+                });
+            });
+        }
+    };
+
+    // ── Resizable Columns ─────────────────────────────────────────
+    window.makeTableResizable = function(tableSelector) {
+        var table = document.querySelector(tableSelector);
+        if (!table) return;
+        var ths = table.querySelectorAll('thead th');
+        ths.forEach(function(th, i) {
+            if (i >= ths.length - 1) return; // skip last column
+            var handle = document.createElement('div');
+            handle.className = 'resize-handle';
+            th.appendChild(handle);
+
+            handle.addEventListener('mousedown', function(e) {
+                e.preventDefault();
+                var startX = e.pageX;
+                var startW = th.offsetWidth;
+                th.classList.add('is-resizing');
+
+                function onMove(ev) {
+                    var newW = Math.max(60, startW + (ev.pageX - startX));
+                    th.style.width = newW + 'px';
+                    th.style.minWidth = newW + 'px';
+                }
+                function onUp() {
+                    th.classList.remove('is-resizing');
+                    document.removeEventListener('mousemove', onMove);
+                    document.removeEventListener('mouseup', onUp);
+                }
+                document.addEventListener('mousemove', onMove);
+                document.addEventListener('mouseup', onUp);
+            });
+        });
+    };
+
+    // ── Density / Touch Mode Toggles ──────────────────────────────
+    window.DensityToggle = {
+        set: function(density) {
+            document.documentElement.setAttribute('data-density', density);
+            localStorage.setItem('pos_density', density);
+        },
+        init: function() {
+            var saved = localStorage.getItem('pos_density') || 'normal';
+            document.documentElement.setAttribute('data-density', saved);
+        }
+    };
+    window.TouchModeToggle = {
+        set: function(enabled) {
+            document.documentElement.setAttribute('data-touch', enabled ? 'true' : 'false');
+            localStorage.setItem('pos_touch_mode', enabled ? 'true' : 'false');
+        },
+        init: function() {
+            var saved = localStorage.getItem('pos_touch_mode') === 'true';
+            document.documentElement.setAttribute('data-touch', saved ? 'true' : 'false');
+        }
+    };
+    DensityToggle.init();
+    TouchModeToggle.init();
+
+    // ── Notifications Dropdown (functional) ───────────────────────
+    window.NotificationsDropdown = {
+        _visible: false,
+        _el: null,
+        toggle: function() {
+            if (this._visible) { this.hide(); return; }
+            this.show();
+        },
+        show: function() {
+            if (this._el) this._el.remove();
+            var btn = document.getElementById('notifDropdownBtn');
+            var el = document.createElement('div');
+            el.className = 'notif-dropdown';
+            el.innerHTML = '<div class="notif-dropdown__header">Notificaciones <button onclick="NotificationsDropdown.hide()" style="background:none;border:none;color:var(--color-text-muted);cursor:pointer;font-size:16px;">✕</button></div>' +
+                '<div class="notif-dropdown__list" id="notifDropdownList"><div class="notif-dropdown__empty">Sin notificaciones nuevas</div></div>';
+            if (btn) {
+                btn.parentElement.style.position = 'relative';
+                btn.parentElement.appendChild(el);
+            } else {
+                document.body.appendChild(el);
+            }
+            this._el = el;
+            this._visible = true;
+            this._load();
+            setTimeout(function() {
+                document.addEventListener('click', function handler(e) {
+                    if (!el.contains(e.target) && e.target !== btn) {
+                        NotificationsDropdown.hide();
+                        document.removeEventListener('click', handler);
+                    }
+                });
+            }, 100);
+        },
+        hide: function() { if (this._el) { this._el.remove(); this._el = null; } this._visible = false; },
+        _load: function() {
+            // Stub: can be wired to /api/notifications endpoint
+            var list = document.getElementById('notifDropdownList');
+            if (!list) return;
+            // Example: show inventory alerts count if available
+            var token = localStorage.getItem('pos_token');
+            if (!token) return;
+            fetch('/pos/api/inventory/alerts', { headers: { 'Authorization': 'Bearer ' + token } })
+                .then(function(r) { return r.json(); })
+                .then(function(d) {
+                    var count = (d.counts || {}).critical || 0;
+                    if (count > 0) {
+                        list.innerHTML = '<div class="notif-dropdown__item notif-dropdown__item--unread" onclick="window.location.href=\'/pos/inventory#alertas\'">' +
+                            '<div class="notif-dropdown__icon">⚠️</div>' +
+                            '<div class="notif-dropdown__content"><div class="notif-dropdown__title">' + count + ' producto' + (count > 1 ? 's' : '') + ' sin stock</div>' +
+                            '<div class="notif-dropdown__time">Stock crítico</div></div></div>';
+                    }
+                }).catch(function() {});
+        }
+    };
+
+    // ── Ticket Preview Helper ─────────────────────────────────────
+    window.previewTicket = function(ticketData) {
+        var data = ticketData || {};
+        var items = (data.items || []).map(function(it) {
+            return '<div class="ticket-preview__row"><span>' + (it.quantity || 1) + 'x ' + esc(it.name) + '</span><span>$' + (it.subtotal || 0).toFixed(2) + '</span></div>';
+        }).join('');
+        var html = '<div class="ticket-preview">' +
+            '<div class="ticket-preview__header"><div class="ticket-preview__title">Nexus Autoparts</div><div class="ticket-preview__meta">' + (data.store || 'Sucursal Centro') + '</div></div>' +
+            '<div class="ticket-preview__meta" style="text-align:center;margin-bottom:8px;">' + new Date().toLocaleString('es-MX') + '</div>' +
+            '<div class="ticket-preview__row"><span>Ticket #' + (data.id || '---') + '</span></div>' +
+            '<hr style="border:none;border-top:1px dashed #ccc;margin:8px 0;">' +
+            items +
+            '<hr style="border:none;border-top:1px dashed #ccc;margin:8px 0;">' +
+            '<div class="ticket-preview__row"><span>Subtotal</span><span>$' + (data.subtotal || 0).toFixed(2) + '</span></div>' +
+            '<div class="ticket-preview__row"><span>IVA</span><span>$' + (data.tax || 0).toFixed(2) + '</span></div>' +
+            '<div class="ticket-preview__total"><span>TOTAL</span><span>$' + (data.total || 0).toFixed(2) + '</span></div>' +
+            '<div style="text-align:center;font-size:10px;color:#666;margin-top:12px;">Gracias por su compra</div>' +
+            '</div>';
+        return html;
+    };
+
+    // ── Image Comparator Helper ───────────────────────────────────
+    window.initImageComparator = function(containerSelector) {
+        var container = document.querySelector(containerSelector);
+        if (!container) return;
+        var overlay = container.querySelector('.img-compare__overlay');
+        var handle = container.querySelector('.img-compare__handle');
+        if (!overlay || !handle) return;
+
+        function move(x) {
+            var rect = container.getBoundingClientRect();
+            var pct = Math.max(0, Math.min(100, ((x - rect.left) / rect.width) * 100));
+            overlay.style.width = pct + '%';
+            handle.style.left = pct + '%';
+        }
+        handle.addEventListener('mousedown', function(e) {
+            e.preventDefault();
+            function onMove(ev) { move(ev.pageX); }
+            function onUp() { document.removeEventListener('mousemove', onMove); document.removeEventListener('mouseup', onUp); }
+            document.addEventListener('mousemove', onMove);
+            document.addEventListener('mouseup', onUp);
+        });
+        handle.addEventListener('touchstart', function(e) {
+            function onMove(ev) { move(ev.touches[0].pageX); }
+            function onUp() { document.removeEventListener('touchmove', onMove); document.removeEventListener('touchend', onUp); }
+            document.addEventListener('touchmove', onMove);
+            document.addEventListener('touchend', onUp);
+        });
+    };
+
+    // ── Infinite Scroll Helper ────────────────────────────────────
+    window.InfiniteScroll = function(opts) {
+        opts = opts || {};
+        var container = opts.container || window;
+        var threshold = opts.threshold || 200;
+        var loading = false;
+        var observer = new IntersectionObserver(function(entries) {
+            if (entries[0].isIntersecting && !loading && opts.onLoad) {
+                loading = true;
+                opts.onLoad(function() { loading = false; });
+            }
+        }, { root: container === window ? null : container, rootMargin: threshold + 'px' });
+        var sentinel = document.createElement('div');
+        sentinel.style.cssText = 'height:1px;';
+        (opts.sentinelParent || document.body).appendChild(sentinel);
+        observer.observe(sentinel);
+        return { disconnect: function() { observer.disconnect(); sentinel.remove(); } };
+    };
+
+    // ── Sparkline Renderer ────────────────────────────────────────
+    window.renderSparkline = function(containerSelector, values, opts) {
+        opts = opts || {};
+        var container = typeof containerSelector === 'string' ? document.querySelector(containerSelector) : containerSelector;
+        if (!container || !values || !values.length) return;
+        var max = Math.max.apply(null, values) || 1;
+        var min = Math.min.apply(null, values);
+        var range = max - min || 1;
+        var cls = opts.trend === 'up' ? 'sparkline--up' : (opts.trend === 'down' ? 'sparkline--down' : '');
+        var html = '<div class="sparkline ' + cls + '">';
+        values.forEach(function(v) {
+            var h = Math.max(4, Math.round(((v - min) / range) * 100));
+            html += '<div class="sparkline__bar" style="height:' + h + '%" title="' + (opts.prefix || '') + v + '"></div>';
+        });
+        html += '</div>';
+        container.innerHTML = html;
+    };
+
 })();
diff --git a/pos/static/js/pos.js b/pos/static/js/pos.js
index 3caff55..ab1a133 100644
--- a/pos/static/js/pos.js
+++ b/pos/static/js/pos.js
@@ -123,6 +123,8 @@ const POS = (() => {
                 currentRegister = null;
                 document.getElementById('registerInfo').innerHTML =
                     '<span style="color:var(--color-error);cursor:pointer;" onclick="POS.showOpenRegisterModal()" title="Clic para abrir caja">&#x26A0; Sin caja abierta — Clic para abrir</span>';
+                // Force open register modal on first load
+                showOpenRegisterModal();
             }
         } catch (e) {
             console.warn('Register check failed:', e);
@@ -240,6 +242,7 @@ const POS = (() => {
         if (existing) {
             existing.quantity += (item.quantity || 1);
             renderCart();
+            if (window.BarcodeFeedback) BarcodeFeedback.success();
             return;
         }
 
@@ -253,6 +256,9 @@ const POS = (() => {
             discount_pct: parseFloat(item.discount_pct || 0),
             tax_rate: parseFloat(item.tax_rate || 0.16),
             stock: item.stock || 0,
+            price_1: parseFloat(item.price_1 || 0),
+            price_2: parseFloat(item.price_2 || 0),
+            price_3: parseFloat(item.price_3 || 0),
         });
 
         renderCart();
@@ -265,6 +271,82 @@ const POS = (() => {
         renderCart();
     }
 
+    function clearCart() {
+        cart.length = 0;
+        selectedRow = -1;
+        renderCart();
+    }
+
+    function openCancelModal() {
+        const overlay = document.getElementById('overlay-cancelar-venta');
+        const dialog = document.getElementById('modal-cancelar-venta');
+        if (overlay) overlay.classList.add('active');
+        if (dialog) dialog.classList.add('active');
+    }
+
+    function closeCancelModal() {
+        const overlay = document.getElementById('overlay-cancelar-venta');
+        const dialog = document.getElementById('modal-cancelar-venta');
+        if (overlay) overlay.classList.remove('active');
+        if (dialog) dialog.classList.remove('active');
+    }
+
+    function changeQuantity() {
+        if (selectedRow < 0 || selectedRow >= cart.length) {
+            showToast('Selecciona un articulo primero', 'warn');
+            return;
+        }
+        const q = prompt('Nueva cantidad:', cart[selectedRow].quantity);
+        if (q !== null) {
+            const n = parseInt(q);
+            if (n > 0) {
+                cart[selectedRow].quantity = n;
+                renderCart();
+            }
+        }
+    }
+
+    function applyDiscount() {
+        if (selectedRow < 0 || selectedRow >= cart.length) {
+            showToast('Selecciona un articulo primero', 'warn');
+            return;
+        }
+        const d = prompt('Descuento %:', cart[selectedRow].discount_pct);
+        if (d !== null) {
+            const n = parseFloat(d);
+            if (n >= 0 && n <= 100) {
+                cart[selectedRow].discount_pct = n;
+                renderCart();
+            }
+        }
+    }
+
+    function modifyPrice() {
+        if (selectedRow < 0 || selectedRow >= cart.length) {
+            showToast('Selecciona un articulo primero', 'warn');
+            return;
+        }
+        const p = prompt('Nuevo precio unitario:', cart[selectedRow].unit_price);
+        if (p !== null) {
+            const n = parseFloat(p);
+            if (n >= 0) {
+                cart[selectedRow].unit_price = n;
+                renderCart();
+            }
+        }
+    }
+
+    // Wire confirm-cancel button
+    document.addEventListener('DOMContentLoaded', function() {
+        var btn = document.getElementById('btnConfirmCancel');
+        if (btn) {
+            btn.addEventListener('click', function() {
+                clearCart();
+                closeCancelModal();
+            });
+        }
+    });
+
     function renderCart() {
         const tbody = document.getElementById('cartBody');
         const table = document.getElementById('cartTable');
@@ -436,6 +518,19 @@ const POS = (() => {
 
             if (data.data.length === 0) {
                 container.innerHTML = '<div style="padding:20px;text-align:center;color:var(--color-text-muted);">Sin resultados</div>';
+                if (window.BarcodeFeedback) BarcodeFeedback.error();
+            } else if (data.data.length === 1 && q.length >= 8) {
+                // Auto-select single result on barcode scan (long codes)
+                const item = data.data[0];
+                let price = item.price_1;
+                if (currentCustomer) {
+                    const tier = currentCustomer.price_tier || 1;
+                    price = tier === 3 ? item.price_3 : tier === 2 ? item.price_2 : item.price_1;
+                }
+                addFromSearch(item, price);
+                input.value = '';
+                hideSearchResults();
+                return;
             } else {
                 let html = '';
                 data.data.forEach(item => {
@@ -472,7 +567,11 @@ const POS = (() => {
             cost: item.cost,
             tax_rate: item.tax_rate,
             stock: item.stock,
+            price_1: item.price_1,
+            price_2: item.price_2,
+            price_3: item.price_3,
         });
+        if (window.BarcodeFeedback) BarcodeFeedback.success();
         hideSearchResults();
         document.getElementById('itemSearch').value = '';
         document.getElementById('itemSearch').focus();
@@ -530,11 +629,22 @@ const POS = (() => {
         }
     }
 
+    function recalcCartPrices() {
+        const tier = currentCustomer ? (currentCustomer.price_tier || 1) : 1;
+        cart.forEach(item => {
+            if (item.price_1 > 0) {
+                item.unit_price = tier === 3 ? item.price_3 : tier === 2 ? item.price_2 : item.price_1;
+            }
+        });
+    }
+
     async function selectCustomer(customer) {
         currentCustomer = customer;
         document.getElementById('customerAutocomplete').style.display = 'none';
         document.getElementById('customerSearchWrap').querySelector('input').style.display = 'none';
 
+        recalcCartPrices();
+
         const tiers = { 1: 'P1 Mostrador', 2: 'P2 Taller', 3: 'P3 Mayoreo' };
         document.getElementById('customerName').textContent = customer.name;
         document.getElementById('customerTier').textContent = tiers[customer.price_tier] || 'P1';
@@ -1255,7 +1365,7 @@ const POS = (() => {
     init();
 
     return {
-        addToCart, removeFromCart, selectRow,
+        addToCart, removeFromCart, clearCart, selectRow,
         updateQty, updateDiscount,
         addFromSearch, hideSearchResults,
         selectCustomer, clearCustomer,
@@ -1268,5 +1378,14 @@ const POS = (() => {
         connectThermal, thermalPrint,
         showOpenRegisterModal, closeOpenRegisterModal, openRegister,
         showCutZModal, closeCutZModal, loadCutX, confirmCutZ,
+        openCancelModal, closeCancelModal, changeQuantity, applyDiscount, modifyPrice,
     };
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/js/pos.min.js b/pos/static/js/pos.min.js
index 9fa3744..36242df 100644
--- a/pos/static/js/pos.min.js
+++ b/pos/static/js/pos.min.js
@@ -1 +1 @@
-const POS=(()=>{let e=localStorage.getItem("pos_token")||"",t=[],n=-1,o=null,a=null,i="efectivo",r=!1,c=100,s=null,l=null,d=null,m=null;const u=localStorage.getItem("pos_currency")||"MXN",p={MXN:"$",USD:"US$"},y="USD"===u?"en-US":"es-MX",v=e=>(p[u]||"$")+parseFloat(e||0).toLocaleString(y,{minimumFractionDigits:2,maximumFractionDigits:2});async function g(t,n={}){n.headers={"Content-Type":"application/json",Authorization:"Bearer "+e};const o=await fetch(t,n),a=await o.json();if(!o.ok)throw new Error(a.error||`HTTP ${o.status}`);return a}function f(e){const t=document.getElementById("toastContainer");if(!t)return;const n=document.createElement("div");n.className="toast",n.textContent=e,t.appendChild(n),setTimeout((()=>n.remove()),2100)}function h(e){const n=t.find((t=>t.inventory_id===e.inventory_id));if(n)return n.quantity+=e.quantity||1,void E();t.push({inventory_id:e.inventory_id||e.id,part_number:e.part_number||"",name:e.name||"",quantity:e.quantity||1,unit_price:parseFloat(e.unit_price||e.price_1||0),unit_cost:parseFloat(e.cost||0),discount_pct:parseFloat(e.discount_pct||0),tax_rate:parseFloat(e.tax_rate||.16),stock:e.stock||0}),E(),f(`${e.name||"Articulo"} agregado`)}function _(e){t.splice(e,1),n>=t.length&&(n=t.length-1),E()}function E(){const e=document.getElementById("cartBody"),o=document.getElementById("cartTable"),a=document.getElementById("cartEmpty");if(0===t.length)return o.style.display="none",a.style.display="flex",void b();o.style.display="",a.style.display="none";let i="";t.forEach(((e,t)=>{const o=e.unit_price*e.quantity,a=o-o*e.discount_pct/100,c=r?`<td class="num" style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);color:var(--color-text-muted);font-size:var(--text-caption);">${v(e.unit_cost)}</td>`:"";let s="";if(r){const t=e.unit_price*(1-e.discount_pct/100),n=t>0?((t-e.unit_cost)/t*100).toFixed(1):"0.0",o=parseFloat(n);s=`<td style="text-align:center;padding:var(--space-2);"><span style="font-family:var(--font-mono);font-size:var(--text-caption);font-weight:var(--font-weight-bold);color:${o>30?"var(--color-success)":o>15?"var(--color-warning)":"var(--color-error)"};">${n}%</span></td>`}i+=`<tr style="border-bottom:1px solid var(--color-border);cursor:pointer;${t===n?"background:var(--color-primary-muted);":""}" onclick="POS.selectRow(${t})">\n                <td style="padding:var(--space-2);color:var(--color-text-muted);">${t+1}</td>\n                <td style="padding:var(--space-2);">\n                    <div style="font-weight:var(--font-weight-semibold);color:var(--color-text-primary);">${e.name}</div>\n                    <div style="font-family:var(--font-mono);font-size:var(--text-caption);color:var(--color-text-muted);">${e.part_number} | Stock: ${e.stock}</div>\n                </td>\n                <td style="text-align:center;padding:var(--space-2);"><input type="number" style="width:50px;text-align:center;font-family:var(--font-mono);background:var(--color-bg-base);color:var(--color-text-primary);border:1px solid var(--color-border);border-radius:var(--radius-sm);padding:2px 4px;" value="${e.quantity}" min="1"\n                    onchange="POS.updateQty(${t}, this.value)" onclick="event.stopPropagation()"></td>\n                <td style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);">${v(e.unit_price)}</td>\n                <td style="text-align:center;padding:var(--space-2);"><input type="number" style="width:45px;text-align:center;font-family:var(--font-mono);background:var(--color-bg-base);color:var(--color-text-primary);border:1px solid var(--color-border);border-radius:var(--radius-sm);padding:2px 4px;" value="${e.discount_pct}" min="0" max="100" step="0.5"\n                    onchange="POS.updateDiscount(${t}, this.value)" onclick="event.stopPropagation()">%</td>\n                <td style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);font-weight:var(--font-weight-bold);">${v(a)}</td>\n                ${c}\n                ${s}\n                <td style="text-align:center;"><button style="background:transparent;border:1px solid var(--color-border);border-radius:var(--radius-sm);width:24px;height:24px;cursor:pointer;color:var(--color-text-muted);font-size:14px;" onclick="event.stopPropagation(); POS.removeFromCart(${t})">&times;</button></td>\n            </tr>`})),e.innerHTML=i,b(),function(){const e=document.getElementById("avgMargin");if(!e||!r)return;let n=0,o=0;if(t.forEach((e=>{if(e.unit_cost>0){const t=e.unit_price*(1-e.discount_pct/100);n+=t*e.quantity,o+=e.unit_cost*e.quantity}})),n>0){const t=(n-o)/n*100;e.textContent=t.toFixed(1)+"%",e.style.color=t>30?"var(--color-success)":t>15?"var(--color-warning)":"var(--color-error)"}else e.textContent="--"}()}function I(e,n){let o=Math.max(0,Math.min(100,parseFloat(n)||0));o>c&&(alert(`Descuento maximo permitido: ${c}%`),o=c),t[e].discount_pct=o,E()}function b(){let e=0,n=0,o=0;t.forEach((t=>{const a=t.unit_price*t.quantity,i=a*t.discount_pct/100,r=a-i,c=r*t.tax_rate;e+=r,n+=i,o+=c}));const a=e+o;document.getElementById("dispSubtotal").textContent=v(e),document.getElementById("dispTax").textContent=v(o),document.getElementById("dispTotal").textContent=v(a),n>0?(document.getElementById("discountRow").style.display="",document.getElementById("dispDiscount").textContent="-"+v(n)):document.getElementById("discountRow").style.display="none"}function x(){let e=0,n=0;return t.forEach((t=>{const o=t.unit_price*t.quantity,a=o-o*t.discount_pct/100,i=a*t.tax_rate;e+=a,n+=i})),Math.round(100*(e+n))/100}async function B(e){if(!e||e.length<2)$();else try{const t=await g(`/pos/api/inventory/items?q=${encodeURIComponent(e)}&per_page=20`),n=document.getElementById("searchResults"),a=document.getElementById("totalsPanel");if(0===t.data.length)n.innerHTML='<div style="padding:20px;text-align:center;color:var(--color-text-muted);">Sin resultados</div>';else{let e="";t.data.forEach((t=>{let n=t.price_1;if(o){const e=o.price_tier||1;n=3===e?t.price_3:2===e?t.price_2:t.price_1}e+=`<div style="padding:var(--space-3) var(--space-4);border-bottom:1px solid var(--color-border);cursor:pointer;display:flex;justify-content:space-between;align-items:center;transition:var(--transition-fast);" onmouseover="this.style.background='var(--color-primary-muted)'" onmouseout="this.style.background=''" onclick='POS.addFromSearch(${JSON.stringify(t).replace(/'/g,"&#39;")}, ${n})'>\n                        <div>\n                            <div style="font-weight:var(--font-weight-semibold);">${t.name}</div>\n                            <div style="font-family:var(--font-mono);font-size:var(--text-caption);color:var(--color-text-muted);">${t.part_number} | ${t.brand||""}</div>\n                            <div style="font-size:var(--text-caption);color:${t.stock<=0?"var(--color-error)":"var(--color-text-muted)"};">Stock: ${t.stock}</div>\n                        </div>\n                        <div style="font-family:var(--font-mono);font-weight:var(--font-weight-bold);color:var(--color-primary);">${v(n)}</div>\n                    </div>`})),n.innerHTML=e}n.style.display="",a.style.display="none"}catch(e){console.error("Search error:",e)}}function $(){const e=document.getElementById("searchResults"),t=document.getElementById("totalsPanel");e&&(e.style.display="none"),t&&(t.style.display="")}async function C(e){o=e,document.getElementById("customerAutocomplete").style.display="none",document.getElementById("customerSearchWrap").querySelector("input").style.display="none";if(document.getElementById("customerName").textContent=e.name,document.getElementById("customerTier").textContent={1:"P1 Mostrador",2:"P2 Taller",3:"P3 Mayoreo"}[e.price_tier]||"P1",document.getElementById("customerCredit").textContent=`Credito: ${v(e.credit_balance)} / ${v(e.credit_limit)}`,document.getElementById("customerSelected").style.display="",e.vehicle_info&&e.vehicle_info.length>0){const t=e.vehicle_info[0];document.getElementById("vehicleInfo").textContent=`${t.make||""} ${t.model||""} ${t.year||""} ${t.plates?"("+t.plates+")":""}`,document.getElementById("vehicleBanner").classList.add("visible")}try{const t=await g(`/pos/api/customers/${e.id}`);if(t.recent_purchases&&t.recent_purchases.length>0){const e=t.recent_purchases[0],n=Math.floor((Date.now()-new Date(e.created_at).getTime())/864e5),o=0===n?"hoy":1===n?"hace 1 dia":`hace ${n} dias`;document.getElementById("lastPurchaseInfo").textContent=`${v(e.total)} ${o}`,document.getElementById("vehicleBanner").classList.add("visible")}}catch(e){console.warn("Could not fetch customer detail:",e)}const t=document.getElementById("cfdiHint");t&&e.rfc&&(t.textContent=`RFC: ${e.rfc}`,document.getElementById("cfdiCheck").checked=!!e.rfc),E()}function w(){o=null,document.getElementById("customerSelected").style.display="none";const e=document.getElementById("customerSearch");e&&(e.style.display="",e.value=""),document.getElementById("vehicleBanner").classList.remove("visible");const t=document.getElementById("cfdiHint");t&&(t.textContent=""),E()}function k(){document.getElementById("newCustomerModal").classList.remove("open")}function S(){if(0===t.length)return void f("Carrito vacio");if(!a)return void alert("No hay caja abierta. Abra una caja primero.");i="efectivo";const e=x();document.getElementById("modalTotal").textContent=v(e),document.getElementById("modalItemCount").textContent=`${t.reduce(((e,t)=>e+t.quantity),0)} productos`,document.getElementById("modalCustomerName").textContent=o?o.name:"Publico General",document.getElementById("cashReceived").value="",document.getElementById("changeDisplay").textContent="$0.00",document.getElementById("changeDisplay").className="cambio-amount positive";const n=document.getElementById("paymentRef");n&&(n.value="");const r=document.getElementById("quickAmounts");if(r){const t=[Math.ceil(e),100*Math.ceil(e/100),500*Math.ceil(e/500),1e3*Math.ceil(e/1e3)],n=[...new Set(t)].slice(0,4);r.innerHTML=n.map((e=>`<button class="quick-btn" onclick="document.getElementById('cashReceived').value=${e};POS.updateChange();">${v(e)}</button>`)).join("")}const c=document.getElementById("refAmount");c&&(c.value=v(e)),document.querySelectorAll(".pago-tab").forEach((e=>e.classList.remove("active"))),document.querySelector('.pago-tab[data-method="efectivo"]').classList.add("active"),document.getElementById("cashPayment").classList.add("active"),document.getElementById("cashPayment").style.display="",document.getElementById("refPayment").classList.remove("active"),document.getElementById("refPayment").style.display="none",document.getElementById("mixedPayment").classList.remove("active"),document.getElementById("mixedPayment").style.display="none";const s=document.getElementById("btnConfirmPayment");s.disabled=!1,s.textContent=`Confirmar Pago — ${v(e)}`,document.getElementById("paymentModal").classList.add("open"),setTimeout((()=>document.getElementById("cashReceived").focus()),100)}function P(){document.getElementById("paymentModal").classList.remove("open")}async function T(){const e=x();let r=0,c=[],d="";if("efectivo"===i){if(r=parseFloat(document.getElementById("cashReceived").value)||0,r<e)return void alert(`Monto insuficiente. Total: ${v(e)}`)}else if("transferencia"===i||"tarjeta"===i)r=e,d=document.getElementById("paymentRef").value.trim();else if("mixto"===i){if(document.querySelectorAll(".mixed-row").forEach((e=>{const t=e.querySelector("select").value,n=parseFloat(e.querySelector(".mixed-amount").value)||0,o=e.querySelectorAll("input")[1]?.value||"";n>0&&(c.push({method:t,amount:n,reference:o}),r+=n)})),r<e)return void alert(`Monto total insuficiente. Falta: ${v(e-r)}`)}const m={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o?o.id:null,payment_method:i,sale_type:"cash",register_id:a?a.id:null,amount_paid:r,payment_details:c,reference:d,generate_cfdi:document.getElementById("cfdiCheck").checked},u=document.getElementById("btnConfirmPayment");u.disabled=!0,u.textContent="Procesando...";try{const e=await g("/pos/api/sales",{method:"POST",body:JSON.stringify(m)});s=e.id,l=e,P(),L(e),t=[],n=-1,w(),E(),f(`Venta #${e.id} completada`)}catch(e){alert("Error al procesar venta: "+e.message)}finally{u.disabled=!1,u.textContent="Confirmar Pago"}}async function M(){if(0===t.length)return void f("Carrito vacio");const e={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o?o.id:null};try{const t=await g("/pos/api/quotations",{method:"POST",body:JSON.stringify(e)});f(`Cotizacion #${t.id} guardada. Total: ${v(t.total)}`)}catch(e){alert("Error: "+e.message)}}function L(e){const t=new Date(e.created_at).toLocaleString("es-MX",{year:"numeric",month:"short",day:"numeric",hour:"2-digit",minute:"2-digit"}),n=o?o.name:"Publico General",r=o&&o.rfc?o.rfc:"";let c="";(e.items||[]).forEach((e=>{const t=e.unit_price*e.quantity*(1-(e.discount_pct||0)/100);c+=`\n                <div class="item-line-wide">\n                    <span class="qty">${e.quantity}</span>\n                    <span class="name">${e.name||""}</span>\n                    <span class="price">${v(e.unit_price)}</span>\n                    <span class="subtotal">${v(e.subtotal||t)}</span>\n                </div>`}));const s=`\n            <div class="store-name">NEXUS AUTOPARTS</div>\n            <div class="store-tagline">Tu conexion con las refacciones</div>\n            <div class="store-info">\n                Sucursal: ${a&&a.branch_name||""}<br>\n                RFC: NAU210315XX1\n            </div>\n            <hr class="divider-double">\n            <div class="folio-line">\n                <span>VENTA: V-${e.id}</span>\n                <span>${t}</span>\n            </div>\n            <div class="ticket-row" style="font-size: 9px; color: #555; margin-bottom: 4px;">\n                <span>Cliente: ${n}</span>\n                ${r?`<span>RFC: ${r}</span>`:""}\n            </div>\n            <hr class="divider">\n            <div class="item-line-wide" style="font-weight: bold; font-size: 9px; color: #555; text-transform: uppercase;">\n                <span class="qty">Cant</span>\n                <span class="name">Descripcion</span>\n                <span class="price">P. Unit</span>\n                <span class="subtotal">Importe</span>\n            </div>\n            <hr class="divider" style="margin: 2px 0;">\n            ${c}\n            <hr class="divider-double">\n            <div class="total-section">\n                <div class="total-line">\n                    <span>Subtotal:</span><span>${v(e.subtotal)}</span>\n                </div>\n                ${e.discount_total>0?`<div class="total-line"><span>Descuento:</span><span>-${v(e.discount_total)}</span></div>`:""}\n                <div class="total-line">\n                    <span>IVA 16%:</span><span>${v(e.tax_total)}</span>\n                </div>\n                <div class="total-line grand">\n                    <span>TOTAL:</span><span>${v(e.total)}</span>\n                </div>\n            </div>\n            <hr class="divider">\n            <div class="payment-section">\n                <div class="ticket-row">\n                    <span>Forma de pago:</span><span>${e.payment_method||i}</span>\n                </div>\n                ${"efectivo"===e.payment_method?`\n                <div class="ticket-row">\n                    <span>Recibido:</span><span>${v(e.amount_paid)}</span>\n                </div>\n                <div class="ticket-row" style="font-weight: bold;">\n                    <span>Cambio:</span><span>${v(e.change_given||0)}</span>\n                </div>`:""}\n            </div>\n            <hr class="divider">\n            <div class="footer-section">\n                <div class="thanks">Gracias por su compra!</div>\n                <div>Conserve su ticket como comprobante.</div>\n            </div>\n        `,l=document.getElementById("ticketContent");l&&(l.innerHTML=s);const d=document.getElementById("ticketPreviewContent");d&&(d.innerHTML=s),document.getElementById("ticketModal").classList.add("open")}function q(){document.getElementById("ticketModal").classList.remove("open")}async function N(){if(s)try{L(await g(`/pos/api/sales/${s}`))}catch(e){alert("Error: "+e.message)}else f("No hay venta reciente")}function D(){f("Comando enviado al cajon de efectivo.")}return async function(){try{const t=JSON.parse(atob(e.split(".")[1]));if(document.getElementById("employeeName").textContent=t.name||"Empleado",document.getElementById("branchName").textContent=t.branch_name||"",r=(t.permissions||[]).includes("pos.view_cost"),c=t.max_discount_pct||100,r){document.getElementById("thCost").style.display="",document.getElementById("thMargin").style.display="";const e=document.getElementById("costToggle");e&&(e.style.display="")}const n=document.querySelector(".status-bar__user-avatar");if(n&&t.name){const e=t.name.split(" ");n.textContent=e.map((e=>e[0])).join("").substring(0,2).toUpperCase()}}catch(e){console.warn("Could not parse token:",e)}const o=localStorage.getItem("pos_cart");if(o)try{const e=JSON.parse(o);for(const t of e)h(t);localStorage.removeItem("pos_cart")}catch(e){console.warn("Could not load catalog cart:",e)}await async function(){try{const e=await g("/pos/api/register/current");e.register?(a=e.register,document.getElementById("registerInfo").innerHTML=`<span>Caja #${e.register.register_number}</span>`):document.getElementById("registerInfo").innerHTML="<span>Sin caja abierta</span>"}catch(e){console.warn("Register check failed:",e)}}(),document.addEventListener("keydown",(e=>{const o=e.target.tagName,a="INPUT"===o||"TEXTAREA"===o||"SELECT"===o;switch(e.key){case"F1":e.preventDefault(),document.getElementById("itemSearch").focus();break;case"F2":e.preventDefault(),document.getElementById("customerSearch").focus(),document.getElementById("customerSearch").style.display="",document.getElementById("customerSelected").style.display="none";break;case"F3":e.preventDefault(),S();break;case"F4":e.preventDefault(),M();break;case"F5":e.preventDefault(),N();break;case"F6":e.preventDefault(),D();break;case"Escape":if(e.preventDefault(),document.getElementById("paymentModal").classList.contains("open"))P();else if(document.getElementById("newCustomerModal").classList.contains("open"))k();else if(document.getElementById("ticketModal").classList.contains("open"))q();else if(document.querySelector(".confirm-overlay.active")){const e=document.getElementById("overlay-cancelar-venta"),t=document.getElementById("modal-cancelar-venta");e&&e.classList.contains("active")&&(e.classList.remove("active"),t.classList.remove("active"))}else $();break;case"Delete":!a&&n>=0&&n<t.length&&(e.preventDefault(),_(n));break;case"+":!a&&n>=0&&n<t.length&&(e.preventDefault(),t[n].quantity++,E());break;case"-":!a&&n>=0&&n<t.length&&(e.preventDefault(),t[n].quantity>1&&(t[n].quantity--,E()));break;case"*":if(!a&&n>=0&&n<t.length){e.preventDefault();const o=prompt("Descuento %:",t[n].discount_pct);null!==o&&I(n,o)}break;case"ArrowUp":!a&&t.length>0&&(e.preventDefault(),n=Math.max(0,n-1),E());break;case"ArrowDown":!a&&t.length>0&&(e.preventDefault(),n=Math.min(t.length-1,n+1),E());break;case"Enter":"cashReceived"===e.target.id&&(e.preventDefault(),T())}})),function(){const e=document.getElementById("itemSearch");if(!e)return;e.addEventListener("input",(()=>{clearTimeout(d),d=setTimeout((()=>B(e.value.trim())),300)})),e.addEventListener("keydown",(t=>{"Enter"===t.key&&(t.preventDefault(),B(e.value.trim())),"Escape"===t.key&&(e.value="",$())}))}(),function(){const e=document.getElementById("customerSearch");if(!e)return;e.addEventListener("input",(()=>{clearTimeout(m),m=setTimeout((()=>async function(e){if(!e||e.length<2)return void(document.getElementById("customerAutocomplete").style.display="none");try{const t=await g(`/pos/api/customers?q=${encodeURIComponent(e)}&per_page=10`),n=document.getElementById("customerAutocomplete");if(0===t.data.length)n.innerHTML='<div style="padding:var(--space-3);color:var(--color-text-muted);">Sin resultados</div>';else{let e="";t.data.forEach((t=>{const n={1:"Mostrador",2:"Taller",3:"Mayoreo"};e+=`<div style="padding:var(--space-3) var(--space-4);border-bottom:1px solid var(--color-border);cursor:pointer;transition:var(--transition-fast);" onmouseover="this.style.background='var(--color-primary-muted)'" onmouseout="this.style.background=''" onclick='POS.selectCustomer(${JSON.stringify(t).replace(/'/g,"&#39;")})'>\n                        <div style="font-weight:var(--font-weight-semibold);">${t.name}</div>\n                        <div style="font-size:var(--text-caption);color:var(--color-text-muted);">${t.rfc||""} | ${t.phone||""} | ${n[t.price_tier]||"P1"} | Credito: ${v(t.credit_balance)}/${v(t.credit_limit)}</div>\n                    </div>`})),n.innerHTML=e}n.style.display="block"}catch(e){console.error("Customer search error:",e)}}(e.value.trim())),300)})),e.addEventListener("keydown",(t=>{"Escape"===t.key&&(e.value="",document.getElementById("customerAutocomplete").style.display="none")}))}()}(),{addToCart:h,removeFromCart:_,selectRow:function(e){n=e,E()},updateQty:function(e,n){const o=Math.max(1,parseInt(n)||1);t[e].quantity=o,E()},updateDiscount:I,addFromSearch:function(e,t){h({inventory_id:e.id,part_number:e.part_number,name:e.name,unit_price:t,cost:e.cost,tax_rate:e.tax_rate,stock:e.stock}),$(),document.getElementById("itemSearch").value="",document.getElementById("itemSearch").focus()},hideSearchResults:$,selectCustomer:C,clearCustomer:w,showNewCustomerModal:function(){document.getElementById("newCustomerModal").classList.add("open"),setTimeout((()=>document.getElementById("ncName").focus()),100)},closeNewCustomerModal:k,saveNewCustomer:async function(){const e=document.getElementById("ncName").value.trim();if(!e)return void alert("Nombre es requerido");const t=[],n=document.getElementById("ncVehMake").value.trim();n&&t.push({make:n,model:document.getElementById("ncVehModel").value.trim(),year:document.getElementById("ncVehYear").value.trim(),plates:document.getElementById("ncVehPlates").value.trim()});const o={name:e,rfc:document.getElementById("ncRfc").value.trim()||null,razon_social:document.getElementById("ncRazonSocial").value.trim()||null,regimen_fiscal:document.getElementById("ncRegimenFiscal").value||null,uso_cfdi:document.getElementById("ncUsoCfdi").value||"G03",phone:document.getElementById("ncPhone").value.trim()||null,email:document.getElementById("ncEmail").value.trim()||null,price_tier:parseInt(document.getElementById("ncPriceTier").value)||1,credit_limit:parseFloat(document.getElementById("ncCreditLimit").value)||0,vehicle_info:t.length>0?t:null};try{C({id:(await g("/pos/api/customers",{method:"POST",body:JSON.stringify(o)})).id,name:o.name,rfc:o.rfc,phone:o.phone,price_tier:o.price_tier,credit_limit:o.credit_limit,credit_balance:0,vehicle_info:o.vehicle_info}),k(),f("Cliente creado")}catch(e){alert("Error al crear cliente: "+e.message)}},checkout:S,confirmPayment:T,closePaymentModal:P,selectPaymentMethod:function(e,t){i=e,document.querySelectorAll(".pago-tab").forEach((e=>e.classList.remove("active"))),t&&t.classList.add("active");const n={efectivo:"cashPayment",transferencia:"refPayment",tarjeta:"refPayment",mixto:"mixedPayment"};if(["cashPayment","refPayment","mixedPayment"].forEach((t=>{const o=document.getElementById(t);if(o){const t=o.id===n[e];o.classList.toggle("active",t),o.style.display=t?"":"none"}})),"efectivo"===e&&document.getElementById("cashReceived").focus(),"transferencia"===e||"tarjeta"===e){const e=document.getElementById("paymentRef");e&&e.focus()}},updateChange:function(){const e=x(),t=(parseFloat(document.getElementById("cashReceived").value)||0)-e,n=document.getElementById("changeDisplay");t>=0?(n.textContent=v(t),n.className="cambio-amount positive"):(n.textContent="-"+v(Math.abs(t)),n.className="cambio-amount negative")},updateMixedTotal:function(){const e=x();let t=0;document.querySelectorAll(".mixed-amount").forEach((e=>{t+=parseFloat(e.value)||0}));const n=e-t,o=document.getElementById("mixedRemaining");o.textContent=n>0?`Faltante: ${v(n)}`:`Cubierto (${v(t)})`,o.style.color=n>0?"var(--color-error)":"var(--color-success)"},creditSale:async function(){if(0===t.length)return void alert("Carrito vacio");if(!o)return void alert("Seleccione un cliente para venta a credito");if(!a)return void alert("No hay caja abierta.");const e=x(),i=(o.credit_limit||0)-(o.credit_balance||0);if(o.credit_limit>0&&e>i&&!confirm(`Credito insuficiente. Disponible: ${v(i)}, Total: ${v(e)}. Continuar?`))return;const r={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o.id,payment_method:"credito",sale_type:"credit",register_id:a?a.id:null,amount_paid:0};try{const e=await g("/pos/api/sales",{method:"POST",body:JSON.stringify(r)});s=e.id,l=e,L(e),t=[],n=-1,w(),E()}catch(e){alert("Error: "+e.message)}},saveQuotation:M,createLayaway:async function(){if(0===t.length)return void alert("Carrito vacio");if(!o)return void alert("Seleccione un cliente para apartado");const e=x(),i=prompt(`Total: ${v(e)}\nIngrese monto del anticipo:`);if(!i)return;const r=parseFloat(i);if(isNaN(r)||r<=0)return void alert("Monto invalido");if(r>e)return void alert("El anticipo no puede exceder el total");const c={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o.id,initial_payment:r,payment_method:"efectivo",register_id:a?a.id:null};try{const e=await g("/pos/api/layaways",{method:"POST",body:JSON.stringify(c)});f(`Apartado #${e.id} creado. Restante: ${v(e.remaining)}`),t=[],n=-1,w(),E()}catch(e){alert("Error: "+e.message)}},showLastSale:N,openDrawer:D,showTicket:L,closeTicketModal:q,printTicket:function(){const e=document.getElementById("ticketPrintArea");e&&(e.style.display="block"),window.print(),setTimeout((()=>{e&&(e.style.display="none")}),500)},connectThermal:async function(){if(!window.NexusPrinter)return void f("Printer module not loaded");const e=await NexusPrinter.connect();e.ok?(f("Impresora conectada: "+(e.name||e.type)),function(){const e=document.getElementById("btnConnectPrinter"),t=document.getElementById("btnThermalPrint");window.NexusPrinter&&NexusPrinter.isConnected()?(e&&(e.style.display="none"),t&&(t.style.display="")):(e&&(e.style.display=""),t&&(t.style.display="none"))}()):f(e.error||"No se pudo conectar la impresora")},thermalPrint:async function(){if(!window.NexusPrinter||!NexusPrinter.isConnected())return void f("Conecte una impresora termica primero");if(!s)return void f("No hay venta para imprimir");f(await NexusPrinter.printSale(s)?"Ticket enviado a impresora termica":"Error al imprimir. Reconecte la impresora.")}}})();
\ No newline at end of file
+const POS=(()=>{let e=localStorage.getItem("pos_token")||"",t=[],n=-1,o=null,a=null,r="efectivo",i=!1,c=100,s=null,l=null,d=null,m=null;const u=localStorage.getItem("pos_currency")||"MXN",p={MXN:"$",USD:"US$"},y="USD"===u?"en-US":"es-MX",v=e=>(p[u]||"$")+parseFloat(e||0).toLocaleString(y,{minimumFractionDigits:2,maximumFractionDigits:2});async function g(t,n={}){n.headers={"Content-Type":"application/json",Authorization:"Bearer "+e};const o=await fetch(t,n),a=await o.json();if(!o.ok)throw new Error(a.error||`HTTP ${o.status}`);return a}function f(e){const t=document.getElementById("toastContainer");if(!t)return;const n=document.createElement("div");n.className="toast",n.textContent=e,t.appendChild(n),setTimeout((()=>n.remove()),2100)}function h(){document.getElementById("openRegisterModal").classList.add("open"),document.getElementById("registerOpenResult").innerHTML=""}function _(){document.getElementById("openRegisterModal").classList.remove("open"),document.getElementById("registerOpenResult").innerHTML=""}function E(){document.getElementById("cutZModal").classList.remove("open"),document.getElementById("cutZResult").innerHTML=""}async function b(){const e=document.getElementById("cutZSummary");try{const t=await g("/pos/api/register/cut-x");if(t.error)return void(e.innerHTML='<p style="color:var(--color-error);">'+t.error+"</p>");let n='<div style="display:grid;grid-template-columns:1fr 1fr;gap:var(--space-3);font-size:var(--text-body-sm);">';if(n+='<div><span style="color:var(--color-text-muted);">Efectivo inicial</span><br/><strong>'+v(t.opening_amount)+"</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Ventas totales</span><br/><strong>'+v(t.total_sales)+"</strong> ("+t.total_sales_count+")</div>",n+='<div><span style="color:var(--color-text-muted);">Efectivo en ventas</span><br/><strong>'+v(t.cash_from_sales)+"</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Cambio entregado</span><br/><strong>-'+v(t.change_given)+"</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Entradas de efectivo</span><br/><strong>+'+v(t.cash_movements_in)+"</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Salidas de efectivo</span><br/><strong>-'+v(t.cash_movements_out)+"</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Cancelaciones</span><br/><strong>'+t.cancelled_count+" ("+v(t.cancelled_amount)+")</strong></div>",n+='<div><span style="color:var(--color-text-muted);">Efectivo esperado</span><br/><strong style="color:var(--color-accent);font-size:1.1em;">'+v(t.expected_cash)+"</strong></div>",n+="</div>",t.sales_by_method&&Object.keys(t.sales_by_method).length){n+='<div style="margin-top:var(--space-3);padding-top:var(--space-3);border-top:1px solid var(--color-border);">',n+='<span style="color:var(--color-text-muted);font-size:var(--text-caption);">Por metodo de pago:</span><br/>';for(const[e,o]of Object.entries(t.sales_by_method))n+='<span style="font-size:var(--text-body-sm);margin-right:var(--space-3);">'+e+": "+v(o.amount)+" ("+o.count+")</span>";n+="</div>"}t.movement_detail&&t.movement_detail.length&&(n+='<div style="margin-top:var(--space-3);padding-top:var(--space-3);border-top:1px solid var(--color-border);">',n+='<span style="color:var(--color-text-muted);font-size:var(--text-caption);">Movimientos de caja:</span><br/>',t.movement_detail.forEach((function(e){n+='<div style="font-size:var(--text-body-sm);">'+e.type+" "+v(e.amount)+" — "+(e.reason||"")+"</div>"})),n+="</div>"),e.innerHTML=n,document.getElementById("cutZClosingAmount").value=t.expected_cash.toFixed(2)}catch(t){e.innerHTML='<p style="color:var(--color-error);">Error cargando resumen</p>'}}function I(e){const n=t.find((t=>t.inventory_id===e.inventory_id));if(n)return n.quantity+=e.quantity||1,void B();t.push({inventory_id:e.inventory_id||e.id,part_number:e.part_number||"",name:e.name||"",quantity:e.quantity||1,unit_price:parseFloat(e.unit_price||e.price_1||0),unit_cost:parseFloat(e.cost||0),discount_pct:parseFloat(e.discount_pct||0),tax_rate:parseFloat(e.tax_rate||.16),stock:e.stock||0}),B(),f(`${e.name||"Articulo"} agregado`)}function x(e){t.splice(e,1),n>=t.length&&(n=t.length-1),B()}function B(){const e=document.getElementById("cartBody"),o=document.getElementById("cartTable"),a=document.getElementById("cartEmpty");if(0===t.length)return o.style.display="none",a.style.display="flex",void $();o.style.display="",a.style.display="none";let r="";t.forEach(((e,t)=>{const o=e.unit_price*e.quantity,a=o-o*e.discount_pct/100,c=i?`<td class="num" style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);color:var(--color-text-muted);font-size:var(--text-caption);">${v(e.unit_cost)}</td>`:"";let s="";if(i){const t=e.unit_price*(1-e.discount_pct/100),n=t>0?((t-e.unit_cost)/t*100).toFixed(1):"0.0",o=parseFloat(n);s=`<td style="text-align:center;padding:var(--space-2);"><span style="font-family:var(--font-mono);font-size:var(--text-caption);font-weight:var(--font-weight-bold);color:${o>30?"var(--color-success)":o>15?"var(--color-warning)":"var(--color-error)"};">${n}%</span></td>`}r+=`<tr style="border-bottom:1px solid var(--color-border);cursor:pointer;${t===n?"background:var(--color-primary-muted);":""}" onclick="POS.selectRow(${t})">\n                <td style="padding:var(--space-2);color:var(--color-text-muted);">${t+1}</td>\n                <td style="padding:var(--space-2);">\n                    <div style="font-weight:var(--font-weight-semibold);color:var(--color-text-primary);">${e.name}</div>\n                    <div style="font-family:var(--font-mono);font-size:var(--text-caption);color:var(--color-text-muted);">${e.part_number} | Stock: ${e.stock}</div>\n                </td>\n                <td style="text-align:center;padding:var(--space-2);"><input type="number" style="width:50px;text-align:center;font-family:var(--font-mono);background:var(--color-bg-base);color:var(--color-text-primary);border:1px solid var(--color-border);border-radius:var(--radius-sm);padding:2px 4px;" value="${e.quantity}" min="1"\n                    onchange="POS.updateQty(${t}, this.value)" onclick="event.stopPropagation()"></td>\n                <td style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);">${v(e.unit_price)}</td>\n                <td style="text-align:center;padding:var(--space-2);"><input type="number" style="width:45px;text-align:center;font-family:var(--font-mono);background:var(--color-bg-base);color:var(--color-text-primary);border:1px solid var(--color-border);border-radius:var(--radius-sm);padding:2px 4px;" value="${e.discount_pct}" min="0" max="100" step="0.5"\n                    onchange="POS.updateDiscount(${t}, this.value)" onclick="event.stopPropagation()">%</td>\n                <td style="text-align:right;padding:var(--space-2);font-family:var(--font-mono);font-weight:var(--font-weight-bold);">${v(a)}</td>\n                ${c}\n                ${s}\n                <td style="text-align:center;"><button style="background:transparent;border:1px solid var(--color-border);border-radius:var(--radius-sm);width:24px;height:24px;cursor:pointer;color:var(--color-text-muted);font-size:14px;" onclick="event.stopPropagation(); POS.removeFromCart(${t})">&times;</button></td>\n            </tr>`})),e.innerHTML=r,$(),function(){const e=document.getElementById("avgMargin");if(!e||!i)return;let n=0,o=0;if(t.forEach((e=>{if(e.unit_cost>0){const t=e.unit_price*(1-e.discount_pct/100);n+=t*e.quantity,o+=e.unit_cost*e.quantity}})),n>0){const t=(n-o)/n*100;e.textContent=t.toFixed(1)+"%",e.style.color=t>30?"var(--color-success)":t>15?"var(--color-warning)":"var(--color-error)"}else e.textContent="--"}()}function C(e,n){let o=Math.max(0,Math.min(100,parseFloat(n)||0));o>c&&(alert(`Descuento maximo permitido: ${c}%`),o=c),t[e].discount_pct=o,B()}function $(){let e=0,n=0,o=0;t.forEach((t=>{const a=t.unit_price*t.quantity,r=a*t.discount_pct/100,i=a-r,c=i*t.tax_rate;e+=i,n+=r,o+=c}));const a=e+o;document.getElementById("dispSubtotal").textContent=v(e),document.getElementById("dispTax").textContent=v(o),document.getElementById("dispTotal").textContent=v(a),n>0?(document.getElementById("discountRow").style.display="",document.getElementById("dispDiscount").textContent="-"+v(n)):document.getElementById("discountRow").style.display="none"}function S(){let e=0,n=0;return t.forEach((t=>{const o=t.unit_price*t.quantity,a=o-o*t.discount_pct/100,r=a*t.tax_rate;e+=a,n+=r})),Math.round(100*(e+n))/100}async function w(e){if(!e||e.length<2)k();else try{const t=await g(`/pos/api/inventory/items?q=${encodeURIComponent(e)}&per_page=20`),n=document.getElementById("searchResults"),a=document.getElementById("totalsPanel");if(0===t.data.length)n.innerHTML='<div style="padding:20px;text-align:center;color:var(--color-text-muted);">Sin resultados</div>';else{let e="";t.data.forEach((t=>{let n=t.price_1;if(o){const e=o.price_tier||1;n=3===e?t.price_3:2===e?t.price_2:t.price_1}e+=`<div style="padding:var(--space-3) var(--space-4);border-bottom:1px solid var(--color-border);cursor:pointer;display:flex;justify-content:space-between;align-items:center;transition:var(--transition-fast);" onmouseover="this.style.background='var(--color-primary-muted)'" onmouseout="this.style.background=''" onclick='POS.addFromSearch(${JSON.stringify(t).replace(/'/g,"&#39;")}, ${n})'>\n                        <div>\n                            <div style="font-weight:var(--font-weight-semibold);">${t.name}</div>\n                            <div style="font-family:var(--font-mono);font-size:var(--text-caption);color:var(--color-text-muted);">${t.part_number} | ${t.brand||""}</div>\n                            <div style="font-size:var(--text-caption);color:${t.stock<=0?"var(--color-error)":"var(--color-text-muted)"};">Stock: ${t.stock}</div>\n                        </div>\n                        <div style="font-family:var(--font-mono);font-weight:var(--font-weight-bold);color:var(--color-primary);">${v(n)}</div>\n                    </div>`})),n.innerHTML=e}n.style.display="",a.style.display="none"}catch(e){console.error("Search error:",e)}}function k(){const e=document.getElementById("searchResults"),t=document.getElementById("totalsPanel");e&&(e.style.display="none"),t&&(t.style.display="")}async function M(e){o=e,document.getElementById("customerAutocomplete").style.display="none",document.getElementById("customerSearchWrap").querySelector("input").style.display="none";if(document.getElementById("customerName").textContent=e.name,document.getElementById("customerTier").textContent={1:"P1 Mostrador",2:"P2 Taller",3:"P3 Mayoreo"}[e.price_tier]||"P1",document.getElementById("customerCredit").textContent=`Credito: ${v(e.credit_balance)} / ${v(e.credit_limit)}`,document.getElementById("customerSelected").style.display="",e.vehicle_info&&e.vehicle_info.length>0){const t=e.vehicle_info[0];document.getElementById("vehicleInfo").textContent=`${t.make||""} ${t.model||""} ${t.year||""} ${t.plates?"("+t.plates+")":""}`,document.getElementById("vehicleBanner").classList.add("visible")}try{const t=await g(`/pos/api/customers/${e.id}`);if(t.recent_purchases&&t.recent_purchases.length>0){const e=t.recent_purchases[0],n=Math.floor((Date.now()-new Date(e.created_at).getTime())/864e5),o=0===n?"hoy":1===n?"hace 1 dia":`hace ${n} dias`;document.getElementById("lastPurchaseInfo").textContent=`${v(e.total)} ${o}`,document.getElementById("vehicleBanner").classList.add("visible")}}catch(e){console.warn("Could not fetch customer detail:",e)}const t=document.getElementById("cfdiHint");t&&e.rfc&&(t.textContent=`RFC: ${e.rfc}`,document.getElementById("cfdiCheck").checked=!!e.rfc),B()}function T(){o=null,document.getElementById("customerSelected").style.display="none";const e=document.getElementById("customerSearch");e&&(e.style.display="",e.value=""),document.getElementById("vehicleBanner").classList.remove("visible");const t=document.getElementById("cfdiHint");t&&(t.textContent=""),B()}function P(){document.getElementById("newCustomerModal").classList.remove("open")}function L(){if(0===t.length)return void f("Carrito vacio");if(!a)return void h();r="efectivo";const e=S();document.getElementById("modalTotal").textContent=v(e),document.getElementById("modalItemCount").textContent=`${t.reduce(((e,t)=>e+t.quantity),0)} productos`,document.getElementById("modalCustomerName").textContent=o?o.name:"Publico General",document.getElementById("cashReceived").value="",document.getElementById("changeDisplay").textContent="$0.00",document.getElementById("changeDisplay").className="cambio-amount positive";const n=document.getElementById("paymentRef");n&&(n.value="");const i=document.getElementById("quickAmounts");if(i){const t=[Math.ceil(e),100*Math.ceil(e/100),500*Math.ceil(e/500),1e3*Math.ceil(e/1e3)],n=[...new Set(t)].slice(0,4);i.innerHTML=n.map((e=>`<button class="quick-btn" onclick="document.getElementById('cashReceived').value=${e};POS.updateChange();">${v(e)}</button>`)).join("")}const c=document.getElementById("refAmount");c&&(c.value=v(e)),document.querySelectorAll(".pago-tab").forEach((e=>e.classList.remove("active"))),document.querySelector('.pago-tab[data-method="efectivo"]').classList.add("active"),document.getElementById("cashPayment").classList.add("active"),document.getElementById("cashPayment").style.display="",document.getElementById("refPayment").classList.remove("active"),document.getElementById("refPayment").style.display="none",document.getElementById("mixedPayment").classList.remove("active"),document.getElementById("mixedPayment").style.display="none";const s=document.getElementById("btnConfirmPayment");s.disabled=!1,s.textContent=`Confirmar Pago — ${v(e)}`,document.getElementById("paymentModal").classList.add("open"),setTimeout((()=>document.getElementById("cashReceived").focus()),100)}function q(){document.getElementById("paymentModal").classList.remove("open")}async function N(){const e=S();let i=0,c=[],d="";if("efectivo"===r){if(i=parseFloat(document.getElementById("cashReceived").value)||0,i<e)return void alert(`Monto insuficiente. Total: ${v(e)}`)}else if("transferencia"===r||"tarjeta"===r)i=e,d=document.getElementById("paymentRef").value.trim();else if("mixto"===r){if(document.querySelectorAll(".mixed-row").forEach((e=>{const t=e.querySelector("select").value,n=parseFloat(e.querySelector(".mixed-amount").value)||0,o=e.querySelectorAll("input")[1]?.value||"";n>0&&(c.push({method:t,amount:n,reference:o}),i+=n)})),i<e)return void alert(`Monto total insuficiente. Falta: ${v(e-i)}`)}const m={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o?o.id:null,payment_method:r,sale_type:"cash",register_id:a?a.id:null,amount_paid:i,payment_details:c,reference:d,generate_cfdi:document.getElementById("cfdiCheck").checked},u=document.getElementById("btnConfirmPayment");u.disabled=!0,u.textContent="Procesando...";try{const e=localStorage.getItem("pos_convert_quote_id");let o;if(e){const t={register_id:a?a.id:null,payment_method:r,sale_type:"cash",amount_paid:i,payment_details:c};o=await g("/pos/api/quotations/"+e+"/convert",{method:"POST",body:JSON.stringify(t)}),localStorage.removeItem("pos_convert_quote_id"),f(`Cotizacion #${e} convertida a venta #${o.id}`)}else o=await g("/pos/api/sales",{method:"POST",body:JSON.stringify(m)}),f(`Venta #${o.id} completada`);s=o.id,l=o,q(),O(o),t=[],n=-1,T(),B()}catch(e){alert("Error al procesar venta: "+e.message)}finally{u.disabled=!1,u.textContent="Confirmar Pago"}}async function R(){if(0===t.length)return void f("Carrito vacio");const e={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o?o.id:null},n=localStorage.getItem("pos_edit_quote_id");try{if(n){const t=await g("/pos/api/quotations/"+n,{method:"PUT",body:JSON.stringify(e)});localStorage.removeItem("pos_edit_quote_id"),localStorage.removeItem("pos_edit_quote_customer_id"),localStorage.removeItem("pos_edit_quote_notes"),f(`Cotizacion #${n} actualizada. Total: ${v(t.total)}`)}else{const t=await g("/pos/api/quotations",{method:"POST",body:JSON.stringify(e)});f(`Cotizacion #${t.id} guardada. Total: ${v(t.total)}`)}}catch(e){alert("Error: "+e.message)}}function O(e){const t=new Date(e.created_at).toLocaleString("es-MX",{year:"numeric",month:"short",day:"numeric",hour:"2-digit",minute:"2-digit"}),n=o?o.name:"Publico General",i=o&&o.rfc?o.rfc:"";let c="";(e.items||[]).forEach((e=>{const t=e.unit_price*e.quantity*(1-(e.discount_pct||0)/100);c+=`\n                <div class="item-line-wide">\n                    <span class="qty">${e.quantity}</span>\n                    <span class="name">${e.name||""}</span>\n                    <span class="price">${v(e.unit_price)}</span>\n                    <span class="subtotal">${v(e.subtotal||t)}</span>\n                </div>`}));const s=`\n            <div class="store-name">NEXUS AUTOPARTS</div>\n            <div class="store-tagline">Tu conexion con las refacciones</div>\n            <div class="store-info">\n                Sucursal: ${a&&a.branch_name||""}<br>\n                RFC: NAU210315XX1\n            </div>\n            <hr class="divider-double">\n            <div class="folio-line">\n                <span>VENTA: V-${e.id}</span>\n                <span>${t}</span>\n            </div>\n            <div class="ticket-row" style="font-size: 9px; color: #555; margin-bottom: 4px;">\n                <span>Cliente: ${n}</span>\n                ${i?`<span>RFC: ${i}</span>`:""}\n            </div>\n            <hr class="divider">\n            <div class="item-line-wide" style="font-weight: bold; font-size: 9px; color: #555; text-transform: uppercase;">\n                <span class="qty">Cant</span>\n                <span class="name">Descripcion</span>\n                <span class="price">P. Unit</span>\n                <span class="subtotal">Importe</span>\n            </div>\n            <hr class="divider" style="margin: 2px 0;">\n            ${c}\n            <hr class="divider-double">\n            <div class="total-section">\n                <div class="total-line">\n                    <span>Subtotal:</span><span>${v(e.subtotal)}</span>\n                </div>\n                ${e.discount_total>0?`<div class="total-line"><span>Descuento:</span><span>-${v(e.discount_total)}</span></div>`:""}\n                <div class="total-line">\n                    <span>IVA 16%:</span><span>${v(e.tax_total)}</span>\n                </div>\n                <div class="total-line grand">\n                    <span>TOTAL:</span><span>${v(e.total)}</span>\n                </div>\n            </div>\n            <hr class="divider">\n            <div class="payment-section">\n                <div class="ticket-row">\n                    <span>Forma de pago:</span><span>${e.payment_method||r}</span>\n                </div>\n                ${"efectivo"===e.payment_method?`\n                <div class="ticket-row">\n                    <span>Recibido:</span><span>${v(e.amount_paid)}</span>\n                </div>\n                <div class="ticket-row" style="font-weight: bold;">\n                    <span>Cambio:</span><span>${v(e.change_given||0)}</span>\n                </div>`:""}\n            </div>\n            <hr class="divider">\n            <div class="footer-section">\n                <div class="thanks">Gracias por su compra!</div>\n                <div>Conserve su ticket como comprobante.</div>\n            </div>\n        `,l=document.getElementById("ticketContent");l&&(l.innerHTML=s);const d=document.getElementById("ticketPreviewContent");d&&(d.innerHTML=s),document.getElementById("ticketModal").classList.add("open")}function F(){document.getElementById("ticketModal").classList.remove("open")}async function D(){if(s)try{O(await g(`/pos/api/sales/${s}`))}catch(e){alert("Error: "+e.message)}else f("No hay venta reciente")}function A(){f("Comando enviado al cajon de efectivo.")}return async function(){try{const t=JSON.parse(atob(e.split(".")[1]));if(document.getElementById("employeeName").textContent=t.name||"Empleado",document.getElementById("branchName").textContent=t.branch_name||"",i=(t.permissions||[]).includes("pos.view_cost"),c=t.max_discount_pct||100,i){document.getElementById("thCost").style.display="",document.getElementById("thMargin").style.display="";const e=document.getElementById("costToggle");e&&(e.style.display="")}const n=document.querySelector(".status-bar__user-avatar");if(n&&t.name){const e=t.name.split(" ");n.textContent=e.map((e=>e[0])).join("").substring(0,2).toUpperCase()}}catch(e){console.warn("Could not parse token:",e)}const o=localStorage.getItem("pos_cart"),r=localStorage.getItem("pos_edit_quote_id"),s=localStorage.getItem("pos_convert_quote_id");if(o)try{const e=JSON.parse(o);for(const t of e)I(t);localStorage.removeItem("pos_cart")}catch(e){console.warn("Could not load catalog cart:",e)}r&&f(`Modo edicion: Cotizacion #${r}. Guardar actualizara la cotizacion.`),s&&f(`Modo conversion: Cotizacion #${s}. El pago convertira la cotizacion en venta.`),await async function(){try{const e=await g("/pos/api/register/current");e.register?(a=e.register,document.getElementById("registerInfo").innerHTML=`<span>Caja #${e.register.register_number}</span>`):(a=null,document.getElementById("registerInfo").innerHTML='<span style="color:var(--color-error);cursor:pointer;" onclick="POS.showOpenRegisterModal()" title="Clic para abrir caja">&#x26A0; Sin caja abierta — Clic para abrir</span>')}catch(e){console.warn("Register check failed:",e)}}(),document.addEventListener("keydown",(e=>{const o=e.target.tagName,a="INPUT"===o||"TEXTAREA"===o||"SELECT"===o;switch(e.key){case"F1":e.preventDefault(),document.getElementById("itemSearch").focus();break;case"F2":e.preventDefault(),document.getElementById("customerSearch").focus(),document.getElementById("customerSearch").style.display="",document.getElementById("customerSelected").style.display="none";break;case"F3":e.preventDefault(),L();break;case"F4":e.preventDefault(),R();break;case"F5":e.preventDefault(),D();break;case"F6":e.preventDefault(),A();break;case"Escape":if(e.preventDefault(),document.getElementById("paymentModal").classList.contains("open"))q();else if(document.getElementById("newCustomerModal").classList.contains("open"))P();else if(document.getElementById("ticketModal").classList.contains("open"))F();else if(document.querySelector(".confirm-overlay.active")){const e=document.getElementById("overlay-cancelar-venta"),t=document.getElementById("modal-cancelar-venta");e&&e.classList.contains("active")&&(e.classList.remove("active"),t.classList.remove("active"))}else k();break;case"Delete":!a&&n>=0&&n<t.length&&(e.preventDefault(),x(n));break;case"+":!a&&n>=0&&n<t.length&&(e.preventDefault(),t[n].quantity++,B());break;case"-":!a&&n>=0&&n<t.length&&(e.preventDefault(),t[n].quantity>1&&(t[n].quantity--,B()));break;case"*":if(!a&&n>=0&&n<t.length){e.preventDefault();const o=prompt("Descuento %:",t[n].discount_pct);null!==o&&C(n,o)}break;case"ArrowUp":!a&&t.length>0&&(e.preventDefault(),n=Math.max(0,n-1),B());break;case"ArrowDown":!a&&t.length>0&&(e.preventDefault(),n=Math.min(t.length-1,n+1),B());break;case"Enter":"cashReceived"===e.target.id&&(e.preventDefault(),N())}})),function(){const e=document.getElementById("itemSearch");if(!e)return;e.addEventListener("input",(()=>{clearTimeout(d),d=setTimeout((()=>w(e.value.trim())),300)})),e.addEventListener("keydown",(t=>{"Enter"===t.key&&(t.preventDefault(),w(e.value.trim())),"Escape"===t.key&&(e.value="",k())}))}(),function(){const e=document.getElementById("customerSearch");if(!e)return;e.addEventListener("input",(()=>{clearTimeout(m),m=setTimeout((()=>async function(e){if(!e||e.length<2)return void(document.getElementById("customerAutocomplete").style.display="none");try{const t=await g(`/pos/api/customers?q=${encodeURIComponent(e)}&per_page=10`),n=document.getElementById("customerAutocomplete");if(0===t.data.length)n.innerHTML='<div style="padding:var(--space-3);color:var(--color-text-muted);">Sin resultados</div>';else{let e="";t.data.forEach((t=>{const n={1:"Mostrador",2:"Taller",3:"Mayoreo"};e+=`<div style="padding:var(--space-3) var(--space-4);border-bottom:1px solid var(--color-border);cursor:pointer;transition:var(--transition-fast);" onmouseover="this.style.background='var(--color-primary-muted)'" onmouseout="this.style.background=''" onclick='POS.selectCustomer(${JSON.stringify(t).replace(/'/g,"&#39;")})'>\n                        <div style="font-weight:var(--font-weight-semibold);">${t.name}</div>\n                        <div style="font-size:var(--text-caption);color:var(--color-text-muted);">${t.rfc||""} | ${t.phone||""} | ${n[t.price_tier]||"P1"} | Credito: ${v(t.credit_balance)}/${v(t.credit_limit)}</div>\n                    </div>`})),n.innerHTML=e}n.style.display="block"}catch(e){console.error("Customer search error:",e)}}(e.value.trim())),300)})),e.addEventListener("keydown",(t=>{"Escape"===t.key&&(e.value="",document.getElementById("customerAutocomplete").style.display="none")}))}()}(),{addToCart:I,removeFromCart:x,clearCart:function(){t.length=0,n=-1,B()},selectRow:function(e){n=e,B()},updateQty:function(e,n){const o=Math.max(1,parseInt(n)||1);t[e].quantity=o,B()},updateDiscount:C,addFromSearch:function(e,t){I({inventory_id:e.id,part_number:e.part_number,name:e.name,unit_price:t,cost:e.cost,tax_rate:e.tax_rate,stock:e.stock}),k(),document.getElementById("itemSearch").value="",document.getElementById("itemSearch").focus()},hideSearchResults:k,selectCustomer:M,clearCustomer:T,showNewCustomerModal:function(){document.getElementById("newCustomerModal").classList.add("open"),setTimeout((()=>document.getElementById("ncName").focus()),100)},closeNewCustomerModal:P,saveNewCustomer:async function(){const e=document.getElementById("ncName").value.trim();if(!e)return void alert("Nombre es requerido");const t=[],n=document.getElementById("ncVehMake").value.trim();n&&t.push({make:n,model:document.getElementById("ncVehModel").value.trim(),year:document.getElementById("ncVehYear").value.trim(),plates:document.getElementById("ncVehPlates").value.trim()});const o={name:e,rfc:document.getElementById("ncRfc").value.trim()||null,razon_social:document.getElementById("ncRazonSocial").value.trim()||null,regimen_fiscal:document.getElementById("ncRegimenFiscal").value||null,uso_cfdi:document.getElementById("ncUsoCfdi").value||"G03",phone:document.getElementById("ncPhone").value.trim()||null,email:document.getElementById("ncEmail").value.trim()||null,price_tier:parseInt(document.getElementById("ncPriceTier").value)||1,credit_limit:parseFloat(document.getElementById("ncCreditLimit").value)||0,vehicle_info:t.length>0?t:null};try{M({id:(await g("/pos/api/customers",{method:"POST",body:JSON.stringify(o)})).id,name:o.name,rfc:o.rfc,phone:o.phone,price_tier:o.price_tier,credit_limit:o.credit_limit,credit_balance:0,vehicle_info:o.vehicle_info}),P(),f("Cliente creado")}catch(e){alert("Error al crear cliente: "+e.message)}},checkout:L,confirmPayment:N,closePaymentModal:q,selectPaymentMethod:function(e,t){r=e,document.querySelectorAll(".pago-tab").forEach((e=>e.classList.remove("active"))),t&&t.classList.add("active");const n={efectivo:"cashPayment",transferencia:"refPayment",tarjeta:"refPayment",mixto:"mixedPayment"};if(["cashPayment","refPayment","mixedPayment"].forEach((t=>{const o=document.getElementById(t);if(o){const t=o.id===n[e];o.classList.toggle("active",t),o.style.display=t?"":"none"}})),"efectivo"===e&&document.getElementById("cashReceived").focus(),"transferencia"===e||"tarjeta"===e){const e=document.getElementById("paymentRef");e&&e.focus()}},updateChange:function(){const e=S(),t=(parseFloat(document.getElementById("cashReceived").value)||0)-e,n=document.getElementById("changeDisplay");t>=0?(n.textContent=v(t),n.className="cambio-amount positive"):(n.textContent="-"+v(Math.abs(t)),n.className="cambio-amount negative")},updateMixedTotal:function(){const e=S();let t=0;document.querySelectorAll(".mixed-amount").forEach((e=>{t+=parseFloat(e.value)||0}));const n=e-t,o=document.getElementById("mixedRemaining");o.textContent=n>0?`Faltante: ${v(n)}`:`Cubierto (${v(t)})`,o.style.color=n>0?"var(--color-error)":"var(--color-success)"},creditSale:async function(){if(0===t.length)return void alert("Carrito vacio");if(!o)return void alert("Seleccione un cliente para venta a credito");if(!a)return void alert("No hay caja abierta.");const e=S(),r=(o.credit_limit||0)-(o.credit_balance||0);if(o.credit_limit>0&&e>r&&!confirm(`Credito insuficiente. Disponible: ${v(r)}, Total: ${v(e)}. Continuar?`))return;const i={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o.id,payment_method:"credito",sale_type:"credit",register_id:a?a.id:null,amount_paid:0};try{const e=await g("/pos/api/sales",{method:"POST",body:JSON.stringify(i)});s=e.id,l=e,O(e),t=[],n=-1,T(),B()}catch(e){alert("Error: "+e.message)}},saveQuotation:R,createLayaway:async function(){if(0===t.length)return void alert("Carrito vacio");if(!o)return void alert("Seleccione un cliente para apartado");const e=S(),r=prompt(`Total: ${v(e)}\nIngrese monto del anticipo:`);if(!r)return;const i=parseFloat(r);if(isNaN(i)||i<=0)return void alert("Monto invalido");if(i>e)return void alert("El anticipo no puede exceder el total");const c={items:t.map((e=>({inventory_id:e.inventory_id,quantity:e.quantity,unit_price:e.unit_price,discount_pct:e.discount_pct,tax_rate:e.tax_rate}))),customer_id:o.id,initial_payment:i,payment_method:"efectivo",register_id:a?a.id:null};try{const e=await g("/pos/api/layaways",{method:"POST",body:JSON.stringify(c)});f(`Apartado #${e.id} creado. Restante: ${v(e.remaining)}`),t=[],n=-1,T(),B()}catch(e){alert("Error: "+e.message)}},showLastSale:D,openDrawer:A,showTicket:O,closeTicketModal:F,printTicket:function(){const e=document.getElementById("ticketPrintArea");e&&(e.style.display="block"),window.print(),setTimeout((()=>{e&&(e.style.display="none")}),500)},connectThermal:async function(){if(!window.NexusPrinter)return void f("Printer module not loaded");const e=await NexusPrinter.connect();e.ok?(f("Impresora conectada: "+(e.name||e.type)),function(){const e=document.getElementById("btnConnectPrinter"),t=document.getElementById("btnThermalPrint");window.NexusPrinter&&NexusPrinter.isConnected()?(e&&(e.style.display="none"),t&&(t.style.display="")):(e&&(e.style.display=""),t&&(t.style.display="none"))}()):f(e.error||"No se pudo conectar la impresora")},thermalPrint:async function(){if(!window.NexusPrinter||!NexusPrinter.isConnected())return void f("Conecte una impresora termica primero");if(!s)return void f("No hay venta para imprimir");f(await NexusPrinter.printSale(s)?"Ticket enviado a impresora termica":"Error al imprimir. Reconecte la impresora.")},showOpenRegisterModal:h,closeOpenRegisterModal:_,openRegister:async function(){const e=parseInt(document.getElementById("regNumber").value),t=parseFloat(document.getElementById("regOpeningAmount").value)||0;if(!e||e<1)document.getElementById("registerOpenResult").innerHTML='<span style="color:var(--color-error);">Numero de caja invalido</span>';else try{const n=await g("/pos/api/register/open",{method:"POST",body:JSON.stringify({register_number:e,opening_amount:t})});if(n.error)return void(document.getElementById("registerOpenResult").innerHTML='<span style="color:var(--color-error);">'+(n.error||"Error")+"</span>");a=n,document.getElementById("registerInfo").innerHTML=`<span>Caja #${n.register_number}</span>`,_(),f(`Caja #${n.register_number} abierta con $${t.toFixed(2)}`)}catch(e){document.getElementById("registerOpenResult").innerHTML='<span style="color:var(--color-error);">Error de red</span>'}},showCutZModal:function(){document.getElementById("cutZModal").classList.add("open"),document.getElementById("cutZResult").innerHTML="",b()},closeCutZModal:E,loadCutX:b,confirmCutZ:async function(){const e=parseFloat(document.getElementById("cutZClosingAmount").value)||0;try{const t=await g("/pos/api/register/cut-z",{method:"POST",body:JSON.stringify({closing_amount:e})});if(t.error)return void(document.getElementById("cutZResult").innerHTML='<span style="color:var(--color-error);">'+t.error+"</span>");t.difference>0||t.difference;document.getElementById("cutZResult").innerHTML='<span style="color:var(--color-success);">Caja cerrada correctamente</span>',document.getElementById("registerInfo").innerHTML='<span style="color:var(--color-text-muted);" onclick="POS.showOpenRegisterModal()">Sin caja abierta</span>',a=null,E(),f("Corte Z completado. Diferencia: $"+t.difference.toFixed(2))}catch(e){document.getElementById("cutZResult").innerHTML='<span style="color:var(--color-error);">Error de red</span>'}}}})();
\ No newline at end of file
diff --git a/pos/static/js/reports.js b/pos/static/js/reports.js
index 2cffc7c..7539c90 100644
--- a/pos/static/js/reports.js
+++ b/pos/static/js/reports.js
@@ -714,6 +714,13 @@ const Reports = (() => {
         init, setTheme, switchTab,
         loadVentas, loadInventario, loadClientes, loadFinancieros, fmt
     };
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "Reportes", href: "/pos/reports", icon: "📈" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+    }
+
 })();
 
 // ── Global: Export visible table as CSV (Excel-compatible) ──
diff --git a/pos/static/js/sidebar.js b/pos/static/js/sidebar.js
index 9b30727..81cbb18 100644
--- a/pos/static/js/sidebar.js
+++ b/pos/static/js/sidebar.js
@@ -3,7 +3,7 @@
  * Replaces existing sidebar in each page with a consistent, themed version.
  * Uses i18n t() for all labels when available.
  */
-(function() {
+window.renderSidebar = function(modulesOverride) {
     'use strict';
 
     // i18n helper — falls back to raw string if i18n.js not loaded
@@ -17,24 +17,38 @@
     var currentTheme = localStorage.getItem('pos_theme') || 'industrial';
     var currentLang = localStorage.getItem('pos_lang') || 'es';
 
+    var modules = {};
+    if (modulesOverride && typeof modulesOverride === 'object') {
+        modules = modulesOverride;
+    } else {
+        try {
+            modules = JSON.parse(localStorage.getItem('pos_modules') || '{}');
+        } catch(e) { modules = {}; }
+    }
+
+    function moduleEnabled(key) {
+        // Default to true if not configured yet
+        return modules[key] !== false;
+    }
+
     var navSections = [
         { label: _t('nav_main'), items: [
             { name: _t('dashboard'), href: '/pos/dashboard', icon: '<rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/><rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/>' },
             { name: _t('pos'), href: '/pos/sale', icon: '<rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/>' },
-            { name: _t('catalog'), href: '/pos/catalog', icon: '<path d="M4 6h16M4 10h16M4 14h16M4 18h16"/>' },
+            moduleEnabled('catalog') ? { name: _t('catalog'), href: '/pos/catalog', icon: '<path d="M4 6h16M4 10h16M4 14h16M4 18h16"/>' } : null,
             { name: _t('inventory'), href: '/pos/inventory', icon: '<path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/><polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/>' },
-
-        ]},
+        ].filter(Boolean)},
         { label: _t('nav_management'), items: [
             { name: _t('customers'), href: '/pos/customers', icon: '<path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75"/>' },
             { name: 'Cotizaciones', href: '/pos/quotations', icon: '<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="9" y1="15" x2="15" y2="15"/><line x1="12" y1="12" x2="12" y2="18"/>' },
-            { name: 'Marketplace', href: '/pos/marketplace', icon: '<circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/><path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/>' },
+            moduleEnabled('marketplace') ? { name: 'Marketplace', href: '/pos/marketplace', icon: '<circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/><path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/>' } : null,
+            moduleEnabled('meli') ? { name: 'MercadoLibre', href: '/pos/marketplace-external', icon: '<rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/>' } : null,
             { name: _t('invoicing'), href: '/pos/invoicing', icon: '<path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/><polyline points="14 2 14 8 20 8"/><line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/><polyline points="10 9 9 9 8 9"/>' },
             { name: _t('accounting'), href: '/pos/accounting', icon: '<line x1="12" y1="1" x2="12" y2="23"/><path d="M17 5H9.5a3.5 3.5 0 0 0 0 7h5a3.5 3.5 0 0 1 0 7H6"/>' },
             { name: _t('reports'), href: '/pos/reports', icon: '<line x1="18" y1="20" x2="18" y2="10"/><line x1="12" y1="20" x2="12" y2="4"/><line x1="6" y1="20" x2="6" y2="14"/>' },
             { name: _t('fleet'), href: '/pos/fleet', icon: '<path d="M1 13h22M1 13l2-6h6l2 6M9 7h6l2 6M15 13l2-6M5 17a2 2 0 1 0 0-4 2 2 0 0 0 0 4zM19 17a2 2 0 1 0 0-4 2 2 0 0 0 0 4z"/>' },
-            { name: _t('whatsapp'), href: '/pos/whatsapp', icon: '<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"/>' },
-        ]},
+            moduleEnabled('whatsapp') ? { name: _t('whatsapp'), href: '/pos/whatsapp', icon: '<path d="M21 11.5a8.38 8.38 0 0 1-.9 3.8 8.5 8.5 0 0 1-7.6 4.7 8.38 8.38 0 0 1-3.8-.9L3 21l1.9-5.7a8.38 8.38 0 0 1-.9-3.8 8.5 8.5 0 0 1 4.7-7.6 8.38 8.38 0 0 1 3.8-.9h.5a8.48 8.48 0 0 1 8 8v.5z"/>' } : null,
+        ].filter(Boolean)},
         { label: _t('nav_system'), items: [
             { name: _t('config'), href: '/pos/config', icon: '<circle cx="12" cy="12" r="3"/><path d="M19.07 4.93a10 10 0 0 1 0 14.14M4.93 4.93a10 10 0 0 0 0 14.14"/>' },
         ]},
@@ -124,10 +138,6 @@
     if (main) main.classList.add('pos-main-offset');
 
     // ── Tablet/mobile: sidebar toggle + overlay ─────────────────────
-    // Creates a hamburger button + overlay for screens < 1024px.
-    // The CSS in pos-glass.css hides the sidebar by default on tablets
-    // and shows it as a slide-in drawer when .open is added.
-
     var sidebar = document.querySelector('.pos-sidebar, .sidebar, #sidebar');
     var overlay = document.getElementById('sidebar-overlay');
 
@@ -180,4 +190,9 @@
     window.toggleSidebar = toggleSidebar;
     window.closeSidebar = closeSidebar;
 
-})();
+    // Reveal sidebar smoothly after replacement to avoid flash/stun
+    document.body.classList.add('sidebar-ready');
+};
+
+// Initial render
+window.renderSidebar();
diff --git a/pos/static/js/splash-loader.js b/pos/static/js/splash-loader.js
new file mode 100644
index 0000000..7c6b7be
--- /dev/null
+++ b/pos/static/js/splash-loader.js
@@ -0,0 +1,131 @@
+/**
+ * splash-loader.js — PWA splash screen + dynamic favicon
+ * Show an animated splash while the app loads, then fade out.
+ * Also provides dynamic favicon updates for notifications / offline states.
+ */
+(function() {
+    'use strict';
+
+    // ─── Create splash element ──────────────────────────────────────────────
+    var splash = document.createElement('div');
+    splash.id = 'nx-splash';
+    splash.style.cssText = 'position:fixed;inset:0;z-index:99999;' +
+        'background:linear-gradient(135deg,#0d0d0d 0%,#1a1205 100%);' +
+        'display:flex;flex-direction:column;align-items:center;justify-content:center;' +
+        'transition:opacity 0.5s ease,visibility 0.5s ease;';
+
+    // Logo SVG (animated)
+    var logoSvg = '<svg width="80" height="80" viewBox="0 0 80 80" style="margin-bottom:24px;">' +
+        '<defs><linearGradient id="nxg" x1="0%" y1="0%" x2="100%" y2="100%">' +
+        '<stop offset="0%" style="stop-color:#F5A623"/>' +
+        '<stop offset="100%" style="stop-color:#E08E00"/>' +
+        '</linearGradient></defs>' +
+        '<circle cx="40" cy="40" r="36" fill="none" stroke="url(#nxg)" stroke-width="3" stroke-dasharray="226" stroke-dashoffset="226" style="animation:nxDraw 1.2s ease forwards;">' +
+        '<animateTransform attributeName="transform" type="rotate" from="0 40 40" to="360 40 40" dur="8s" repeatCount="indefinite"/>' +
+        '</circle>' +
+        '<text x="40" y="48" text-anchor="middle" fill="#F5A623" font-family="system-ui,sans-serif" font-weight="800" font-size="28" style="animation:nxFadeIn 0.6s 0.4s ease both;">N</text>' +
+        '</svg>';
+
+    var title = '<div style="font-family:system-ui,sans-serif;font-size:20px;font-weight:700;color:#eee;letter-spacing:2px;text-transform:uppercase;margin-bottom:8px;">Nexus</div>';
+    var subtitle = '<div style="font-family:system-ui,sans-serif;font-size:13px;color:#888;letter-spacing:4px;text-transform:uppercase;">Autoparts POS</div>';
+    var spinner = '<div class="nx-loader" style="margin-top:32px;width:32px;height:32px;"><div class="nx-loader__ring"></div><div class="nx-loader__ring"></div></div>';
+
+    splash.innerHTML = logoSvg + title + subtitle + spinner;
+
+    // Inject keyframes if not present
+    if (!document.getElementById('nx-splash-styles')) {
+        var style = document.createElement('style');
+        style.id = 'nx-splash-styles';
+        style.textContent = '@keyframes nxDraw { to { stroke-dashoffset:0; } } @keyframes nxFadeIn { from { opacity:0;transform:translateY(8px); } to { opacity:1;transform:translateY(0); } }';
+        document.head.appendChild(style);
+    }
+
+    document.body.appendChild(splash);
+
+    // Hide splash when DOM is ready + minimum display time
+    var minDisplay = 800;
+    var startTime = Date.now();
+
+    function hideSplash() {
+        var elapsed = Date.now() - startTime;
+        var remaining = Math.max(0, minDisplay - elapsed);
+        setTimeout(function() {
+            splash.style.opacity = '0';
+            splash.style.visibility = 'hidden';
+            setTimeout(function() { splash.remove(); }, 500);
+        }, remaining);
+    }
+
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', hideSplash);
+    } else {
+        hideSplash();
+    }
+
+    // ─── Dynamic Favicon ────────────────────────────────────────────────────
+    window.NexusFavicon = {
+        canvas: null,
+        ctx: null,
+        link: null,
+        baseColor: '#F5A623',
+
+        init: function() {
+            this.canvas = document.createElement('canvas');
+            this.canvas.width = 64;
+            this.canvas.height = 64;
+            this.ctx = this.canvas.getContext('2d');
+            this.link = document.querySelector('link[rel*="icon"]') || document.createElement('link');
+            this.link.rel = 'shortcut icon';
+            this.link.type = 'image/png';
+            document.head.appendChild(this.link);
+            this.setNormal();
+        },
+
+        draw: function(color, badge) {
+            var ctx = this.ctx;
+            var c = this.canvas;
+            ctx.clearRect(0, 0, 64, 64);
+
+            // Background circle
+            ctx.beginPath();
+            ctx.arc(32, 32, 30, 0, Math.PI * 2);
+            ctx.fillStyle = color || this.baseColor;
+            ctx.fill();
+
+            // Letter N
+            ctx.fillStyle = '#0d0d0d';
+            ctx.font = 'bold 36px system-ui,sans-serif';
+            ctx.textAlign = 'center';
+            ctx.textBaseline = 'middle';
+            ctx.fillText('N', 32, 33);
+
+            // Badge dot
+            if (badge) {
+                ctx.beginPath();
+                ctx.arc(52, 12, 10, 0, Math.PI * 2);
+                ctx.fillStyle = '#ef4444';
+                ctx.fill();
+                ctx.fillStyle = '#fff';
+                ctx.font = 'bold 11px system-ui,sans-serif';
+                ctx.fillText(badge > 9 ? '9+' : String(badge), 52, 13);
+            }
+
+            this.link.href = c.toDataURL('image/png');
+        },
+
+        setNormal: function() { this.draw(this.baseColor); },
+        setOffline: function() { this.draw('#666'); },
+        setNotify: function(count) { this.draw(this.baseColor, count); },
+    };
+
+    // Auto-init favicon
+    if (document.readyState === 'loading') {
+        document.addEventListener('DOMContentLoaded', function() { NexusFavicon.init(); });
+    } else {
+        NexusFavicon.init();
+    }
+
+    // Update favicon on online/offline
+    window.addEventListener('online', function() { if (window.NexusFavicon) NexusFavicon.setNormal(); });
+    window.addEventListener('offline', function() { if (window.NexusFavicon) NexusFavicon.setOffline(); });
+})();
diff --git a/pos/static/js/supplier_catalog.js b/pos/static/js/supplier_catalog.js
new file mode 100644
index 0000000..bfbc690
--- /dev/null
+++ b/pos/static/js/supplier_catalog.js
@@ -0,0 +1,299 @@
+(function() {
+  'use strict';
+
+  const API = '/pos/api/supplier-catalog';
+  const VEHICLE_API = '/pos/api/inventory/vehicles';
+  const token = localStorage.getItem('pos_token') || '';
+
+  let state = {
+    q: '',
+    category: '',
+    make: '',
+    model: '',
+    year: '',
+    engine: '',
+    myeId: null,
+    page: 1,
+    perPage: 30,
+    totalPages: 1,
+    categories: [],
+    items: []
+  };
+
+  function headers() {
+    return { 'Authorization': 'Bearer ' + token, 'Content-Type': 'application/json' };
+  }
+
+  let scAbort = null;
+  let scSeq = 0;
+
+  async function apiFetch(url) {
+    if (scAbort) {
+      scAbort.abort();
+      scAbort = null;
+    }
+    const ctrl = new AbortController();
+    scAbort = ctrl;
+    try {
+      const resp = await fetch(url, { headers: headers(), signal: ctrl.signal });
+      if (resp.status === 401) { window.location.href = '/pos/login'; return null; }
+      if (!resp.ok) { console.error('API error', url, resp.status); return null; }
+      return resp.json();
+    } catch (e) {
+      if (e.name === 'AbortError') return null;
+      console.error('API error', url, e);
+      return null;
+    }
+  }
+
+  async function apiFetchSeq(url) {
+    const mySeq = ++scSeq;
+    const data = await apiFetch(url);
+    if (!data || scSeq !== mySeq) return null;
+    return data;
+  }
+
+  // ─── Categories ─────────────────────────────────────────────
+  async function loadCategories() {
+    const data = await apiFetch(API + '/categories');
+    if (!data) return;
+    state.categories = data.categories || [];
+    renderCategories();
+  }
+
+  function renderCategories() {
+    const el = document.getElementById('categoriesGrid');
+    if (!el) return;
+    let html = '<div class="sc-cat-card' + (state.category === '' ? ' active' : '') + '" onclick="selectCategory(\'\')">' +
+      '<div>Todas</div><div class="count">' + state.categories.reduce((a,c)=>a+c.count,0) + ' items</div></div>';
+    state.categories.forEach(function(c) {
+      html += '<div class="sc-cat-card' + (state.category === c.name ? ' active' : '') + '" onclick="selectCategory(\'' + escapeHtml(c.name) + '\')">' +
+        '<div>' + escapeHtml(c.name) + '</div><div class="count">' + c.count + ' items</div></div>';
+    });
+    el.innerHTML = html;
+  }
+
+  window.selectCategory = function(name) {
+    state.category = name;
+    state.page = 1;
+    renderCategories();
+    doSearch();
+  };
+
+  // ─── Vehicle filters ────────────────────────────────────────
+  async function loadMakes() {
+    const data = await apiFetch(VEHICLE_API + '/makes');
+    if (!data) return;
+    const sel = document.getElementById('filterMake');
+    sel.innerHTML = '<option value="">Marca vehiculo</option>';
+    (data.data || []).forEach(function(m) {
+      sel.innerHTML += '<option value="' + escapeHtml(m.name_brand) + '">' + escapeHtml(m.name_brand) + '</option>';
+    });
+  }
+
+  window.onMakeChange = async function() {
+    const sel = document.getElementById('filterMake');
+    state.make = sel.value;
+    state.model = ''; state.year = ''; state.engine = ''; state.myeId = null;
+    document.getElementById('filterModel').disabled = true;
+    document.getElementById('filterYear').disabled = true;
+    document.getElementById('filterEngine').disabled = true;
+    if (!state.make) { doSearch(); return; }
+
+    const makes = await apiFetchSeq(VEHICLE_API + '/makes');
+    if (!makes) return;
+    const brand = (makes.data || []).find(function(m) { return m.name_brand === state.make; });
+    if (!brand) { doSearch(); return; }
+
+    const models = await apiFetchSeq(VEHICLE_API + '/models?brand_id=' + brand.id_brand);
+    if (!models) return;
+    const msel = document.getElementById('filterModel');
+    msel.innerHTML = '<option value="">Modelo</option>';
+    (models.data || []).forEach(function(m) {
+      msel.innerHTML += '<option value="' + m.id_model + '">' + escapeHtml(m.name_model) + '</option>';
+    });
+    msel.disabled = false;
+    doSearch();
+  };
+
+  window.onModelChange = async function() {
+    const sel = document.getElementById('filterModel');
+    const modelId = sel.value;
+    state.model = modelId ? sel.options[sel.selectedIndex].text : '';
+    state.year = ''; state.engine = ''; state.myeId = null;
+    document.getElementById('filterYear').disabled = true;
+    document.getElementById('filterEngine').disabled = true;
+    if (!modelId) { doSearch(); return; }
+
+    const years = await apiFetchSeq(VEHICLE_API + '/years?model_id=' + modelId);
+    if (!years) return;
+    const ysel = document.getElementById('filterYear');
+    ysel.innerHTML = '<option value="">Año</option>';
+    (years.data || []).forEach(function(y) {
+      ysel.innerHTML += '<option value="' + y.id_year + '">' + y.year_car + '</option>';
+    });
+    ysel.disabled = false;
+    doSearch();
+  };
+
+  window.onYearChange = async function() {
+    const sel = document.getElementById('filterYear');
+    const yearId = sel.value;
+    const modelId = document.getElementById('filterModel').value;
+    state.year = yearId ? sel.options[sel.selectedIndex].text : '';
+    state.engine = ''; state.myeId = null;
+    document.getElementById('filterEngine').disabled = true;
+    if (!yearId || !modelId) { doSearch(); return; }
+
+    const engines = await apiFetchSeq(VEHICLE_API + '/engines?model_id=' + modelId + '&year_id=' + yearId);
+    if (!engines) return;
+    const esel = document.getElementById('filterEngine');
+    esel.innerHTML = '<option value="">Motorizacion</option>';
+    (engines.data || []).forEach(function(e) {
+      const label = escapeHtml(e.name_engine) + (e.trim_level ? ' (' + escapeHtml(e.trim_level) + ')' : '');
+      esel.innerHTML += '<option value="' + e.id_mye + '">' + label + '</option>';
+    });
+    esel.disabled = false;
+    doSearch();
+  };
+
+  // ─── Search ─────────────────────────────────────────────────
+  window.doSearch = async function() {
+    state.q = document.getElementById('searchInput').value.trim();
+    const engineSel = document.getElementById('filterEngine');
+    state.myeId = engineSel.value || null;
+
+    let url = API + '/search?page=' + state.page + '&per_page=' + state.perPage;
+    if (state.q) url += '&q=' + encodeURIComponent(state.q);
+    if (state.category) url += '&category=' + encodeURIComponent(state.category);
+    if (state.myeId) {
+      url += '&mye_id=' + state.myeId;
+    } else {
+      if (state.make) url += '&make=' + encodeURIComponent(state.make);
+      if (state.model) url += '&model=' + encodeURIComponent(state.model);
+      if (state.year) url += '&year=' + encodeURIComponent(state.year);
+    }
+
+    const data = await apiFetch(url);
+    if (!data) return;
+    state.items = data.data || [];
+    state.totalPages = (data.pagination || {}).total_pages || 1;
+    renderItems();
+    renderPagination();
+  };
+
+  window.clearFilters = function() {
+    document.getElementById('searchInput').value = '';
+    document.getElementById('filterMake').value = '';
+    document.getElementById('filterModel').innerHTML = '<option value="">Modelo</option>'; document.getElementById('filterModel').disabled = true;
+    document.getElementById('filterYear').innerHTML = '<option value="">Año</option>'; document.getElementById('filterYear').disabled = true;
+    document.getElementById('filterEngine').innerHTML = '<option value="">Motorizacion</option>'; document.getElementById('filterEngine').disabled = true;
+    state.q = ''; state.category = ''; state.make = ''; state.model = ''; state.year = ''; state.engine = ''; state.myeId = null; state.page = 1;
+    renderCategories();
+    doSearch();
+  };
+
+  // ─── Render results ─────────────────────────────────────────
+  function renderItems() {
+    const el = document.getElementById('partsGrid');
+    if (!el) return;
+    if (!state.items.length) {
+      el.innerHTML = '<div class="sc-empty" style="grid-column:1/-1;"><div style="font-size:48px;margin-bottom:var(--space-4);">🔍</div><h3>Sin resultados</h3><p>Intenta con otros filtros o terminos de busqueda.</p></div>';
+      return;
+    }
+    el.innerHTML = state.items.map(function(it) {
+      return '<div class="sc-card" onclick="openDetail(' + it.id + ')">' +
+        '<div class="sc-card__sku">' + escapeHtml(it.sku) + '</div>' +
+        '<div class="sc-card__name">' + escapeHtml(it.name) + '</div>' +
+        '<div class="sc-card__meta">' +
+          '<span class="sc-card__badge">' + escapeHtml(it.category || 'SIN CATEGORIA') + '</span>' +
+          ' <span>' + escapeHtml(it.supplier_name) + '</span>' +
+        '</div>' +
+      '</div>';
+    }).join('');
+  }
+
+  function renderPagination() {
+    const el = document.getElementById('pagination');
+    if (!el) return;
+    if (state.totalPages <= 1) { el.innerHTML = ''; return; }
+    let html = '<button ' + (state.page <= 1 ? 'disabled' : '') + ' onclick="goPage(' + (state.page - 1) + ')">Anterior</button>';
+    html += '<span>Pagina ' + state.page + ' de ' + state.totalPages + '</span>';
+    html += '<button ' + (state.page >= state.totalPages ? 'disabled' : '') + ' onclick="goPage(' + (state.page + 1) + ')">Siguiente</button>';
+    el.innerHTML = html;
+  }
+
+  window.goPage = function(p) {
+    state.page = p;
+    doSearch();
+  };
+
+  // ─── Detail modal ───────────────────────────────────────────
+  window.openDetail = async function(id) {
+    const data = await apiFetch(API + '/items/' + id);
+    if (!data) return;
+    document.getElementById('modalTitle').textContent = escapeHtml(data.sku);
+    let html = '';
+    html += '<div><strong style="font-size:var(--text-h6);">' + escapeHtml(data.name) + '</strong></div>';
+    html += '<div class="sc-modal__section"><h4>Informacion</h4>' +
+      '<p>Proveedor: ' + escapeHtml(data.supplier_name) + '<br>Categoria: ' + escapeHtml(data.category || 'N/A') + '</p></div>';
+
+    if (data.interchanges && data.interchanges.length) {
+      html += '<div class="sc-modal__section"><h4>Intercambios</h4><div class="sc-interchange-list">' +
+        data.interchanges.map(function(ix) {
+          return '<span class="sc-interchange-chip">' + escapeHtml(ix.brand) + ' — ' + escapeHtml(ix.part_number) + '</span>';
+        }).join('') + '</div></div>';
+    }
+
+    if (data.compatibilities && data.compatibilities.length) {
+      var seenCompat = {};
+      var uniqCompat = data.compatibilities.filter(function(c) {
+        var key = (c.make || '') + '|' + (c.model || '') + '|' + (c.year || '') + '|' + (c.engine || '');
+        if (seenCompat[key]) return false;
+        seenCompat[key] = true;
+        return true;
+      });
+      html += '<div class="sc-modal__section"><h4>Vehiculos compatibles (' + uniqCompat.length + ')</h4>' +
+        '<div class="sc-compat-grid">' +
+        uniqCompat.slice(0, 50).map(function(c) {
+          return '<div class="sc-compat-item">' +
+            '<strong>' + escapeHtml(c.make || '') + ' ' + escapeHtml(c.model || '') + '</strong><br>' +
+            (c.year || '') + ' ' + escapeHtml(c.engine || '') +
+          '</div>';
+        }).join('') +
+        (uniqCompat.length > 50 ? '<div style="grid-column:1/-1;text-align:center;color:var(--color-text-muted);">... y ' + (uniqCompat.length - 50) + ' mas</div>' : '') +
+        '</div></div>';
+    }
+
+    document.getElementById('modalBody').innerHTML = html;
+    document.getElementById('detailModal').classList.add('open');
+  };
+
+  window.closeModal = function() {
+    document.getElementById('detailModal').classList.remove('open');
+  };
+
+  // ─── Utils ──────────────────────────────────────────────────
+  function escapeHtml(s) {
+    if (s == null) return '';
+    return String(s).replace(/&/g,'&amp;').replace(/</g,'&lt;').replace(/>/g,'&gt;').replace(/"/g,'&quot;');
+  }
+
+  // ─── Init ───────────────────────────────────────────────────
+  function init() {
+    if (!token) { window.location.href = '/pos/login'; return; }
+    loadCategories();
+    loadMakes();
+    doSearch().then(function() {
+      var params = new URLSearchParams(window.location.search);
+      var id = params.get('id');
+      if (id) { openDetail(parseInt(id)); }
+    });
+  }
+
+  if (document.readyState === 'loading') {
+    document.addEventListener('DOMContentLoaded', init);
+  } else {
+    init();
+  }
+})();
diff --git a/pos/static/js/virtual-scroll.js b/pos/static/js/virtual-scroll.js
index 882e449..6ddaba6 100644
--- a/pos/static/js/virtual-scroll.js
+++ b/pos/static/js/virtual-scroll.js
@@ -24,6 +24,8 @@
         this._scrollHandler = this._onScroll.bind(this);
         this._resizeHandler = this._onResize.bind(this);
         this._isTbody = this.container.tagName === 'TBODY';
+        this._rafId = null;
+        this._pendingRender = false;
         this._init();
     }
 
@@ -58,11 +60,22 @@
     };
 
     VirtualScroll.prototype._onScroll = function() {
-        this._render();
+        this._scheduleRender();
     };
 
     VirtualScroll.prototype._onResize = function() {
-        this._render();
+        this._scheduleRender();
+    };
+
+    VirtualScroll.prototype._scheduleRender = function() {
+        if (this._pendingRender) return;
+        this._pendingRender = true;
+        var self = this;
+        this._rafId = requestAnimationFrame(function() {
+            self._rafId = null;
+            self._pendingRender = false;
+            self._render();
+        });
     };
 
     VirtualScroll.prototype._getScrollTop = function() {
@@ -99,11 +112,7 @@
         var buffer = this.buffer;
 
         if (!data.length) {
-            if (this._isTbody) {
-                this.container.innerHTML = this.emptyHtml;
-            } else {
-                this.container.innerHTML = this.emptyHtml;
-            }
+            this.container.innerHTML = this.emptyHtml;
             return;
         }
 
@@ -112,20 +121,19 @@
         var startIdx = Math.max(0, Math.floor(scrollTop / rowH) - buffer);
         var endIdx = Math.min(data.length, Math.ceil((scrollTop + containerHeight) / rowH) + buffer);
 
+        // Build new HTML
         var html = '';
         if (this._isTbody) {
-            // Top spacer row
             var topSpacerHeight = startIdx * rowH;
             if (topSpacerHeight > 0) {
-                html += '<tr style="height:' + topSpacerHeight + 'px;"><td colspan="99" style="padding:0;border:0;"></td></tr>';
+                html += '<tr style="height:' + topSpacerHeight + 'px;" aria-hidden="true"><td colspan="99" style="padding:0;border:0;"></td></tr>';
             }
             for (var i = startIdx; i < endIdx; i++) {
                 html += this.renderRow(data[i], i);
             }
-            // Bottom spacer row
             var bottomSpacerHeight = (data.length - endIdx) * rowH;
             if (bottomSpacerHeight > 0) {
-                html += '<tr style="height:' + bottomSpacerHeight + 'px;"><td colspan="99" style="padding:0;border:0;"></td></tr>';
+                html += '<tr style="height:' + bottomSpacerHeight + 'px;" aria-hidden="true"><td colspan="99" style="padding:0;border:0;"></td></tr>';
             }
         } else {
             for (var j = startIdx; j < endIdx; j++) {
@@ -133,6 +141,10 @@
             }
         }
 
+        // Use a DocumentFragment approach via innerHTML to avoid flicker:
+        // Setting innerHTML on tbody is the fastest way, but we can reduce
+        // perceived flicker by ensuring the container has contain: paint
+        // and by batching via rAF (done in _scheduleRender).
         this.container.innerHTML = html;
     };
 
diff --git a/pos/static/js/whatsapp2.js b/pos/static/js/whatsapp2.js
index 8a7608f..40f08ea 100644
--- a/pos/static/js/whatsapp2.js
+++ b/pos/static/js/whatsapp2.js
@@ -16,6 +16,7 @@
   var activePhone = null;
   var pollTimer = null;
   var statusPollTimer = null;
+  var qrPollTimer = null;
   var connectionState = 'unknown'; // 'open', 'close', 'connecting', 'unknown'
 
   // -- Helpers ---------------------------------------------------------------
@@ -88,6 +89,10 @@
     api('GET', '/status').then(function (data) {
       var state = (data.instance || data).state || data.state || 'close';
       updateConnectionUI(state);
+      // If bridge already has a QR ready, show it immediately
+      if (state === 'qr' || state === 'connecting') {
+        fetchQR();
+      }
     }).catch(function () {
       updateConnectionUI('close');
     });
@@ -106,7 +111,8 @@
       // Load conversations + start polling on page load / reconnect
       loadConversations();
       startPolling();
-    } else if (state === 'connecting') {
+      stopQRPolling();
+    } else if (state === 'connecting' || state === 'qr') {
       statusDot.className = 'status-dot status-dot--warn';
       statusText.textContent = 'Escaneando QR...';
       connectSection.style.display = 'flex';
@@ -125,6 +131,7 @@
       refreshQrBtn.style.display = 'none';
       qrImg.style.display = 'none';
       qrPlaceholder.style.display = '';
+      stopQRPolling();
     }
   }
 
@@ -141,8 +148,15 @@
         return;
       }
 
-      // Instance created, now fetch QR
-      fetchQR();
+      // Switch UI to connecting state immediately
+      updateConnectionUI('connecting');
+      qrPlaceholder.textContent = 'Iniciando conexion con WhatsApp, generando QR...';
+      qrPlaceholder.style.display = '';
+      qrImg.style.display = 'none';
+
+      // Start polling for QR; the first fetchQR may not have QR ready yet
+      startStatusPolling();
+      startQRPolling();
     }).catch(function () {
       connectBtn.disabled = false;
       connectBtn.textContent = 'Conectar WhatsApp';
@@ -151,7 +165,10 @@
   }
 
   function fetchQR() {
-    qrPlaceholder.textContent = 'Generando QR...';
+    // Only update placeholder text if we don't already have a QR image showing
+    if (qrImg.style.display !== 'block') {
+      qrPlaceholder.textContent = 'Generando codigo QR, espera unos segundos...';
+    }
 
     api('GET', '/qr').then(function (data) {
       var base64 = data.qr || data.base64 || data.qrcode || '';
@@ -164,14 +181,18 @@
 
         // Start polling for connection state while QR is shown
         startStatusPolling();
+        startQRPolling();
       } else if ((data.instance && data.instance.state === 'open') || data.state === 'open') {
         // Already connected
         updateConnectionUI('open');
         loadConversations();
       } else {
-        qrPlaceholder.textContent = 'No se pudo generar el QR. Intenta de nuevo.';
-        qrPlaceholder.style.display = '';
-        qrImg.style.display = 'none';
+        // QR not ready yet — this is normal right after pressing Connect
+        if (qrImg.style.display !== 'block') {
+          qrPlaceholder.textContent = 'Generando codigo QR, por favor espera... (el codigo cambia cada pocos segundos, escanealo en cuanto aparezca)';
+          qrPlaceholder.style.display = '';
+          qrImg.style.display = 'none';
+        }
       }
     }).catch(function () {
       qrPlaceholder.textContent = 'Error al obtener QR';
@@ -208,6 +229,24 @@
     }
   }
 
+  function startQRPolling() {
+    stopQRPolling();
+    qrPollTimer = setInterval(function () {
+      if (connectionState === 'connecting' || connectionState === 'qr') {
+        fetchQR();
+      } else {
+        stopQRPolling();
+      }
+    }, 5000);
+  }
+
+  function stopQRPolling() {
+    if (qrPollTimer) {
+      clearInterval(qrPollTimer);
+      qrPollTimer = null;
+    }
+  }
+
   connectBtn.addEventListener('click', doConnect);
   disconnectBtn.addEventListener('click', doDisconnect);
   refreshQrBtn.addEventListener('click', fetchQR);
@@ -486,4 +525,12 @@
     };
   } catch(e) {}
 
+    // Register Cmd+K items
+    if (typeof registerCmdKItem === "function") {
+        registerCmdKItem({ group: "Principal", label: "POS Ventas", href: "/pos/sale", icon: "🛒" });
+        registerCmdKItem({ group: "Principal", label: "Catálogo", href: "/pos/catalog", icon: "📁" });
+        registerCmdKItem({ group: "Principal", label: "Clientes", href: "/pos/customers", icon: "👤" });
+        registerCmdKItem({ group: "Principal", label: "Dashboard", href: "/pos/dashboard", icon: "📊" });
+    }
+
 })();
diff --git a/pos/static/pwa/manifest.json b/pos/static/pwa/manifest.json
index faa8969..3c8b2cb 100644
--- a/pos/static/pwa/manifest.json
+++ b/pos/static/pwa/manifest.json
@@ -1,13 +1,23 @@
 {
-  "name": "Nexus POS",
+  "name": "Nexus Autoparts POS",
   "short_name": "NexusPOS",
   "description": "Sistema de Punto de Venta para Refaccionarias",
   "start_url": "/pos/login",
   "display": "standalone",
+  "orientation": "portrait",
   "background_color": "#0d0d0d",
   "theme_color": "#F5A623",
+  "categories": ["business", "productivity"],
   "icons": [
-    {"src": "/pos/static/pwa/icon-192.png", "sizes": "192x192", "type": "image/png"},
-    {"src": "/pos/static/pwa/icon-512.png", "sizes": "512x512", "type": "image/png"}
-  ]
+    {"src": "/pos/static/pwa/icon-192.png", "sizes": "192x192", "type": "image/png", "purpose": "any maskable"},
+    {"src": "/pos/static/pwa/icon-512.png", "sizes": "512x512", "type": "image/png", "purpose": "any maskable"}
+  ],
+  "shortcuts": [
+    {"name": "Nueva Venta", "short_name": "Venta", "description": "Abrir punto de venta", "url": "/pos/sale", "icons": [{"src": "/pos/static/pwa/icon-192.png", "sizes": "192x192"}]},
+    {"name": "Inventario", "short_name": "Stock", "description": "Ver inventario", "url": "/pos/inventory", "icons": [{"src": "/pos/static/pwa/icon-192.png", "sizes": "192x192"}]},
+    {"name": "Dashboard", "short_name": "Dashboard", "description": "Ver resumen", "url": "/pos/dashboard", "icons": [{"src": "/pos/static/pwa/icon-192.png", "sizes": "192x192"}]}
+  ],
+  "screenshots": [],
+  "related_applications": [],
+  "prefer_related_applications": false
 }
diff --git a/pos/static/pwa/sw.js b/pos/static/pwa/sw.js
index 15917cb..85669f2 100644
--- a/pos/static/pwa/sw.js
+++ b/pos/static/pwa/sw.js
@@ -1,27 +1,27 @@
 // /home/Autopartes/pos/static/pwa/sw.js
-// Nexus POS — Service Worker v6
+// Nexus POS — Service Worker v17
 // Self-contained vanilla JS. No external imports.
+//
+// Bump CACHE_NAME whenever static assets change significantly.
+// The fetch handler normalizes static asset URLs (strips ?v= query strings)
+// so templates can use cache-busting query params freely.
 
-const CACHE_NAME = 'nexus-pos-v6';
+const CACHE_NAME = 'nexus-pos-v17';
 
 const APP_SHELL = [
   '/pos/static/css/tokens.css',
   '/pos/static/css/common.css',
+  '/pos/static/css/pos-ui.css',
   '/pos/static/js/app-init.js',
   '/pos/static/js/sidebar.js',
-  '/pos/static/js/login.js',
-  '/pos/static/js/pos.js',
-  '/pos/static/js/catalog.js',
-  '/pos/static/js/inventory.js',
-  '/pos/static/js/customers.js',
-  '/pos/static/js/invoicing.js',
-  '/pos/static/js/accounting.js',
-  '/pos/static/js/dashboard.js',
-  '/pos/static/js/config.js',
-  '/pos/static/js/reports.js',
   '/pos/static/js/offline-banner.js',
   '/pos/static/js/sync-engine.js',
-  '/pos/static/js/brand-catalog.js',
+  '/pos/static/js/i18n.js',
+  '/pos/static/js/kiosk.js',
+  '/pos/static/js/splash-loader.js',
+  '/pos/static/js/pos-utils.js',
+  '/pos/static/js/pwa-install.js',
+  '/pos/static/js/chat.js',
   '/pos/static/pwa/manifest.json',
   '/pos/static/pwa/icon-192.png',
   '/pos/static/pwa/icon-512.png'
@@ -103,6 +103,12 @@ self.addEventListener('activate', function (event) {
       );
     }).then(function () {
       return self.clients.claim();
+    }).then(function () {
+      return self.clients.matchAll({ type: 'window' }).then(function (clients) {
+        clients.forEach(function (client) {
+          client.postMessage({ type: 'SW_UPDATED', cacheName: CACHE_NAME });
+        });
+      });
     })
   );
 });
@@ -117,6 +123,13 @@ self.addEventListener('fetch', function (event) {
     return;
   }
 
+  // Normalize cache key for static assets (strip query strings) so
+  // catalog.js?v=5 and catalog.js?v=6 share the same cache entry.
+  var cacheKey = req;
+  if (/\.(js|css|png|jpg|jpeg|webp|svg|gif|ico|woff|woff2|ttf|eot|json)$/.test(url.pathname)) {
+    cacheKey = new Request(url.pathname);
+  }
+
   // Never cache auth endpoints
   if (url.pathname.indexOf('/pos/api/auth/') !== -1) {
     return;
@@ -172,26 +185,27 @@ self.addEventListener('fetch', function (event) {
   }
 
   // Everything else (JS, CSS, images) -> cache-first
-  event.respondWith(cacheFirst(req));
+  event.respondWith(cacheFirst(req, cacheKey));
 });
 
-function cacheFirst(request) {
-  return caches.match(request).then(function (cached) {
+function cacheFirst(request, cacheKey) {
+  cacheKey = cacheKey || request;
+  return caches.match(cacheKey).then(function (cached) {
     if (cached) {
       fetch(request).then(function (response) {
-        if (response && response.status === 200) {
+        if (response && response.status === 200 && request.method === 'GET') {
           caches.open(CACHE_NAME).then(function (cache) {
-            cache.put(request, response);
+            cache.put(cacheKey, response);
           });
         }
       }).catch(function () {});
       return cached;
     }
     return fetch(request).then(function (response) {
-      if (response && response.status === 200) {
+      if (response && response.status === 200 && request.method === 'GET') {
         var clone = response.clone();
         caches.open(CACHE_NAME).then(function (cache) {
-          cache.put(request, clone);
+          cache.put(cacheKey, clone);
         });
       }
       return response;
@@ -201,7 +215,7 @@ function cacheFirst(request) {
 
 function networkFirst(request) {
   return fetch(request).then(function (response) {
-    if (response && response.status === 200) {
+    if (response && response.status === 200 && request.method === 'GET') {
       var clone = response.clone();
       caches.open(CACHE_NAME).then(function (cache) {
         cache.put(request, clone);
diff --git a/pos/tasks.py b/pos/tasks.py
index 8423169..28d4ecc 100644
--- a/pos/tasks.py
+++ b/pos/tasks.py
@@ -98,6 +98,144 @@ def generate_report_task(self, report_type, params, tenant_id):
     }
 
 
+# ─── MercadoLibre Tasks ───────────────────────────────────────────────────
+
+@celery.task(bind=True, max_retries=3)
+def sync_meli_stock_price_task(self, tenant_id: int):
+    """Sync stock and price for all active ML listings."""
+    from services import marketplace_external_service as meli_svc
+    from tenant_db import get_tenant_conn
+
+    conn = get_tenant_conn(tenant_id)
+    try:
+        cfg = meli_svc.get_meli_config(conn)
+        svc = meli_svc._get_meli_service(cfg)
+        if not svc:
+            return {'error': 'MercadoLibre not configured'}
+
+        cur = conn.cursor()
+        cur.execute(
+            """
+            SELECT id, inventory_id, external_item_id, publish_price
+            FROM marketplace_listings
+            WHERE is_active = true AND channel = 'mercadolibre'
+            """
+        )
+        listings = cur.fetchall()
+        cur.close()
+
+        from services.inventory_engine import get_stock_bulk
+        stock_map = get_stock_bulk(conn, branch_id=None)
+
+        updated = 0
+        failed = 0
+        for row in listings:
+            listing_id, inv_id, ext_id, last_price = row
+            cur = conn.cursor()
+            cur.execute("SELECT price_1 FROM inventory WHERE id = %s", (inv_id,))
+            price_row = cur.fetchone()
+            cur.close()
+            current_price = float(price_row[0]) if price_row and price_row[0] else 0
+            current_stock = stock_map.get(inv_id, 0)
+
+            try:
+                svc.update_item(
+                    ext_id,
+                    {"price": round(current_price, 2), "available_quantity": max(current_stock, 0)},
+                )
+                cur = conn.cursor()
+                cur.execute(
+                    """
+                    UPDATE marketplace_listings
+                    SET last_sync_at = NOW(), sync_errors = NULL, publish_price = %s
+                    WHERE id = %s
+                    """,
+                    (current_price, listing_id),
+                )
+                conn.commit()
+                cur.close()
+                updated += 1
+            except Exception as e:
+                conn.rollback()
+                cur = conn.cursor()
+                cur.execute(
+                    "UPDATE marketplace_listings SET sync_errors = %s WHERE id = %s",
+                    (str(e)[:500], listing_id),
+                )
+                conn.commit()
+                cur.close()
+                failed += 1
+
+        return {'updated': updated, 'failed': failed, 'total': len(listings)}
+    finally:
+        conn.close()
+
+
+@celery.task(bind=True, max_retries=3)
+def sync_meli_orders_task(self, tenant_id: int):
+    """Fetch new orders from MercadoLibre."""
+    from services import marketplace_external_service as meli_svc
+    from tenant_db import get_tenant_conn
+
+    conn = get_tenant_conn(tenant_id)
+    try:
+        # Determine last check date from most recent order
+        cur = conn.cursor()
+        cur.execute(
+            "SELECT MAX(created_at) FROM marketplace_orders WHERE channel = 'mercadolibre'"
+        )
+        row = cur.fetchone()
+        last_check = row[0]
+        cur.close()
+
+        date_from = None
+        if last_check:
+            date_from = last_check.strftime('%Y-%m-%dT%H:%M:%S.000-00:00')
+
+        result = meli_svc.fetch_and_save_orders(conn, date_from=date_from)
+        return result
+    except Exception as e:
+        return {'error': str(e)}
+    finally:
+        conn.close()
+
+
+@celery.task(bind=True, max_retries=3)
+def process_meli_webhook_task(self, tenant_id: int, topic: str, resource: str):
+    """Process incoming MercadoLibre webhook asynchronously."""
+    from services import marketplace_external_service as meli_svc
+    from tenant_db import get_tenant_conn
+
+    conn = get_tenant_conn(tenant_id)
+    try:
+        if topic.startswith("orders"):
+            # Fetch full order and upsert
+            cfg = meli_svc.get_meli_config(conn)
+            svc = meli_svc._get_meli_service(cfg)
+            if svc and resource:
+                order_id = resource.split("/")[-1]
+                full = svc.get_order(order_id)
+                # Re-use fetch_and_save_orders by passing the order directly
+                # For simplicity, trigger a full sync for recent orders
+                return meli_svc.fetch_and_save_orders(conn)
+
+        if topic.startswith("questions"):
+            # Fetch single question and upsert locally
+            if resource:
+                question_id = resource.split("/")[-1]
+                try:
+                    meli_svc.fetch_question_from_ml(conn, question_id)
+                    return {'ok': True, 'topic': topic, 'question_id': question_id}
+                except Exception as qe:
+                    return {'ok': False, 'topic': topic, 'error': str(qe)}
+
+        return {'ok': True, 'topic': topic}
+    except Exception as e:
+        return {'error': str(e)}
+    finally:
+        conn.close()
+
+
 @celery.task(bind=True, max_retries=2)
 def sync_vehicle_compatibility_task(self, tenant_id, item_id, part_number, name, brand, compat_source):
     """Fetch AI/TecDoc vehicle compatibility in background after item creation."""
@@ -140,3 +278,27 @@ def sync_vehicle_compatibility_task(self, tenant_id, item_id, part_number, name,
             tenant_conn.close()
         if master_conn:
             master_conn.close()
+
+
+@celery.task(bind=True)
+def publish_meli_items_task(self, tenant_id: int, inventory_ids: list, category_id: str, listing_type: str = "gold_special", shipping_mode: str = "me2", custom_data: dict = None, base_url: str = None):
+    """Publish inventory items to MercadoLibre asynchronously."""
+    from services import marketplace_external_service as meli_svc
+    from tenant_db import get_tenant_conn
+
+    conn = get_tenant_conn(tenant_id)
+    try:
+        result = meli_svc.publish_items(
+            conn,
+            inventory_ids=inventory_ids,
+            meli_category_id=category_id,
+            listing_type_id=listing_type,
+            shipping_mode=shipping_mode,
+            custom_data=custom_data or {},
+            base_url=base_url,
+        )
+        return result
+    except Exception as e:
+        return {"success": [], "failed": [{"inventory_id": "batch", "error": str(e)}]}
+    finally:
+        conn.close()
diff --git a/pos/templates/accounting.html b/pos/templates/accounting.html
index 7e290bd..8ee43da 100644
--- a/pos/templates/accounting.html
+++ b/pos/templates/accounting.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/accounting.css">
 </head>
@@ -188,10 +190,10 @@
       <!-- Tabs -->
       <div class="tabs-row" role="tablist">
         <button class="tab-btn is-active" role="tab" aria-selected="true" onclick="switchTab('cxc')">
-          Ctas. por Cobrar <span class="tab-btn__badge">23</span>
+          Ctas. por Cobrar <span class="tab-btn__badge" id="badge-cxc">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" onclick="switchTab('cxp')">
-          Ctas. por Pagar <span class="tab-btn__badge--alert tab-btn__badge">3</span>
+          Ctas. por Pagar <span class="tab-btn__badge--alert tab-btn__badge" id="badge-cxp">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" onclick="switchTab('balance')">
           Balance General
@@ -490,7 +492,8 @@
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
   <script src="/pos/static/js/accounting.js" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
@@ -498,5 +501,31 @@
   <script src="/pos/static/js/pwa-install.js" defer></script>
 
   <script src="/pos/static/js/chat.js" defer></script>
+
+  <script>
+    // Load accounting stats for tab badges
+    async function loadAccountingStats() {
+      const token = localStorage.getItem('pos_token') || '';
+      try {
+        const res = await fetch('/pos/api/accounting/stats', {
+          headers: token ? { 'Authorization': 'Bearer ' + token } : {}
+        });
+        if (!res.ok) return;
+        const data = await res.json();
+        const map = {
+          'badge-cxc': data.cuentas_cobrar,
+          'badge-cxp': data.cuentas_pagar
+        };
+        Object.entries(map).forEach(function([id, val]) {
+          const el = document.getElementById(id);
+          if (el) el.textContent = val || 0;
+        });
+      } catch (e) {
+        console.error('Failed to load accounting stats:', e);
+      }
+    }
+    window.loadAccountingStats = loadAccountingStats;
+    loadAccountingStats();
+  </script>
 </body>
 </html>
diff --git a/pos/templates/catalog.html b/pos/templates/catalog.html
index 8eaad9d..17e479c 100644
--- a/pos/templates/catalog.html
+++ b/pos/templates/catalog.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -7,12 +7,14 @@
   <title>Catalogo — Nexus Autoparts POS</title>
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/onboarding.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
   <script src="/pos/static/js/native-bridge.js" defer></script>
 
   <link rel="stylesheet" href="/pos/static/css/catalog.css">
@@ -66,6 +68,10 @@
           <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75"><rect x="3" y="3" width="18" height="18" rx="2"/><path d="M8 7h8M8 12h8M8 17h5"/></svg>
           Catalogo
         </a>
+        <a class="nav-item" href="/pos/supplier-catalog" role="menuitem">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75"><path d="M2 3h6l2 3h12v14H2V3z"/></svg>
+          Cat. Proveedores
+        </a>
         <div class="nav-section-label" style="margin-top: var(--space-2);">Gestion</div>
         <a class="nav-item" href="/pos/customers" role="menuitem">
           <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75"><path d="M17 21v-2a4 4 0 00-4-4H5a4 4 0 00-4 4v2"/><circle cx="9" cy="7" r="4"/><path d="M23 21v-2a4 4 0 00-3-3.87"/><path d="M16 3.13a4 4 0 010 7.75"/></svg>
@@ -107,6 +113,9 @@
           <span class="breadcrumb__current">Catalogo</span>
         </nav>
         <div class="header-actions" style="position:relative;">
+          <button class="btn btn--sm" id="uploadPricesBtn" onclick="CatalogApp.openUploadPricesModal()" title="Subir precios de proveedor" style="margin-right:var(--space-2);display:none;">
+            💰 Precios proveedor
+          </button>
           <div class="mode-toggle" id="modeToggle" title="Cambiar entre catalogo OEM (TecDoc), marcas locales, por marca de vehiculo y consumibles">
             <button data-mode="oem" onclick="CatalogApp.setMode('oem')" disabled style="opacity:0.5;cursor:not-allowed;" title="Próximamente">OEM 🔒</button>
             <button data-mode="local" onclick="CatalogApp.setMode('local')">Local</button>
@@ -269,6 +278,29 @@
     <button class="banner__dismiss" onclick="document.getElementById('offlineBanner').style.display='none'" aria-label="Cerrar">&times;</button>
   </div>
 
+  <!-- Upload Supplier Prices Modal -->
+  <div id="uploadPricesModal" style="display:none;position:fixed;top:0;left:0;right:0;bottom:0;z-index:9500;background:rgba(0,0,0,0.6);align-items:center;justify-content:center;padding:var(--space-4);">
+    <div style="background:var(--color-surface-1);border:1px solid var(--color-border);border-radius:var(--radius-md);max-width:520px;width:100%;max-height:90vh;overflow:auto;padding:var(--space-5);">
+      <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:var(--space-4);">
+        <h2 style="margin:0;font-family:var(--font-heading);font-size:var(--text-h4);">Subir precios de proveedor</h2>
+        <button onclick="CatalogApp.closeUploadPricesModal()" style="background:none;border:none;cursor:pointer;font-size:1.4rem;color:var(--color-text-secondary);">&#10005;</button>
+      </div>
+      <p style="color:var(--color-text-secondary);font-size:var(--text-body-sm);margin-bottom:var(--space-3);">
+        Sube un CSV o Excel con las columnas: <code>supplier_name, sku, price, currency, effective_from</code>.<br>
+        El precio se mostrará en el catálogo junto a cada parte del proveedor.
+      </p>
+      <div style="margin-bottom:var(--space-3);">
+        <label style="display:block;font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:4px;">Archivo CSV / Excel</label>
+        <input type="file" id="uploadPricesFile" accept=".csv,.xlsx,.xls" style="width:100%;" />
+      </div>
+      <div style="display:flex;gap:var(--space-2);justify-content:flex-end;">
+        <a href="/pos/api/supplier-catalog/prices/template" class="btn btn--ghost" style="text-decoration:none;">Descargar plantilla</a>
+        <button class="btn btn-primary" onclick="CatalogApp.submitUploadPrices()">Subir precios</button>
+      </div>
+      <div id="uploadPricesStatus" style="margin-top:var(--space-3);font-size:var(--text-body-sm);"></div>
+    </div>
+  </div>
+
   <!-- Brand Catalog Overlay (full-screen overlay for brand-first browsing) -->
   <div id="brandCatalogOverlay" style="display:none;position:relative;top:0;left:0;right:0;bottom:0;background:var(--color-bg-base);overflow:auto;padding:var(--space-4);">
     <div style="max-width:1200px;margin:0 auto;">
@@ -286,9 +318,10 @@
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/kiosk.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
-  <script src="/pos/static/js/catalog.js?v=2" defer></script>
+  <script src="/pos/static/js/catalog.js?v=6" defer></script>
   <script src="/pos/static/js/offline-banner.js" defer></script>
   <script src="/pos/static/js/chat.js" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
diff --git a/pos/templates/config.html b/pos/templates/config.html
index 30f16b2..ae06426 100644
--- a/pos/templates/config.html
+++ b/pos/templates/config.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/config.css?v=2">
 </head>
@@ -249,7 +251,68 @@
         </div>
 
         <!-- ===============================================================
-             SECTION 3: USUARIOS Y PERMISOS
+             SECTION 3: MÓDULOS E INTEGRACIONES
+             =============================================================== -->
+        <div class="settings-section">
+          <div class="settings-section__header">
+            <div class="settings-section__icon">
+              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+            </div>
+            <div>
+              <div class="settings-section__title">Módulos e Integraciones</div>
+              <div class="settings-section__desc">Activa o desactiva funcionalidades del menú para este tenant</div>
+            </div>
+          </div>
+
+          <div class="settings-card">
+            <div class="toggle-row">
+              <div class="toggle-row__info">
+                <span class="toggle-row__label">WhatsApp</span>
+                <span class="toggle-row__desc">Mostrar el menú de WhatsApp Bridge y chat</span>
+              </div>
+              <label class="toggle">
+                <input type="checkbox" id="cfg-module-whatsapp" checked />
+                <span class="toggle__slider"></span>
+              </label>
+            </div>
+            <div class="toggle-row">
+              <div class="toggle-row__info">
+                <span class="toggle-row__label">Marketplace</span>
+                <span class="toggle-row__desc">Mostrar el menú de Marketplace interno</span>
+              </div>
+              <label class="toggle">
+                <input type="checkbox" id="cfg-module-marketplace" checked />
+                <span class="toggle__slider"></span>
+              </label>
+            </div>
+            <div class="toggle-row">
+              <div class="toggle-row__info">
+                <span class="toggle-row__label">MercadoLibre</span>
+                <span class="toggle-row__desc">Mostrar el menú de integración con MercadoLibre</span>
+              </div>
+              <label class="toggle">
+                <input type="checkbox" id="cfg-module-meli" checked />
+                <span class="toggle__slider"></span>
+              </label>
+            </div>
+            <div class="toggle-row">
+              <div class="toggle-row__info">
+                <span class="toggle-row__label">Catálogo</span>
+                <span class="toggle-row__desc">Mostrar el menú de Catálogo de productos</span>
+              </div>
+              <label class="toggle">
+                <input type="checkbox" id="cfg-module-catalog" checked />
+                <span class="toggle__slider"></span>
+              </label>
+            </div>
+            <div style="margin-top:var(--space-4);text-align:right;">
+              <button class="btn btn--primary" onclick="Config.saveModules()">Guardar módulos</button>
+            </div>
+          </div>
+        </div>
+
+        <!-- ===============================================================
+             SECTION 4: USUARIOS Y PERMISOS
              =============================================================== -->
         <div class="settings-section">
           <div class="settings-section__header">
@@ -655,19 +718,56 @@
        MODALS
        ===================================================================== -->
 
-  <!-- Modal: Nueva Sucursal -->
+  <!-- Modal: Nueva / Editar Sucursal -->
   <div class="cfg-modal-overlay" id="modal-branch" style="display:none;">
-    <div class="cfg-modal">
+    <div class="cfg-modal" style="max-width:640px;">
       <div class="cfg-modal__header">
-        <h3 class="cfg-modal__title">Nueva Sucursal</h3>
+        <h3 class="cfg-modal__title" id="branch-modal-title">Nueva Sucursal</h3>
         <button class="cfg-modal__close" onclick="Config.closeModal('modal-branch')">&times;</button>
       </div>
       <div class="cfg-modal__body">
+        <input type="hidden" id="branch-id" value="" />
         <div class="form-grid">
           <div class="form-group form-group--full">
-            <label class="form-label">Nombre</label>
+            <label class="form-label">Nombre *</label>
             <input class="form-input" id="branch-name" type="text" placeholder="Ej. Sucursal Norte" />
           </div>
+          <div class="form-group">
+            <label class="form-label">RFC</label>
+            <input class="form-input" id="branch-rfc" type="text" placeholder="ABC010101ABC" maxlength="13" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Razon Social</label>
+            <input class="form-input" id="branch-razon" type="text" placeholder="Razon social fiscal" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Regimen Fiscal</label>
+            <input class="form-input" id="branch-regimen" type="text" placeholder="601" maxlength="10" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Codigo Postal</label>
+            <input class="form-input" id="branch-cp" type="text" placeholder="00000" maxlength="5" />
+          </div>
+          <div class="form-group form-group--full">
+            <label class="form-label">Direccion Fiscal</label>
+            <input class="form-input" id="branch-direccion-fiscal" type="text" placeholder="Calle, Colonia, Ciudad" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Serie CFDI</label>
+            <input class="form-input" id="branch-serie" type="text" placeholder="A" maxlength="10" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Folio Inicio</label>
+            <input class="form-input" id="branch-folio-inicio" type="number" placeholder="1" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Folio Actual</label>
+            <input class="form-input" id="branch-folio-actual" type="number" placeholder="1" />
+          </div>
+          <div class="form-group">
+            <label class="form-label">Email</label>
+            <input class="form-input" id="branch-email" type="email" placeholder="sucursal@empresa.com" />
+          </div>
           <div class="form-group form-group--full">
             <label class="form-label">Direccion</label>
             <input class="form-input" id="branch-address" type="text" placeholder="Calle, Colonia, Ciudad" />
@@ -676,6 +776,12 @@
             <label class="form-label">Telefono</label>
             <input class="form-input" id="branch-phone" type="tel" placeholder="(55) 1234-5678" />
           </div>
+          <div class="form-group form-group--full">
+            <label class="form-check" style="display:flex;align-items:center;gap:8px;cursor:pointer;">
+              <input type="checkbox" id="branch-main" style="width:auto;" />
+              <span>Sucursal principal (datos fiscales por defecto)</span>
+            </label>
+          </div>
         </div>
       </div>
       <div class="cfg-modal__footer">
@@ -741,10 +847,11 @@
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
   <script src="/pos/static/js/kiosk.js" defer></script>
-  <script src="/pos/static/js/config.js?v=2" defer></script>
+  <script src="/pos/static/js/config.js?v=3" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
   <script src="/pos/static/js/pwa-install.js" defer></script>
diff --git a/pos/templates/customers.html b/pos/templates/customers.html
index 1bc6841..254a3ee 100644
--- a/pos/templates/customers.html
+++ b/pos/templates/customers.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/customers.css">
 </head>
@@ -304,9 +306,11 @@
 
           <!-- Table -->
           <div class="table-wrap themed-scrollbar">
+            <div id="customersBulkToolbar"></div>
             <table class="customers-table" id="customersTable">
               <thead>
                 <tr>
+                  <th><input type="checkbox" id="selectAllCustomers" onclick="Customers.toggleSelectAll()"></th>
                   <th>#</th>
                   <th>Nombre</th>
                   <th class="hide-mobile">RFC</th>
@@ -380,10 +384,18 @@
             <div class="detail-section">
               <div class="detail-section__title">Información de Contacto</div>
               <div class="info-grid">
+                <div class="info-row info-row--full">
+                  <span class="info-label">Razón Social</span>
+                  <span class="info-value" id="detailRazonSocial">—</span>
+                </div>
                 <div class="info-row info-row--full">
                   <span class="info-label">Dirección</span>
                   <span class="info-value" id="detailAddress">Av. Insurgentes Sur 1602, Col. Crédito Constructor, CDMX</span>
                 </div>
+                <div class="info-row">
+                  <span class="info-label">CP</span>
+                  <span class="info-value info-value--mono" id="detailCp">—</span>
+                </div>
                 <div class="info-row">
                   <span class="info-label">Teléfono</span>
                   <span class="info-value info-value--mono" id="detailPhone">+52 55 1234-5678</span>
@@ -420,6 +432,10 @@
                     <div class="credit-metric__label">Utilizado</div>
                     <div class="credit-metric__value used" id="detailCreditUsed">$31,500</div>
                   </div>
+                  <div class="credit-metric">
+                    <div class="credit-metric__label">Descuento Max</div>
+                    <div class="credit-metric__value" id="detailMaxDiscount">0%</div>
+                  </div>
                 </div>
                 <div class="credit-progress">
                   <div class="credit-progress__labels">
@@ -611,16 +627,17 @@
     </div>
     <div class="panel-footer">
       <button class="btn-edit" onclick="if(typeof Customers!=='undefined') Customers.editCurrent();">Editar Cliente</button>
-      <button class="btn-sale" onclick="window.location.href='/pos/';">Nueva Venta</button>
+      <button class="btn-sale" onclick="window.location.href='/pos/sale';">Nueva Venta</button>
     </div>
   </div>
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
   <script src="/pos/static/js/virtual-scroll.js" defer></script>
-  <script src="/pos/static/js/customers.js" defer></script>
+  <script src="/pos/static/js/customers.js?v=2" defer></script>
   <script src="/pos/static/js/offline-banner.js" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
diff --git a/pos/templates/dashboard.html b/pos/templates/dashboard.html
index a80a284..5697609 100644
--- a/pos/templates/dashboard.html
+++ b/pos/templates/dashboard.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,12 +8,14 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
-  <link rel="stylesheet" href="/pos/static/css/dashboard.css">
+  <link rel="stylesheet" href="/pos/static/css/dashboard.css?v=3">
 </head>
 
 <body>
@@ -254,9 +256,9 @@
                   </svg>
                 </span>
               </div>
-              <div class="kpi-card__value" id="kpi-ventas-total">--</div>
+              <div class="kpi-card__value" id="kpi-ventas-total"><div class="skeleton skeleton--text" style="width:60%;"></div></div>
               <div class="kpi-card__meta" id="kpi-ventas-meta">
-                <span class="kpi-tag kpi-tag--neutral">Cargando...</span>
+                <div class="skeleton skeleton--text-sm" style="width:80%;"></div>
               </div>
             </div>
 
@@ -272,9 +274,9 @@
                   </svg>
                 </span>
               </div>
-              <div class="kpi-card__value" id="kpi-tickets-count">--</div>
+              <div class="kpi-card__value" id="kpi-tickets-count"><div class="skeleton skeleton--text" style="width:40%;"></div></div>
               <div class="kpi-card__meta" id="kpi-tickets-meta">
-                <span class="kpi-tag kpi-tag--neutral">Cargando...</span>
+                <div class="skeleton skeleton--text-sm" style="width:70%;"></div>
               </div>
             </div>
 
@@ -290,9 +292,9 @@
                   </svg>
                 </span>
               </div>
-              <div class="kpi-card__value" id="kpi-promedio-value">--</div>
+              <div class="kpi-card__value" id="kpi-promedio-value"><div class="skeleton skeleton--text" style="width:60%;"></div></div>
               <div class="kpi-card__meta" id="kpi-promedio-meta">
-                <span class="kpi-tag kpi-tag--neutral">Cargando...</span>
+                <div class="skeleton skeleton--text-sm" style="width:75%;"></div>
               </div>
             </div>
 
@@ -307,9 +309,9 @@
                   </svg>
                 </span>
               </div>
-              <div class="kpi-card__value" id="kpi-cajas-count">--</div>
+              <div class="kpi-card__value" id="kpi-cajas-count"><div class="skeleton skeleton--text" style="width:30%;"></div></div>
               <div class="kpi-card__meta" id="kpi-cajas-meta">
-                <span class="kpi-tag kpi-tag--neutral">Cargando...</span>
+                <div class="skeleton skeleton--text-sm" style="width:80%;"></div>
               </div>
             </div>
 
@@ -366,7 +368,7 @@
                   Ventas por Hora
                 </div>
               </div>
-              <canvas id="hourlySalesChart" height="180"></canvas>
+              <div class="chart-canvas-wrap"><canvas id="hourlySalesChart"></canvas></div>
             </div>
             <div class="rank-card">
               <div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:var(--space-4);">
@@ -374,7 +376,7 @@
                   Top Productos (Hoy)
                 </div>
               </div>
-              <canvas id="topProductsChart" height="180"></canvas>
+              <div class="chart-canvas-wrap"><canvas id="topProductsChart"></canvas></div>
             </div>
           </div>
         </section>
@@ -398,7 +400,9 @@
                 <a href="/pos/inventory" style="font-size:var(--text-caption);color:var(--color-primary);font-weight:var(--font-weight-semibold);cursor:pointer;text-decoration:none;">Ver todos</a>
               </div>
               <div class="rank-list" id="top-products-list">
-                <div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Cargando...</div>
+                <div class="rank-item"><div class="skeleton skeleton--text" style="width:90%;"></div></div>
+                <div class="rank-item"><div class="skeleton skeleton--text" style="width:70%;"></div></div>
+                <div class="rank-item"><div class="skeleton skeleton--text" style="width:80%;"></div></div>
               </div>
             </div><!-- end Top Productos -->
 
@@ -411,7 +415,8 @@
                 <a href="/pos/config" style="font-size:var(--text-caption);color:var(--color-primary);font-weight:var(--font-weight-semibold);cursor:pointer;text-decoration:none;">Gestionar</a>
               </div>
               <div class="rank-list" id="registers-list">
-                <div class="rank-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);">Cargando...</div>
+                <div class="rank-item"><div class="skeleton skeleton--text" style="width:85%;"></div></div>
+                <div class="rank-item"><div class="skeleton skeleton--text" style="width:65%;"></div></div>
               </div>
             </div><!-- end Cajas del Día -->
 
@@ -428,7 +433,8 @@
             <span class="section-action">Gestionar todo &rarr;</span>
           </div>
           <div class="alerts-grid" id="alerts-grid">
-            <div class="alert-item" style="justify-content:center;color:var(--color-text-muted);font-size:var(--text-caption);border-left:none;">Cargando alertas...</div>
+            <div class="alert-item" style="border-left:none;"><div class="skeleton skeleton--text" style="width:100%;"></div></div>
+            <div class="alert-item" style="border-left:none;"><div class="skeleton skeleton--text" style="width:80%;"></div></div>
           </div><!-- end alerts-grid -->
         </section>
 
@@ -466,7 +472,9 @@
                   </tr>
                 </thead>
                 <tbody id="recent-sales-tbody">
-                  <tr><td colspan="5" style="text-align:center;color:var(--color-text-muted);font-size:var(--text-caption);">Cargando ventas recientes...</td></tr>
+                  <tr><td colspan="5"><div class="skeleton skeleton--text" style="width:100%;"></div></td></tr>
+                  <tr><td colspan="5"><div class="skeleton skeleton--text" style="width:80%;"></div></td></tr>
+                  <tr><td colspan="5"><div class="skeleton skeleton--text" style="width:90%;"></div></td></tr>
                 </tbody>
               </table>
             </div>
@@ -483,10 +491,11 @@
   <script src="/pos/static/js/chart.umd.min.js" defer></script>
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
-  <script src="/pos/static/js/dashboard-stats.js" defer></script>
-  <script src="/pos/static/js/dashboard.js" defer></script>
+  <script src="/pos/static/js/dashboard-stats.js?v=3" defer></script>
+  <script src="/pos/static/js/dashboard.js?v=3" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
   <script src="/pos/static/js/pwa-install.js" defer></script>
diff --git a/pos/templates/diagrams.html b/pos/templates/diagrams.html
index c0674f7..d902b6e 100644
--- a/pos/templates/diagrams.html
+++ b/pos/templates/diagrams.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,11 +8,13 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="stylesheet" href="/pos/static/css/onboarding.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
   <script src="/pos/static/js/native-bridge.js" defer></script>
 
   <link rel="stylesheet" href="/pos/static/css/diagrams.css">
@@ -150,7 +152,8 @@
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/kiosk.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
   <script src="/pos/static/js/diagrams.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
diff --git a/pos/templates/fleet.html b/pos/templates/fleet.html
index 0bf2bc5..8458f12 100644
--- a/pos/templates/fleet.html
+++ b/pos/templates/fleet.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/fleet.css">
 </head>
@@ -303,7 +305,8 @@
 
 <script src="/pos/static/js/i18n.js" defer></script>
 <script src="/pos/static/js/app-init.js" defer></script>
-<script src="/pos/static/js/pos-utils.js" defer></script>
+<script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+<script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
 <script src="/pos/static/js/fleet.js" defer></script>
 <script src="/pos/static/js/offline-banner.js" defer></script>
diff --git a/pos/templates/inventory.html b/pos/templates/inventory.html
index 6973319..f05b4bb 100644
--- a/pos/templates/inventory.html
+++ b/pos/templates/inventory.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,12 +8,14 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
-  <link rel="stylesheet" href="/pos/static/css/inventory.css">
+  <link rel="stylesheet" href="/pos/static/css/inventory.css?v=8">
 </head>
 
 <body>
@@ -32,6 +34,16 @@
       <span class="theme-bar__label">Sucursal Centro &mdash; Usuario: H. García</span>
     </div>
     <div class="theme-bar__right">
+      <button class="icon-btn" id="notifDropdownBtn" title="Notificaciones" onclick="NotificationsDropdown.toggle()" style="margin-right:8px;">
+        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M18 8A6 6 0 0 0 6 8c0 7-3 9-3 9h18s-3-2-3-9"/><path d="M13.73 21a2 2 0 0 1-3.46 0"/></svg>
+        <span class="notif-dot" id="headerNotifDot"></span>
+      </button>
+      <button class="icon-btn" title="Modo táctil" onclick="TouchModeToggle.set(document.documentElement.getAttribute('data-touch') !== 'true')" style="margin-right:4px;">
+        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect x="4" y="2" width="16" height="20" rx="2" ry="2"/><line x1="12" y1="18" x2="12.01" y2="18"/></svg>
+      </button>
+      <button class="icon-btn" title="Densidad" onclick="DensityToggle.set(document.documentElement.getAttribute('data-density') === 'compact' ? 'normal' : 'compact')" style="margin-right:8px;">
+        <svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><line x1="4" y1="6" x2="20" y2="6"/><line x1="4" y1="12" x2="20" y2="12"/><line x1="4" y1="18" x2="20" y2="18"/></svg>
+      </button>
       <span class="theme-bar__label">Tema:</span>
       <button class="theme-btn theme-btn--industrial is-active" data-theme-target="industrial" onclick="setTheme('industrial')">
         <span class="theme-btn__swatch"></span>
@@ -171,6 +183,10 @@
           <h1 class="page-header__title">Inventario</h1>
         </div>
         <div class="page-header__actions">
+          <button class="btn btn--ghost" onclick="document.getElementById('bulkImportModal').classList.add('is-open')">
+            <svg viewBox="0 0 24 24"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="17 8 12 3 7 8"/><line x1="12" y1="3" x2="12" y2="15"/></svg>
+            Importar CSV
+          </button>
           <button class="btn btn--ghost" onclick="exportVisibleTableCSV('inventario')">
             <svg viewBox="0 0 24 24"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>
             Exportar CSV
@@ -268,6 +284,7 @@
              =================================================================== -->
         <div class="tab-panel is-active" id="panel-stock" role="tabpanel">
 
+          <div id="savedFiltersContainer" style="margin-bottom:var(--space-2);"></div>
           <div class="toolbar">
             <div class="search-box">
               <svg viewBox="0 0 24 24" stroke-linecap="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
@@ -306,10 +323,18 @@
                 ]);
             }
             </script>
+            <button class="btn btn--ghost btn--sm" onclick="showTierDiscountModal()">
+              <svg viewBox="0 0 24 24"><circle cx="12" cy="12" r="10"/><line x1="12" y1="6" x2="12" y2="12"/><line x1="16.24" y1="16.24" x2="12" y2="12"/></svg>
+              <span id="tierDiscountBadge">Taller -15% · Mayoreo -25%</span>
+            </button>
             <button class="btn btn--primary btn--sm" onclick="showCreateModal()">
               <svg viewBox="0 0 24 24"><line x1="12" y1="5" x2="12" y2="19"/><line x1="5" y1="12" x2="19" y2="12"/></svg>
               Nuevo Producto
             </button>
+            <button class="btn btn--sm btn--meli" id="btnPublishML" style="display:none;" onclick="openMeliPublishModal()">
+              <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg>
+              Publicar en ML <span id="meliSelectedCountBadge" style="background:#2D3277;color:#FFE600;border-radius:10px;padding:0 6px;font-size:11px;margin-left:4px;">0</span>
+            </button>
           </div>
 
           <div class="table-wrapper">
@@ -317,6 +342,7 @@
               <table class="data-table" id="stockTable">
                 <thead>
                   <tr>
+                    <th style="width:32px;"><input type="checkbox" id="selectAllItems" onclick="toggleSelectAllItems()" title="Seleccionar todos" /></th>
                     <th style="font-size:var(--text-caption);color:var(--color-text-muted);">ID</th>
                     <th>Barcode</th>
                     <th>No. Parte</th>
@@ -324,9 +350,9 @@
                     <th>Marca</th>
                     <th style="text-align:right">Stock</th>
                     <th style="text-align:right">Costo</th>
-                    <th style="text-align:right">Precio 1</th>
-                    <th style="text-align:right">Precio 2</th>
-                    <th style="text-align:right">Precio 3</th>
+                    <th style="text-align:right">Mostrador</th>
+                    <th style="text-align:right">Taller</th>
+                    <th style="text-align:right">Mayoreo</th>
                     <th>Ubicación</th>
                     <th>Acciones</th>
                   </tr>
@@ -686,12 +712,22 @@
         <div class="inv-form-grid">
           <div class="inv-field"><label>No. Parte *</label><input type="text" id="newPartNumber" placeholder="Ej: GAT-50104" /></div>
           <div class="inv-field"><label>Nombre *</label><input type="text" id="newName" placeholder="Nombre del producto" /></div>
-          <div class="inv-field"><label>Marca</label><input type="text" id="newBrand" placeholder="Marca" /></div>
+          <div class="inv-field"><label>Marca</label><input type="text" id="newBrand" placeholder="Marca del fabricante" /></div>
+          <div class="inv-field"><label>Categoría</label>
+            <select class="select-filter" id="newCategory" onchange="onCategoryChange(this.value)" style="width:100%;">
+              <option value="">Selecciona categoría</option>
+            </select>
+          </div>
+          <div class="inv-field"><label>Subcategoría</label>
+            <select class="select-filter" id="newSubcategory" style="width:100%;" disabled>
+              <option value="">Selecciona categoría primero</option>
+            </select>
+          </div>
           <div class="inv-field"><label>Barcode</label><input type="text" id="newBarcode" placeholder="Auto-generado si vacío" /></div>
+          <div class="inv-field"><label>SKU Alternativo 1</label><input type="text" id="newSku2" placeholder="Ej: SKU-Bodega-A" /></div>
+          <div class="inv-field"><label>SKU Alternativo 2</label><input type="text" id="newSku3" placeholder="Ej: SKU-Bodega-B" /></div>
           <div class="inv-field"><label>Costo</label><input type="number" id="newCost" step="0.01" placeholder="0.00" /></div>
-          <div class="inv-field"><label>Precio 1</label><input type="number" id="newPrice1" step="0.01" placeholder="0.00" /></div>
-          <div class="inv-field"><label>Precio 2</label><input type="number" id="newPrice2" step="0.01" placeholder="0.00" /></div>
-          <div class="inv-field"><label>Precio 3</label><input type="number" id="newPrice3" step="0.01" placeholder="0.00" /></div>
+          <div class="inv-field"><label>Precio Mostrador</label><input type="number" id="newPrice1" step="0.01" placeholder="0.00" /></div>
           <div class="inv-field"><label>Stock Mínimo</label><input type="number" id="newMinStock" placeholder="0" /></div>
           <div class="inv-field"><label>Stock Inicial</label><input type="number" id="newInitialStock" placeholder="0" /></div>
           <div class="inv-field"><label>Ubicación</label><input type="text" id="newLocation" placeholder="Ej: A-12-3" /></div>
@@ -809,6 +845,191 @@
     </div>
   </div>
 
+  <!-- Tier Discounts Modal -->
+  <div class="inv-modal-overlay" id="tierDiscountModal">
+    <div class="inv-modal">
+      <div class="inv-modal__header">
+        <h3>Descuentos por Tipo de Cliente</h3>
+        <button class="inv-modal__close" onclick="closeTierDiscountModal()">&times;</button>
+      </div>
+      <div class="inv-modal__body">
+        <p style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-4);">Estos descuentos se aplican automáticamente a todos los productos al calcular precios de Taller y Mayoreo.</p>
+        <div style="display:grid;grid-template-columns:1fr 1fr;gap:16px;">
+          <div class="inv-field"><label>Descuento Taller (%)</label><input type="number" id="tierDisc2" step="0.1" min="0" max="100" placeholder="15" /></div>
+          <div class="inv-field"><label>Descuento Mayoreo (%)</label><input type="number" id="tierDisc3" step="0.1" min="0" max="100" placeholder="25" /></div>
+        </div>
+      </div>
+      <div class="inv-modal__footer">
+        <button class="btn btn--ghost" onclick="closeTierDiscountModal()">Cancelar</button>
+        <button class="btn btn--primary" onclick="saveTierDiscounts()">Guardar</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- ══════════ Publicar en MercadoLibre Modal ══════════ -->
+  <div class="inv-modal-overlay" id="meliPublishModal">
+    <div class="inv-modal inv-modal--wide">
+      <div class="inv-modal__header">
+        <h3>Publicar en MercadoLibre</h3>
+        <button class="inv-modal__close" onclick="closeMeliPublishModal()">&times;</button>
+      </div>
+      <div class="inv-modal__body">
+        <div id="meliPublishSelectedCount" style="font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:var(--space-3);">0 productos seleccionados</div>
+
+        <!-- Pre-flight checks & editable preview -->
+        <div id="meliPublishItemsPreview" style="max-height:320px;overflow-y:auto;margin-bottom:var(--space-4);">
+          <p style="color:var(--color-text-muted);font-size:var(--text-caption);">Cargando preview...</p>
+        </div>
+
+        <div style="display:grid;grid-template-columns:1fr 1fr 1fr;gap:16px;margin-bottom:var(--space-4);">
+          <div class="inv-field">
+            <label>Categoría ML *</label>
+            <div style="position:relative;">
+              <input type="text" id="meliCategorySearch" placeholder="Buscar categoría..." oninput="searchMeliCategories()" onkeydown="handleMeliCatKeydown(event)" autocomplete="off" />
+              <div id="meliCategoryResults"></div>
+            </div>
+            <input type="hidden" id="meliCategoryId" />
+          </div>
+          <div class="inv-field">
+            <label>Tipo de Publicación</label>
+            <select id="meliListingType">
+              <option value="gold_special">Gold Special</option>
+              <option value="gold_pro">Gold Pro</option>
+              <option value="bronze">Bronce (gratis)</option>
+            </select>
+          </div>
+          <div class="inv-field">
+            <label>Modo de Envío</label>
+            <select id="meliShippingMode" onchange="onMeliShippingChange()">
+              <option value="me2" selected>MercadoEnvíos (me2)</option>
+              <option value="custom">Propio (custom)</option>
+              <option value="not_specified">No especificado</option>
+            </select>
+            <small style="color:var(--color-text-muted);font-size:var(--text-caption);">Si no puedes activar ME1/ME2 en ML, prueba 'Propio' o 'No especificado'.</small>
+          </div>
+          <div class="inv-field" id="meliShippingCostField" style="display:none;">
+            <label>Costo de Envío (MXN)</label>
+            <input type="number" id="meliShippingCost" value="150" min="0" step="1" />
+          </div>
+          <div class="inv-field" style="display:flex;align-items:center;gap:8px;margin-top:var(--space-2);">
+            <input type="checkbox" id="meliSkipValidate" style="width:auto;height:auto;" />
+            <label for="meliSkipValidate" style="margin:0;font-size:var(--text-caption);color:var(--color-text-muted);text-transform:none;">Saltear validación y publicar directamente (si la validación falla por config de cuenta)</label>
+          </div>
+        </div>
+
+        <!-- Dynamic required attributes section -->
+        <div id="meliAttrsSection" style="display:none;">
+          <div class="meli-attrs-section">
+            <strong style="font-size:var(--text-body-sm);">Atributos requeridos para esta categoría</strong>
+            <div id="meliAttrsGrid" class="meli-attrs-grid"></div>
+          </div>
+        </div>
+
+        <div id="meliPublishResult" style="min-height:1.5em;margin-top:var(--space-3);"></div>
+      </div>
+      <div class="inv-modal__footer">
+        <button class="btn btn--ghost" onclick="closeMeliPublishModal()">Cancelar</button>
+        <button class="btn btn--secondary" id="meliValidateBtn" onclick="validateMeliPublish()">Validar con ML</button>
+        <button class="btn btn--meli" id="meliPublishBtn" onclick="executeMeliPublish()"><svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/></svg> Publicar</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- ══════════ Product Timeline Modal ══════════ -->
+  <div class="inv-modal-overlay" id="productTimelineModal">
+    <div class="inv-modal inv-modal--wide">
+      <div class="inv-modal__header">
+        <h3>Timeline del Producto</h3>
+        <button class="inv-modal__close" onclick="document.getElementById('productTimelineModal').classList.remove('is-open')">&times;</button>
+      </div>
+      <div class="inv-modal__body" id="productTimelineBody">
+        <div class="timeline">
+          <div class="timeline__item"><div class="timeline__dot"></div><div class="timeline__content"><div class="timeline__date">--</div><div class="timeline__title">Producto creado</div></div></div>
+        </div>
+      </div>
+      <div class="inv-modal__footer">
+        <button class="btn btn--ghost" onclick="document.getElementById('productTimelineModal').classList.remove('is-open')">Cerrar</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- ══════════ Image Comparator Modal ══════════ -->
+  <div class="inv-modal-overlay" id="imageCompareModal">
+    <div class="inv-modal">
+      <div class="inv-modal__header">
+        <h3>Comparar Imágenes</h3>
+        <button class="inv-modal__close" onclick="document.getElementById('imageCompareModal').classList.remove('is-open')">&times;</button>
+      </div>
+      <div class="inv-modal__body">
+        <div class="img-compare" id="imgCompareContainer" style="max-height:400px;">
+          <img class="img-compare__img" src="" id="imgCompareNew" alt="Nueva" />
+          <div class="img-compare__overlay">
+            <img src="" id="imgCompareOld" alt="Anterior" />
+          </div>
+          <div class="img-compare__handle">↔</div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- ══════════ Ticket Preview Modal ══════════ -->
+  <div class="inv-modal-overlay" id="ticketPreviewModal">
+    <div class="inv-modal" style="max-width:400px;">
+      <div class="inv-modal__header">
+        <h3>Vista previa del ticket</h3>
+        <button class="inv-modal__close" onclick="document.getElementById('ticketPreviewModal').classList.remove('is-open')">&times;</button>
+      </div>
+      <div class="inv-modal__body" id="ticketPreviewBody">
+        <!-- Populated by JS -->
+      </div>
+      <div class="inv-modal__footer">
+        <button class="btn btn--ghost" onclick="document.getElementById('ticketPreviewModal').classList.remove('is-open')">Cerrar</button>
+        <button class="btn btn--primary" onclick="window.print()">Imprimir</button>
+      </div>
+    </div>
+  </div>
+
+  <!-- ══════════ Bulk Import Modal ══════════ -->
+  <div class="inv-modal-overlay" id="bulkImportModal">
+    <div class="inv-modal" style="max-width:520px;">
+      <div class="inv-modal__header">
+        <h3>Importar Productos Masivamente</h3>
+        <button class="inv-modal__close" onclick="document.getElementById('bulkImportModal').classList.remove('is-open')">&times;</button>
+      </div>
+      <div class="inv-modal__body">
+        <div style="margin-bottom:12px;">
+          <label style="display:block;margin-bottom:4px;font-size:var(--text-caption);color:var(--color-text-muted);">Archivo CSV o Excel</label>
+          <input type="file" id="bulkImportFile" accept=".csv,.xlsx,.xls" style="width:100%;padding:8px;border:1px dashed var(--color-border);border-radius:6px;background:var(--color-surface);color:var(--color-text);" />
+        </div>
+        <div style="margin-bottom:12px;">
+          <label style="display:block;margin-bottom:4px;font-size:var(--text-caption);color:var(--color-text-muted);">Modo de importación</label>
+          <select id="bulkImportMode" class="select-filter" style="width:100%;">
+            <option value="strict">Estricto — abortar al primer error</option>
+            <option value="lenient" selected>Permisivo — saltar filas con error</option>
+          </select>
+        </div>
+        <div style="margin-bottom:12px;">
+          <label style="display:block;margin-bottom:4px;font-size:var(--text-caption);color:var(--color-text-muted);">Compatibilidad de vehículo faltante</label>
+          <select id="bulkImportStrategy" class="select-filter" style="width:100%;">
+            <option value="qwen" selected>Auto-generar con IA (QWEN)</option>
+            <option value="skip">Omitir compatibilidad</option>
+            <option value="reject">Rechazar filas sin compatibilidad</option>
+          </select>
+        </div>
+        <div style="font-size:var(--text-caption);color:var(--color-text-muted);background:var(--color-surface);padding:10px;border-radius:6px;">
+          <strong>Columnas esperadas:</strong>
+          <code style="display:block;margin-top:4px;word-break:break-all;">sku, name, brand, price, stock, cost, location, description, category, make, model, year, engine, engine_code</code>
+          <span style="display:block;margin-top:4px;">También se aceptan sinónimos en español: <em>numero_de_parte, nombre, marca, precio, cantidad, costo, ubicacion, categoria, fabricante, modelo, anio, motor, codigo_motor</em></span>
+        </div>
+        <div id="bulkImportResult" style="margin-top:12px;display:none;"></div>
+      </div>
+      <div class="inv-modal__footer">
+        <button class="btn btn--ghost" onclick="document.getElementById('bulkImportModal').classList.remove('is-open')">Cancelar</button>
+        <button class="btn btn--primary" onclick="submitBulkImport()">Importar</button>
+      </div>
+    </div>
+  </div>
+
   <!-- Offline Banner -->
   <div id="offlineBanner" class="banner banner--warning" style="display:none;position:fixed;top:0;left:0;right:0;z-index:9999;border-radius:0;animation:none;">
     <span class="banner__icon"></span>
@@ -818,10 +1039,11 @@
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
-  <script src="/pos/static/js/virtual-scroll.js" defer></script>
-  <script src="/pos/static/js/inventory.js?v=5" defer></script>
+  <script src="/pos/static/js/virtual-scroll.js?v=2" defer></script>
+  <script src="/pos/static/js/inventory.js?v=17" defer></script>
   <script src="/pos/static/js/offline-banner.js" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
diff --git a/pos/templates/invoicing.html b/pos/templates/invoicing.html
index 1c8f036..f05b440 100644
--- a/pos/templates/invoicing.html
+++ b/pos/templates/invoicing.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/invoicing.css">
 </head>
@@ -301,16 +303,16 @@
       <!-- Tabs Row -->
       <div class="tabs-row" role="tablist" aria-label="Módulos de Facturación">
         <button class="tab-btn is-active" role="tab" aria-selected="true"  aria-controls="panel-facturas"     id="tab-facturas"     onclick="switchTab('facturas')">
-          Facturas <span class="tab-btn__badge">247</span>
+          Facturas <span class="tab-btn__badge" id="badge-facturas">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-notas"        id="tab-notas"        onclick="switchTab('notas')">
-          Notas de Crédito <span class="tab-btn__badge">8</span>
+          Notas de Crédito <span class="tab-btn__badge" id="badge-notas-credito">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-complementos" id="tab-complementos" onclick="switchTab('complementos')">
-          Complementos de Pago <span class="tab-btn__badge">12</span>
+          Complementos de Pago <span class="tab-btn__badge" id="badge-complementos">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-cancelaciones" id="tab-cancelaciones" onclick="switchTab('cancelaciones')">
-          Cancelaciones <span class="tab-btn__badge tab-btn__badge--warn">6</span>
+          Cancelaciones <span class="tab-btn__badge tab-btn__badge--warn" id="badge-cancelaciones">0</span>
         </button>
         <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-config"       id="tab-config"       onclick="switchTab('config')">
           Configuración CFDI
@@ -354,6 +356,16 @@
 
             <div class="toolbar__spacer"></div>
 
+            <button class="btn btn--primary" onclick="Invoicing.openGlobalInvoiceModal()">
+              <svg viewBox="0 0 24 24" style="width:16px;height:16px;stroke:currentColor;fill:none;stroke-width:2;">
+                <rect x="3" y="4" width="18" height="18" rx="2" ry="2"/>
+                <line x1="16" y1="2" x2="16" y2="6"/>
+                <line x1="8" y1="2" x2="8" y2="6"/>
+                <line x1="3" y1="10" x2="21" y2="10"/>
+              </svg>
+              Factura Global
+            </button>
+
             <button class="btn btn--ghost">
               <svg viewBox="0 0 24 24">
                 <path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/>
@@ -1052,13 +1064,77 @@
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
-  <script src="/pos/static/js/invoicing.js" defer></script>
+  <script src="/pos/static/js/invoicing.js?v=2" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
   <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
   <script src="/pos/static/js/pwa-install.js" defer></script>
 
   <script src="/pos/static/js/chat.js" defer></script>
+
+  <script>
+    // Load invoicing stats for tab badges
+    async function loadInvoicingStats() {
+      const token = localStorage.getItem('pos_token') || '';
+      try {
+        const res = await fetch('/pos/api/invoicing/stats', {
+          headers: token ? { 'Authorization': 'Bearer ' + token } : {}
+        });
+        if (!res.ok) return;
+        const data = await res.json();
+        const map = {
+          'badge-facturas': data.facturas,
+          'badge-notas-credito': data.notas_credito,
+          'badge-complementos': data.complementos,
+          'badge-cancelaciones': data.cancelaciones
+        };
+        Object.entries(map).forEach(function([id, val]) {
+          const el = document.getElementById(id);
+          if (el) el.textContent = val || 0;
+        });
+      } catch (e) {
+        console.error('Failed to load invoicing stats:', e);
+      }
+    }
+    window.loadInvoicingStats = loadInvoicingStats;
+    loadInvoicingStats();
+  </script>
+
+  <!-- =====================================================================
+       MODAL: FACTURA GLOBAL
+       ===================================================================== -->
+  <div class="modal-overlay" id="modalGlobalInvoice" style="display:none; position:fixed; inset:0; z-index:var(--z-modal); background:var(--overlay-backdrop); align-items:center; justify-content:center;">
+    <div class="modal-card" style="background:var(--color-bg-elevated); border:1px solid var(--color-border); border-radius:var(--radius-lg); width:480px; max-width:95vw; box-shadow:var(--shadow-xl);">
+      <div style="display:flex; align-items:center; justify-content:space-between; padding:var(--space-5) var(--space-6); border-bottom:1px solid var(--color-border);">
+        <div>
+          <div style="font-weight:var(--font-weight-semibold); font-size:var(--text-body-lg);">Generar Factura Global</div>
+          <div style="font-size:var(--text-caption); color:var(--color-text-muted); margin-top:2px;">Agrupa ventas de contado no facturadas</div>
+        </div>
+        <button onclick="document.getElementById('modalGlobalInvoice').style.display='none'" style="background:none; border:none; color:var(--color-text-muted); font-size:1.4rem; cursor:pointer; padding:var(--space-2);">✕</button>
+      </div>
+      <div style="padding:var(--space-5) var(--space-6);">
+        <div style="display:flex; gap:var(--space-3); margin-bottom:var(--space-4);">
+          <div style="flex:1;">
+            <label style="font-size:var(--text-caption); color:var(--color-text-muted); display:block; margin-bottom:var(--space-1);">Año</label>
+            <input type="number" id="global-year" class="form-input" style="width:100%;" />
+          </div>
+          <div style="flex:1;">
+            <label style="font-size:var(--text-caption); color:var(--color-text-muted); display:block; margin-bottom:var(--space-1);">Mes</label>
+            <input type="number" id="global-month" class="form-input" style="width:100%;" min="1" max="12" />
+          </div>
+        </div>
+        <div id="global-preview" style="background:var(--color-surface); border-radius:var(--radius-md); padding:var(--space-3); font-size:var(--text-caption); color:var(--color-text-muted);">
+          Presiona "Vista previa" para ver ventas elegibles.
+        </div>
+      </div>
+      <div style="display:flex; gap:var(--space-3); justify-content:flex-end; padding:var(--space-4) var(--space-6); border-top:1px solid var(--color-border);">
+        <button onclick="document.getElementById('modalGlobalInvoice').style.display='none'" class="btn btn--ghost">Cancelar</button>
+        <button onclick="Invoicing.previewGlobalInvoice()" class="btn btn--ghost">Vista previa</button>
+        <button onclick="Invoicing.generateGlobalInvoice()" class="btn btn--primary">Generar</button>
+      </div>
+    </div>
+  </div>
 </body>
 </html>
diff --git a/pos/templates/login.html b/pos/templates/login.html
index 5f9af7f..7b2c69f 100644
--- a/pos/templates/login.html
+++ b/pos/templates/login.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -291,6 +291,13 @@
       btnLogin.disabled = !canLogin;
     }
 
+    /* ------------------------------------------------------------------
+       LOGIN BUTTON CLICK
+       ------------------------------------------------------------------ */
+    btnLogin.addEventListener('click', function() {
+      triggerLogin();
+    });
+
     /* ------------------------------------------------------------------
        TRIGGER LOGIN (demo)
        ------------------------------------------------------------------ */
diff --git a/pos/templates/marketplace.html b/pos/templates/marketplace.html
index c712570..db399ce 100644
--- a/pos/templates/marketplace.html
+++ b/pos/templates/marketplace.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/marketplace.css">
 </head>
@@ -57,10 +59,11 @@
     <h2 style="margin-bottom:var(--space-4);font-family:var(--font-heading);">Mi Inventario</h2>
     <div class="upload-box">
       <label>Cargar inventario via CSV</label>
-      <textarea id="csvText" placeholder="part_number,stock,price&#10;AB-123,5,150.50&#10;CD-456,12,89.00"></textarea>
+      <textarea id="csvText" placeholder="part_number,stock,price,name&#10;AB-123,5,150.50,Filtro de aceite&#10;CD-456,12,89.00,Balata delantera"></textarea>
       <div class="hint">
         Columnas requeridas: <code>part_number, stock, price</code>.
-        Opcionales: <code>min_order, warehouse_location, currency</code>.
+        Opcionales: <code>name, min_order, warehouse_location, currency</code>.
+        <br>Si la parte no existe en el catálogo, se crea automáticamente como <em>seller listing</em>.
       </div>
       <button style="margin-top:var(--space-3);padding:var(--space-3) var(--space-6);background:var(--gradient-accent);color:var(--btn-primary-text);border:none;border-radius:var(--radius-md);font-weight:bold;cursor:pointer;" onclick="uploadCSV()">Subir CSV</button>
       <div id="uploadResult" style="margin-top:var(--space-3);font-size:var(--text-body-sm);"></div>
@@ -205,8 +208,18 @@
           var priceStr = p.min_price === p.max_price
             ? '$' + fmt(p.min_price)
             : '$' + fmt(p.min_price) + ' – $' + fmt(p.max_price);
-          return '<div class="part-card" onclick="openPartDetail(' + p.id_part + ')">' +
-            '<div class="part-card__oem">' + esc(p.oem_part_number) + '</div>' +
+          var isOem = p.listing_type === 'oem';
+          var badge = isOem
+            ? '<span style="background:#3FB95020;color:#3FB950;padding:2px 6px;border-radius:4px;font-size:var(--text-caption);">Catálogo</span>'
+            : '<span style="background:#F5A62320;color:#F5A623;padding:2px 6px;border-radius:4px;font-size:var(--text-caption);">Listing</span>';
+          var onclick = isOem
+            ? 'openPartDetail(' + p.id + ')'
+            : 'openListingDetail(' + p.id + ')';
+          return '<div class="part-card" onclick="' + onclick + '">' +
+            '<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:var(--space-1);">' +
+              '<div class="part-card__oem">' + esc(p.part_number) + '</div>' +
+              badge +
+            '</div>' +
             '<div class="part-card__name">' + esc(p.name) + '</div>' +
             '<div class="part-card__meta">' +
               '<span class="price-range">' + priceStr + '</span>' +
@@ -248,7 +261,7 @@
             '</div>' +
             '<div style="text-align:right;">' +
               '<div class="price-range">$' + fmt(b.price) + '</div>' +
-              '<button style="margin-top:var(--space-1);padding:var(--space-1) var(--space-3);background:var(--gradient-accent);color:var(--btn-primary-text);border:none;border-radius:var(--radius-sm);font-size:var(--text-caption);cursor:pointer;" onclick="createOrderFor(' + partId + ', ' + b.id_bodega + ', \'' + esc(b.name).replace(/\'/g, '\\\'') + '\', ' + (b.price || 0) + ')">Ordenar</button>' +
+              '<button style="margin-top:var(--space-1);padding:var(--space-1) var(--space-3);background:var(--gradient-accent);color:var(--btn-primary-text);border:none;border-radius:var(--radius-sm);font-size:var(--text-caption);cursor:pointer;" onclick="createOrderFor(' + partId + ', null, ' + b.id_bodega + ', \'' + esc(b.name).replace(/\'/g, '\\\'') + '\', ' + (b.price || 0) + ')">Ordenar</button>' +
             '</div>' +
           '</div>';
         });
@@ -257,7 +270,38 @@
       });
     };
 
-    window.createOrderFor = function (partId, bodegaId, bodegaName, price) {
+    window.openListingDetail = function (wiId) {
+      var modal = document.getElementById('partModal');
+      modal.classList.add('open');
+      document.getElementById('partModalBody').innerHTML = 'Cargando bodegas...';
+
+      apiFetch('/inventory/listing/' + wiId).then(function (resp) {
+        if (!resp || !resp.data) return;
+        var bodegas = resp.data;
+        if (bodegas.length === 0) {
+          document.getElementById('partModalBody').innerHTML = '<div class="empty-state">Ninguna bodega tiene esta parte en stock.</div>';
+          return;
+        }
+        var html = '<p style="color:var(--color-text-muted);margin-bottom:var(--space-3);">Elige una bodega para ordenar:</p>';
+        html += '<div style="display:flex;flex-direction:column;gap:var(--space-2);">';
+        bodegas.forEach(function (b) {
+          html += '<div style="padding:var(--space-3);border:1px solid var(--glass-border);border-radius:var(--radius-md);display:flex;justify-content:space-between;align-items:center;">' +
+            '<div>' +
+              '<strong>' + esc(b.name) + '</strong>' +
+              '<div style="color:var(--color-text-muted);font-size:var(--text-caption);">' + esc(b.city || '') + ' · ' + esc(b.stock_hint) + '</div>' +
+            '</div>' +
+            '<div style="text-align:right;">' +
+              '<div class="price-range">$' + fmt(b.price) + '</div>' +
+              '<button style="margin-top:var(--space-1);padding:var(--space-1) var(--space-3);background:var(--gradient-accent);color:var(--btn-primary-text);border:none;border-radius:var(--radius-sm);font-size:var(--text-caption);cursor:pointer;" onclick="createOrderFor(null, ' + wiId + ', ' + b.id_bodega + ', \'' + esc(b.name).replace(/\'/g, '\\\'') + '\', ' + (b.price || 0) + ')">Ordenar</button>' +
+            '</div>' +
+          '</div>';
+        });
+        html += '</div>';
+        document.getElementById('partModalBody').innerHTML = html;
+      });
+    };
+
+    window.createOrderFor = function (partId, wiId, bodegaId, bodegaName, price) {
       var qty = prompt('Cantidad a ordenar para "' + bodegaName + '":', '1');
       if (!qty) return;
       qty = parseInt(qty);
@@ -265,12 +309,22 @@
 
       var notes = prompt('Notas para la bodega (opcional):', '') || '';
 
+      var item = { quantity: qty, unit_price: price };
+      if (partId) {
+        item.part_id = partId;
+      } else if (wiId) {
+        item.wi_id = wiId;
+      } else {
+        alert('Error: se requiere part_id o wi_id');
+        return;
+      }
+
       // Create PO draft
       apiFetch('/orders', {
         method: 'POST',
         body: JSON.stringify({
           bodega_id: bodegaId,
-          items: [{ part_id: partId, quantity: qty, unit_price: price }],
+          items: [item],
           delivery_method: 'pickup',
           buyer_notes: notes,
         }),
@@ -482,6 +536,10 @@
                   r.updated + ' actualizados';
         if (r.skipped > 0) msg += ', ' + r.skipped + ' omitidos';
         msg += '</span>';
+        if (r.oem_count !== undefined || r.seller_count !== undefined) {
+          msg += '<div style="margin-top:var(--space-2);font-size:var(--text-caption);color:var(--color-text-muted);">' +
+                 (r.oem_count || 0) + ' catálogo OEM · ' + (r.seller_count || 0) + ' seller listings</div>';
+        }
         if (r.errors && r.errors.length) {
           msg += '<div style="margin-top:var(--space-2);color:var(--color-text-muted);font-size:var(--text-caption);">';
           r.errors.slice(0, 5).forEach(function (e) {
diff --git a/pos/templates/marketplace_external.html b/pos/templates/marketplace_external.html
new file mode 100644
index 0000000..cc71403
--- /dev/null
+++ b/pos/templates/marketplace_external.html
@@ -0,0 +1,354 @@
+<!DOCTYPE html>
+<html lang="es">
+<head>
+  <script>(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>MercadoLibre — Nexus Autoparts POS</title>
+  <link rel="stylesheet" href="/pos/static/css/chat.css" />
+  <link rel="stylesheet" href="/pos/static/css/tokens.css" />
+  <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
+  <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
+  <link rel="stylesheet" href="/pos/static/css/inventory.css" />
+  <link rel="manifest" href="/pos/static/pwa/manifest.json" />
+  <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
+  <style>
+    .meli-status { display:inline-flex;align-items:center;gap:6px;padding:4px 10px;border-radius:20px;font-size:12px;font-weight:600; }
+    .meli-status--active { background:#d4edda;color:#155724; }
+    .meli-status--paused { background:#fff3cd;color:#856404; }
+    .meli-status--closed { background:#f8d7da;color:#721c24; }
+    .meli-status--pending { background:#e2e3e5;color:#383d41; }
+    .meli-card { background:var(--color-surface-1);border:1px solid var(--color-border);border-radius:var(--radius-md);padding:var(--space-4); }
+    .meli-grid { display:grid;grid-template-columns:repeat(auto-fill,minmax(300px,1fr));gap:var(--space-4); }
+    .meli-connect-btn { display:inline-flex;align-items:center;gap:8px;padding:10px 20px;background:#FFE600;color:#2D3277;border:none;border-radius:var(--radius-md);font-weight:700;cursor:pointer; }
+    .meli-connect-btn:hover { filter:brightness(0.95); }
+    .meli-config-row { display:flex;gap:var(--space-4);flex-wrap:wrap;margin-bottom:var(--space-4); }
+    .meli-config-row label { display:block;font-size:var(--text-caption);color:var(--color-text-muted);margin-bottom:4px; }
+    .meli-config-row input, .meli-config-row select { padding:8px 12px;border:1px solid var(--color-border);border-radius:var(--radius-sm);background:var(--color-surface-0);color:var(--color-text-primary); }
+  </style>
+</head>
+
+<body>
+
+  <!-- =========================================================================
+       THEME SWITCHER BAR
+       ========================================================================= -->
+
+  <header class="theme-bar" role="banner">
+    <div class="theme-bar__left">
+      <div class="theme-bar__store">
+        <span class="theme-bar__dot"></span>
+        Nexus Autoparts
+      </div>
+      <div class="theme-bar__sep"></div>
+      <span class="theme-bar__label">MercadoLibre — Integración</span>
+    </div>
+    <div class="theme-bar__right">
+      <span class="theme-bar__label">Tema:</span>
+      <button class="theme-btn theme-btn--industrial is-active" data-theme-target="industrial" onclick="setTheme('industrial')">
+        <span class="theme-btn__swatch"></span>
+        Industrial
+      </button>
+      <button class="theme-btn theme-btn--modern" data-theme-target="modern" onclick="setTheme('modern')">
+        <span class="theme-btn__swatch"></span>
+        Moderno
+      </button>
+    </div>
+  </header>
+
+  <!-- =========================================================================
+       APP SHELL
+       ========================================================================= -->
+
+  <div class="app-shell">
+
+    <!-- -----------------------------------------------------------------------
+         SIDEBAR NAVIGATION
+         ----------------------------------------------------------------------- -->
+
+    <aside class="sidebar" role="navigation" aria-label="Navegación principal">
+      <div class="sidebar__brand">
+        <div class="brand-logo">NA</div>
+        <div class="brand-name">
+          <span class="brand-name__primary">Nexus</span>
+          <span class="brand-name__sub">Autoparts POS</span>
+        </div>
+      </div>
+      <nav class="sidebar__nav">
+        <div class="nav-section-label">Principal</div>
+        <a class="nav-item" href="/pos/dashboard">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <rect x="3" y="3" width="7" height="7"/><rect x="14" y="3" width="7" height="7"/>
+            <rect x="14" y="14" width="7" height="7"/><rect x="3" y="14" width="7" height="7"/>
+          </svg>
+          <span>Dashboard</span>
+        </a>
+        <a class="nav-item" href="/pos/sale">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/>
+          </svg>
+          <span>POS</span>
+        </a>
+        <a class="nav-item" href="/pos/catalog">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M4 6h16M4 10h16M4 14h16M4 18h16"/>
+          </svg>
+          <span>Catálogo</span>
+        </a>
+        <a class="nav-item" href="/pos/inventory">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M21 16V8a2 2 0 0 0-1-1.73l-7-4a2 2 0 0 0-2 0l-7 4A2 2 0 0 0 3 8v8a2 2 0 0 0 1 1.73l7 4a2 2 0 0 0 2 0l7-4A2 2 0 0 0 21 16z"/>
+            <polyline points="3.27 6.96 12 12.01 20.73 6.96"/><line x1="12" y1="22.08" x2="12" y2="12"/>
+          </svg>
+          <span>Inventario</span>
+        </a>
+        <div class="nav-section-label">Gestión</div>
+        <a class="nav-item" href="/pos/customers">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"/>
+            <circle cx="9" cy="7" r="4"/>
+            <path d="M23 21v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75"/>
+          </svg>
+          <span>Clientes</span>
+        </a>
+        <a class="nav-item" href="/pos/marketplace">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/>
+            <path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/>
+          </svg>
+          <span>Marketplace B2B</span>
+        </a>
+        <a class="nav-item is-active" href="/pos/marketplace-external" aria-current="page">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <rect x="2" y="3" width="20" height="14" rx="2"/><path d="M8 21h8M12 17v4"/>
+          </svg>
+          <span>MercadoLibre</span>
+        </a>
+        <a class="nav-item" href="/pos/invoicing">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <path d="M14 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V8z"/>
+            <polyline points="14 2 14 8 20 8"/>
+            <line x1="16" y1="13" x2="8" y2="13"/><line x1="16" y1="17" x2="8" y2="17"/>
+            <polyline points="10 9 9 9 8 9"/>
+          </svg>
+          <span>Facturación</span>
+        </a>
+        <a class="nav-item" href="/pos/config">
+          <svg class="nav-item__icon" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.75" stroke-linecap="round" stroke-linejoin="round">
+            <circle cx="12" cy="12" r="3"/>
+            <path d="M19.07 4.93a10 10 0 0 1 0 14.14M4.93 4.93a10 10 0 0 0 0 14.14"/>
+          </svg>
+          <span>Configuración</span>
+        </a>
+      </nav>
+      <div class="sidebar__footer">
+        <div class="sidebar__user-avatar" id="sidebarAvatar">U</div>
+        <div class="sidebar__user-info">
+          <div class="sidebar__user-name" id="sidebarName">Usuario</div>
+          <div class="sidebar__user-role" id="sidebarRole">—</div>
+        </div>
+      </div>
+    </aside>
+
+    <!-- -----------------------------------------------------------------------
+         MAIN CONTENT
+         ----------------------------------------------------------------------- -->
+
+    <main class="main" role="main">
+
+      <!-- Page Header -->
+      <div class="page-header">
+        <div class="page-header__title-group">
+          <span class="page-header__eyebrow">Marketplace</span>
+          <h1 class="page-header__title">MercadoLibre</h1>
+        </div>
+        <div class="page-header__actions">
+          <a class="btn btn--ghost" href="/pos/dashboard">
+            <svg viewBox="0 0 24 24"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg>
+            Dashboard
+          </a>
+        </div>
+      </div>
+
+      <!-- Tab Bar -->
+      <div class="tab-bar">
+        <button class="tab-btn is-active" role="tab" aria-selected="true" aria-controls="panel-config" onclick="switchTab('config')">
+          Configuración
+        </button>
+        <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-listings" onclick="switchTab('listings')">
+          Publicaciones
+        </button>
+        <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-orders" onclick="switchTab('orders')">
+          Órdenes
+        </button>
+        <button class="tab-btn" role="tab" aria-selected="false" aria-controls="panel-questions" onclick="switchTab('questions')">
+          Preguntas
+        </button>
+      </div>
+
+      <!-- Tab Panels -->
+      <div class="tab-panels" id="tab-panels">
+
+        <!-- ══════════ TAB: Configuración ══════════ -->
+        <div class="tab-panel is-active" id="panel-config" role="tabpanel">
+          <div class="meli-card" style="max-width:600px;">
+            <h3 style="margin:0 0 var(--space-4);font-family:var(--font-heading);">Conexión con MercadoLibre</h3>
+            <div id="configStatus">
+              <div class="skeleton skeleton--text" style="width:120px;"></div>
+            </div>
+            <div id="configForm" style="display:none;margin-top:var(--space-4);">
+              <p style="margin-bottom:var(--space-3);font-size:var(--text-body-sm);color:var(--color-text-secondary);">
+                Para conectar, necesitas una <strong>aplicación de MercadoLibre</strong>.
+                Ve a <a href="https://developers.mercadolibre.com.mx" target="_blank">developers.mercadolibre.com.mx</a>
+                y crea una app. Luego pega los datos aquí:
+              </p>
+              <div class="meli-config-row">
+                <div>
+                  <label>Client ID</label>
+                  <input type="text" id="cfgClientId" placeholder="Tu App ID" style="width:200px;" />
+                </div>
+                <div>
+                  <label>Client Secret</label>
+                  <input type="password" id="cfgClientSecret" placeholder="Tu Secret Key" style="width:200px;" />
+                </div>
+              </div>
+              <div class="meli-config-row">
+                <div>
+                  <label>Categoría Default</label>
+                  <input type="text" id="cfgCategory" placeholder="MLM1747" style="width:150px;" />
+                </div>
+                <div>
+                  <label>Modo de Envío</label>
+                  <select id="cfgShipping">
+                    <option value="me2">MercadoEnvíos (me2)</option>
+                    <option value="custom">Propio (custom)</option>
+                  </select>
+                </div>
+              </div>
+              <button class="meli-connect-btn" onclick="startOAuth()">🔗 Conectar con MercadoLibre</button>
+            </div>
+            <div id="configConnected" style="display:none;margin-top:var(--space-4);">
+              <div style="display:flex;align-items:center;gap:12px;margin-bottom:var(--space-3);">
+                <div style="width:48px;height:48px;border-radius:50%;background:#FFE600;display:flex;align-items:center;justify-content:center;font-weight:800;color:#2D3277;">ML</div>
+                <div>
+                  <div style="font-weight:700;" id="connectedNickname">Usuario ML</div>
+                  <div style="font-size:var(--text-caption);color:var(--color-text-muted);" id="connectedSite">MLM</div>
+                </div>
+              </div>
+              <button class="btn btn--danger btn--sm" onclick="disconnectMeli()">Desconectar</button>
+            </div>
+          </div>
+        </div>
+
+        <!-- ══════════ TAB: Publicaciones ══════════ -->
+        <div class="tab-panel" id="panel-listings" role="tabpanel">
+          <div class="toolbar">
+            <div class="search-box">
+              <svg viewBox="0 0 24 24" stroke-linecap="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
+              <input type="text" id="listingSearch" placeholder="Buscar publicación..." oninput="filterListings()" />
+            </div>
+            <select class="select-filter" id="listingStatusFilter" onchange="filterListings()">
+              <option value="">Todos los estados</option>
+              <option value="active">Activas</option>
+              <option value="paused">Pausadas</option>
+              <option value="closed">Cerradas</option>
+            </select>
+            <div class="toolbar__spacer"></div>
+            <button class="btn btn--ghost btn--sm" onclick="loadMeliStats()">📊 Resumen</button>
+            <button class="btn btn--primary" onclick="loadListings()">🔄 Actualizar</button>
+          </div>
+          <div id="meliStatsBar" style="margin-bottom:var(--space-4);"></div>
+          <div id="listingsContainer" class="meli-grid"></div>
+          <div id="listingsPagination" class="table-footer" style="margin-top:var(--space-4);"></div>
+        </div>
+
+        <!-- ══════════ TAB: Preguntas ══════════ -->
+        <div class="tab-panel" id="panel-questions" role="tabpanel">
+          <div class="toolbar">
+            <div class="search-box">
+              <svg viewBox="0 0 24 24" stroke-linecap="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
+              <input type="text" id="questionSearch" placeholder="Buscar pregunta..." oninput="filterQuestions()" />
+            </div>
+            <select class="select-filter" id="questionStatusFilter" onchange="filterQuestions()">
+              <option value="">Todas</option>
+              <option value="unanswered">Sin responder</option>
+              <option value="answered">Respondidas</option>
+              <option value="closed">Cerradas</option>
+            </select>
+            <div class="toolbar__spacer"></div>
+            <button class="btn btn--ghost btn--sm" onclick="syncQuestions()">🔄 Sincronizar con ML</button>
+            <button class="btn btn--primary" onclick="loadQuestions()">🔄 Actualizar</button>
+          </div>
+          <div id="questionsStatsBar" style="margin-bottom:var(--space-4);"></div>
+          <div id="questionsContainer" class="meli-grid"></div>
+        </div>
+
+        <!-- ══════════ TAB: Órdenes ══════════ -->
+        <div class="tab-panel" id="panel-orders" role="tabpanel">
+          <div class="toolbar">
+            <div class="search-box">
+              <svg viewBox="0 0 24 24" stroke-linecap="round"><circle cx="11" cy="11" r="8"/><line x1="21" y1="21" x2="16.65" y2="16.65"/></svg>
+              <input type="text" id="orderSearch" placeholder="Buscar orden..." oninput="filterOrders()" />
+            </div>
+            <select class="select-filter" id="orderStatusFilter" onchange="filterOrders()">
+              <option value="">Todos los estados</option>
+              <option value="pending">Pendientes</option>
+              <option value="confirmed">Confirmadas</option>
+              <option value="packed">Empacadas</option>
+              <option value="shipped">Enviadas</option>
+              <option value="delivered">Entregadas</option>
+              <option value="cancelled">Canceladas</option>
+            </select>
+            <div class="toolbar__spacer"></div>
+            <button class="btn btn--ghost btn--sm" id="btnKanbanView" onclick="toggleOrderView()">📋 Kanban</button>
+            <button class="btn btn--primary" onclick="loadOrders()">🔄 Actualizar</button>
+          </div>
+          <div id="ordersKanbanView" style="display:none;"></div>
+          <div class="table-wrapper" id="ordersTableView">
+            <table class="data-table">
+              <thead>
+                <tr>
+                  <th>Orden ML</th>
+                  <th>Comprador</th>
+                  <th style="text-align:right">Total</th>
+                  <th>Estado Nexus</th>
+                  <th>Fecha</th>
+                  <th>Acciones</th>
+                </tr>
+              </thead>
+              <tbody id="ordersTableBody"></tbody>
+            </table>
+            <div id="ordersPagination" class="table-footer"></div>
+          </div>
+        </div>
+
+      </div><!-- /tab-panels -->
+
+    </main>
+
+  </div><!-- /app-shell -->
+
+  <!-- ══════════ Order Detail Modal ══════════ -->
+  <div class="inv-modal-overlay" id="orderModal">
+    <div class="inv-modal inv-modal--wide">
+      <div class="inv-modal__header">
+        <h3>Detalle de Orden ML</h3>
+        <button class="inv-modal__close" onclick="closeModal('orderModal')">&times;</button>
+      </div>
+      <div class="inv-modal__body" id="orderModalBody">cargando...</div>
+      <div class="inv-modal__footer" id="orderModalFooter"></div>
+    </div>
+  </div>
+
+  <script src="/pos/static/js/i18n.js" defer></script>
+  <script src="/pos/static/js/app-init.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
+  <script src="/pos/static/js/sidebar.js" defer></script>
+  <script src="/pos/static/js/marketplace_external.js?v=4" defer></script>
+  <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
+</body>
+</html>
diff --git a/pos/templates/pos.html b/pos/templates/pos.html
index 2e97bcf..07efd96 100644
--- a/pos/templates/pos.html
+++ b/pos/templates/pos.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -7,11 +7,13 @@
   <title>Nexus Autoparts — Punto de Venta</title>
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
   <script src="/pos/static/js/native-bridge.js" defer></script>
 
   <link rel="stylesheet" href="/pos/static/css/pos.css?v=4">
@@ -32,6 +34,10 @@
       <span id="statusClock"></span>
     </div>
     <div class="status-bar__right">
+      <a href="/pos/dashboard" class="btn btn--ghost btn--sm" id="backToSystemBtn" style="margin-right:8px;display:none;">
+        <svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M3 9l9-7 9 7v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2z"/><polyline points="9 22 9 12 15 12 15 22"/></svg>
+        Sistema
+      </a>
       <div class="status-bar__user" aria-label="Usuario activo">
         <div class="status-bar__user-avatar" aria-hidden="true">--</div>
         <span id="employeeName">Empleado</span>
@@ -200,10 +206,11 @@
 
         <!-- Secondary Actions -->
         <div class="secondary-actions" role="toolbar" aria-label="Acciones secundarias">
+          <button class="btn-secondary-action" onclick="POS.modifyPrice()" title="Modificar precio">Mod.Precio</button>
           <button class="btn-secondary-action" onclick="POS.saveQuotation()" title="Cotizacion (F4)">Cotizar</button>
           <button class="btn-secondary-action" onclick="POS.showLastSale()" title="Ultima venta (F5)">Ult.Venta</button>
           <button class="btn-secondary-action" onclick="POS.showCutZModal()" title="Corte Z - Cerrar caja">Corte Z</button>
-          <button class="btn-secondary-action danger" id="btnCancelSale" title="Cancelar (Esc)">Cancelar</button>
+          <button class="btn-secondary-action danger" id="btnCancelSale" onclick="POS.openCancelModal()" title="Cancelar (Esc)">Cancelar</button>
         </div>
       </div>
     </aside>
@@ -233,14 +240,14 @@
       <span class="fkey-key">F6</span><span class="fkey-label">Cajon</span>
     </div>
     <div class="fkey-sep"></div>
-    <div class="fkey" title="Cantidad +/-">
+    <div class="fkey" onclick="POS.changeQuantity()" title="Cantidad +/-">
       <span class="fkey-key">+/-</span><span class="fkey-label">Cantidad</span>
     </div>
-    <div class="fkey" title="Descuento">
+    <div class="fkey" onclick="POS.applyDiscount()" title="Descuento">
       <span class="fkey-key">*</span><span class="fkey-label">Descuento</span>
     </div>
     <div class="fkey-sep"></div>
-    <div class="fkey" id="fkeyEsc" title="Cancelar">
+    <div class="fkey" id="fkeyEsc" onclick="POS.openCancelModal()" title="Cancelar">
       <span class="fkey-key">Esc</span><span class="fkey-label">Cancelar</span>
     </div>
   </div>
@@ -559,11 +566,12 @@
        ================================================================ -->
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/kiosk.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
   <script src="/pos/static/js/push.js" defer></script>
   <script src="/pos/static/js/printer.js" defer></script>
-  <script src="/pos/static/js/pos.js?v=4" defer></script>
+  <script src="/pos/static/js/pos.js?v=7" defer></script>
 
   <script>
     // Cancel sale button wiring
@@ -577,11 +585,7 @@
       closeCancelModal();
       // Clear cart via POS module
       if (typeof POS !== 'undefined') {
-        // Clear each item
-        const tbody = document.getElementById('cartBody');
-        while (tbody && tbody.firstChild) {
-          POS.removeFromCart(0);
-        }
+        POS.clearCart();
         POS.clearCustomer();
       }
     });
@@ -614,6 +618,20 @@
     }
     updateClock();
     setInterval(updateClock, 30000);
+
+    // Show "Back to System" button when NOT in kiosk mode
+    (function checkKiosk() {
+      var btn = document.getElementById('backToSystemBtn');
+      if (!btn) return;
+      function showIfNotKiosk() {
+        try {
+          var isKiosk = window.isKioskEnabled && window.isKioskEnabled();
+          btn.style.display = isKiosk ? 'none' : 'inline-flex';
+        } catch (e) { btn.style.display = 'inline-flex'; }
+      }
+      showIfNotKiosk();
+      setInterval(showIfNotKiosk, 2000);
+    })();
   </script>
 
   <script src="/pos/static/js/chat.js" defer></script>
diff --git a/pos/templates/quotations.html b/pos/templates/quotations.html
index a831058..d332e69 100644
--- a/pos/templates/quotations.html
+++ b/pos/templates/quotations.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,14 +8,17 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="stylesheet" href="/pos/static/css/quotations.css">
 </head>
 <body>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
-  <script src="/pos/static/js/sidebar.js" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
+  <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/sidebar.js" defer></script>
 
   <div class="page">
     <h1 class="page-title">Cotizaciones</h1>
@@ -65,7 +68,9 @@
             html += '<td onclick="openQuote(' + q.id + ')" style="cursor:pointer;font-family:var(--font-mono);font-weight:700;">$' + fmt(q.total) + '</td>';
             html += '<td onclick="openQuote(' + q.id + ')" style="cursor:pointer;">' + statusBadge + '</td>';
             html += '<td onclick="openQuote(' + q.id + ')" style="cursor:pointer;color:var(--color-text-muted);">' + dateStr + '</td>';
-            html += '<td><button onclick="deleteQuote(' + q.id + ', event)" style="background:none;border:none;color:var(--color-text-muted);cursor:pointer;font-size:16px;padding:4px 8px;border-radius:4px;" onmouseover="this.style.color=\'#F85149\';this.style.background=\'rgba(248,81,73,0.1)\'" onmouseout="this.style.color=\'var(--color-text-muted)\';this.style.background=\'none\'">🗑️</button></td>';
+            html += '<td><button onclick="deleteQuote(' + q.id + ', event)" style="background:var(--color-bg-overlay);border:1.5px solid var(--color-border);color:var(--color-text-muted);cursor:pointer;font-size:13px;padding:6px 10px;border-radius:var(--radius-md);display:inline-flex;align-items:center;gap:4px;transition:var(--transition-fast);" onmouseover="this.style.color=\'var(--color-error)\';this.style.borderColor=\'var(--color-error)\';this.style.background=\'rgba(248,81,73,0.08)\'" onmouseout="this.style.color=\'var(--color-text-muted)\';this.style.borderColor=\'var(--color-border)\';this.style.background=\'var(--color-bg-overlay)\'">';
+            html += '<svg width="14" height="14" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg>';
+            html += 'Eliminar</button></td>';
             html += '</tr>';
           });
           html += '</tbody></table>';
@@ -114,15 +119,33 @@
           html += '<div style="font-size:var(--text-h5);font-weight:700;color:var(--color-text-accent);">Total: $' + fmt(q.total) + '</div>';
           html += '</div>';
 
-          html += '<div style="margin-top:var(--space-5);display:flex;gap:var(--space-3);justify-content:flex-end;flex-wrap:wrap;">';
+          html += '<div style="margin-top:var(--space-5);">';
+          // Primary actions
           if (q.status === 'active') {
-            html += '<button class="btn btn--ghost" onclick="editQuote(' + q.id + ')" style="color:#4f46e5;">Editar</button>';
-            html += '<button class="btn btn--ghost" onclick="convertQuote(' + q.id + ')" style="color:#059669;">Convertir a venta</button>';
-            html += '<button class="btn btn--ghost" onclick="shareQuote(' + q.id + ')">Compartir link</button>';
+            html += '<div style="display:flex;gap:var(--space-3);flex-wrap:wrap;margin-bottom:var(--space-3);">';
+            html += '<button class="btn btn--primary" onclick="convertQuote(' + q.id + ')" style="padding:10px 20px;font-size:var(--text-body);display:inline-flex;align-items:center;gap:8px;">';
+            html += '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="9" cy="21" r="1"/><circle cx="20" cy="21" r="1"/><path d="M1 1h4l2.68 13.39a2 2 0 0 0 2 1.61h9.72a2 2 0 0 0 2-1.61L23 6H6"/></svg>';
+            html += 'Convertir a Venta</button>';
+            html += '<button class="btn btn--secondary" onclick="editQuote(' + q.id + ')" style="padding:10px 20px;font-size:var(--text-body);display:inline-flex;align-items:center;gap:8px;">';
+            html += '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M11 4H4a2 2 0 0 0-2 2v14a2 2 0 0 0 2 2h14a2 2 0 0 0 2-2v-7"/><path d="M18.5 2.5a2.121 2.121 0 0 1 3 3L12 15l-4 1 1-4 9.5-9.5z"/></svg>';
+            html += 'Editar</button>';
+            html += '<button class="btn btn--ghost" onclick="shareQuote(' + q.id + ')" style="padding:10px 20px;font-size:var(--text-body);display:inline-flex;align-items:center;gap:8px;border:1.5px solid var(--color-border);">';
+            html += '<svg width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><circle cx="18" cy="5" r="3"/><circle cx="6" cy="12" r="3"/><circle cx="18" cy="19" r="3"/><line x1="8.59" y1="13.51" x2="15.42" y2="17.49"/><line x1="15.41" y1="6.51" x2="8.59" y2="10.49"/></svg>';
+            html += 'Compartir</button>';
+            html += '</div>';
           }
-          html += '<button class="btn btn--ghost" onclick="deleteQuote(' + q.id + ')" style="color:#F85149;">Eliminar</button>';
-          html += '<button class="btn btn--ghost" onclick="exportVisibleTableCSV(\'cotizacion_' + q.id + '\')">Exportar CSV</button>';
-          html += '<button class="btn btn--ghost" onclick="window.print()">Imprimir</button>';
+          // Secondary actions
+          html += '<div style="display:flex;gap:var(--space-3);flex-wrap:wrap;justify-content:flex-end;">';
+          html += '<button class="btn btn--ghost" onclick="window.print()" style="padding:8px 16px;font-size:var(--text-body-sm);display:inline-flex;align-items:center;gap:6px;">';
+          html += '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="6 9 6 2 18 2 18 9"/><path d="M6 18H4a2 2 0 0 1-2-2v-5a2 2 0 0 1 2-2h16a2 2 0 0 1 2 2v5a2 2 0 0 1-2 2h-2"/><rect x="6" y="14" width="12" height="8"/></svg>';
+          html += 'Imprimir</button>';
+          html += '<button class="btn btn--ghost" onclick="exportVisibleTableCSV(\'cotizacion_' + q.id + '\')" style="padding:8px 16px;font-size:var(--text-body-sm);display:inline-flex;align-items:center;gap:6px;">';
+          html += '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M21 15v4a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2v-4"/><polyline points="7 10 12 15 17 10"/><line x1="12" y1="15" x2="12" y2="3"/></svg>';
+          html += 'Exportar CSV</button>';
+          html += '<button class="btn btn--ghost" onclick="deleteQuote(' + q.id + ')" style="padding:8px 16px;font-size:var(--text-body-sm);display:inline-flex;align-items:center;gap:6px;color:var(--color-error);">';
+          html += '<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><polyline points="3 6 5 6 21 6"/><path d="M19 6v14a2 2 0 0 1-2 2H7a2 2 0 0 1-2-2V6m3 0V4a2 2 0 0 1 2-2h4a2 2 0 0 1 2 2v2"/></svg>';
+          html += 'Eliminar</button>';
+          html += '</div>';
           html += '</div>';
 
           document.getElementById('quoteDetail').innerHTML = html;
@@ -142,69 +165,83 @@
           } else {
             alert('Error: ' + (d.error || 'desconocido'));
           }
-        });
+        })
+        .catch(function(err) { alert('Error de red al eliminar: ' + err.message); });
     };
 
     window.editQuote = function(id) {
-      fetch(API + '/quotations/' + id, { headers: headers() })
-        .then(function(r) { return r.json(); })
-        .then(function(q) {
-          if (!q.items) { alert('Error cargando cotización'); return; }
-          var cartItems = q.items.map(function(it) {
-            return {
-              inventory_id: it.inventory_id,
-              part_number: it.part_number,
-              name: it.name,
-              quantity: it.quantity,
-              unit_price: it.unit_price,
-              discount_pct: it.discount_pct,
-              tax_rate: it.tax_rate
-            };
-          });
-          localStorage.setItem('pos_edit_quote_id', id);
-          localStorage.setItem('pos_edit_quote_customer_id', q.customer_id || '');
-          localStorage.setItem('pos_edit_quote_notes', q.notes || '');
-          localStorage.setItem('pos_cart', JSON.stringify(cartItems));
-          window.location.href = '/pos';
-        });
+      try {
+        fetch(API + '/quotations/' + id, { headers: headers() })
+          .then(function(r) { return r.json(); })
+          .then(function(q) {
+            if (!q.items) { alert('Error cargando cotización'); return; }
+            var cartItems = q.items.map(function(it) {
+              return {
+                inventory_id: it.inventory_id,
+                part_number: it.part_number,
+                name: it.name,
+                quantity: it.quantity,
+                unit_price: it.unit_price,
+                discount_pct: it.discount_pct,
+                tax_rate: it.tax_rate
+              };
+            });
+            localStorage.setItem('pos_edit_quote_id', id);
+            localStorage.setItem('pos_edit_quote_customer_id', q.customer_id || '');
+            localStorage.setItem('pos_edit_quote_notes', q.notes || '');
+            localStorage.setItem('pos_cart', JSON.stringify(cartItems));
+            window.location.href = '/pos/sale';
+          })
+          .catch(function(err) { alert('Error al cargar para editar: ' + err.message); });
+      } catch (e) { alert('Excepcion en editQuote: ' + e.message); }
     };
 
     window.convertQuote = function(id) {
-      fetch(API + '/quotations/' + id, { headers: headers() })
-        .then(function(r) { return r.json(); })
-        .then(function(q) {
-          if (!q.items) { alert('Error cargando cotización'); return; }
-          var cartItems = q.items.map(function(it) {
-            return {
-              inventory_id: it.inventory_id,
-              part_number: it.part_number,
-              name: it.name,
-              quantity: it.quantity,
-              unit_price: it.unit_price,
-              discount_pct: it.discount_pct,
-              tax_rate: it.tax_rate
-            };
-          });
-          localStorage.setItem('pos_convert_quote_id', id);
-          localStorage.setItem('pos_cart', JSON.stringify(cartItems));
-          window.location.href = '/pos';
-        });
+      try {
+        fetch(API + '/quotations/' + id, { headers: headers() })
+          .then(function(r) { return r.json(); })
+          .then(function(q) {
+            if (!q.items) { alert('Error cargando cotización'); return; }
+            var cartItems = q.items.map(function(it) {
+              return {
+                inventory_id: it.inventory_id,
+                part_number: it.part_number,
+                name: it.name,
+                quantity: it.quantity,
+                unit_price: it.unit_price,
+                discount_pct: it.discount_pct,
+                tax_rate: it.tax_rate
+              };
+            });
+            localStorage.setItem('pos_convert_quote_id', id);
+            localStorage.setItem('pos_cart', JSON.stringify(cartItems));
+            window.location.href = '/pos/sale';
+          })
+          .catch(function(err) { alert('Error al cargar para convertir: ' + err.message); });
+      } catch (e) { alert('Excepcion en convertQuote: ' + e.message); }
     };
 
     window.shareQuote = function(id) {
-      fetch(API + '/quotations/' + id + '/share', { method: 'POST', headers: headers() })
-        .then(function(r) { return r.json(); })
-        .then(function(d) {
-          if (d.url) {
-            navigator.clipboard.writeText(d.url).then(function() {
-              alert('Link copiado al portapapeles:\n' + d.url);
-            }).catch(function() {
-              prompt('Copia este link:', d.url);
-            });
-          } else {
-            alert('Error: ' + (d.error || 'desconocido'));
-          }
-        });
+      try {
+        fetch(API + '/quotations/' + id + '/share', { method: 'POST', headers: headers() })
+          .then(function(r) { return r.json(); })
+          .then(function(d) {
+            if (d.url) {
+              if (navigator.clipboard && navigator.clipboard.writeText) {
+                navigator.clipboard.writeText(d.url).then(function() {
+                  alert('Link copiado al portapapeles:\n' + d.url);
+                }).catch(function() {
+                  prompt('Copia este link:', d.url);
+                });
+              } else {
+                prompt('Copia este link:', d.url);
+              }
+            } else {
+              alert('Error del servidor: ' + (d.error || 'desconocido'));
+            }
+          })
+          .catch(function(err) { alert('Error de red al compartir: ' + err.message); });
+      } catch (e) { alert('Excepcion en shareQuote: ' + e.message); }
     };
 
     // Close modal on outside click
diff --git a/pos/templates/reports.html b/pos/templates/reports.html
index c30547e..9b17b7f 100644
--- a/pos/templates/reports.html
+++ b/pos/templates/reports.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -8,10 +8,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/reports.css">
 </head>
@@ -318,7 +320,8 @@
 
   <script src="/pos/static/js/i18n.js" defer></script>
   <script src="/pos/static/js/app-init.js" defer></script>
-  <script src="/pos/static/js/pos-utils.js" defer></script>
+  <script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+  <script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
   <script src="/pos/static/js/reports.js" defer></script>
   <script src="/pos/static/js/sync-engine.js" defer></script>
diff --git a/pos/templates/supplier_catalog.html b/pos/templates/supplier_catalog.html
new file mode 100644
index 0000000..b0ff853
--- /dev/null
+++ b/pos/templates/supplier_catalog.html
@@ -0,0 +1,135 @@
+<!DOCTYPE html>
+<html lang="es">
+<head>
+  <script>(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
+  <meta charset="UTF-8" />
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <title>Catalogo de Proveedores — Nexus Autoparts POS</title>
+  <link rel="stylesheet" href="/pos/static/css/tokens.css" />
+  <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
+  <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
+  <link rel="manifest" href="/pos/static/pwa/manifest.json" />
+  <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
+  <style>
+    .supplier-catalog { padding: var(--space-5); max-width: 1400px; margin: 0 auto; }
+    .sc-header { display:flex; align-items:center; justify-content:space-between; gap:var(--space-4); margin-bottom:var(--space-5); flex-wrap:wrap; }
+    .sc-search { display:flex; gap:var(--space-3); flex:1; min-width:280px; }
+    .sc-search input { flex:1; padding:var(--space-3) var(--space-4); border:1px solid var(--color-border); border-radius:var(--radius-md); background:var(--color-bg-elevated); color:var(--color-text-primary); font-size:var(--text-body); }
+    .sc-filters { display:flex; gap:var(--space-3); flex-wrap:wrap; margin-bottom:var(--space-5); }
+    .sc-filters select { padding:var(--space-2) var(--space-3); border:1px solid var(--color-border); border-radius:var(--radius-md); background:var(--color-bg-elevated); color:var(--color-text-primary); min-width:140px; }
+    .sc-categories { display:grid; grid-template-columns:repeat(auto-fill, minmax(160px, 1fr)); gap:var(--space-3); margin-bottom:var(--space-5); }
+    .sc-cat-card { background:var(--color-bg-elevated); border:1px solid var(--color-border); border-radius:var(--radius-lg); padding:var(--space-4); cursor:pointer; transition:all .15s; text-align:center; }
+    .sc-cat-card:hover, .sc-cat-card.active { border-color:var(--color-primary); box-shadow:var(--shadow-sm); }
+    .sc-cat-card .count { font-size:var(--text-caption); color:var(--color-text-muted); margin-top:2px; }
+    .sc-grid { display:grid; grid-template-columns:repeat(auto-fill, minmax(280px, 1fr)); gap:var(--space-4); }
+    .sc-card { background:var(--color-bg-elevated); border:1px solid var(--color-border); border-radius:var(--radius-lg); padding:var(--space-4); cursor:pointer; transition:all .15s; display:flex; flex-direction:column; gap:var(--space-2); }
+    .sc-card:hover { border-color:var(--color-primary); transform:translateY(-2px); box-shadow:var(--shadow-sm); }
+    .sc-card__sku { font-family:var(--font-mono); font-size:var(--text-caption); color:var(--color-primary); font-weight:var(--font-weight-bold); }
+    .sc-card__name { font-weight:var(--font-weight-semibold); color:var(--color-text-primary); line-height:1.3; }
+    .sc-card__meta { font-size:var(--text-caption); color:var(--color-text-muted); margin-top:auto; }
+    .sc-card__badge { display:inline-block; padding:2px 8px; border-radius:var(--radius-full); background:var(--color-primary-muted); color:var(--color-primary); font-size:10px; font-weight:var(--font-weight-bold); text-transform:uppercase; }
+    .sc-empty { text-align:center; padding:var(--space-8); color:var(--color-text-muted); }
+    .sc-pagination { display:flex; justify-content:center; align-items:center; gap:var(--space-3); margin-top:var(--space-6); }
+    .sc-pagination button { padding:var(--space-2) var(--space-4); border:1px solid var(--color-border); border-radius:var(--radius-md); background:var(--color-bg-elevated); color:var(--color-text-primary); cursor:pointer; }
+    .sc-pagination button:disabled { opacity:.4; cursor:not-allowed; }
+    .sc-pagination span { font-size:var(--text-caption); color:var(--color-text-muted); }
+
+    /* Modal */
+    .sc-modal-overlay { position:fixed; inset:0; background:var(--overlay-backdrop); z-index:var(--z-modal); display:none; align-items:center; justify-content:center; padding:var(--space-4); }
+    .sc-modal-overlay.open { display:flex; }
+    .sc-modal { background:var(--color-bg-elevated); border:1px solid var(--color-border); border-radius:var(--radius-xl); width:100%; max-width:720px; max-height:90vh; overflow-y:auto; display:flex; flex-direction:column; }
+    .sc-modal__header { display:flex; align-items:center; justify-content:space-between; padding:var(--space-4) var(--space-5); border-bottom:1px solid var(--color-border); }
+    .sc-modal__body { padding:var(--space-5); display:flex; flex-direction:column; gap:var(--space-4); }
+    .sc-modal__section h4 { font-size:var(--text-body-sm); font-weight:var(--font-weight-bold); color:var(--color-text-secondary); margin-bottom:var(--space-2); text-transform:uppercase; letter-spacing:var(--tracking-wider); }
+    .sc-compat-grid { display:grid; grid-template-columns:repeat(auto-fill, minmax(180px, 1fr)); gap:var(--space-2); }
+    .sc-compat-item { background:var(--color-surface-1); border:1px solid var(--color-border); border-radius:var(--radius-md); padding:var(--space-2) var(--space-3); font-size:var(--text-caption); }
+    .sc-interchange-list { display:flex; flex-wrap:wrap; gap:var(--space-2); }
+    .sc-interchange-chip { background:var(--color-surface-2); border:1px solid var(--color-border); border-radius:var(--radius-full); padding:2px 10px; font-size:var(--text-caption); }
+    .sc-close { background:none; border:none; font-size:20px; color:var(--color-text-muted); cursor:pointer; }
+  </style>
+</head>
+<body>
+
+  <!-- Theme bar -->
+  <div class="theme-bar">
+    <span class="theme-bar__label">Tema:</span>
+    <button class="theme-btn" id="btn-industrial" onclick="setTheme('industrial')">Industrial</button>
+    <button class="theme-btn" id="btn-modern" onclick="setTheme('modern')">Moderno</button>
+  </div>
+
+  <div class="sidebar-overlay" id="sidebar-overlay" onclick="closeSidebar()"></div>
+
+  <div class="app-shell">
+    <nav class="sidebar themed-scrollbar" id="sidebar">
+      <div class="sidebar__logo">
+        <div class="sidebar__logo-text">Nexus</div>
+        <div class="sidebar__logo-sub">Autoparts POS</div>
+      </div>
+      <div class="sidebar__nav">
+        <div class="sidebar__section-label">Principal</div>
+        <a href="/pos/dashboard" class="nav-link"><span class="nav-link__icon">📊</span> Dashboard</a>
+        <a href="/pos/sale" class="nav-link"><span class="nav-link__icon">🛒</span> POS</a>
+        <a href="/pos/catalog" class="nav-link"><span class="nav-link__icon">📁</span> Catalogo</a>
+        <a href="/pos/supplier-catalog" class="nav-link active"><span class="nav-link__icon">🏭</span> Cat. Proveedores</a>
+        <a href="/pos/inventory" class="nav-link"><span class="nav-link__icon">📦</span> Inventario</a>
+        <a href="/pos/config" class="nav-link"><span class="nav-link__icon">⚙️</span> Configuracion</a>
+      </div>
+    </nav>
+
+    <div class="main">
+      <header class="header">
+        <div class="header__left">
+          <button class="hamburger-btn" onclick="toggleSidebar()">☰</button>
+          <div class="header__greeting">
+            <div class="header__title">Catalogo de Proveedores</div>
+            <div class="header__subtitle">Busca por vehiculo, SKU o nombre de parte</div>
+          </div>
+        </div>
+      </header>
+
+      <div class="supplier-catalog themed-scrollbar">
+        <div class="sc-header">
+          <div class="sc-search">
+            <input type="text" id="searchInput" placeholder="Buscar SKU, nombre o intercambio..." onkeydown="if(event.key==='Enter') doSearch()" />
+            <button class="btn btn--primary" onclick="doSearch()">Buscar</button>
+            <button class="btn btn--secondary" onclick="clearFilters()">Limpiar</button>
+          </div>
+        </div>
+
+        <div class="sc-filters">
+          <select id="filterMake" onchange="onMakeChange()"><option value="">Marca vehiculo</option></select>
+          <select id="filterModel" onchange="onModelChange()" disabled><option value="">Modelo</option></select>
+          <select id="filterYear" onchange="onYearChange()" disabled><option value="">Año</option></select>
+          <select id="filterEngine" onchange="doSearch()" disabled><option value="">Motorizacion</option></select>
+        </div>
+
+        <div class="sc-categories" id="categoriesGrid"></div>
+
+        <div id="resultsArea">
+          <div class="sc-grid" id="partsGrid"></div>
+          <div class="sc-pagination" id="pagination"></div>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <!-- Detail Modal -->
+  <div class="sc-modal-overlay" id="detailModal" onclick="closeModal(event)">
+    <div class="sc-modal" onclick="event.stopPropagation()">
+      <div class="sc-modal__header">
+        <h3 id="modalTitle">Detalle</h3>
+        <button class="sc-close" onclick="closeModal()">&times;</button>
+      </div>
+      <div class="sc-modal__body" id="modalBody"></div>
+    </div>
+  </div>
+
+  <script src="/pos/static/js/app-init.js" defer></script>
+  <script src="/pos/static/js/sidebar.js" defer></script>
+  <script src="/pos/static/js/supplier_catalog.js?v=2" defer></script>
+  <script>if('serviceWorker' in navigator){navigator.serviceWorker.register('/pos/sw.js',{scope:'/pos/'});}</script>
+</body>
+</html>
diff --git a/pos/templates/whatsapp.html b/pos/templates/whatsapp.html
index 8173a2d..b43d79e 100644
--- a/pos/templates/whatsapp.html
+++ b/pos/templates/whatsapp.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="es" data-theme="industrial">
+<html lang="es">
 <head>
   <script>/*pos_theme_early*/(function(){var t=localStorage.getItem("pos_theme")||"industrial";document.documentElement.setAttribute("data-theme",t);})()</script>
   <meta charset="UTF-8" />
@@ -11,10 +11,12 @@
   <link rel="stylesheet" href="/pos/static/css/chat.css" />
   <link rel="stylesheet" href="/pos/static/css/tokens.css" />
   <link rel="stylesheet" href="/pos/static/css/common.css" />
+  <link rel="stylesheet" href="/pos/static/css/pos-ui.css?v=2" />
   <link rel="stylesheet" href="/pos/static/css/sidebar.css" />
   <link rel="stylesheet" href="/pos/static/css/pos-glass.css" />
   <link rel="manifest" href="/pos/static/pwa/manifest.json" />
   <meta name="theme-color" content="#F5A623" />
+  <link rel="shortcut icon" type="image/png" href="/pos/static/pwa/icon-192.png" />
 
   <link rel="stylesheet" href="/pos/static/css/whatsapp.css">
 </head>
@@ -131,8 +133,10 @@ function posLogout(){localStorage.removeItem('pos_token');window.location.href='
 
 <!-- Sidebar -->
 <script src="/pos/static/js/i18n.js" defer></script>
-<script src="/pos/static/js/whatsapp2.js" defer></script>
-<script src="/pos/static/js/pos-utils.js" defer></script>
+<script src="/pos/static/js/app-init.js" defer></script>
+<script src="/pos/static/js/splash-loader.js?v=1" defer></script>
+<script src="/pos/static/js/whatsapp2.js?v=5" defer></script>
+<script src="/pos/static/js/pos-utils.js?v=2" defer></script>
   <script src="/pos/static/js/sidebar.js" defer></script>
 
   <script src="/pos/static/js/chat.js" defer></script>
diff --git a/pos/tests/test_bulk_import.py b/pos/tests/test_bulk_import.py
new file mode 100644
index 0000000..c997cef
--- /dev/null
+++ b/pos/tests/test_bulk_import.py
@@ -0,0 +1,109 @@
+#!/usr/bin/env python3
+"""Test bulk import endpoint — CSV parsing, column normalisation, upsert logic."""
+
+import os
+import sys
+import io
+import csv
+
+sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__))))
+
+os.environ.setdefault('MASTER_DB_URL', 'postgresql://postgres@/nexus_autopartes')
+os.environ.setdefault('TENANT_DB_URL_TEMPLATE', 'postgresql://postgres@/{db_name}')
+os.environ.setdefault('POS_JWT_SECRET', 'test-secret-12345678901234567890123456789012')
+
+from blueprints.inventory_bp import _to_decimal, _to_int
+
+RED = '\033[91m'
+GREEN = '\033[92m'
+YELLOW = '\033[93m'
+RESET = '\033[0m'
+
+
+def print_result(name, passed, detail=""):
+    status = f"{GREEN}PASS{RESET}" if passed else f"{RED}FAIL{RESET}"
+    print(f"  [{status}] {name}" + (f" — {detail}" if detail else ""))
+
+
+def test_to_decimal():
+    assert _to_decimal("10.5") == 10.5
+    assert _to_decimal("1,000.50") == 1000.50
+    assert _to_decimal("") == 0
+    assert _to_decimal(None, 5) == 5
+    assert _to_decimal("abc", 99) == 99
+    print_result("_to_decimal parsing", True)
+
+
+def test_to_int():
+    assert _to_int("42") == 42
+    assert _to_int("1,000") == 1000
+    assert _to_int("") == 0
+    assert _to_int(None, 7) == 7
+    assert _to_int("abc", 99) == 99
+    print_result("_to_int parsing", True)
+
+
+def test_csv_column_normalisation():
+    """Simulate the column normalisation done in bulk_import_items."""
+    raw_rows = [
+        {"SKU": "ABC123", "Nombre": "Filtro de aceite", "Marca": "Bosch", "Precio": "150", "Cantidad": "10"},
+        {"sku": "DEF456", "name": "Pastillas de freno", "brand": "TRW", "price": "450.50", "stock": "5"},
+    ]
+
+    # Normalise keys
+    for r in raw_rows:
+        normalised = {}
+        for k, v in r.items():
+            nk = str(k).strip().lower().replace(' ', '_')
+            normalised[nk] = v
+        r.clear()
+        r.update(normalised)
+
+    col_map = {
+        'sku': 'part_number', 'numero_de_parte': 'part_number', 'parte': 'part_number',
+        'nombre': 'name', 'producto': 'name', 'descripcion': 'name',
+        'marca': 'brand', 'precio': 'price', 'costo': 'cost',
+        'cantidad': 'stock', 'existencia': 'stock', 'inventario': 'stock',
+        'ubicacion': 'location', 'categoria': 'category',
+        'fabricante': 'make', 'vehiculo': 'make', 'auto': 'make',
+        'modelo': 'model', 'anio': 'year', 'ano': 'year',
+        'motor': 'engine', 'codigo_motor': 'engine_code',
+    }
+    for r in raw_rows:
+        for old_k, new_k in col_map.items():
+            if old_k in r and new_k not in r:
+                r[new_k] = r.pop(old_k)
+
+    assert raw_rows[0]['part_number'] == 'ABC123'
+    assert raw_rows[0]['name'] == 'Filtro de aceite'
+    assert raw_rows[0]['stock'] == '10'
+    assert raw_rows[1]['part_number'] == 'DEF456'
+    assert raw_rows[1]['price'] == '450.50'
+    print_result("CSV column normalisation", True)
+
+
+def test_csv_dict_reader():
+    """Verify csv.DictReader produces the expected structure."""
+    csv_text = "sku,name,brand,price,stock\nABC123,Filtro,Bosch,150,10\nDEF456,Pastillas,TRW,450,5"
+    f = io.StringIO(csv_text)
+    reader = csv.DictReader(f)
+    rows = list(reader)
+    assert len(rows) == 2
+    assert rows[0]['sku'] == 'ABC123'
+    assert rows[1]['price'] == '450'
+    print_result("csv.DictReader parsing", True)
+
+
+def run_all():
+    print("\nBulk Import Tests")
+    print("=" * 40)
+    test_to_decimal()
+    test_to_int()
+    test_csv_column_normalisation()
+    test_csv_dict_reader()
+    print("=" * 40)
+    print("Done.\n")
+
+
+if __name__ == '__main__':
+    run_all()
diff --git a/pos/whatsapp-bridge-package.json b/pos/whatsapp-bridge-package.json
index 9e9d959..40958b6 100644
--- a/pos/whatsapp-bridge-package.json
+++ b/pos/whatsapp-bridge-package.json
@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "type": "commonjs",
   "dependencies": {
-    "@whiskeysockets/baileys": "^6.7.16",
+    "@whiskeysockets/baileys": "^6.7.23",
     "express": "^4.18.2",
     "qrcode": "^1.5.3",
     "pino": "^8.16.2"
diff --git a/pos/whatsapp-bridge-server.js b/pos/whatsapp-bridge-server.js
index 6fc34d4..81a7b1c 100644
--- a/pos/whatsapp-bridge-server.js
+++ b/pos/whatsapp-bridge-server.js
@@ -1,7 +1,9 @@
-const { default: makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion } = require('@whiskeysockets/baileys');
+const { default: makeWASocket, useMultiFileAuthState, DisconnectReason, fetchLatestBaileysVersion, downloadMediaMessage } = require('@whiskeysockets/baileys');
 const express = require('express');
 const QRCode = require('qrcode');
 const pino = require('pino');
+const fs = require('fs');
+const path = require('path');
 
 const app = express();
 app.use(express.json());
@@ -17,15 +19,113 @@ const AUTH_DIR = process.env.AUTH_DIR || '/app/auth';
 let sock = null;
 let qrCode = null;
 let connectionState = 'disconnected';
+let retry440Count = 0;
+let lastConnectAttempt = 0;
 const logger = pino({ level: process.env.LOG_LEVEL || 'warn' });
 
+// Queue for outgoing messages when disconnected
+const sendQueue = [];
+let queueTimer = null;
+let connectWatchdog = null;
+let staleWatchdog = null;
+let queueFlushInterval = null;
+const WATCHDOG_MS = 300000;   // 5 minutos para dar tiempo al QR scanning
+const STALE_MS = 1800000;     // 30 minutos (keepalive ya maneja pings, no forzamos reconexión por inactividad)
+let lastActivity = Date.now();
+
+function updateActivity() {
+    lastActivity = Date.now();
+}
+
+function clearAuthState() {
+    try {
+        if (fs.existsSync(AUTH_DIR)) {
+            fs.readdirSync(AUTH_DIR).forEach(f => {
+                try { fs.unlinkSync(path.join(AUTH_DIR, f)); } catch (e) {}
+            });
+        }
+        console.log(`[Tenant ${TENANT_ID}] Auth state cleared`);
+    } catch (e) {
+        console.error(`[Tenant ${TENANT_ID}] Failed to clear auth:`, e.message);
+    }
+}
+
+function flushSendQueue() {
+    if (!sock || connectionState !== 'open') return;
+    while (sendQueue.length > 0) {
+        const item = sendQueue.shift();
+        try {
+            sock.sendMessage(item.jid, { text: item.message });
+            console.log(`[Tenant ${TENANT_ID}] Flushed queued message to ${item.jid}`);
+        } catch (e) {
+            console.error(`[Tenant ${TENANT_ID}] Failed to flush queued message:`, e.message);
+            sendQueue.unshift(item);
+            break;
+        }
+    }
+}
+
+function clearWatchdog() {
+    if (connectWatchdog) { clearTimeout(connectWatchdog); connectWatchdog = null; }
+    if (staleWatchdog) { clearInterval(staleWatchdog); staleWatchdog = null; }
+    if (queueFlushInterval) { clearInterval(queueFlushInterval); queueFlushInterval = null; }
+}
+
+function scheduleStaleWatchdog() {
+    // ELIMINADO: el stale watchdog forzaba reconexión cada 90s sin mensajes,
+    // lo cual destruía la sesión de Baileys y provocaba 440 + limpieza de auth.
+    // Baileys ya envía keepalive cada 15s (keepAliveIntervalMs). No es necesario.
+    if (staleWatchdog) { clearInterval(staleWatchdog); staleWatchdog = null; }
+}
+
+function scheduleWatchdog() {
+    clearWatchdog();
+    connectWatchdog = setTimeout(() => {
+        if (connectionState !== 'open') {
+            console.log(`[Tenant ${TENANT_ID}] Watchdog: connection not stable after ${WATCHDOG_MS/1000}s, forcing reconnect`);
+            try { sock?.ws?.close(); } catch (e) {}
+            sock = null;
+            connectionState = 'disconnected';
+            setTimeout(connectWhatsApp, 30000);
+        }
+    }, WATCHDOG_MS);
+}
+
 async function connectWhatsApp() {
+    // Rate limit: max 1 attempt per 30 seconds to avoid WhatsApp throttling
+    const now = Date.now();
+    if (now - lastConnectAttempt < 30000) {
+        const wait = 30000 - (now - lastConnectAttempt);
+        console.log(`[Tenant ${TENANT_ID}] Rate limiting: waiting ${wait/1000}s before next attempt`);
+        setTimeout(connectWhatsApp, wait);
+        return;
+    }
+    lastConnectAttempt = now;
+
+    clearWatchdog();
     const { state, saveCreds } = await useMultiFileAuthState(AUTH_DIR);
     const { version } = await fetchLatestBaileysVersion();
     console.log(`[Tenant ${TENANT_ID}] Connecting with Baileys v` + version.join('.'));
     connectionState = 'connecting';
+    scheduleWatchdog();
 
-    sock = makeWASocket({ version, auth: state, logger, printQRInTerminal: true, browser: ['Nexus POS', 'Chrome', '120.0'] });
+    sock = makeWASocket({
+        version,
+        auth: state,
+        logger,
+        // Use a generic Ubuntu + Chrome fingerprint — less suspicious than raw Linux
+        browser: ['Chrome', 'Windows', '124.0.0.0'],
+        defaultQueryTimeoutMs: 60000,
+        keepAliveIntervalMs: 15000,
+        markOnlineOnConnect: false,
+        syncFullHistory: false,
+        shouldSyncHistoryMessage: () => false,
+        shouldIgnoreJid: (jid) => false,
+        retryRequestDelayMs: 250,
+        maxMsgRetryCount: 2,
+        connectTimeoutMs: 60000,
+        emitOwnEvents: false,
+    });
     sock.ev.on('creds.update', saveCreds);
 
     sock.ev.on('connection.update', async (update) => {
@@ -36,43 +136,256 @@ async function connectWhatsApp() {
             console.log(`[Tenant ${TENANT_ID}] QR code generated!`);
         }
         if (connection === 'close') {
+            clearWatchdog();
             connectionState = 'disconnected';
             qrCode = null;
-            const reason = lastDisconnect?.error?.output?.statusCode;
-            if (reason !== DisconnectReason.loggedOut) { setTimeout(connectWhatsApp, 5000); }
+            const statusCode = lastDisconnect?.error?.output?.statusCode;
+            // Baileys wraps some errors differently; try both paths
+            const reason = statusCode || lastDisconnect?.error?.statusCode;
+            console.log(`[Tenant ${TENANT_ID}] Disconnected, reason:`, reason);
+
+            if (reason === DisconnectReason.loggedOut) {
+                console.log(`[Tenant ${TENANT_ID}] Logged out — clearing auth`);
+                clearAuthState();
+                sock = null;
+                retry440Count = 0;
+                return;
+            }
+
+            if (reason === 440) {
+                // 440 = conflict/replaced. WhatsApp reemplazó esta sesión (puede ser
+                // por reconexión muy rápida, o porque el teléfono abrió otra sesión).
+                // NUNCA limpiamos auth automáticamente — solo esperamos más tiempo.
+                retry440Count++;
+                const delay = retry440Count >= 3 ? 600000 : 120000; // 2min → 10min
+                console.log(`[Tenant ${TENANT_ID}] 440 Session replaced — reconnecting in ${delay/1000}s with existing creds (attempt ${retry440Count})`);
+                sock = null;
+                setTimeout(connectWhatsApp, delay);
+                return;
+            }
+
+            if (reason === 515) {
+                // 515 = stream error / restart required. WhatsApp sends this after
+                // successful pairing to force a reconnect with the new credentials.
+                // DO NOT clear auth — the credentials were just saved by creds.update.
+                console.log(`[Tenant ${TENANT_ID}] 515 Restart required — reconnecting in 5s with saved creds`);
+                sock = null;
+                setTimeout(connectWhatsApp, 5000);
+                return;
+            }
+
+            if (reason === 428) {
+                console.log(`[Tenant ${TENANT_ID}] 428 Server terminated — waiting 60s`);
+                sock = null;
+                setTimeout(connectWhatsApp, 60000);
+                return;
+            }
+
+            if (reason === 408) {
+                // 408 during init queries = rate-limit o auth parcialmente inválido.
+                // No limpiamos auth automáticamente; esperamos más tiempo.
+                console.log(`[Tenant ${TENANT_ID}] 408 Timeout — waiting 120s`);
+                sock = null;
+                setTimeout(connectWhatsApp, 120000);
+                return;
+            }
+
+            // Any other error — wait 30s and retry
+            console.log(`[Tenant ${TENANT_ID}] Reconnecting in 30s... (reason: ${reason})`);
+            sock = null;
+            setTimeout(connectWhatsApp, 30000);
+        }
+
+        if (connection === 'open') {
+            // Race-condition guard: if sock was nulled by a concurrent disconnect,
+            // ignore this stale 'open' event.
+            if (!sock) {
+                console.log(`[Tenant ${TENANT_ID}] Ignoring stale 'open' event (sock is null)`);
+                return;
+            }
+            clearWatchdog();
+            connectionState = 'open';
+            qrCode = null;
+            retry440Count = 0;
+            updateActivity();
+            // Stale watchdog eliminado — Baileys ya mantiene keepalive.
+            console.log(`[Tenant ${TENANT_ID}] Connected!`);
+            flushSendQueue();
+            if (!queueFlushInterval) {
+                queueFlushInterval = setInterval(() => {
+                    if (connectionState === 'open') flushSendQueue();
+                }, 5000);
+            }
         }
-        if (connection === 'open') { connectionState = 'open'; qrCode = null; console.log(`[Tenant ${TENANT_ID}] Connected!`); }
     });
 
     sock.ev.on('messages.upsert', async ({ messages }) => {
         for (const msg of messages) {
             if (msg.key.fromMe) continue;
+            // Skip system/receipt messages with no meaningful content
+            if (!msg.message || Object.keys(msg.message).length === 0) continue;
             const phone = msg.key.remoteJid.replace('@s.whatsapp.net', '');
-            const text = msg.message?.conversation || msg.message?.extendedTextMessage?.text || '';
-            console.log(`[Tenant ${TENANT_ID}] From ${phone}: ${text}`);
+            const message = msg.message || {};
+            
+            let media_kind = 'text';
+            let media_base64 = null;
+            let media_mimetype = null;
+            let media_caption = null;
+            let media_ptt = false;
+            let latitude = null;
+            let longitude = null;
+            let text = '';
+
+            if (message.conversation) {
+                text = message.conversation;
+            } else if (message.extendedTextMessage) {
+                text = message.extendedTextMessage.text || '';
+            } else if (message.imageMessage) {
+                media_kind = 'image';
+                media_mimetype = message.imageMessage.mimetype;
+                media_caption = message.imageMessage.caption || '';
+                text = media_caption;
+            } else if (message.videoMessage) {
+                media_kind = 'video';
+                media_mimetype = message.videoMessage.mimetype;
+                media_caption = message.videoMessage.caption || '';
+                text = media_caption;
+            } else if (message.audioMessage) {
+                media_kind = 'audio';
+                media_mimetype = message.audioMessage.mimetype;
+                media_ptt = message.audioMessage.ptt || false;
+            } else if (message.locationMessage) {
+                media_kind = 'location';
+                latitude = message.locationMessage.degreesLatitude;
+                longitude = message.locationMessage.degreesLongitude;
+                text = `Ubicación: ${latitude}, ${longitude}`;
+            }
+
+            if (['image', 'video', 'audio'].includes(media_kind)) {
+                try {
+                    const buffer = await downloadMediaMessage(msg, 'buffer', {}, { logger: pino({ level: 'silent' }) });
+                    if (buffer) media_base64 = buffer.toString('base64');
+                } catch (e) {
+                    console.log(`[Tenant ${TENANT_ID}] Media download failed:`, e.message);
+                }
+            }
+
+            updateActivity();
+            console.log(`[Tenant ${TENANT_ID}] From ${phone}: [${media_kind}] ${text.substring(0, 80)}`);
             try {
-                await fetch(WEBHOOK_URL, { method: 'POST', headers: { 'Content-Type': 'application/json' },
-                    body: JSON.stringify({ event: 'messages.upsert', data: { key: msg.key, message: msg.message, messageTimestamp: msg.messageTimestamp } }) });
-            } catch (e) { console.log(`[Tenant ${TENANT_ID}] Webhook failed:`, e.message); }
+                const controller = new AbortController();
+                const timeoutId = setTimeout(() => controller.abort(), 30000);
+                const resp = await fetch(WEBHOOK_URL, {
+                    method: 'POST',
+                    headers: { 'Content-Type': 'application/json' },
+                    body: JSON.stringify({
+                        event: 'messages.upsert',
+                        data: {
+                            key: msg.key,
+                            message: msg.message,
+                            messageTimestamp: msg.messageTimestamp,
+                            media_kind,
+                            media_base64,
+                            media_mimetype,
+                            media_caption,
+                            media_ptt,
+                            latitude,
+                            longitude,
+                            push_name: msg.pushName || '',
+                            sender_pn: msg.key?.senderPn || ''
+                        }
+                    }),
+                    signal: controller.signal
+                });
+                clearTimeout(timeoutId);
+                if (resp.ok) {
+                    console.log(`[Tenant ${TENANT_ID}] Webhook delivered OK (${resp.status})`);
+                } else {
+                    console.log(`[Tenant ${TENANT_ID}] Webhook returned ${resp.status}`);
+                }
+            } catch (e) {
+                console.log(`[Tenant ${TENANT_ID}] Webhook failed:`, e.message);
+            }
         }
     });
 }
 
-app.get('/', (req, res) => res.json({ status: 'ok', service: 'Nexus WhatsApp Bridge', tenant: TENANT_ID, state: connectionState }));
+app.get('/', (req, res) => res.json({ status: 'ok', service: 'Nexus WhatsApp Bridge', tenant: TENANT_ID, state: connectionState, queued: sendQueue.length }));
 app.get('/status', (req, res) => res.json({ state: connectionState, hasQr: !!qrCode }));
 app.get('/qr', (req, res) => {
     if (connectionState === 'open') return res.json({ state: 'open', message: 'Already connected' });
     if (!qrCode) return res.json({ state: connectionState, qr: null, message: 'QR not ready' });
     res.json({ state: 'qr', qr: qrCode });
 });
-app.post('/connect', async (req, res) => { if (!sock) connectWhatsApp(); res.json({ state: connectionState }); });
-app.post('/send', async (req, res) => {
-    if (connectionState !== 'open') return res.status(400).json({ error: 'Not connected' });
-    const { phone, message } = req.body;
-    const jid = phone.includes('@') ? phone : phone + '@s.whatsapp.net';
-    try { const r = await sock.sendMessage(jid, { text: message }); res.json({ success: true, id: r.key.id }); }
-    catch (e) { res.status(500).json({ error: e.message }); }
+app.post('/connect', async (req, res) => {
+    if (sock) {
+        try { await sock.logout(); } catch (e) {}
+        sock = null;
+    }
+    retry440Count = 0;
+    clearAuthState();
+    qrCode = null;
+    connectionState = 'connecting';
+    connectWhatsApp();
+    res.json({ state: connectionState });
 });
-app.post('/logout', async (req, res) => { if (sock) { await sock.logout(); sock = null; } qrCode = null; connectionState = 'disconnected'; res.json({ state: 'disconnected' }); });
+app.post('/send', async (req, res) => {
+    const { phone, message } = req.body;
+    if (!phone || !message) {
+        return res.status(400).json({ error: 'phone and message required' });
+    }
+    const jid = phone.includes('@') ? phone : phone + '@s.whatsapp.net';
+    console.log(`[Tenant ${TENANT_ID}] /send called for ${jid}. state=${connectionState}, sock=${!!sock}`);
 
-app.listen(PORT, () => { console.log(`[Tenant ${TENANT_ID}] WhatsApp Bridge on port ${PORT}`); connectWhatsApp(); });
+    if (connectionState === 'open' && sock) {
+        try {
+            const r = await sock.sendMessage(jid, { text: message });
+            res.json({ success: true, id: r.key.id });
+            return;
+        } catch (e) {
+            console.log(`[Tenant ${TENANT_ID}] Send failed, will queue:`, e.message);
+            // fall through to queue
+        }
+    }
+
+    sendQueue.push({ jid, message });
+    console.log(`[Tenant ${TENANT_ID}] Message queued for ${jid} (state: ${connectionState}, queue size: ${sendQueue.length})`);
+    res.status(202).json({ queued: true, state: connectionState });
+});
+app.post('/send-image', async (req, res) => {
+    const { phone, caption, base64 } = req.body;
+    if (!phone || !base64) {
+        return res.status(400).json({ error: 'phone and base64 required' });
+    }
+    const jid = phone.includes('@') ? phone : phone + '@s.whatsapp.net';
+
+    if (connectionState !== 'open' || !sock) {
+        return res.status(400).json({ error: 'Not connected' });
+    }
+
+    try {
+        const buffer = Buffer.from(base64, 'base64');
+        const r = await sock.sendMessage(jid, {
+            image: buffer,
+            caption: caption || ''
+        });
+        res.json({ success: true, id: r.key.id });
+    } catch (e) {
+        console.log(`[Tenant ${TENANT_ID}] Send image failed:`, e.message);
+        res.status(500).json({ error: e.message });
+    }
+});
+
+app.post('/logout', async (req, res) => {
+    if (sock) { await sock.logout(); sock = null; }
+    clearAuthState();
+    qrCode = null;
+    connectionState = 'disconnected';
+    retry440Count = 0;
+    res.json({ state: 'disconnected' });
+});
+
+app.listen(PORT, () => {
+    console.log(`[Tenant ${TENANT_ID}] WhatsApp Bridge on port ${PORT}`);
+    connectWhatsApp();
+});
diff --git a/scripts/assign_categories_estrada.py b/scripts/assign_categories_estrada.py
new file mode 100644
index 0000000..bd748e3
--- /dev/null
+++ b/scripts/assign_categories_estrada.py
@@ -0,0 +1,138 @@
+#!/usr/bin/env python3
+"""
+Assign categories to Strada inventory based on pcode from TODO.st01.
+Creates categories if they don't exist and updates inventory.category_id.
+"""
+
+import os
+import sys
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+from tenant_db import get_tenant_conn
+
+# pcode → category name mapping (inferred from common auto parts codes)
+PCODE_MAP = {
+    'SU': 'Suspensión',
+    'SO': 'Soportería',
+    'MA': 'Mangueras',
+    'EM': 'Empaques',
+    'HQ': 'Herramientas y Equipo',
+    'AM': 'Amortiguadores',
+    'IG': 'Ignición y Eléctrico',
+    'BD': 'Bandas y Correas',
+    'BL': 'Baleros',
+    'FI': 'Filtros',
+    'HE': 'Herramientas',
+    'PI': 'Pistones y Anillos',
+    'AW': 'Accesorios',
+    'BE': 'Baterías y Eléctrico',
+    'K0': 'Kit de Servicio',
+    'DF': 'Frenos (Discos)',
+    'RE': 'Refrigeración',
+    'PE': 'Perfiles y Sellos',
+    'BG': 'Bujías',
+    'TA': 'Toma de Agua',
+    'CV': 'Conversiones y Kits',
+    'CT': 'Clutch y Transmisión',
+    'CC': 'Cilindros y Componentes',
+    'OT': 'Otros',
+    'SF': 'Soportes y Bases',
+    'BT': 'Bujes y Terminales',
+    'HF': 'Herramientas y Ferretería',
+    'CR': 'Cremalleras y Dirección',
+    'CS': 'Cilindros de Freno',
+    'CF': 'Cables y Frenos',
+    'FG': 'Faros y Iluminación',
+    'TO': 'Tornillería',
+    'AO': 'Aceites y Lubricantes',
+    'BJ': 'Bujes',
+    'FR': 'Frenos',
+    'DR': 'Dirección y Rótulas',
+    'KT': 'Kits de Reparación',
+    'TT': 'Transmisión',
+    'BU': 'Bujes y Soportes',
+    'PC': 'Poleas y Componentes',
+    'CL': 'Clutch',
+    'PG': 'Pegamentos y Adhesivos',
+    'QU': 'Químicos',
+    'TA': 'Toma de Agua',
+    'VC': 'Válvulas y Controles',
+    'MV': 'Motoventiladores',
+    'AS': 'Aspas y Ventiladores',
+    'PO': 'Poleas',
+    'CM': 'Compresores y A/C',
+    'HE': 'Herramientas',
+    'EA': 'Enfriadores y Radiadores',
+    'CO': 'Conectores',
+    'CX': 'Conectores y Cables',
+    'TR': 'Tren Delantero',
+    'AB': 'Abrazaderas',
+    'FU': 'Fusibles',
+    'MR': 'Mangueras de Freno',
+    'TO': 'Tornillería',
+    'RA': 'Radiadores',
+    'MC': 'Mangueras y Conectores',
+}
+
+def assign_categories(tenant_id):
+    conn = get_tenant_conn(tenant_id)
+    cur = conn.cursor()
+    
+    # Get or create categories
+    cur.execute("SELECT id, name FROM part_categories")
+    existing = {name: id for id, name in cur.fetchall()}
+    
+    created = 0
+    category_map = {}  # pcode -> category_id
+    
+    for pcode, name in PCODE_MAP.items():
+        if name in existing:
+            category_map[pcode] = existing[name]
+        else:
+            cur.execute("INSERT INTO part_categories (name) VALUES (%s) RETURNING id", (name,))
+            cat_id = cur.fetchone()[0]
+            existing[name] = cat_id
+            category_map[pcode] = cat_id
+            created += 1
+    
+    print(f"Categories: {len(existing)} total, {created} created")
+    
+    # Update inventory items based on location (pcode) field
+    updated = 0
+    for pcode, cat_id in category_map.items():
+        cur.execute("""
+            UPDATE inventory
+            SET category_id = %s
+            WHERE location = %s AND category_id IS NULL
+        """, (cat_id, pcode))
+        updated += cur.rowcount
+    
+    conn.commit()
+    cur.close()
+    conn.close()
+    
+    print(f"Updated {updated:,} inventory items with categories")
+    
+    # Show uncategorized items
+    conn = get_tenant_conn(tenant_id)
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT location, COUNT(*) FROM inventory
+        WHERE category_id IS NULL AND location IS NOT NULL
+        GROUP BY location ORDER BY COUNT(*) DESC
+    """)
+    uncategorized = cur.fetchall()
+    if uncategorized:
+        print(f"\nUncategorized items by pcode:")
+        for pcode, cnt in uncategorized[:20]:
+            print(f"  {pcode}: {cnt:,}")
+    cur.close()
+    conn.close()
+
+
+if __name__ == '__main__':
+    import argparse
+    parser = argparse.ArgumentParser()
+    parser.add_argument('--tenant', type=int, required=True)
+    args = parser.parse_args()
+    assign_categories(args.tenant)
diff --git a/scripts/clean_fake_models.py b/scripts/clean_fake_models.py
new file mode 100755
index 0000000..2da05d6
--- /dev/null
+++ b/scripts/clean_fake_models.py
@@ -0,0 +1,274 @@
+#!/usr/bin/env python3
+"""
+Clean fake/corrupted models from master DB caused by supplier catalog imports.
+Handles:
+- Models ending in ' INT.' -> map to base model
+- Empty-name models -> delete or merge
+- Year-range models (09-15, etc.) -> delete
+- Torque-spec models ((60 Nm+90°), etc.) -> delete
+"""
+
+import sys
+import re
+import psycopg2
+from collections import defaultdict
+
+MASTER_DSN = "host=localhost dbname=nexus_autoparts user=postgres password=1123517"
+
+
+def get_connection():
+    return psycopg2.connect(MASTER_DSN)
+
+
+def delete_model_and_myes(conn, model_id, dry_run=True):
+    """Delete all MYEs for a model, then the model itself."""
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+    mye_ids = [r[0] for r in cur.fetchall()]
+    if mye_ids:
+        print(f"  Would delete {len(mye_ids)} MYEs for model {model_id}")
+        if not dry_run:
+            # supplier_catalog_compat has no FK, just update to null
+            cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+            cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+            cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+    else:
+        print(f"  No MYEs for model {model_id}")
+    print(f"  Would delete model {model_id}")
+    if not dry_run:
+        cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+
+
+def merge_int_models(conn, dry_run=True):
+    """Merge 'X INT.' models into their base equivalents."""
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT m.id_model, m.name_model, m.brand_id, b.name_brand
+        FROM models m
+        JOIN brands b ON b.id_brand = m.brand_id
+        WHERE m.name_model LIKE '%INT.'
+        ORDER BY m.brand_id, m.name_model
+    """)
+    int_models = cur.fetchall()
+    print(f"Found {len(int_models)} INT. models to process")
+
+    merged = 0
+    renamed = 0
+    skipped = 0
+
+    for model_id, name_model, brand_id, brand_name in int_models:
+        base_name = name_model[:-5]  # Remove ' INT.'
+        # Find base model (case-insensitive)
+        cur.execute("""
+            SELECT id_model, name_model FROM models
+            WHERE brand_id = %s AND LOWER(name_model) = LOWER(%s)
+            LIMIT 1
+        """, (brand_id, base_name))
+        base = cur.fetchone()
+
+        if base:
+            base_id, base_name_exact = base
+            print(f"[{brand_name}] {name_model} -> {base_name_exact} (id={base_id})")
+        else:
+            # No base exists: rename this model to base name
+            print(f"[{brand_name}] {name_model} -> RENAME to '{base_name}' (no base found)")
+            if not dry_run:
+                cur.execute("UPDATE models SET name_model = %s WHERE id_model = %s", (base_name, model_id))
+                conn.commit()
+            renamed += 1
+            continue
+
+        # Migrate MYEs from INT model to base model
+        cur.execute("""
+            SELECT id_mye, year_id, engine_id FROM model_year_engine
+            WHERE model_id = %s
+        """, (model_id,))
+        myes = cur.fetchall()
+
+        mye_migrated = 0
+        mye_deleted = 0
+        for mye_id, year_id, engine_id in myes:
+            # Find equivalent MYE in base model
+            cur.execute("""
+                SELECT id_mye FROM model_year_engine
+                WHERE model_id = %s AND year_id = %s
+                AND (engine_id = %s OR (engine_id IS NULL AND %s IS NULL))
+            """, (base_id, year_id, engine_id, engine_id))
+            base_mye = cur.fetchone()
+
+            if base_mye:
+                base_mye_id = base_mye[0]
+                # Update supplier_catalog_compat
+                cur.execute("""
+                    UPDATE supplier_catalog_compat
+                    SET model_year_engine_id = %s
+                    WHERE model_year_engine_id = %s
+                """, (base_mye_id, mye_id))
+                # Delete the old MYE
+                cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = %s", (mye_id,))
+                cur.execute("DELETE FROM model_year_engine WHERE id_mye = %s", (mye_id,))
+                mye_migrated += 1
+            else:
+                # Move MYE to base model
+                cur.execute("""
+                    UPDATE model_year_engine SET model_id = %s WHERE id_mye = %s
+                """, (base_id, mye_id))
+                mye_migrated += 1
+
+        # Now delete the INT model (should have no MYEs left)
+        if not dry_run:
+            cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+            conn.commit()
+
+        print(f"  Migrated {mye_migrated} MYEs, deleted model")
+        merged += 1
+
+    print(f"\nINT. summary: merged={merged}, renamed={renamed}, skipped={skipped}")
+    cur.close()
+    return merged, renamed, skipped
+
+
+def clean_empty_models(conn, dry_run=True):
+    """Delete or merge models with empty names."""
+    cur = conn.cursor()
+    cur.execute("""
+        SELECT m.id_model, m.name_model, m.brand_id, b.name_brand,
+               (SELECT COUNT(*) FROM model_year_engine mye WHERE mye.model_id = m.id_model) as mye_count
+        FROM models m
+        JOIN brands b ON b.id_brand = m.brand_id
+        WHERE m.name_model IS NULL OR TRIM(m.name_model) = ''
+        ORDER BY mye_count DESC
+    """)
+    empty_models = cur.fetchall()
+    print(f"\nFound {len(empty_models)} empty-name models")
+
+    deleted = 0
+    for model_id, name_model, brand_id, brand_name, mye_count in empty_models:
+        print(f"[{brand_name}] empty model id={model_id}, MYEs={mye_count}")
+        if mye_count == 0:
+            print(f"  -> Safe to delete (no MYEs)")
+            if not dry_run:
+                cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+                conn.commit()
+            deleted += 1
+        else:
+            # Check MYEs: if they have supplier_catalog_compat, we need to find a target
+            cur.execute("""
+                SELECT mye.id_mye, mye.year_id, mye.engine_id, y.year_car, e.name_engine
+                FROM model_year_engine mye
+                LEFT JOIN years y ON y.id_year = mye.year_id
+                LEFT JOIN engines e ON e.id_engine = mye.engine_id
+                WHERE mye.model_id = %s
+            """, (model_id,))
+            myes = cur.fetchall()
+            print(f"  -> Has {len(myes)} MYEs. Details:")
+            for mye_id, yid, eid, yname, ename in myes:
+                print(f"      MYE {mye_id}: year={yname}, engine={ename}")
+                # Check if there's a real model in same brand with this year+engine combo
+                cur.execute("""
+                    SELECT m2.id_model, m2.name_model FROM model_year_engine mye2
+                    JOIN models m2 ON m2.id_model = mye2.model_id
+                    WHERE m2.brand_id = %s AND mye2.year_id = %s
+                    AND (mye2.engine_id = %s OR (mye2.engine_id IS NULL AND %s IS NULL))
+                    LIMIT 3
+                """, (brand_id, yid, eid, eid))
+                candidates = cur.fetchall()
+                print(f"        Candidates: {candidates}")
+                if candidates and not dry_run:
+                    target_id = candidates[0][0]
+                    cur.execute("""
+                        UPDATE supplier_catalog_compat SET model_year_engine_id = NULL
+                        WHERE model_year_engine_id = %s
+                    """, (mye_id,))
+                    cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = %s", (mye_id,))
+                    cur.execute("DELETE FROM model_year_engine WHERE id_mye = %s", (mye_id,))
+                    conn.commit()
+                    print(f"        -> Cleared MYE {mye_id} (moved to NULL, manual remap needed)")
+            if not dry_run:
+                cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+                conn.commit()
+            deleted += 1
+
+    print(f"Empty models processed: {deleted}")
+    cur.close()
+    return deleted
+
+
+def clean_year_range_models(conn, dry_run=True):
+    """Delete models that are year ranges like '09-15'."""
+    cur = conn.cursor()
+    cur.execute("SELECT id_model, name_model, brand_id FROM models")
+    year_ranges = []
+    for mid, name, bid in cur.fetchall():
+        if name and re.match(r'^(\d{2}-\d{2}|\d{4}-\d{4})$', name.strip()):
+            year_ranges.append((mid, name.strip(), bid))
+
+    print(f"\nFound {len(year_ranges)} year-range models")
+    deleted = 0
+    for mid, name, bid in year_ranges:
+        cur.execute("SELECT COUNT(*) FROM model_year_engine WHERE model_id = %s", (mid,))
+        count = cur.fetchone()[0]
+        cur.execute("SELECT name_brand FROM brands WHERE id_brand = %s", (bid,))
+        bname = cur.fetchone()[0]
+        print(f"[{bname}] '{name}' id={mid}, MYEs={count}")
+        if not dry_run:
+            delete_model_and_myes(conn, mid, dry_run=False)
+            conn.commit()
+        deleted += 1
+    print(f"Year-range models deleted: {deleted}")
+    cur.close()
+    return deleted
+
+
+def clean_torque_models(conn, dry_run=True):
+    """Delete models that contain torque specs like 'Nm'."""
+    cur = conn.cursor()
+    cur.execute("SELECT id_model, name_model, brand_id FROM models")
+    torque_models = []
+    for mid, name, bid in cur.fetchall():
+        if name and ('Nm' in name or 'nm' in name.lower()):
+            torque_models.append((mid, name, bid))
+
+    print(f"\nFound {len(torque_models)} torque-spec models")
+    deleted = 0
+    for mid, name, bid in torque_models:
+        cur.execute("SELECT COUNT(*) FROM model_year_engine WHERE model_id = %s", (mid,))
+        count = cur.fetchone()[0]
+        cur.execute("SELECT name_brand FROM brands WHERE id_brand = %s", (bid,))
+        bname = cur.fetchone()[0]
+        print(f"[{bname}] '{name}' id={mid}, MYEs={count}")
+        if not dry_run:
+            delete_model_and_myes(conn, mid, dry_run=False)
+            conn.commit()
+        deleted += 1
+    print(f"Torque-spec models deleted: {deleted}")
+    cur.close()
+    return deleted
+
+
+def main():
+    dry_run = '--execute' not in sys.argv
+    if dry_run:
+        print("=" * 60)
+        print("DRY RUN MODE — no changes will be made")
+        print("Run with --execute to apply changes")
+        print("=" * 60)
+
+    conn = get_connection()
+    try:
+        merge_int_models(conn, dry_run=dry_run)
+        clean_empty_models(conn, dry_run=dry_run)
+        clean_year_range_models(conn, dry_run=dry_run)
+        clean_torque_models(conn, dry_run=dry_run)
+    finally:
+        conn.close()
+
+    if dry_run:
+        print("\n" + "=" * 60)
+        print("DRY RUN complete. Run with --execute to apply.")
+        print("=" * 60)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/clean_supplier_corrupted_models.py b/scripts/clean_supplier_corrupted_models.py
new file mode 100755
index 0000000..4c28168
--- /dev/null
+++ b/scripts/clean_supplier_corrupted_models.py
@@ -0,0 +1,240 @@
+#!/usr/bin/env python3
+"""
+Clean supplier-corrupted models from master DB.
+Handles trailing years, year ranges, engine specs, trim variants, etc.
+
+Usage:
+    python scripts/clean_supplier_corrupted_models.py [--execute]
+"""
+
+import os
+import re
+import sys
+
+import psycopg2
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+
+
+def connect():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def delete_model_and_myes(conn, model_id):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+    mye_ids = [r[0] for r in cur.fetchall()]
+    if mye_ids:
+        cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+
+
+def normalize_for_match(name):
+    """Normalize model name for matching: uppercase, remove extra spaces, replace spaces with hyphens and vice versa."""
+    if not name:
+        return ''
+    return ' '.join(str(name).upper().split())
+
+
+def find_base_model(cur, brand_id, base_name):
+    """Find a base model in same brand by normalized name match."""
+    normalized = normalize_for_match(base_name)
+    # Try exact
+    cur.execute("""
+        SELECT id_model, name_model FROM models
+        WHERE brand_id = %s AND LOWER(name_model) = LOWER(%s)
+        LIMIT 1
+    """, (brand_id, normalized))
+    row = cur.fetchone()
+    if row:
+        return row
+    # Try with spaces replaced by hyphens
+    hyphenated = normalized.replace(' ', '-')
+    cur.execute("""
+        SELECT id_model, name_model FROM models
+        WHERE brand_id = %s AND REPLACE(UPPER(name_model), ' ', '-') = %s
+        LIMIT 1
+    """, (brand_id, hyphenated))
+    row = cur.fetchone()
+    if row:
+        return row
+    # Try with hyphens replaced by spaces
+    spaced = normalized.replace('-', ' ')
+    cur.execute("""
+        SELECT id_model, name_model FROM models
+        WHERE brand_id = %s AND REPLACE(UPPER(name_model), '-', ' ') = %s
+        LIMIT 1
+    """, (brand_id, spaced))
+    return cur.fetchone()
+
+
+def merge_model_to_base(conn, model_id, base_id, base_name):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye, year_id, engine_id FROM model_year_engine WHERE model_id = %s", (model_id,))
+    myes = cur.fetchall()
+    migrated = 0
+    for mye_id, year_id, engine_id in myes:
+        cur.execute("""
+            SELECT id_mye FROM model_year_engine
+            WHERE model_id = %s AND year_id = %s
+            AND (engine_id = %s OR (engine_id IS NULL AND %s IS NULL))
+        """, (base_id, year_id, engine_id, engine_id))
+        base_mye = cur.fetchone()
+        if base_mye:
+            base_mye_id = base_mye[0]
+            cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = %s WHERE model_year_engine_id = %s", (base_mye_id, mye_id))
+            cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = %s", (mye_id,))
+            cur.execute("DELETE FROM model_year_engine WHERE id_mye = %s", (mye_id,))
+        else:
+            cur.execute("UPDATE model_year_engine SET model_id = %s WHERE id_mye = %s", (base_id, mye_id))
+        migrated += 1
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+    return migrated
+
+
+def extract_base_name(name, reason):
+    n = name.strip()
+    if reason == 'trailing_year':
+        m = re.search(r'^(.*?)\s+(19|20)\d{2}$', n)
+        if m:
+            return m.group(1).strip()
+    elif reason == 'year_range_parens':
+        m = re.search(r'^(.*?)\s+\d{2}-\d{2}\s*\(', n)
+        if m:
+            return m.group(1).strip()
+    elif reason == 'hasta_tas':
+        if 'Tas.' in n:
+            m = re.search(r'^(.*?)(?:\s+\d+\.\d+L)?\s+\d{2}-\d{2}\s+Tas\.', n)
+            if m:
+                return m.group(1).strip()
+        if 'hasta' in n.lower():
+            m = re.search(r'^(.*?)\s+hasta', n, re.IGNORECASE)
+            if m:
+                return m.group(1).strip()
+    return None
+
+
+def main():
+    dry_run = '--execute' not in sys.argv
+    if dry_run:
+        print("=" * 60)
+        print("DRY RUN MODE — no changes will be made")
+        print("Run with --execute to apply changes")
+        print("=" * 60)
+
+    conn = connect()
+    cur = conn.cursor()
+
+    cur.execute('SELECT id_model, name_model, brand_id FROM models')
+    models = cur.fetchall()
+
+    patterns = {
+        'trailing_year': (re.compile(r' (19|20)\d{2}$'), lambda b: b != 'MCLAREN'),
+        'year_range_parens': (re.compile(r'[A-Za-z]+ \d{2}-\d{2} \('), None),
+        'engine_spec': (re.compile(r',?\s*\(\d+ HP\)|DOHC|SOHC|Valv\.|Turbo L4|L4,\s*\(', re.IGNORECASE), None),
+        'hasta_tas': (re.compile(r'hasta|Tas\.', re.IGNORECASE), None),
+        'engine_only': (re.compile(r'^\d+\.\d+L$', re.IGNORECASE), None),
+        'engine_config': (re.compile(r'^\d+\.\d+L\s+(?:L\d|V\d|R\s|Turbo|TDI|GSI)', re.IGNORECASE),
+                          lambda n: not re.search(r'\([A-Z0-9_]{3,}\)$', n)),
+    }
+
+    suspicious = []
+    for mid, name, bid in models:
+        if not name:
+            continue
+        for reason, (pat, extra_check) in patterns.items():
+            if pat.search(name):
+                ok = True
+                if extra_check:
+                    if reason == 'trailing_year':
+                        cur.execute('SELECT name_brand FROM brands WHERE id_brand=%s', (bid,))
+                        bname = cur.fetchone()[0]
+                        ok = extra_check(bname)
+                    else:
+                        ok = extra_check(name)
+                if ok:
+                    suspicious.append((bid, name, mid, reason))
+                    break
+
+    # Trim variant detection: "500 POP", "FIESTA SE", etc.
+    trim_variants = ['LOUNGE', 'POP', 'SPORT', 'ADVENTURE', 'FIRE', 'GT', 'GTV', 'STD', 'SE', 'LE', 'XLE', 'LIMITED', 'LX', 'EX', 'SX']
+    trim_pattern = re.compile(r'^(\S+?)\s*(' + '|'.join(trim_variants) + r')$')
+
+    trim_matches = []
+    for mid, name, bid in models:
+        if not name:
+            continue
+        if any(s[2] == mid for s in suspicious):
+            continue  # already flagged
+        m = trim_pattern.match(name.upper())
+        if m:
+            base = m.group(1)
+            base_model = find_base_model(cur, bid, base)
+            if base_model:
+                trim_matches.append((bid, name, mid, 'trim_variant', base_model[0], base_model[1]))
+
+    print(f"\nFound {len(suspicious)} suspicious models by pattern")
+    print(f"Found {len(trim_matches)} trim variant models")
+
+    to_merge = []
+    to_delete = []
+
+    for bid, name, mid, reason in suspicious:
+        if reason in ('engine_spec', 'engine_only', 'engine_config'):
+            to_delete.append((bid, name, mid, reason))
+            continue
+        base_name = extract_base_name(name, reason)
+        if base_name:
+            base = find_base_model(cur, bid, base_name)
+            if base:
+                to_merge.append((bid, name, mid, reason, base[0], base[1]))
+                continue
+        to_delete.append((bid, name, mid, reason))
+
+    # Add trim matches to merge list
+    for item in trim_matches:
+        to_merge.append(item)
+
+    print(f"\nTo merge: {len(to_merge)}")
+    for bid, name, mid, reason, base_id, base_name in to_merge:
+        print(f"  [{bid}] '{name}' -> '{base_name}' (reason={reason})")
+
+    print(f"\nTo delete: {len(to_delete)}")
+    for bid, name, mid, reason in to_delete:
+        print(f"  [{bid}] '{name}' reason={reason}")
+
+    if dry_run:
+        print("\n" + "=" * 60)
+        print("DRY RUN complete. Run with --execute to apply.")
+        print("=" * 60)
+        cur.close()
+        conn.close()
+        return
+
+    print("\nApplying merges...")
+    for bid, name, mid, reason, base_id, base_name in to_merge:
+        cur.execute('SELECT name_brand FROM brands WHERE id_brand=%s', (bid,))
+        bname = cur.fetchone()[0]
+        migrated = merge_model_to_base(conn, mid, base_id, base_name)
+        print(f"  [{bname}] '{name}' -> '{base_name}' ({migrated} MYEs migrated)")
+        conn.commit()
+
+    print("\nApplying deletes...")
+    for bid, name, mid, reason in to_delete:
+        cur.execute('SELECT name_brand FROM brands WHERE id_brand=%s', (bid,))
+        bname = cur.fetchone()[0]
+        delete_model_and_myes(conn, mid)
+        print(f"  [{bname}] '{name}' deleted")
+        conn.commit()
+
+    print(f"\nDone. Merged {len(to_merge)}, deleted {len(to_delete)}.")
+    cur.close()
+    conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/clean_supplier_corrupted_models_v2.py b/scripts/clean_supplier_corrupted_models_v2.py
new file mode 100644
index 0000000..f321c09
--- /dev/null
+++ b/scripts/clean_supplier_corrupted_models_v2.py
@@ -0,0 +1,118 @@
+#!/usr/bin/env python3
+"""
+Second pass: clean remaining supplier-corrupted models.
+More aggressive patterns for engine specs mixed with years.
+
+Usage:
+    python scripts/clean_supplier_corrupted_models_v2.py [--execute]
+"""
+
+import os
+import re
+import sys
+
+import psycopg2
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+
+
+def connect():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def delete_model_and_myes(conn, model_id):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+    mye_ids = [r[0] for r in cur.fetchall()]
+    if mye_ids:
+        cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+
+
+def main():
+    dry_run = '--execute' not in sys.argv
+    if dry_run:
+        print("=" * 60)
+        print("DRY RUN MODE — no changes will be made")
+        print("Run with --execute to apply changes")
+        print("=" * 60)
+
+    conn = connect()
+    cur = conn.cursor()
+
+    # Aggressive patterns for remaining garbage
+    # Pattern: starts with displacement and contains year range or engine config
+    patterns = [
+        re.compile(r'^\d+\.\d+L.*\d{2}-\d{2}', re.IGNORECASE),  # 2.2L 98-99 L4 Amigo
+        re.compile(r'^\d+\.\d+L\s+[A-Za-z].*L\d', re.IGNORECASE),  # 1.5L March
+        re.compile(r'^\d+\.\d+L\s+[A-Za-z]{3,}$', re.IGNORECASE),  # 1.8L R
+        re.compile(r'^\d+\.\d+L\s+Datsun', re.IGNORECASE),  # 1.5L Datsun 1600
+        re.compile(r'\d{2}-\d{2}.*L4,', re.IGNORECASE),  # ...98-99...L4,
+        re.compile(r'\d{2}-\d{2}.*\d+\.\d+L.*Gasolina', re.IGNORECASE),  # ...07-16...2.4L Gasolina
+        re.compile(r'^370 Z\s+\d+\.\d+L', re.IGNORECASE),  # 370 Z 1.5L
+        re.compile(r'Brakes.*\d{2}-\d{2}', re.IGNORECASE),  # Cooper JC Works Brakes 09-15
+        re.compile(r'Cabstar.*\d{2}-\d{2}', re.IGNORECASE),  # Cabstar 3.5T 07-16
+        re.compile(r'X Terra.*Chevrolet', re.IGNORECASE),  # X Terra 05-15 Chevrolet City
+    ]
+
+    # Specific known-bad models by exact name
+    known_bad = {
+        '1.8L R', '2.5L 08 - 13', 'Eclipse 2.0L Aspiración Natural',
+        'Cooper JC Works Brakes 09-15 Disco de 316mm',
+        'Cabstar 3.5T 07-16 C/Sensor', 'X Terra 05-15 Chevrolet City Ex-',
+        'NP-300 (D-22) 2WD 2.4L GASOLINA', 'NV-350 2.5L GAS',
+    }
+
+    cur.execute('SELECT id_model, name_model, brand_id FROM models')
+    models = cur.fetchall()
+
+    to_delete = []
+    for mid, name, bid in models:
+        if not name:
+            continue
+        n = name.strip()
+        if n in known_bad:
+            to_delete.append((bid, n, mid, 'known_bad'))
+            continue
+        for pat in patterns:
+            if pat.search(n):
+                # Exclude legitimate TecDoc patterns like "1100-1900 (101_)"
+                if re.search(r'^\d{4}-\d{4} \([A-Z0-9_]+\)$', n):
+                    continue
+                to_delete.append((bid, n, mid, 'pattern'))
+                break
+
+    print(f"\nFound {len(to_delete)} remaining corrupted models")
+    for bid, n, mid, reason in to_delete:
+        cur.execute('SELECT name_brand FROM brands WHERE id_brand=%s', (bid,))
+        bname = cur.fetchone()[0]
+        cur.execute('SELECT COUNT(*) FROM model_year_engine WHERE model_id=%s', (mid,))
+        mye_count = cur.fetchone()[0]
+        print(f"  [{bname}] '{n}' id={mid} MYEs={mye_count} reason={reason}")
+
+    if dry_run:
+        print("\n" + "=" * 60)
+        print("DRY RUN complete. Run with --execute to apply.")
+        print("=" * 60)
+        cur.close()
+        conn.close()
+        return
+
+    print("\nApplying deletes...")
+    for bid, n, mid, reason in to_delete:
+        cur.execute('SELECT name_brand FROM brands WHERE id_brand=%s', (bid,))
+        bname = cur.fetchone()[0]
+        delete_model_and_myes(conn, mid)
+        print(f"  [{bname}] '{n}' deleted")
+        conn.commit()
+
+    print(f"\nDone. Deleted {len(to_delete)} models.")
+    cur.close()
+    conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/clean_supplier_corrupted_models_v3.py b/scripts/clean_supplier_corrupted_models_v3.py
new file mode 100644
index 0000000..e86bfe7
--- /dev/null
+++ b/scripts/clean_supplier_corrupted_models_v3.py
@@ -0,0 +1,228 @@
+#!/usr/bin/env python3
+"""
+Third pass: clean specific remaining supplier-corrupted models.
+
+Usage:
+    python scripts/clean_supplier_corrupted_models_v3.py [--execute]
+"""
+
+import os
+import sys
+
+import psycopg2
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+
+
+def connect():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def delete_model_and_myes(conn, model_id):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+    mye_ids = [r[0] for r in cur.fetchall()]
+    if mye_ids:
+        cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+
+
+def merge_model_to_base(conn, model_id, base_id):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye, year_id, engine_id FROM model_year_engine WHERE model_id = %s", (model_id,))
+    myes = cur.fetchall()
+    migrated = 0
+    for mye_id, year_id, engine_id in myes:
+        cur.execute("""
+            SELECT id_mye FROM model_year_engine
+            WHERE model_id = %s AND year_id = %s
+            AND (engine_id = %s OR (engine_id IS NULL AND %s IS NULL))
+        """, (base_id, year_id, engine_id, engine_id))
+        base_mye = cur.fetchone()
+        if base_mye:
+            cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = %s WHERE model_year_engine_id = %s", (base_mye[0], mye_id))
+            cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = %s", (mye_id,))
+            cur.execute("DELETE FROM model_year_engine WHERE id_mye = %s", (mye_id,))
+        else:
+            cur.execute("UPDATE model_year_engine SET model_id = %s WHERE id_mye = %s", (base_id, mye_id))
+        migrated += 1
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+    return migrated
+
+
+def main():
+    dry_run = '--execute' not in sys.argv
+    if dry_run:
+        print("=" * 60)
+        print("DRY RUN MODE — no changes will be made")
+        print("Run with --execute to apply changes")
+        print("=" * 60)
+
+    conn = connect()
+    cur = conn.cursor()
+
+    # Exact (brand, model_name) pairs to delete
+    delete_exact = [
+        ('ISUZU', '1.9L 81 - 86 Pick-Up'),
+        ('ISUZU', '2.2L 98 - 02 L4 2.3L Turbo 84 - 87'),
+        ('ISUZU', '2.2L 98 - 99 L4 Amigo'),
+        ('ISUZU', '2.3L 81 - 95 2.0L Turbo 84 - 87'),
+        ('ISUZU', '2.3L 81 - 95 Pick-Up'),
+        ('ISUZU', '3.2L 92 - 93 V6'),
+        ('ISUZU', '3.2L 92 - 93 V6 2.3L Turbo 84 - 87'),
+        ('CHEVROLET', '2.0L 1984 L4'),
+        ('CHEVROLET', '2.0L 83 - 84 L4'),
+        ('CHEVROLET', '2.0L 83 - 84 L4 Jimmy'),
+        ('CHEVROLET', '2.8L 1984 V6'),
+        ('CHEVROLET', '2.8L 85 - 93 V6'),
+        ('CHEVROLET', '3.1L 91 - 95 V6'),
+        ('CHEVROLET', '3.1L 91 - 98 V6'),
+        ('CHEVROLET', '4.1L 81 - 84 L6'),
+        ('CHEVROLET', '4.1L 81 - 84 L6 10'),
+        ('CHEVROLET', '4.3L 10'),
+        ('CHEVROLET', '4.3L 90 - 93 V6'),
+        ('CHEVROLET', '4.3L 90 - 93 V6 10'),
+        ('CHEVROLET', '4.3L 96 - 00 V6 10'),
+        ('CHEVROLET', '5.0L 96 - 98 V8'),
+        ('CHEVROLET', '5.0L 96 - 98 V8 10'),
+        ('CHEVROLET', '5.1L 82 - 91 V8'),
+        ('CHEVROLET', '5.7L (19.15 mm)'),
+        ('CHEVROLET', '5.7L 10'),
+        ('CHEVROLET', '5.7L 69 - 91 V8'),
+        ('CHEVROLET', '5.7L 69 - 91 V8 10'),
+        ('CHRYSLER / DODGE', '2.5L Chasis Cabina'),
+        ('CHRYSLER / DODGE', '3.7L 10'),
+        ('CHRYSLER / DODGE', '3.7L 86 - 87 L6 23'),
+        ('CHRYSLER / DODGE', '3.9L 88 - 91 V6'),
+        ('CHRYSLER / DODGE', '3.9L 88 - 91 V6 23'),
+        ('CHRYSLER / DODGE', '4.7L 04 - 05 V8'),
+        ('CHRYSLER / DODGE', '4.7L 04 - 05 V8 10'),
+        ('CHRYSLER / DODGE', '4.7L 10'),
+        ('CHRYSLER / DODGE', '5.2L 10'),
+        ('CHRYSLER / DODGE', '5.2L 85 - 93 V8'),
+        ('CHRYSLER / DODGE', '5.7L 10'),
+        ('CHRYSLER / DODGE', '5.9L 10'),
+        ('CHRYSLER / DODGE', '5.9L 19'),
+        ('CHRYSLER / DODGE', '5.9L 1992 V8 19'),
+        ('CHRYSLER / DODGE', '5.9L 88 - 91 V8 19'),
+        ('CHRYSLER / DODGE', '5.9L 94 - 97 V8 Ram 7000'),
+        ('FORD', '2.0L 97 - 03 L4'),
+        ('FORD', '2.0L 97 - 03 L4 10'),
+        ('FORD', '2.0L LX, SE'),
+        ('FORD', '2.3L 87 - 88 L4'),
+        ('FORD', '2.3L 87 - 88 L4 10'),
+        ('FORD', '2.3L 87 - 88 L4 Aerostar'),
+        ('FORD', '2.3L 87 - 88 L4 Bronco'),
+        ('FORD', '3.0L 98 - 01 V6'),
+        ('FORD', '4.0L 93 - 97 V6'),
+        ('FORD', '4.6L 10'),
+        ('FORD', '4.9L 83 - 93 L6 10'),
+        ('FORD', '4.9L 88 - 89 L6'),
+        ('FORD', '4.9L 88 - 92 L6 10'),
+        ('FORD', '5.0L 10'),
+        ('FORD', '5.0L 65 - 91 V8 10'),
+        ('FORD', '5.0L 88 - 89 V8 10'),
+        ('FORD', '5.7L 65 - 84 V8'),
+        ('FORD', '5.8L 10'),
+        ('FORD', '5.8L 1992 10'),
+        ('JEEP', '4.0L 10'),
+        ('JEEP', '4.0L 14'),
+        ('JEEP', '4.0L 19'),
+        ('JEEP', '4.0L 1”'),
+        ('JEEP', '4.2L 87 - 89 L6 10'),
+        ('JEEP', '4.2L 87 - 89 L6 14'),
+        ('NISSAN', '2.4L 85 - 92 L4'),
+        ('NISSAN', '2.4L 85 - 92 L4 2.0L 720 74 - 83 L4, L20B, Z22, SD22'),
+        ('NISSAN', '2.4L 85 - 92 L4 2.4L 91 - 00 L4, D21'),
+        ('NISSAN', '3.0L 89 - 94 Micra'),
+        ('NISSAN', '3.0L 89 - 94 NX Coupé DE'),
+        ('MAZDA', '4.0L B4000'),
+        ('PONTIAC', '5.7L 1998 V8'),
+        ('VW', '1.6L (23.40 mm)'),
+        ('AUDI', '1.4L TFSI (17.0 mm)'),
+        ('BMW', 'Q60 14-16 Sin Paq. Sport'),
+        ('MERCEDES BENZ', 'Cayenne Turbo 05-10 R-19”'),
+        ('MERCEDES BENZ', 'ne S 05-10 R-19”'),
+        ('DODGE', 'Sienna 11-19 Lexux NX200t 15-'),
+        ('PEUGEOT', '406 00-05 4Cil.'),
+        ('PEUGEOT', 'RAV-4 06-18 Nacio-'),
+        ('TOYOTA', 'Sonic RS 12-17 Che-'),
+        ('SEAT', 'Ibiza 18. Volkswagen Golf 17-18 9193-D1968 SG'),
+    ]
+
+    # (brand, bad_model, base_model)
+    merge_map = [
+        ('KIA', 'Sorento 14-16 Latino', 'SORENTO'),
+        ('HYUNDAI', 'IX20 11-16 Latino', 'ix20 (JC)'),
+        ('TOYOTA', 'Corolla CE 07-11 Brasil', 'COROLLA'),
+        ('SUZUKI', 'Grand Vitara 09-13 Na-', 'GRAND VITARA'),
+        ('CHRYSLER', 'Voyager 00-04 Modelos Europeos', 'VOYAGER'),
+    ]
+
+    # Resolve IDs
+    to_delete = []
+    for bname, mname in delete_exact:
+        cur.execute("""
+            SELECT b.id_brand, m.id_model
+            FROM brands b JOIN models m ON m.brand_id = b.id_brand
+            WHERE b.name_brand = %s AND m.name_model = %s
+        """, (bname, mname))
+        row = cur.fetchone()
+        if row:
+            to_delete.append((bname, mname, row[1]))
+
+    to_merge = []
+    for bname, bad_name, base_name in merge_map:
+        cur.execute("""
+            SELECT b.id_brand, m.id_model
+            FROM brands b JOIN models m ON m.brand_id = b.id_brand
+            WHERE b.name_brand = %s AND m.name_model = %s
+        """, (bname, bad_name))
+        bad = cur.fetchone()
+        cur.execute("""
+            SELECT m.id_model FROM models m JOIN brands b ON b.id_brand = m.brand_id
+            WHERE b.name_brand = %s AND m.name_model = %s
+        """, (bname, base_name))
+        base = cur.fetchone()
+        if bad and base:
+            to_merge.append((bname, bad_name, bad[1], base_name, base[0]))
+
+    print(f"\nTo delete: {len(to_delete)}")
+    for bname, mname, mid in to_delete:
+        print(f"  [{bname}] '{mname}' id={mid}")
+
+    print(f"\nTo merge: {len(to_merge)}")
+    for bname, bad_name, mid, base_name, base_id in to_merge:
+        print(f"  [{bname}] '{bad_name}' -> '{base_name}'")
+
+    if dry_run:
+        print("\n" + "=" * 60)
+        print("DRY RUN complete. Run with --execute to apply.")
+        print("=" * 60)
+        cur.close()
+        conn.close()
+        return
+
+    print("\nApplying merges...")
+    for bname, bad_name, mid, base_name, base_id in to_merge:
+        migrated = merge_model_to_base(conn, mid, base_id)
+        print(f"  [{bname}] '{bad_name}' -> '{base_name}' ({migrated} MYEs migrated)")
+        conn.commit()
+
+    print("\nApplying deletes...")
+    for bname, mname, mid in to_delete:
+        delete_model_and_myes(conn, mid)
+        print(f"  [{bname}] '{mname}' deleted")
+        conn.commit()
+
+    print(f"\nDone. Merged {len(to_merge)}, deleted {len(to_delete)}.")
+    cur.close()
+    conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/clean_supplier_corrupted_models_v4.py b/scripts/clean_supplier_corrupted_models_v4.py
new file mode 100755
index 0000000..e0e17d5
--- /dev/null
+++ b/scripts/clean_supplier_corrupted_models_v4.py
@@ -0,0 +1,126 @@
+#!/usr/bin/env python3
+"""Final wave: delete remaining engine-displacement models left by supplier imports.
+
+These are not real models (e.g. '5.7L 85 - 96 V8', '7.4L 73 - 91 V8', '5.8L 93 - 96 V8').
+Deleting them removes fake MYEs; compat rows are unlinked (model_year_engine_id=NULL)
+and remain searchable by SKU / part number.
+"""
+import argparse
+import os
+
+import psycopg2
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+
+# Remaining engine-pattern models after v3 cleanup.
+ENGINE_PATTERN_MODELS = [
+    # Chevrolet
+    ("CHEVROLET", "5.7L 85 - 96 V8"),
+    ("CHEVROLET", "5.7L 85 - 96 V8 Yukon"),
+    ("CHEVROLET", "5.7L 99 - 00 V8"),
+    ("CHEVROLET", "5.7L P-300 85 - 98 V8 10"),
+    ("CHEVROLET", "7.4L 73 - 91 V8"),
+    ("CHEVROLET", "7.4L 73 - 91 V8 10"),
+    ("CHEVROLET", "7.4L 85 - 95 V8"),
+    ("CHEVROLET", "7.4L 85 - 95 V8 10"),
+    ("CHEVROLET", "7.4L 87 - 91 V8"),
+    ("CHEVROLET", "7.4L 87 - 91 V8 10"),
+    # Ford
+    ("FORD", "5.8L 1998 V8"),
+    ("FORD", "5.8L 1998 V8 10"),
+    ("FORD", "5.8L 84 - 87 V8"),
+    ("FORD", "5.8L 84 - 87 V8 10"),
+    ("FORD", "5.8L 84 - 87 V8 Pro"),
+    ("FORD", "5.8L 88 - 89 V8"),
+    ("FORD", "5.8L 88 - 95 V8 10"),
+    ("FORD", "5.8L 89 - 91 V8"),
+    ("FORD", "5.8L 93 - 96 V8"),
+    ("FORD", "5.8L XLT 91 - 97 V8"),
+    ("FORD", "6.2L 10"),
+    ("FORD", "6.8L XL Super Duty 05 - 06"),
+    ("FORD", "6.8L XL Super Duty 05 - 06 10"),
+    ("FORD", "7.3L 1994 V8, FI, Turbo Diesel"),
+    ("FORD", "7.3L 94 - 98 10"),
+    # Toyota
+    ("TOYOTA", "2.2L 74 - 80 L4, 20R Engine"),
+]
+
+
+def delete_model_and_myes(conn, model_id):
+    cur = conn.cursor()
+    cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+    mye_ids = [r[0] for r in cur.fetchall()]
+    if mye_ids:
+        cur.execute(
+            "UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)",
+            (mye_ids,),
+        )
+        cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+        cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+    cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+    cur.close()
+
+
+def main():
+    parser = argparse.ArgumentParser()
+    parser.add_argument("--execute", action="store_true")
+    args = parser.parse_args()
+
+    if not args.execute:
+        print("=" * 60)
+        print("DRY RUN MODE — no changes will be made")
+        print("Run with --execute to apply changes")
+        print("=" * 60)
+
+    conn = psycopg2.connect(MASTER_DB_URL)
+    conn.autocommit = False
+    cur = conn.cursor()
+
+    to_delete = []
+    for brand_name, model_name in ENGINE_PATTERN_MODELS:
+        cur.execute(
+            """
+            SELECT m.id_model, b.name_brand, m.name_model
+            FROM models m
+            JOIN brands b ON b.id_brand = m.brand_id
+            WHERE UPPER(b.name_brand) = %s AND m.name_model = %s
+            """,
+            (brand_name, model_name),
+        )
+        row = cur.fetchone()
+        if row:
+            to_delete.append(row)
+        else:
+            print(f"  NOT FOUND: [{brand_name}] {model_name!r}")
+
+    print(f"\nTo delete: {len(to_delete)}")
+    total_myes = 0
+    for mid, bname, mname in to_delete:
+        cur.execute("SELECT COUNT(*) FROM model_year_engine WHERE model_id = %s", (mid,))
+        cnt = cur.fetchone()[0]
+        total_myes += cnt
+        print(f"  [{bname}] {mname!r} id={mid} MYEs={cnt}")
+
+    print(f"Total MYEs to remove: {total_myes}")
+
+    if not args.execute:
+        print("\n" + "=" * 60)
+        print("DRY RUN complete. Run with --execute to apply.")
+        print("=" * 60)
+        cur.close()
+        conn.close()
+        return
+
+    for mid, bname, mname in to_delete:
+        delete_model_and_myes(conn, mid)
+        print(f"  Deleted [{bname}] {mname!r}")
+
+    conn.commit()
+    print(f"\nDone. Deleted {len(to_delete)} models ({total_myes} MYEs removed).")
+
+    cur.close()
+    conn.close()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/clean_year_suffix_models.py b/scripts/clean_year_suffix_models.py
new file mode 100755
index 0000000..616b69a
--- /dev/null
+++ b/scripts/clean_year_suffix_models.py
@@ -0,0 +1,57 @@
+#!/usr/bin/env python3
+"""Clean models with year suffixes like 'Model 17-18' or 'Model 2010-2015'."""
+
+import psycopg2, re, sys
+
+MASTER_DSN = "host=localhost dbname=nexus_autoparts user=postgres password=1123517"
+
+def main():
+    dry_run = '--execute' not in sys.argv
+    conn = psycopg2.connect(MASTER_DSN)
+    cur = conn.cursor()
+
+    cur.execute("""
+        SELECT m.id_model, m.name_model, m.brand_id, b.name_brand,
+               (SELECT COUNT(*) FROM model_year_engine mye WHERE mye.model_id = m.id_model) as mye_count
+        FROM models m
+        JOIN brands b ON b.id_brand = m.brand_id
+        WHERE m.name_model ~ ' [0-9]{2}-[0-9]{2}$' OR m.name_model ~ ' [0-9]{4}-[0-9]{4}$'
+        ORDER BY mye_count DESC
+    """)
+    rows = cur.fetchall()
+    print(f"Found {len(rows)} models with year suffix")
+
+    total_myes = 0
+    total_models = 0
+    total_scc = 0
+
+    for model_id, name_model, brand_id, brand_name, mye_count in rows:
+        total_models += 1
+        print(f"[{brand_name}] \"{name_model}\" id={model_id}, MYEs={mye_count}")
+
+        if mye_count > 0:
+            cur.execute("SELECT id_mye FROM model_year_engine WHERE model_id = %s", (model_id,))
+            mye_ids = [r[0] for r in cur.fetchall()]
+            total_myes += len(mye_ids)
+
+            # Count supplier_catalog_compat affected
+            cur.execute("SELECT COUNT(*) FROM supplier_catalog_compat WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+            scc_count = cur.fetchone()[0]
+            total_scc += scc_count
+            print(f"  -> {scc_count} supplier_catalog_compat rows will be nulled")
+
+            if not dry_run:
+                cur.execute("UPDATE supplier_catalog_compat SET model_year_engine_id = NULL WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+                cur.execute("DELETE FROM vin_cache WHERE model_year_engine_id = ANY(%s)", (mye_ids,))
+                cur.execute("DELETE FROM model_year_engine WHERE id_mye = ANY(%s)", (mye_ids,))
+
+        if not dry_run:
+            cur.execute("DELETE FROM models WHERE id_model = %s", (model_id,))
+            conn.commit()
+
+    print(f"\n{'DRY RUN' if dry_run else 'EXECUTED'}: {total_models} models, {total_myes} MYEs, {total_scc} SCC rows affected")
+    cur.close()
+    conn.close()
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_estrada_st01.py b/scripts/import_estrada_st01.py
new file mode 100644
index 0000000..0c0aea5
--- /dev/null
+++ b/scripts/import_estrada_st01.py
@@ -0,0 +1,310 @@
+#!/usr/bin/env python3
+"""
+Nexus Autoparts — Import Strada TODO.st01 Inventory
+Parses fixed-width report and imports into tenant DB using PostgreSQL COPY.
+
+Usage:
+    python3 import_estrada_st01.py --tenant=28 --file=/tmp/todo_st01.txt --branch=1
+"""
+
+import argparse
+import csv
+import io
+import os
+import sys
+import tempfile
+import time
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+import psycopg2
+from tenant_db import get_tenant_conn
+
+# Margins applied to Cost A
+MARGIN_PRICE_1 = 1.35   # mostrador / retail
+MARGIN_PRICE_2 = 1.25   # taller / workshop
+MARGIN_PRICE_3 = 1.15   # mayoreo / wholesale
+
+
+def parse_number(val, default=0):
+    """Parse a string that might be '$1,234.56' or '.000' or empty."""
+    if not val:
+        return default
+    cleaned = str(val).replace('$', '').replace(',', '').replace(' ', '').strip()
+    if cleaned == '.':
+        return default
+    try:
+        return float(cleaned)
+    except ValueError:
+        return default
+
+
+def parse_st01_line(line):
+    """Parse a single line from TODO.st01 fixed-width format."""
+    line = line.rstrip('\n')
+    
+    # Skip short lines
+    if len(line) < 80:
+        return None
+    
+    # Skip header/footer lines
+    if 'Page:' in line or 'General Inventory' in line or 'STRADA AUTO' in line:
+        return None
+    if 'Tienda:' in line and 'Page:' in line:
+        return None
+    if line.strip().startswith('Line Part Number'):
+        return None
+    if line.strip().startswith('----'):
+        return None
+    
+    # Fixed-width columns based on header:
+    # Line Part Number      Description      Addl description Pcode   Instk  Min 1  Max 1     Cost A     Cost B codes[1]
+    # ---- ---------------- ---------------- ---------------- ----- ------- ------ ------ ---------- ---------- --------
+    marca = line[0:5].strip()
+    part_number_raw = line[5:21].strip()
+    description = line[22:39].strip()
+    addl_desc = line[40:56].strip()
+    pcode = line[56:61].strip()
+    instk = line[62:70].strip()
+    min1 = line[71:77].strip()
+    max1 = line[78:84].strip()
+    cost_a = line[85:95].strip()
+    cost_b = line[96:106].strip()
+    codes = line[107:].strip() if len(line) > 107 else ''
+    
+    if not part_number_raw:
+        return None
+    
+    # Build composite part number: MARCA-NUMERO
+    # Some marcas are empty (fallback to pcode or generic)
+    marca_safe = marca if marca else 'GEN'
+    part_number = f"{marca_safe}-{part_number_raw}"
+    
+    # Build name from description + additional description
+    name = description
+    if addl_desc and addl_desc != '?':
+        name = f"{description} {addl_desc}".strip()
+    
+    if not name:
+        return None
+    
+    cost = parse_number(cost_a, 0)
+    stock = int(parse_number(instk, 0))
+    min_stock = int(parse_number(min1, 0))
+    max_stock = int(parse_number(max1, 0))
+    
+    # Calculate prices with margins
+    price_1 = round(cost * MARGIN_PRICE_1, 2) if cost > 0 else 0
+    price_2 = round(cost * MARGIN_PRICE_2, 2) if cost > 0 else 0
+    price_3 = round(cost * MARGIN_PRICE_3, 2) if cost > 0 else 0
+    
+    return {
+        'part_number': part_number,
+        'name': name[:300],  # truncate to schema limit
+        'brand': marca_safe,
+        'cost': cost,
+        'price_1': price_1,
+        'price_2': price_2,
+        'price_3': price_3,
+        'stock': stock,
+        'min_stock': min_stock,
+        'max_stock': max_stock,
+        'location': pcode,
+        'unit': 'PZA',
+        'tax_rate': 0.16,
+    }
+
+
+def import_st01(tenant_id, file_path, branch_id=1):
+    print(f"=== Importing Strada inventory ===")
+    print(f"Tenant: {tenant_id}")
+    print(f"File:   {file_path}")
+    print(f"Branch: {branch_id}")
+    print()
+    
+    # Parse file
+    print("Parsing fixed-width file...")
+    parsed = []
+    skipped = 0
+    start_time = time.time()
+    
+    with open(file_path, 'r', encoding='utf-8', errors='replace') as f:
+        for line in f:
+            row = parse_st01_line(line)
+            if row is None:
+                skipped += 1
+                continue
+            parsed.append(row)
+    
+    parse_time = time.time() - start_time
+    print(f"  Parsed: {len(parsed):,} rows")
+    print(f"  Skipped: {skipped:,} lines (headers/empty)")
+    print(f"  Time: {parse_time:.1f}s")
+    print()
+    
+    if not parsed:
+        print("ERROR: No data rows found.")
+        return
+    
+    # Show sample
+    print("Sample rows:")
+    for row in parsed[:5]:
+        print(f"  {row['part_number']:20} | {row['name'][:40]:40} | stk={row['stock']:>4} | cost={row['cost']:>10.2f} | p1={row['price_1']:>10.2f}")
+    print()
+    
+    # Connect to tenant DB
+    conn = get_tenant_conn(tenant_id)
+    cur = conn.cursor()
+    
+    # Ensure branch exists
+    cur.execute("SELECT id FROM branches WHERE id = %s", (branch_id,))
+    if not cur.fetchone():
+        print(f"ERROR: Branch {branch_id} does not exist. Creating default branch...")
+        cur.execute("INSERT INTO branches (name) VALUES ('Principal') RETURNING id")
+        branch_id = cur.fetchone()[0]
+        conn.commit()
+        print(f"  Created branch id={branch_id}")
+    
+    # Step 1: Create temp table and COPY data
+    print("Creating temp table...")
+    cur.execute("""
+        DROP TABLE IF EXISTS tmp_st01_import;
+        CREATE TEMP TABLE tmp_st01_import (
+            part_number VARCHAR(100),
+            name VARCHAR(300),
+            brand VARCHAR(100),
+            cost NUMERIC(12,2),
+            price_1 NUMERIC(12,2),
+            price_2 NUMERIC(12,2),
+            price_3 NUMERIC(12,2),
+            stock INTEGER,
+            min_stock INTEGER,
+            max_stock INTEGER,
+            location VARCHAR(50),
+            unit VARCHAR(20),
+            tax_rate NUMERIC(5,4)
+        );
+    """)
+    conn.commit()
+    
+    print("COPY to temp table...")
+    csv_buffer = io.StringIO()
+    writer = csv.writer(csv_buffer, lineterminator='\n')
+    for row in parsed:
+        writer.writerow([
+            row['part_number'],
+            row['name'],
+            row['brand'],
+            row['cost'],
+            row['price_1'],
+            row['price_2'],
+            row['price_3'],
+            row['stock'],
+            row['min_stock'],
+            row['max_stock'],
+            row['location'],
+            row['unit'],
+            row['tax_rate'],
+        ])
+    
+    csv_buffer.seek(0)
+    cur.copy_expert(
+        """COPY tmp_st01_import (
+            part_number, name, brand, cost, price_1, price_2, price_3,
+            stock, min_stock, max_stock, location, unit, tax_rate
+        ) FROM STDIN WITH (FORMAT CSV)""",
+        csv_buffer
+    )
+    conn.commit()
+    
+    cur.execute("SELECT COUNT(*) FROM tmp_st01_import")
+    copied = cur.fetchone()[0]
+    print(f"  Copied: {copied:,} rows")
+    print()
+    
+    # Step 2: Insert into inventory
+    print("Inserting into inventory...")
+    start_time = time.time()
+    cur.execute("""
+        INSERT INTO inventory (
+            branch_id, part_number, name, brand,
+            cost, price_1, price_2, price_3,
+            min_stock, max_stock, location, unit, tax_rate, is_active
+        )
+        SELECT
+            %s, part_number, name, brand,
+            cost, price_1, price_2, price_3,
+            min_stock, max_stock, location, unit, tax_rate, TRUE
+        FROM tmp_st01_import
+        ON CONFLICT (branch_id, part_number) DO UPDATE SET
+            name = EXCLUDED.name,
+            brand = EXCLUDED.brand,
+            cost = EXCLUDED.cost,
+            price_1 = EXCLUDED.price_1,
+            price_2 = EXCLUDED.price_2,
+            price_3 = EXCLUDED.price_3,
+            min_stock = EXCLUDED.min_stock,
+            max_stock = EXCLUDED.max_stock,
+            location = EXCLUDED.location,
+            is_active = TRUE
+    """, (branch_id,))
+    conn.commit()
+    insert_time = time.time() - start_time
+    
+    cur.execute("SELECT COUNT(*) FROM inventory WHERE branch_id = %s", (branch_id,))
+    total_inventory = cur.fetchone()[0]
+    print(f"  Inventory rows: {total_inventory:,}")
+    print(f"  Time: {insert_time:.1f}s")
+    print()
+    
+    # Step 3: Create stock operations for items with stock > 0
+    print("Creating initial stock operations...")
+    start_time = time.time()
+    cur.execute("""
+        INSERT INTO inventory_operations (
+            inventory_id, branch_id, operation_type, quantity,
+            cost_at_time, reference_type, notes
+        )
+        SELECT
+            i.id,
+            i.branch_id,
+            'INITIAL',
+            t.stock,
+            i.cost,
+            'IMPORT',
+            'Importado desde TODO.st01'
+        FROM tmp_st01_import t
+        JOIN inventory i ON i.part_number = t.part_number AND i.branch_id = %s
+        WHERE t.stock > 0
+    """, (branch_id,))
+    conn.commit()
+    ops_time = time.time() - start_time
+    
+    cur.execute("SELECT COUNT(*) FROM inventory_operations WHERE operation_type = 'INITIAL'")
+    total_ops = cur.fetchone()[0]
+    print(f"  Stock operations created: {total_ops:,}")
+    print(f"  Time: {ops_time:.1f}s")
+    print()
+    
+    # Cleanup
+    cur.execute("DROP TABLE IF EXISTS tmp_st01_import")
+    conn.commit()
+    cur.close()
+    conn.close()
+    
+    print("=== Import complete ===")
+    print(f"Total inventory items: {total_inventory:,}")
+    print(f"Items with stock > 0:  {total_ops:,}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Import Strada TODO.st01 into Nexus tenant')
+    parser.add_argument('--tenant', type=int, required=True, help='Tenant ID')
+    parser.add_argument('--file', required=True, help='Path to TODO.st01 file')
+    parser.add_argument('--branch', type=int, default=1, help='Branch ID (default: 1)')
+    args = parser.parse_args()
+    
+    import_st01(args.tenant, args.file, args.branch)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_keepgreen_catalog.py b/scripts/import_keepgreen_catalog.py
new file mode 100644
index 0000000..ecbc260
--- /dev/null
+++ b/scripts/import_keepgreen_catalog.py
@@ -0,0 +1,240 @@
+#!/usr/bin/env python3
+"""
+Import Keep Green (KG) catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_keepgreen_catalog.py
+"""
+
+import os
+import re
+import sys
+from collections import defaultdict
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'KG (1).xlsx')
+SUPPLIER_NAME = 'KEEP GREEN'
+
+MULTI_WORD_MAKES = {
+    ('MERCEDES', 'BENZ'): 'MERCEDES BENZ',
+    ('LAND', 'ROVER'): 'LAND ROVER',
+    ('ALFA', 'ROMEO'): 'ALFA ROMEO',
+    ('AMERICAN', 'MOTORS'): 'AMERICAN MOTORS',
+    ('ROLLS', 'ROYCE'): 'ROLLS ROYCE',
+    ('ASTON', 'MARTIN'): 'ASTON MARTIN',
+    ('GREAT', 'WALL'): 'GREAT WALL',
+}
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def normalize_name(name):
+    if not name:
+        return ''
+    return ' '.join(str(name).replace('\n', ' ').split())
+
+
+def parse_make(carro):
+    """Extract make from CARRO_PERTENECIENTE text."""
+    if not carro:
+        return None
+    parts = str(carro).strip().split()
+    if not parts:
+        return None
+    make = parts[0]
+    if len(parts) >= 2:
+        key = (parts[0].upper(), parts[1].upper())
+        if key in MULTI_WORD_MAKES:
+            make = MULTI_WORD_MAKES[key]
+    return make
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from interchange columns.
+    KG: interchanges start at col 5 (MARCA.1) through col 16 (INTERCAMBIO.5).
+    """
+    interchanges = []
+    for i in range(6):
+        marca_col = 5 + i * 2
+        inter_col = 6 + i * 2
+        if marca_col < len(row) and row[marca_col]:
+            brand = str(row[marca_col]).strip()
+            pn = str(row[inter_col]).strip() if inter_col < len(row) and row[inter_col] else ''
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def expand_year(year_val):
+    """Return list of integer years from a year value.
+    Handles: 1998, 1998-1999, 98-99, '1998 1999', etc.
+    """
+    if year_val is None:
+        return [None]
+    s = str(year_val).strip()
+    if not s:
+        return [None]
+
+    # Single 4-digit year
+    if re.match(r'^(19|20)\d{2}$', s):
+        return [int(s)]
+
+    # Range with dash or slash: 1998-1999, 98-99, 1998/1999
+    m = re.match(r'^(\d{2,4})\s*[-/]\s*(\d{2,4})$', s)
+    if m:
+        start = int(m.group(1))
+        end = int(m.group(2))
+        # Normalize 2-digit years
+        if start < 100:
+            start = 1900 + start if start >= 70 else 2000 + start
+        if end < 100:
+            end = 1900 + end if end >= 70 else 2000 + end
+        if end < start:
+            start, end = end, start
+        # Sanity: cap range length
+        if end - start > 100:
+            return [None]
+        return list(range(start, end + 1))
+
+    # Try plain integer
+    try:
+        y = int(float(s))
+        if 1900 <= y <= 2100:
+            return [y]
+    except ValueError:
+        pass
+
+    return [None]
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting Keep Green import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category, is_active)
+        VALUES (%s, %s, %s, %s, true)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category,
+            is_active = true
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, NULL, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    stats = defaultdict(int)
+
+    for sheet_name in wb.sheetnames:
+        ws = wb[sheet_name]
+        rows = list(ws.iter_rows(values_only=True))
+        if not rows:
+            continue
+        data_rows = rows[1:]
+        stats['sheets'] += 1
+        print(f"\nProcessing sheet '{sheet_name}' with {len(data_rows)} rows...")
+
+        catalog_id_cache = {}
+
+        for idx, row in enumerate(data_rows):
+            if idx % 2000 == 0 and idx > 0:
+                print(f"  ...{idx} rows processed")
+
+            if not row or len(row) < 5 or not row[4]:
+                stats['skipped_no_sku'] += 1
+                continue
+
+            make = str(row[0]).strip().upper() if row[0] else ''
+            model = str(row[1]).strip() if row[1] else ''
+            engine = normalize_name(row[2]) if row[2] else None
+            year_raw = row[3]
+            sku = str(row[4]).strip()
+            name = normalize_name(row[17]) if len(row) > 17 and row[17] else sheet_name
+            carro = str(row[18]).strip() if len(row) > 18 and row[18] else ''
+
+            if not sku:
+                stats['skipped_no_sku'] += 1
+                continue
+            if not make or not model:
+                stats['skipped_no_vehicle'] += 1
+                continue
+
+            stats['rows'] += 1
+
+            # Prefer make from MARCA column; fall back to parsing CARRO_PERTENECIENTE
+            parsed_make = parse_make(carro) or make
+
+            # Upsert catalog item (keyed by sku; category = sheet name)
+            cache_key = sku
+            catalog_id = catalog_id_cache.get(cache_key)
+            if catalog_id is None:
+                master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, sheet_name))
+                row_result = master_cur.fetchone()
+                catalog_id = row_result[0] if row_result else None
+                catalog_id_cache[cache_key] = catalog_id
+                stats['catalog_items'] += 1
+
+            if catalog_id is None:
+                stats['skipped_no_catalog'] += 1
+                continue
+
+            # Expand years and insert compat rows
+            years = expand_year(year_raw)
+            for year in years:
+                master_cur.execute(insert_compat_sql, (
+                    catalog_id,
+                    parsed_make,
+                    model,
+                    year,
+                    engine or None,
+                    'import_text',
+                ))
+                stats['compat_rows'] += 1
+
+            # Insert interchanges
+            interchanges = extract_interchanges(row)
+            for brand, pn in interchanges:
+                master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+                stats['interchange_rows'] += 1
+
+        master_conn.commit()
+        print(f"  Sheet '{sheet_name}' committed.")
+
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    for k, v in sorted(stats.items()):
+        print(f"{k:25s}: {v}")
+
+    master_cur.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_knadian_catalog.py b/scripts/import_knadian_catalog.py
new file mode 100644
index 0000000..5d5d988
--- /dev/null
+++ b/scripts/import_knadian_catalog.py
@@ -0,0 +1,312 @@
+#!/usr/bin/env python3
+"""
+Import KNADIAN catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_knadian_catalog.py
+"""
+
+import os
+import re
+import sys
+from collections import defaultdict
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'KNADIAN.xlsx')
+SUPPLIER_NAME = 'KNADIAN'
+MAX_IMPORT_YEAR = datetime.now().year + 1  # reject future years from bad supplier data
+
+MULTI_WORD_MAKES = {
+    ('MERCEDES', 'BENZ'): 'MERCEDES BENZ',
+    ('LAND', 'ROVER'): 'LAND ROVER',
+    ('ALFA', 'ROMEO'): 'ALFA ROMEO',
+    ('AMERICAN', 'MOTORS'): 'AMERICAN MOTORS',
+    ('ROLLS', 'ROYCE'): 'ROLLS ROYCE',
+    ('ASTON', 'MARTIN'): 'ASTON MARTIN',
+    ('GREAT', 'WALL'): 'GREAT WALL',
+}
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def normalize_name(name):
+    if not name:
+        return ''
+    return ' '.join(str(name).replace('\n', ' ').split())
+
+
+def parse_year_token(token):
+    """Parse a year token like '05', '1998', '2015'."""
+    if not token or not re.match(r'^\d+$', str(token)):
+        return None
+    val = int(token)
+    if 1000 <= val <= 2100:
+        return val
+    if 70 <= val <= 99:
+        return 1900 + val
+    if 0 <= val <= 69:
+        return 2000 + val
+    return None
+
+
+def extract_years(text):
+    """Extract year(s) from end of a string like '05/10', '2011', '1315', '97/99'."""
+    if not text:
+        return [None], ''
+    s = str(text).strip()
+
+    # Try trailing range with / or -: YY/YY, YYYY-YYYY, YY-YY
+    m = re.search(r'\s+(\d{2,4})\s*[-/]\s*(\d{2,4})$', s)
+    if m:
+        start = parse_year_token(m.group(1))
+        end = parse_year_token(m.group(2))
+        if start and end:
+            if end < start:
+                start, end = end, start
+            if end - start <= 100:
+                rest = s[:m.start()].strip()
+                return list(range(start, end + 1)), rest
+
+    # Try trailing 4-digit year
+    m = re.search(r'\s+(19|20)\d{2}$', s)
+    if m:
+        year = int(m.group(0).strip())
+        rest = s[:m.start()].strip()
+        return [year], rest
+
+    # Try trailing 4 consecutive digits that look like a merged range: 1315 -> 2013,2014,2015
+    m = re.search(r'\s+(\d{4})$', s)
+    if m:
+        digits = m.group(1)
+        # If first two and last two are valid years, treat as range
+        y1 = parse_year_token(digits[:2])
+        y2 = parse_year_token(digits[2:])
+        if y1 and y2 and y1 <= y2 and y2 - y1 <= 30:
+            rest = s[:m.start()].strip()
+            return list(range(y1, y2 + 1)), rest
+
+    return [None], s
+
+
+def parse_carro(carro):
+    """Parse CARRO_PERTENECIENTE like 'ACURA TL 05/10' -> make, model, years."""
+    if not carro:
+        return {'make': None, 'model': None, 'years': [None], 'raw': carro}
+
+    s = str(carro).strip()
+    years, rest = extract_years(s)
+
+    parts = rest.split()
+    if not parts:
+        return {'make': None, 'model': None, 'years': years, 'raw': s}
+
+    # Extract make
+    make = parts[0].upper()
+    if len(parts) >= 2:
+        key = (parts[0].upper(), parts[1].upper())
+        if key in MULTI_WORD_MAKES:
+            make = MULTI_WORD_MAKES[key]
+            parts = parts[2:]
+        else:
+            parts = parts[1:]
+    else:
+        parts = parts[1:]
+
+    model = ' '.join(parts) if parts else None
+
+    return {
+        'make': make,
+        'model': model,
+        'years': years,
+        'raw': s,
+    }
+
+
+def extract_engine(name):
+    """Extract engine description from NOMBRE_PIEZA like 'BOMBA_REFRIGERANTE L4 2.0'."""
+    if not name:
+        return None
+    s = normalize_name(name)
+    parts = s.split()
+    if len(parts) <= 1:
+        return None
+    # Everything after first word
+    engine = ' '.join(parts[1:])
+    # Filter out meaningless tokens that should not be engines
+    if engine.upper() in {'DEL.', 'TRAS.', 'FRONT.', 'EXT.', 'IZQ.', 'DER.', 'INF.', 'SUP.', 'TRANS.'}:
+        return None
+    return engine or None
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from interchange columns.
+    KNADIAN: interchanges start at col 3 (MARCA.1) through col 15 (INTERCAMBIO.5).
+    """
+    interchanges = []
+    for i in range(6):
+        marca_col = 3 + i * 2
+        inter_col = 4 + i * 2
+        if marca_col < len(row) and row[marca_col]:
+            brand = str(row[marca_col]).strip()
+            pn = str(row[inter_col]).strip() if inter_col < len(row) and row[inter_col] else ''
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting KNADIAN import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category, is_active)
+        VALUES (%s, %s, %s, %s, true)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category,
+            is_active = true
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, NULL, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    stats = defaultdict(int)
+
+    for sheet_name in wb.sheetnames:
+        ws = wb[sheet_name]
+        rows = list(ws.iter_rows(values_only=True))
+        if not rows:
+            continue
+        data_rows = rows[1:]
+        stats['sheets'] += 1
+        print(f"\nProcessing sheet '{sheet_name}' with {len(data_rows)} rows...")
+
+        catalog_id_cache = {}
+
+        for idx, row in enumerate(data_rows):
+            if idx % 2000 == 0 and idx > 0:
+                print(f"  ...{idx} rows processed")
+
+            if not row or len(row) < 3 or not row[2]:
+                stats['skipped_no_sku'] += 1
+                continue
+
+            make_col = str(row[0]).strip().upper() if row[0] else ''
+            model_col = str(row[1]).strip() if row[1] else ''
+            sku = str(row[2]).strip()
+            name = normalize_name(row[15]) if len(row) > 15 and row[15] else sheet_name
+            carro = str(row[16]).strip() if len(row) > 16 and row[16] else ''
+
+            if not sku:
+                stats['skipped_no_sku'] += 1
+                continue
+
+            # Always try to parse year from CARRO_PERTENECIENTE
+            parsed = parse_carro(carro)
+            years = parsed['years']
+
+            # Prefer explicit make/model columns; fallback to parsed carro
+            if make_col:
+                make = make_col
+            else:
+                make = parsed['make']
+
+            if model_col:
+                model = model_col
+            else:
+                model = parsed['model']
+
+            # If year still missing, maybe the model column itself contains a year
+            if years == [None] and model_col:
+                years, _ = extract_years(model_col)
+
+            if not make or not model:
+                stats['skipped_no_vehicle'] += 1
+                continue
+
+            # Filter out future years and de-duplicate
+            filtered_years = []
+            for y in years:
+                if y is None:
+                    if None not in filtered_years:
+                        filtered_years.append(None)
+                elif y <= MAX_IMPORT_YEAR:
+                    if y not in filtered_years:
+                        filtered_years.append(y)
+            years = filtered_years if filtered_years else [None]
+
+            stats['rows'] += 1
+
+            # Upsert catalog item (keyed by sku)
+            cache_key = sku
+            catalog_id = catalog_id_cache.get(cache_key)
+            if catalog_id is None:
+                master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, sheet_name))
+                row_result = master_cur.fetchone()
+                catalog_id = row_result[0] if row_result else None
+                catalog_id_cache[cache_key] = catalog_id
+                stats['catalog_items'] += 1
+
+            if catalog_id is None:
+                stats['skipped_no_catalog'] += 1
+                continue
+
+            engine = extract_engine(name)
+
+            for year in years:
+                master_cur.execute(insert_compat_sql, (
+                    catalog_id,
+                    make,
+                    model,
+                    year,
+                    engine,
+                    'import_text',
+                ))
+                stats['compat_rows'] += 1
+
+            interchanges = extract_interchanges(row)
+            for brand, pn in interchanges:
+                master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+                stats['interchange_rows'] += 1
+
+        master_conn.commit()
+        print(f"  Sheet '{sheet_name}' committed.")
+
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    for k, v in sorted(stats.items()):
+        print(f"{k:25s}: {v}")
+
+    master_cur.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_luk_catalog.py b/scripts/import_luk_catalog.py
new file mode 100644
index 0000000..5c1f4df
--- /dev/null
+++ b/scripts/import_luk_catalog.py
@@ -0,0 +1,235 @@
+#!/usr/bin/env python3
+"""
+Import LUK catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_luk_catalog.py
+"""
+
+import os
+import re
+import sys
+from collections import Counter
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+TENANT_DB_URL = os.environ.get('TENANT_DB_URL', 'postgresql://postgres@localhost/tenant_refaccionaria_rached')
+
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'LUK.xlsx')
+SUPPLIER_NAME = 'LUK'
+TENANT_ID = 31
+
+MULTI_WORD_MAKES = {
+    ('ALFA', 'ROMEO'): 'ALFA ROMEO',
+    ('MERCEDES', 'BENZ'): 'MERCEDES BENZ',
+    ('MG', 'ROVER'): 'MG ROVER',
+}
+
+NOTE_KEYWORDS = {
+    'VOLANTE', 'SÓLIDO', 'SOLIDO', 'TIPO', 'CAJA', 'PLANO',
+    'ESCALÓN', 'ESCALON', 'MOTOR', 'EMBRAGUE', 'DOBLE', 'HUMEDO',
+}
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def connect_tenant():
+    return psycopg2.connect(TENANT_DB_URL)
+
+
+def normalize_name(name):
+    if not name:
+        return ''
+    return ' '.join(str(name).replace('\n', ' ').split())
+
+
+def parse_luk(carro):
+    """Parse CARRO_PERTENECIENTE into make, model, year."""
+    if not carro:
+        return None, None, None
+    s = ' '.join(str(carro).strip().split())
+    if not s:
+        return None, None, None
+
+    parts = s.split()
+
+    # Extract year (last occurrence of 19xx or 20xx)
+    year = None
+    year_idx = None
+    for i in range(len(parts)):
+        if re.match(r'^(19|20)\d{2}$', parts[i]):
+            year = int(parts[i])
+            year_idx = i
+
+    # Extract make
+    make = parts[0] if parts else ''
+    make_len = 1
+    if len(parts) >= 2:
+        key2 = (parts[0].upper(), parts[1].upper())
+        if key2 in MULTI_WORD_MAKES:
+            make = MULTI_WORD_MAKES[key2]
+            make_len = 2
+        elif len(parts) >= 3 and parts[0].upper() == 'CHRYSLER' and parts[1] == '/' and parts[2].upper() == 'DODGE':
+            make = 'CHRYSLER / DODGE'
+            make_len = 3
+
+    # Remaining parts between make and year
+    if year_idx is not None:
+        remaining = parts[make_len:year_idx] + parts[year_idx + 1:]
+    else:
+        remaining = parts[make_len:]
+
+    # Clean note keywords
+    cleaned = [p for p in remaining if p.upper() not in NOTE_KEYWORDS]
+    model = ' '.join(cleaned)
+
+    # If empty after cleaning, use original remaining text
+    if not model and remaining:
+        model = ' '.join(remaining)
+
+    return make, model, year
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from 4 interchange columns."""
+    interchanges = []
+    for i in range(4):
+        marca_col = 2 + i * 2
+        inter_col = 3 + i * 2
+        if marca_col < len(row) and row[marca_col]:
+            brand = str(row[marca_col]).strip()
+            pn = str(row[inter_col]).strip() if inter_col < len(row) and row[inter_col] else ''
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting LUK import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+    ws = wb['KIT_CLUTCH']
+
+    master_conn = connect_master()
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+
+    # Pre-scan: determine most common name per SKU
+    print("Pre-scanning SKUs...")
+    sku_name_counter = Counter()
+    for row in ws.iter_rows(min_row=2, values_only=True):
+        sku = str(row[1]).strip() if row[1] else ''
+        name = normalize_name(row[10])
+        if sku and name:
+            sku_name_counter[(sku, name)] += 1
+
+    sku_best_name = {}
+    for (sku, name), count in sku_name_counter.items():
+        if sku not in sku_best_name or count > sku_best_name[sku][1]:
+            sku_best_name[sku] = (name, count)
+
+    print(f"  Found {len(sku_best_name)} unique SKUs")
+
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category)
+        VALUES (%s, %s, %s, %s, %s)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, %s, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    stats = {
+        'rows': 0,
+        'catalog_items': 0,
+        'compat_rows': 0,
+        'interchange_rows': 0,
+        'vehicles_parsed': 0,
+    }
+
+    catalog_id_cache = {}
+
+    for idx, row in enumerate(ws.iter_rows(min_row=2, values_only=True)):
+        if idx % 1000 == 0 and idx > 0:
+            print(f"  ...{idx} rows processed")
+
+        if not row or not row[1]:
+            continue
+
+        sku = str(row[1]).strip()
+        name = sku_best_name.get(sku, ('', 0))[0]
+        carro_raw = str(row[11]).strip() if row[11] else ''
+
+        if not sku or not name:
+            continue
+
+        stats['rows'] += 1
+
+        cache_key = (sku, 'KIT_CLUTCH')
+        catalog_id = catalog_id_cache.get(cache_key)
+        if catalog_id is None:
+            master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, 'KIT_CLUTCH'))
+            catalog_id = master_cur.fetchone()[0]
+            catalog_id_cache[cache_key] = catalog_id
+            stats['catalog_items'] += 1
+
+        parsed = parse_luk(carro_raw)
+        stats['vehicles_parsed'] += 1
+
+        master_cur.execute(insert_compat_sql, (
+            catalog_id,
+            parsed[0],
+            parsed[1],
+            parsed[2],
+            None,
+            None,
+            'import_text',
+        ))
+        stats['compat_rows'] += 1
+
+        interchanges = extract_interchanges(row)
+        for brand, pn in interchanges:
+            master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+            stats['interchange_rows'] += 1
+
+    master_conn.commit()
+
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    print(f"Total rows read:       {stats['rows']}")
+    print(f"Catalog items:         {stats['catalog_items']}")
+    print(f"Compat rows:           {stats['compat_rows']}")
+    print(f"Interchange rows:      {stats['interchange_rows']}")
+    print(f"Vehicles parsed:       {stats['vehicles_parsed']}")
+
+    master_cur.close()
+    master_conn.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_pdf_catalog.py b/scripts/import_pdf_catalog.py
new file mode 100755
index 0000000..cd05252
--- /dev/null
+++ b/scripts/import_pdf_catalog.py
@@ -0,0 +1,439 @@
+#!/usr/bin/env python3
+"""
+Import aftermarket parts catalog from PDF into Nexus Autoparts DB.
+
+Usage:
+  # Extract and preview (generates CSV for review)
+  python3 scripts/import_pdf_catalog.py extract catalogo_bosch.pdf "BOSCH" --output bosch_preview.csv
+
+  # Import after reviewing CSV
+  python3 scripts/import_pdf_catalog.py import bosch_preview.csv "BOSCH"
+
+The CSV should have columns:
+  part_number, name, price_usd, applications
+
+Applications column (optional): comma-separated vehicle descriptions like:
+  "TOYOTA COROLLA 2015-2020, NISSAN SENTRA 2016-2019"
+
+If applications is empty, the part will be created but not linked to vehicles.
+"""
+
+import os
+import sys
+import re
+import csv
+import json
+import argparse
+import subprocess
+import psycopg2
+from pathlib import Path
+
+# Add parent to path for config imports
+sys.path.insert(0, str(Path(__file__).parent.parent / "pos"))
+
+MASTER_DB_URL = os.environ.get("MASTER_DB_URL", "postgresql://postgres@localhost/nexus_autoparts")
+
+
+def get_db_conn():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def pdf_to_text(pdf_path):
+    """Extract text from PDF using pdftotext (preserves layout)."""
+    result = subprocess.run(
+        ["pdftotext", "-layout", pdf_path, "-"],
+        capture_output=True, text=True
+    )
+    if result.returncode != 0:
+        raise RuntimeError(f"pdftotext failed: {result.stderr}")
+    return result.stdout
+
+
+def extract_lines_fuzzy(text, min_cols=2):
+    """
+    Heuristic table extractor.
+    Looks for lines that have:
+      - A part number pattern (alphanumeric with dashes/slashes, 3+ chars)
+      - Some description text
+    Returns list of dicts with raw columns.
+    """
+    rows = []
+    lines = text.splitlines()
+
+    # Part number patterns: BOSCH 0 986 AF1 041, MOOG K80001, NGK BKR6E, etc.
+    part_number_patterns = [
+        re.compile(r'\b[0-9A-Z]{3,}(?:[-\s/][0-9A-Z]+){1,}\b'),  # codes with separators
+        re.compile(r'\b[A-Z]{1,3}\d{3,}[A-Z0-9]*\b'),             # MOOG K80001, NGK BKR6E
+        re.compile(r'\b\d{3,}[A-Z]{1,3}\d+\b'),                    # 123ABC45
+    ]
+
+    for line in lines:
+        line = line.strip()
+        if len(line) < 10:
+            continue
+
+        # Try to find a part number
+        part_number = None
+        for pat in part_number_patterns:
+            m = pat.search(line)
+            if m:
+                part_number = m.group(0).strip()
+                break
+
+        if not part_number:
+            continue
+
+        # Split line by 2+ spaces to get columns
+        cols = [c.strip() for c in re.split(r'\s{2,}', line) if c.strip()]
+        if len(cols) < min_cols:
+            continue
+
+        # Heuristic: part number is usually first or second column
+        # The rest is description, possibly with price at the end
+        name_parts = []
+        price = None
+        for col in cols:
+            if col == part_number:
+                continue
+            # Price detection
+            price_m = re.match(r'^\$?([0-9]{1,6}(?:\.[0-9]{1,2})?)$', col.replace(',', ''))
+            if price_m and not price:
+                price = float(price_m.group(1))
+                continue
+            name_parts.append(col)
+
+        name = ' '.join(name_parts) if name_parts else part_number
+        # Clean up name
+        name = re.sub(r'\s+', ' ', name).strip()
+        if len(name) < 3:
+            name = part_number
+
+        rows.append({
+            'part_number': part_number,
+            'name': name,
+            'price_usd': price,
+            'applications': '',
+            'raw': line,
+        })
+
+    return rows
+
+
+def preview_rows(rows, limit=20):
+    print(f"\nExtracted {len(rows)} candidate rows. First {limit}:")
+    print("-" * 100)
+    for i, r in enumerate(rows[:limit]):
+        print(f"{i+1}. PN: {r['part_number'][:30]:30s} | Name: {r['name'][:50]:50s} | Price: {r['price_usd']}")
+    print("-" * 100)
+
+
+def save_csv(rows, path):
+    with open(path, 'w', newline='', encoding='utf-8') as f:
+        writer = csv.DictWriter(f, fieldnames=['part_number', 'name', 'price_usd', 'applications'])
+        writer.writeheader()
+        for r in rows:
+            writer.writerow({
+                'part_number': r['part_number'],
+                'name': r['name'],
+                'price_usd': r['price_usd'] or '',
+                'applications': r['applications'],
+            })
+    print(f"Saved preview to {path}")
+
+
+def load_csv(path):
+    rows = []
+    with open(path, 'r', encoding='utf-8') as f:
+        reader = csv.DictReader(f)
+        for row in reader:
+            price = row.get('price_usd', '')
+            try:
+                price = float(price) if price else None
+            except ValueError:
+                price = None
+            rows.append({
+                'part_number': row.get('part_number', '').strip(),
+                'name': row.get('name', '').strip(),
+                'price_usd': price,
+                'applications': row.get('applications', '').strip(),
+            })
+    return rows
+
+
+def resolve_manufacturer(cur, name):
+    """Get or create manufacturer. Returns id_manufacture."""
+    cur.execute(
+        "SELECT id_manufacture FROM manufacturers WHERE UPPER(name_manufacture) = UPPER(%s)",
+        (name,)
+    )
+    row = cur.fetchone()
+    if row:
+        return row[0]
+
+    # Insert new manufacturer
+    cur.execute(
+        "INSERT INTO manufacturers (name_manufacture) VALUES (%s) RETURNING id_manufacture",
+        (name.upper() if len(name) <= 6 else name,)
+    )
+    return cur.fetchone()[0]
+
+
+def resolve_or_create_part(cur, oem_part_number, name):
+    """
+    parts.oem_part_number has UNIQUE index.
+    If it exists, return id_part. If not, insert.
+    """
+    cur.execute(
+        "SELECT id_part, name_part FROM parts WHERE oem_part_number = %s",
+        (oem_part_number,)
+    )
+    row = cur.fetchone()
+    if row:
+        return row[0]
+
+    # Need a group_id. Use 'General' group as default.
+    cur.execute("SELECT id_part_group FROM part_groups WHERE name_part_group = 'General' LIMIT 1")
+    grow = cur.fetchone()
+    group_id = grow[0] if grow else None
+
+    cur.execute(
+        """
+        INSERT INTO parts (oem_part_number, name_part, group_id)
+        VALUES (%s, %s, %s)
+        RETURNING id_part
+        """,
+        (oem_part_number, name, group_id)
+    )
+    return cur.fetchone()[0]
+
+
+def parse_applications(app_text):
+    """
+    Parse text like 'TOYOTA COROLLA 2015-2020, NISSAN SENTRA 2016-2019'
+    into list of (brand, model, year_from, year_to).
+    """
+    if not app_text:
+        return []
+
+    results = []
+    # Split by commas or slashes
+    entries = re.split(r'[,;/]', app_text)
+
+    for entry in entries:
+        entry = entry.strip()
+        if not entry:
+            continue
+
+        # Pattern: BRAND MODEL YEAR-YEAR  or  BRAND MODEL YEAR
+        m = re.match(
+            r'^([A-Z][A-Z\s]{1,20}?)\s+([A-Z0-9][A-Z0-9\s\-_]{1,30}?)\s+(\d{4})(?:\s*-\s*(\d{4}))?$',
+            entry.upper().strip()
+        )
+        if m:
+            brand = m.group(1).strip()
+            model = m.group(2).strip()
+            year_from = int(m.group(3))
+            year_to = int(m.group(4)) if m.group(4) else year_from
+            results.append((brand, model, year_from, year_to))
+        else:
+            # Try looser pattern: just BRAND MODEL
+            m2 = re.match(r'^([A-Z][A-Z\s]{1,20}?)\s+([A-Z0-9][A-Z0-9\s\-_]{1,30})$', entry.upper().strip())
+            if m2:
+                results.append((m2.group(1).strip(), m2.group(2).strip(), None, None))
+
+    return results
+
+
+def resolve_mye_ids(cur, brand_name, model_name, year_from, year_to):
+    """Find MYE ids matching brand/model/year range."""
+    myes = []
+
+    # Find brand
+    cur.execute("SELECT id_brand FROM brands WHERE UPPER(name_brand) = UPPER(%s)", (brand_name,))
+    brow = cur.fetchone()
+    if not brow:
+        return myes
+    brand_id = brow[0]
+
+    # Find model (fuzzy)
+    cur.execute(
+        """
+        SELECT id_model, name_model FROM models
+        WHERE brand_id = %s AND UPPER(name_model) LIKE UPPER(%s)
+        ORDER BY name_model
+        LIMIT 5
+        """,
+        (brand_id, f"%{model_name}%")
+    )
+    models = cur.fetchall()
+    if not models:
+        return myes
+
+    # Use first match
+    model_id = models[0][0]
+
+    # Find MYEs for year range
+    if year_from and year_to:
+        cur.execute(
+            """
+            SELECT mye.id_mye FROM model_year_engine mye
+            JOIN years y ON y.id_year = mye.year_id
+            WHERE mye.model_id = %s AND y.year_car BETWEEN %s AND %s
+            """,
+            (model_id, year_from, year_to)
+        )
+    elif year_from:
+        cur.execute(
+            """
+            SELECT mye.id_mye FROM model_year_engine mye
+            JOIN years y ON y.id_year = mye.year_id
+            WHERE mye.model_id = %s AND y.year_car = %s
+            """,
+            (model_id, year_from)
+        )
+    else:
+        cur.execute(
+            "SELECT id_mye FROM model_year_engine WHERE model_id = %s",
+            (model_id,)
+        )
+
+    myes = [r[0] for r in cur.fetchall()]
+    return myes
+
+
+def import_rows(rows, manufacturer_name, dry_run=False):
+    conn = get_db_conn()
+    cur = conn.cursor()
+
+    try:
+        manufacturer_id = resolve_manufacturer(cur, manufacturer_name)
+        print(f"Manufacturer '{manufacturer_name}' → id={manufacturer_id}")
+
+        inserted_parts = 0
+        inserted_am = 0
+        linked_vehicles = 0
+        skipped = 0
+
+        for i, row in enumerate(rows):
+            pn = row['part_number']
+            name = row['name'] or pn
+            price = row['price_usd']
+
+            if not pn:
+                skipped += 1
+                continue
+
+            if dry_run:
+                print(f"  [DRY] {pn} | {name[:40]} | ${price}")
+                continue
+
+            # 1. Ensure part exists in parts table
+            part_id = resolve_or_create_part(cur, pn, name)
+
+            # 2. Insert/upsert aftermarket_parts
+            cur.execute(
+                """
+                SELECT id_aftermarket_parts FROM aftermarket_parts
+                WHERE part_number = %s AND manufacturer_id = %s
+                """,
+                (pn, manufacturer_id)
+            )
+            existing = cur.fetchone()
+            if existing:
+                # Update
+                cur.execute(
+                    """
+                    UPDATE aftermarket_parts
+                    SET name_aftermarket_parts = %s,
+                        price_usd = COALESCE(%s, price_usd),
+                        oem_part_id = %s
+                    WHERE id_aftermarket_parts = %s
+                    """,
+                    (name, price, part_id, existing[0])
+                )
+            else:
+                cur.execute(
+                    """
+                    INSERT INTO aftermarket_parts
+                    (oem_part_id, manufacturer_id, part_number, name_aftermarket_parts, price_usd)
+                    VALUES (%s, %s, %s, %s, %s)
+                    """,
+                    (part_id, manufacturer_id, pn, name, price)
+                )
+                inserted_am += 1
+
+            inserted_parts += 1
+
+            # 3. Link vehicles if applications provided
+            apps = row.get('applications', '')
+            if apps:
+                parsed = parse_applications(apps)
+                for brand, model, yf, yt in parsed:
+                    myes = resolve_mye_ids(cur, brand, model, yf, yt)
+                    for mye_id in myes:
+                        cur.execute(
+                            """
+                            INSERT INTO vehicle_parts (part_id, model_year_engine_id)
+                            VALUES (%s, %s)
+                            ON CONFLICT DO NOTHING
+                            """,
+                            (part_id, mye_id)
+                        )
+                        linked_vehicles += 1
+
+            if (i + 1) % 100 == 0:
+                print(f"  ... processed {i+1}/{len(rows)}")
+
+        conn.commit()
+        print(f"\nDone!")
+        print(f"  Parts processed: {inserted_parts}")
+        print(f"  Aftermarket parts inserted/updated: {inserted_am}")
+        print(f"  Vehicle links created: {linked_vehicles}")
+        print(f"  Skipped (no PN): {skipped}")
+
+    except Exception as e:
+        conn.rollback()
+        raise
+    finally:
+        cur.close()
+        conn.close()
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Import aftermarket catalog from PDF')
+    subparsers = parser.add_subparsers(dest='command')
+
+    # Extract command
+    ext = subparsers.add_parser('extract', help='Extract PDF to preview CSV')
+    ext.add_argument('pdf', help='Path to PDF file')
+    ext.add_argument('manufacturer', help='Manufacturer name')
+    ext.add_argument('--output', '-o', default='catalog_preview.csv', help='Output CSV path')
+
+    # Import command
+    imp = subparsers.add_parser('import', help='Import reviewed CSV to DB')
+    imp.add_argument('csv', help='Path to reviewed CSV')
+    imp.add_argument('manufacturer', help='Manufacturer name')
+    imp.add_argument('--dry-run', action='store_true', help='Preview without writing to DB')
+
+    args = parser.parse_args()
+
+    if args.command == 'extract':
+        print(f"Extracting {args.pdf}...")
+        text = pdf_to_text(args.pdf)
+        rows = extract_lines_fuzzy(text)
+        preview_rows(rows)
+        save_csv(rows, args.output)
+        print(f"\nNext step: Review {args.output}, add 'applications' column if needed,")
+        print(f"then run: python3 scripts/import_pdf_catalog.py import {args.output} '{args.manufacturer}'")
+
+    elif args.command == 'import':
+        rows = load_csv(args.csv)
+        print(f"Loaded {len(rows)} rows from {args.csv}")
+        import_rows(rows, args.manufacturer, dry_run=args.dry_run)
+
+    else:
+        parser.print_help()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_rached_excel.py b/scripts/import_rached_excel.py
new file mode 100755
index 0000000..f8f19b2
--- /dev/null
+++ b/scripts/import_rached_excel.py
@@ -0,0 +1,183 @@
+#!/usr/bin/env python3
+"""
+Importar inventario de refaccionaria_rached desde Excel.
+
+Archivo fuente: /home/Autopartes/data/PRODUCTOS_RACHED_2026.xlsx
+Hoja: Hoja1
+Columnas:
+  A: Codigo      -> part_number
+  B: CB          -> barcode (ignored, mostly empty)
+  C: Cve         -> sku_alias (inventory_sku_aliases)
+  D: Descripcion -> name
+  E: Precio Costo -> cost
+  F: Precio Venta -> price_1
+
+No hay columnas de stock, marca, ni vehiculo. Stock se deja en 0.
+"""
+
+import os
+import sys
+import re
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+
+import psycopg2
+from services.barcode_generator import generate_barcodes_batch
+
+# ─── Config ──────────────────────────────────────────
+DB_NAME = "tenant_refaccionaria_rached"
+BRANCH_ID = 1
+EXCEL_PATH = "/home/Autopartes/data/PRODUCTOS_RACHED_2026.xlsx"
+BATCH_SIZE = 500
+
+# Connect as local postgres user (peer auth)
+conn = psycopg2.connect(f"dbname={DB_NAME} user=postgres")
+conn.autocommit = False
+cur = conn.cursor()
+
+# ─── Read Excel ──────────────────────────────────────
+import openpyxl
+wb = openpyxl.load_workbook(EXCEL_PATH, data_only=True)
+ws = wb["Hoja1"]
+rows = list(ws.iter_rows(min_row=2, values_only=True))
+print(f"Filas leidas del Excel: {len(rows)}")
+
+# ─── Pre-fetch existing part_numbers ─────────────────
+existing_map = {}
+cur.execute("SELECT id, part_number FROM inventory WHERE branch_id = %s", (BRANCH_ID,))
+for item_id, pn in cur.fetchall():
+    existing_map[pn.strip().upper()] = item_id
+cur.close()
+conn.commit()
+
+# ─── Prepare lists ───────────────────────────────────
+to_insert = []   # (part_number, name, cost, price_1)
+to_alias = []    # (part_number, alias_sku)
+skipped = 0
+
+for row in rows:
+    codigo = str(row[0]).strip() if row[0] is not None else ""
+    cve = str(row[2]).strip() if row[2] is not None else ""
+    descripcion = str(row[3]).strip() if row[3] is not None else ""
+    precio_costo = float(row[4]) if row[4] is not None else 0.0
+    precio_venta = float(row[5]) if row[5] is not None else 0.0
+
+    if not codigo or not descripcion:
+        skipped += 1
+        continue
+
+    # Clean description (remove weird chars)
+    descripcion = descripcion.replace("\x81", "").replace("\x80", "").strip()
+
+    to_insert.append((codigo, descripcion, precio_costo, precio_venta))
+    if cve:
+        to_alias.append((codigo, cve))
+
+print(f"Filas validas para importar: {len(to_insert)}")
+print(f"Filas con SKU alternativo (Cve): {len(to_alias)}")
+print(f"Filas saltadas (sin codigo/descripcion): {skipped}")
+
+# ─── Batch insert / update inventory ─────────────────
+cur = conn.cursor()
+inserted_count = 0
+updated_count = 0
+
+# Split into new vs existing
+new_items = []
+update_items = []
+for codigo, descripcion, cost, price in to_insert:
+    key = codigo.upper()
+    if key in existing_map:
+        update_items.append((descripcion, cost, price, existing_map[key]))
+    else:
+        new_items.append((codigo, descripcion, cost, price))
+
+print(f"Nuevos: {len(new_items)} | Existentes a actualizar: {len(update_items)}")
+
+# Generate barcodes for new items in batch
+barcodes = []
+if new_items:
+    barcodes = generate_barcodes_batch(conn, DB_NAME, len(new_items))
+
+# Insert new items
+for i, (codigo, descripcion, cost, price) in enumerate(new_items):
+    barcode = barcodes[i]
+    cur.execute(
+        """
+        INSERT INTO inventory
+        (branch_id, part_number, barcode, name, cost, price_1, unit, is_active)
+        VALUES (%s, %s, %s, %s, %s, %s, %s, %s)
+        ON CONFLICT (branch_id, part_number) DO UPDATE SET
+            name = EXCLUDED.name,
+            cost = CASE WHEN EXCLUDED.cost > 0 THEN EXCLUDED.cost ELSE inventory.cost END,
+            price_1 = CASE WHEN EXCLUDED.price_1 > 0 THEN EXCLUDED.price_1 ELSE inventory.price_1 END
+        RETURNING id, (xmax = 0) AS inserted
+        """,
+        (BRANCH_ID, codigo, barcode, descripcion, cost, price, "PZA", True)
+    )
+    item_id, was_inserted = cur.fetchone()
+    if was_inserted:
+        inserted_count += 1
+    else:
+        updated_count += 1
+    # Add to map for alias linking
+    existing_map[codigo.upper()] = item_id
+
+    if (i + 1) % BATCH_SIZE == 0:
+        conn.commit()
+        print(f"  Procesados {i + 1}/{len(new_items)} nuevos...")
+
+# Update existing items (that weren't caught by ON CONFLICT above, if any)
+for descripcion, cost, price, item_id in update_items:
+    cur.execute(
+        """
+        UPDATE inventory SET
+            name = %s,
+            cost = CASE WHEN %s > 0 THEN %s ELSE cost END,
+            price_1 = CASE WHEN %s > 0 THEN %s ELSE price_1 END
+        WHERE id = %s
+        """,
+        (descripcion, cost, cost, price, price, item_id)
+    )
+    updated_count += 1
+
+conn.commit()
+print(f"Insertados: {inserted_count} | Actualizados: {updated_count}")
+
+# ─── Insert SKU aliases ──────────────────────────────
+alias_inserted = 0
+alias_skipped = 0
+for codigo, cve in to_alias:
+    item_id = existing_map.get(codigo.upper())
+    if not item_id:
+        alias_skipped += 1
+        continue
+    try:
+        cur.execute(
+            """
+            INSERT INTO inventory_sku_aliases (inventory_id, sku, label)
+            VALUES (%s, %s, %s)
+            ON CONFLICT (inventory_id, sku) DO NOTHING
+            """,
+            (item_id, cve, "Cve")
+        )
+        if cur.rowcount > 0:
+            alias_inserted += 1
+    except Exception as e:
+        print(f"  Alias error for {codigo}/{cve}: {e}")
+        alias_skipped += 1
+
+conn.commit()
+cur.close()
+conn.close()
+
+print("\n========================================")
+print("IMPORTACION RACHED COMPLETADA")
+print("========================================")
+print(f"Filas procesadas:   {len(to_insert)}")
+print(f"Nuevos insertados:  {inserted_count}")
+print(f"Exist. actualizados:{updated_count}")
+print(f"SKU aliases creados:{alias_inserted}")
+print(f"Aliases fallidos:   {alias_skipped}")
+print(f"Filas saltadas:     {skipped}")
+print("========================================")
diff --git a/scripts/import_raybestos_catalog.py b/scripts/import_raybestos_catalog.py
new file mode 100644
index 0000000..9f3668d
--- /dev/null
+++ b/scripts/import_raybestos_catalog.py
@@ -0,0 +1,303 @@
+#!/usr/bin/env python3
+"""
+Import Raybestos catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_raybestos_catalog.py
+"""
+
+import os
+import re
+import sys
+from collections import Counter
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+TENANT_DB_URL = os.environ.get('TENANT_DB_URL', 'postgresql://postgres@localhost/tenant_refaccionaria_rached')
+
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'RAYBESTOS.xlsx')
+SUPPLIER_NAME = 'RAYBESTOS'
+TENANT_ID = 31
+
+KNOWN_MAKES = {
+    'ACURA', 'ALFA', 'AMERICAN', 'ASTON', 'AUDI', 'BMW', 'BUICK', 'CADILLAC',
+    'CHEVROLET', 'CHRYSLER', 'CITROEN', 'DAEWOO', 'DODGE', 'FIAT', 'FORD',
+    'GMC', 'GREAT', 'HONDA', 'HYUNDAI', 'INFINITI', 'ISUZU', 'JAGUAR', 'JEEP',
+    'KIA', 'LAMBORGHINI', 'LAND', 'LEXUS', 'LINCOLN', 'MAZDA', 'MERCEDES',
+    'MERCURY', 'MINI', 'MITSUBISHI', 'NISSAN', 'PEUGEOT', 'PONTIAC', 'PORSCHE',
+    'RENAULT', 'ROLLS', 'SATURN', 'SCION', 'SEAT', 'SKODA', 'SMART', 'SUBARU',
+    'SUZUKI', 'TESLA', 'TOYOTA', 'VOLKSWAGEN', 'VOLSWAGEN', 'VOLVO', 'VW'
+}
+
+POS_KEYWORDS = {'DELANTERA', 'TRASERA', 'TAS', 'DEL', 'TRAS', 'FRONT', 'REAR', 'LAT', 'IZQ', 'DER'}
+NOTE_KEYWORDS = {'LATIN', 'AMERICA', 'NACIONAL', 'USA', 'EUROPA', 'IMPORTADO'}
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def connect_tenant():
+    return psycopg2.connect(TENANT_DB_URL)
+
+
+def normalize_name(name):
+    if not name:
+        return ''
+    return ' '.join(str(name).replace('\n', ' ').split())
+
+
+def parse_abbr_year(token):
+    if not token or not token.isdigit():
+        return None
+    n = int(token)
+    if n < 50:
+        return 2000 + n
+    if n < 100:
+        return 1900 + n
+    return None
+
+
+def extract_make(parts):
+    """Return (make, make_len) if first words form a known make, else (None, 0)."""
+    if not parts:
+        return None, 0
+    first = parts[0].upper()
+    if first not in KNOWN_MAKES:
+        return None, 0
+    if first == 'ALFA' and len(parts) >= 2 and parts[1].upper() == 'ROMEO':
+        return 'ALFA ROMEO', 2
+    if first == 'MERCEDES' and len(parts) >= 2 and parts[1].upper() == 'BENZ':
+        return 'MERCEDES BENZ', 2
+    if first == 'ROLLS' and len(parts) >= 2 and parts[1].upper() == 'ROYCE':
+        return 'ROLLS ROYCE', 2
+    if first == 'LAND' and len(parts) >= 2 and parts[1].upper() == 'ROVER':
+        return 'LAND ROVER', 2
+    if first == 'GREAT' and len(parts) >= 2 and parts[1].upper() == 'WALL':
+        return 'GREAT WALL', 2
+    if first == 'AMERICAN' and len(parts) >= 2 and parts[1].upper() == 'MOTORS':
+        return 'AMERICAN MOTORS', 2
+    if first == 'ASTON' and len(parts) >= 2 and parts[1].upper() == 'MARTIN':
+        return 'ASTON MARTIN', 2
+    # Normalize common typos
+    if first == 'VOLSWAGEN':
+        return 'Volkswagen', 1
+    if first == 'VW':
+        return 'Volkswagen', 1
+    return parts[0], 1
+
+
+def parse_raybestos(carro, last_make):
+    if not carro:
+        return None, None, None, None, last_make
+    s = ' '.join(str(carro).strip().split())
+    if not s:
+        return None, None, None, None, last_make
+
+    parts = s.split()
+
+    # Extract 4-digit year from end
+    year = None
+    if parts and re.match(r'^(19|20)\d{2}$', parts[-1]):
+        year = int(parts[-1])
+        parts = parts[:-1]
+
+    # Extract make
+    make, make_len = extract_make(parts)
+    if make:
+        last_make = make
+        remaining = parts[make_len:]
+    elif last_make:
+        make = last_make
+        remaining = parts[:]
+    else:
+        make = None
+        remaining = parts[:]
+
+    # Extract abbreviated year or year range from remaining
+    if year is None and remaining:
+        for i in range(len(remaining)):
+            # Year range like 17-18, 90-05
+            m = re.match(r'^(\d{2})-(\d{2})$', remaining[i])
+            if m:
+                year = parse_abbr_year(m.group(2))  # use end year
+                remaining = remaining[:i] + remaining[i + 1:]
+                break
+            # Single 2-digit year
+            if re.match(r'^\d{2}$', remaining[i]):
+                y = parse_abbr_year(remaining[i])
+                if y:
+                    year = y
+                    remaining = remaining[:i] + remaining[i + 1:]
+                    break
+
+    # Extract position keywords and notes
+    position = None
+    cleaned = []
+    for p in remaining:
+        pup = p.upper()
+        if pup in POS_KEYWORDS:
+            if pup == 'TAS':
+                position = 'TRASERA'
+            elif pup in ('DEL', 'FRONT'):
+                position = 'DELANTERA'
+            elif pup in ('TRAS', 'REAR'):
+                position = 'TRASERA'
+            else:
+                position = pup.title()
+        elif pup in NOTE_KEYWORDS:
+            pass  # skip notes
+        else:
+            cleaned.append(p)
+
+    model = ' '.join(cleaned)
+
+    return make, model, position, year, last_make
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from 2 interchange columns."""
+    interchanges = []
+    for i in range(2):
+        marca_col = 2 + i * 2
+        inter_col = 3 + i * 2
+        if marca_col < len(row) and row[marca_col]:
+            brand = str(row[marca_col]).strip()
+            pn = str(row[inter_col]).strip() if inter_col < len(row) and row[inter_col] else ''
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting Raybestos import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+    ws = wb['Freno_de_disco']
+
+    master_conn = connect_master()
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+
+    # Pre-scan: determine most common name per SKU
+    print("Pre-scanning SKUs...")
+    sku_name_counter = Counter()
+    for row in ws.iter_rows(min_row=2, values_only=True):
+        sku = str(row[1]).strip() if row[1] else ''
+        name = normalize_name(row[6])
+        if sku and name:
+            sku_name_counter[(sku, name)] += 1
+
+    sku_best_name = {}
+    for (sku, name), count in sku_name_counter.items():
+        if sku not in sku_best_name or count > sku_best_name[sku][1]:
+            sku_best_name[sku] = (name, count)
+
+    print(f"  Found {len(sku_best_name)} unique SKUs")
+
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category)
+        VALUES (%s, %s, %s, %s, %s)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, %s, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    stats = {
+        'rows': 0,
+        'catalog_items': 0,
+        'compat_rows': 0,
+        'interchange_rows': 0,
+        'vehicles_parsed': 0,
+        'forward_filled_make': 0,
+    }
+
+    catalog_id_cache = {}
+    last_make = None
+
+    for idx, row in enumerate(ws.iter_rows(min_row=2, values_only=True)):
+        if idx % 1000 == 0 and idx > 0:
+            print(f"  ...{idx} rows processed")
+
+        if not row or not row[1]:
+            continue
+
+        sku = str(row[1]).strip()
+        name = sku_best_name.get(sku, ('', 0))[0]
+        carro_raw = str(row[7]).strip() if row[7] else ''
+
+        if not sku or not name:
+            continue
+
+        stats['rows'] += 1
+
+        cache_key = (sku, 'Freno_de_disco')
+        catalog_id = catalog_id_cache.get(cache_key)
+        if catalog_id is None:
+            master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, 'Freno_de_disco'))
+            catalog_id = master_cur.fetchone()[0]
+            catalog_id_cache[cache_key] = catalog_id
+            stats['catalog_items'] += 1
+
+        make, model, position, year, last_make = parse_raybestos(carro_raw, last_make)
+        if make and carro_raw and not extract_make(carro_raw.split())[0]:
+            stats['forward_filled_make'] += 1
+        stats['vehicles_parsed'] += 1
+
+        master_cur.execute(insert_compat_sql, (
+            catalog_id,
+            make,
+            model,
+            year,
+            position,
+            None,
+            'import_text',
+        ))
+        stats['compat_rows'] += 1
+
+        interchanges = extract_interchanges(row)
+        for brand, pn in interchanges:
+            master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+            stats['interchange_rows'] += 1
+
+    master_conn.commit()
+
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    print(f"Total rows read:       {stats['rows']}")
+    print(f"Catalog items:         {stats['catalog_items']}")
+    print(f"Compat rows:           {stats['compat_rows']}")
+    print(f"Interchange rows:      {stats['interchange_rows']}")
+    print(f"Vehicles parsed:       {stats['vehicles_parsed']}")
+    print(f"Forward-filled makes:  {stats['forward_filled_make']}")
+
+    master_cur.close()
+    master_conn.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_vazlo_catalog.py b/scripts/import_vazlo_catalog.py
new file mode 100644
index 0000000..28c4241
--- /dev/null
+++ b/scripts/import_vazlo_catalog.py
@@ -0,0 +1,285 @@
+#!/usr/bin/env python3
+"""
+Import VAZLO catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_vazlo_catalog.py
+"""
+
+import os
+import re
+import sys
+from collections import defaultdict
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+# DB connections
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+TENANT_DB_URL = os.environ.get('TENANT_DB_URL', 'postgresql://postgres@localhost/tenant_refaccionaria_rached')
+
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'VAZLO (1).xlsx')
+SUPPLIER_NAME = 'VAZLO'
+TENANT_ID = 31
+
+POS_KEYWORDS = {
+    'DEL.', 'TRAS.', 'FRONT.', 'EXT.', 'IZQ.', 'DER.', 'RUEDA', 'CAJA',
+    'INF.', 'SUP.', 'TRANS.', 'STD', 'AWD', '2/4WD', '4WD', 'FWD', 'RWD',
+    '4X4', 'TURBO', 'GASOLINA', 'DIESEL',
+    'DEL', 'TRAS', 'FRONT', 'EXT', 'IZQ', 'DER', 'INF', 'SUP', 'TRANS',
+}
+
+MULTI_WORD_MAKES = {
+    ('MERCEDES', 'BENZ'): 'MERCEDES BENZ',
+    ('LAND', 'ROVER'): 'LAND ROVER',
+    ('ALFA', 'ROMEO'): 'ALFA ROMEO',
+    ('AMERICAN', 'MOTORS'): 'AMERICAN MOTORS',
+    ('ROLLS', 'ROYCE'): 'ROLLS ROYCE',
+    ('ASTON', 'MARTIN'): 'ASTON MARTIN',
+    ('GREAT', 'WALL'): 'GREAT WALL',
+}
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def connect_tenant():
+    return psycopg2.connect(TENANT_DB_URL)
+
+
+def collect_all_skus(wb):
+    """Pre-scan all SKUs to detect SKU-in-model cases."""
+    skus = set()
+    for sheet_name in wb.sheetnames:
+        ws = wb[sheet_name]
+        for row in ws.iter_rows(min_row=2, values_only=True):
+            sku = str(row[1]).strip() if row[1] else ''
+            if sku:
+                skus.add(sku)
+    return skus
+
+
+def parse_carro(carro, all_skus):
+    """
+    Parse CARRO_PERTENECIENTE like:
+      'ACURA TL DEL. 2015'
+      'BMW X1 SDRIVE 20IA TRAS. 2018'
+      'ACURA TL FRONT. DER. 2004'
+      'AUDI 4000S CAJA 1980'
+      'MERCEDES BENZ C350 E --'
+      'ACURA TLX 3429'  (3429 is a SKU inserted into model)
+
+    Returns dict with make, model, year, position, raw.
+    """
+    if not carro:
+        return {'make': None, 'model': None, 'year': None, 'position': None, 'raw': carro}
+
+    s = str(carro).strip()
+    parts = s.split()
+    if not parts:
+        return {'make': None, 'model': None, 'year': None, 'position': None, 'raw': s}
+
+    # Extract year from end
+    year = None
+    if re.match(r'^(19|20)\d{2}$', parts[-1]):
+        year = int(parts[-1])
+        parts = parts[:-1]
+
+    # Remove trailing '--' (no-year marker)
+    if parts and parts[-1] == '--':
+        parts = parts[:-1]
+
+    # Extract make
+    make = parts[0] if parts else ''
+    if len(parts) >= 2:
+        key = (parts[0].upper(), parts[1].upper())
+        if key in MULTI_WORD_MAKES:
+            make = MULTI_WORD_MAKES[key]
+            parts = parts[2:]
+        else:
+            parts = parts[1:]
+    else:
+        parts = parts[1:]
+
+    # Extract position keywords from the end
+    position_parts = []
+    while parts and parts[-1].upper() in POS_KEYWORDS:
+        position_parts.insert(0, parts[-1])
+        parts = parts[:-1]
+
+    model = ' '.join(parts)
+
+    # Remove trailing SKU numbers that match known VAZLO SKUs
+    # e.g. "ACURA TLX 3429" -> model="TLX", sku_suffix="3429"
+    model_parts = model.split()
+    if model_parts and re.match(r'^\d{3,4}$', model_parts[-1]) and model_parts[-1] in all_skus:
+        model = ' '.join(model_parts[:-1])
+
+    return {
+        'make': make,
+        'model': model,
+        'year': year,
+        'position': ' '.join(position_parts),
+        'raw': s,
+    }
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from all 11 interchange columns."""
+    interchanges = []
+    for i in range(11):
+        marca_col = 2 + i * 2
+        inter_col = 3 + i * 2
+        if marca_col < len(row) and row[marca_col]:
+            brand = str(row[marca_col]).strip()
+            pn = str(row[inter_col]).strip() if inter_col < len(row) and row[inter_col] else ''
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def normalize_name(name):
+    """Clean up piece name: collapse whitespace, replace newlines."""
+    if not name:
+        return ''
+    return ' '.join(str(name).replace('\n', ' ').split())
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting VAZLO import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+
+    # Pre-scan SKUs for SKU-in-model detection
+    print("Pre-scanning SKUs...")
+    all_skus = collect_all_skus(wb)
+    print(f"  Found {len(all_skus)} unique SKUs")
+
+    master_conn = connect_master()
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category, is_active)
+        VALUES (%s, %s, %s, %s, true)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category,
+            is_active = true
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, %s, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    stats = {
+        'sheets': 0,
+        'rows': 0,
+        'catalog_items': 0,
+        'compat_rows': 0,
+        'interchange_rows': 0,
+        'vehicles_parsed': 0,
+        'skipped_no_sku': 0,
+        'skipped_no_carro': 0,
+    }
+
+    for sheet_name in wb.sheetnames:
+        ws = wb[sheet_name]
+        rows = list(ws.iter_rows(values_only=True))
+        if not rows:
+            continue
+        data_rows = rows[1:]
+        stats['sheets'] += 1
+        print(f"\nProcessing sheet '{sheet_name}' with {len(data_rows)} rows...")
+
+        # Cache catalog_id per (sku, sheet_name) to avoid repeated upserts
+        catalog_id_cache = {}
+
+        for idx, row in enumerate(data_rows):
+            if idx % 2000 == 0 and idx > 0:
+                print(f"  ...{idx} rows processed")
+
+            if not row or not row[1]:
+                stats['skipped_no_sku'] += 1
+                continue
+
+            sku = str(row[1]).strip()
+            name = normalize_name(row[24])
+            carro_raw = str(row[25]).strip() if row[25] else ''
+
+            if not sku:
+                stats['skipped_no_sku'] += 1
+                continue
+
+            stats['rows'] += 1
+
+            # Upsert catalog item (keyed by sku + category)
+            cache_key = (sku, sheet_name)
+            catalog_id = catalog_id_cache.get(cache_key)
+            if catalog_id is None:
+                master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, sheet_name))
+                catalog_id = master_cur.fetchone()[0]
+                catalog_id_cache[cache_key] = catalog_id
+                stats['catalog_items'] += 1
+
+            # Parse vehicle
+            parsed = parse_carro(carro_raw, all_skus)
+            stats['vehicles_parsed'] += 1
+
+            # Insert compatibility (text-only, no MYE matching during import)
+            master_cur.execute(insert_compat_sql, (
+                catalog_id,
+                parsed['make'],
+                parsed['model'],
+                parsed['year'],
+                parsed['position'] or None,
+                None,
+                'import_text',
+            ))
+            stats['compat_rows'] += 1
+
+            # Insert interchanges
+            interchanges = extract_interchanges(row)
+            for brand, pn in interchanges:
+                master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+                stats['interchange_rows'] += 1
+
+        # Commit per sheet
+        master_conn.commit()
+        print(f"  Sheet '{sheet_name}' committed.")
+
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    print(f"Sheets processed:      {stats['sheets']}")
+    print(f"Total rows read:       {stats['rows']}")
+    print(f"Catalog items:         {stats['catalog_items']}")
+    print(f"Compat rows:           {stats['compat_rows']}")
+    print(f"Interchange rows:      {stats['interchange_rows']}")
+    print(f"Vehicles parsed:       {stats['vehicles_parsed']}")
+    print(f"Skipped (no SKU):      {stats['skipped_no_sku']}")
+
+    master_cur.close()
+    master_conn.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/import_yokomitsu_catalog.py b/scripts/import_yokomitsu_catalog.py
new file mode 100755
index 0000000..0a1a966
--- /dev/null
+++ b/scripts/import_yokomitsu_catalog.py
@@ -0,0 +1,393 @@
+#!/usr/bin/env python3
+"""
+Import Yokomitsu catalog from Excel into supplier_catalog tables.
+
+Usage:
+    python scripts/import_yokomitsu_catalog.py
+"""
+
+import os
+import re
+import sys
+from datetime import datetime
+
+import psycopg2
+from openpyxl import load_workbook
+
+# DB connections
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+TENANT_DB_URL = os.environ.get('TENANT_DB_URL', 'postgresql://postgres@localhost/tenant_refaccionaria_rached')
+
+EXCEL_PATH = os.path.join(os.path.dirname(__file__), '..', 'data', 'YOKOMITSU_CATALOGOS_COMPLETOS_TODOS.xlsx')
+SUPPLIER_NAME = 'YOKOMITSU'
+TENANT_ID = 31
+
+
+def connect_master():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def connect_tenant():
+    return psycopg2.connect(TENANT_DB_URL)
+
+
+def parse_year(token):
+    """Parse a 2-digit or 4-digit year string."""
+    token = token.strip()
+    if not token:
+        return None
+    # Handle ranges like 08-13 or 08-15 -> use first year
+    if '-' in token:
+        token = token.split('-')[0]
+    token = token.strip()
+    if not token.isdigit():
+        return None
+    n = int(token)
+    if n < 50:
+        return 2000 + n
+    if n < 100:
+        return 1900 + n
+    if n >= 1900 and n <= 2050:
+        return n
+    return None
+
+
+def parse_vehicle(vehicle_raw):
+    """
+    Parse a vehicle string like:
+      'Chevrolet AVEO 1.5L 18'
+      'Audi A4 1.8L/2.0L 09'
+      'Dodge GRAND CHEROKEE 2/4WD 3.0L/3.7L/4.7L 08'
+      'Volkswagen JETTA A4/CLASICO 1.8L/2.0L 06 V'
+      'NISSAN 720 1988'
+      'Dodge CARAVAN/VOYAGER 00'
+      'ER 08-15 10'  (garbage/unknown)
+
+    Returns dict with make, model, year, engine, vehicle_raw.
+    """
+    if not vehicle_raw:
+        return {'make': None, 'model': None, 'year': None, 'engine': None, 'vehicle_raw': vehicle_raw}
+
+    s = str(vehicle_raw).strip()
+    # Remove trailing 'V' (variant marker)
+    s = re.sub(r'\s+V$', '', s)
+
+    tokens = s.split()
+    if len(tokens) < 2:
+        return {'make': None, 'model': None, 'year': None, 'engine': None, 'vehicle_raw': s}
+
+    # Last token is usually year (or year with suffix)
+    year = parse_year(tokens[-1])
+    if year is None and len(tokens) >= 3:
+        # Try second-to-last if last doesn't look like year
+        year = parse_year(tokens[-2])
+        if year:
+            tokens = tokens[:-2] + [tokens[-1]]  # keep last as extra, but year found at -2
+            year = parse_year(tokens[-2])
+    if year is None:
+        # No year found; keep raw and try best-effort
+        make = tokens[0] if tokens else None
+        return {'make': make, 'model': ' '.join(tokens[1:]) if len(tokens) > 1 else None,
+                'year': None, 'engine': None, 'vehicle_raw': s}
+
+    # Remove year token
+    tokens_without_year = tokens[:-1]
+    make = tokens_without_year[0] if tokens_without_year else None
+
+    # Try to extract engine from remaining tokens
+    # Engine patterns: contains 'L', 'WD', 'DIESEL', 'TURBO', numeric with decimal
+    remaining = ' '.join(tokens_without_year[1:]) if len(tokens_without_year) > 1 else ''
+
+    # Heuristic: look for engine tokens at the END of remaining string
+    # Common patterns: "1.5L", "1.8L/2.0L", "2/4WD", "3.0L/3.7L/4.7L", "1.9L DIESEL"
+    engine = None
+    model = remaining
+
+    # Try to find engine pattern from the end
+    engine_match = re.search(r'(\d+(?:\.\d+)?\s*L(?:/\d+(?:\.\d+)?\s*L)*|\d+/\d+WD|\d+\.\d+L\s+DIESEL|\d+\.\d+L\s+TURBO)$', remaining, re.IGNORECASE)
+    if engine_match:
+        engine = engine_match.group(1)
+        model = remaining[:engine_match.start()].strip()
+    else:
+        # Try simpler: anything with digits and 'L' or 'WD' at the very end
+        parts = remaining.split()
+        if parts and re.search(r'\d', parts[-1]) and ('L' in parts[-1].upper() or 'WD' in parts[-1].upper()):
+            engine = parts[-1]
+            model = ' '.join(parts[:-1])
+
+    return {
+        'make': make,
+        'model': model,
+        'year': year,
+        'engine': engine,
+        'vehicle_raw': s,
+    }
+
+
+def build_brand_cache(cur):
+    """Fetch all brands from master DB."""
+    cur.execute("SELECT id_brand, name_brand FROM brands")
+    return {row[1].upper(): row[0] for row in cur.fetchall()}
+
+
+def build_model_cache(cur):
+    """Fetch all models from master DB."""
+    cur.execute("SELECT id_model, brand_id, name_model FROM models")
+    rows = cur.fetchall()
+    # Index by brand_id for fast lookup
+    cache = {}
+    for mid, bid, name in rows:
+        cache.setdefault(bid, []).append((mid, name))
+    return cache
+
+
+def build_year_cache(cur):
+    """Fetch all years from master DB."""
+    cur.execute("SELECT id_year, year_car FROM years")
+    return {row[1]: row[0] for row in cur.fetchall()}
+
+
+def build_mye_cache(cur):
+    """Fetch all MYE entries."""
+    cur.execute("SELECT id_mye, model_id, year_id FROM model_year_engine")
+    cache = {}
+    for mye_id, model_id, year_id in cur.fetchall():
+        cache.setdefault((model_id, year_id), []).append(mye_id)
+    return cache
+
+
+def fuzzy_match_vehicle(parsed, brand_cache, model_cache, year_cache, mye_cache):
+    """
+    Try to match parsed vehicle to MYE IDs.
+    Returns list of mye_ids (may be empty).
+    """
+    make = parsed.get('make')
+    model_keyword = parsed.get('model')
+    year = parsed.get('year')
+
+    if not make or not model_keyword or not year:
+        return []
+
+    # Find brand
+    brand_id = brand_cache.get(make.upper())
+    if not brand_id:
+        # Try partial match
+        for name, bid in brand_cache.items():
+            if make.upper() in name or name in make.upper():
+                brand_id = bid
+                break
+    if not brand_id:
+        return []
+
+    # Find models for this brand that contain the keyword
+    models = model_cache.get(brand_id, [])
+    # Extract keyword: longest uppercase word from model string
+    keyword = model_keyword.upper()
+    # Try exact word match first
+    matched_model_ids = []
+    for mid, mname in models:
+        if keyword in mname.upper():
+            matched_model_ids.append(mid)
+
+    if not matched_model_ids:
+        # Try with each word in keyword
+        words = [w for w in keyword.split() if len(w) >= 3]
+        for mid, mname in models:
+            mname_up = mname.upper()
+            if any(w in mname_up for w in words):
+                matched_model_ids.append(mid)
+
+    if not matched_model_ids:
+        return []
+
+    # Find year_id
+    year_id = year_cache.get(year)
+    if not year_id:
+        return []
+
+    # Collect MYEs for all matched model+year combos
+    mye_ids = []
+    for mid in matched_model_ids:
+        mye_ids.extend(mye_cache.get((mid, year_id), []))
+
+    return mye_ids
+
+
+def extract_interchanges(row):
+    """Extract (brand, part_number) pairs from the interchange columns."""
+    interchanges = []
+    # Columns: MARCA.1=2, INTERCAMBIO=3, MARCA.2=4, INTERCAMBIO.1=5, ... up to MARCA.6=12, INTERCAMBIO.5=13
+    pairs = [
+        (row[2], row[3]),
+        (row[4], row[5]),
+        (row[6], row[7]),
+        (row[8], row[9]),
+        (row[10], row[11]),
+        (row[12], row[13]),
+    ]
+    for brand, pn in pairs:
+        if brand and pn:
+            brand = str(brand).strip()
+            pn = str(pn).strip()
+            if brand and pn:
+                interchanges.append((brand, pn))
+    return interchanges
+
+
+def main():
+    print(f"[{datetime.now().isoformat()}] Starting import...")
+
+    if not os.path.exists(EXCEL_PATH):
+        print(f"ERROR: Excel not found at {EXCEL_PATH}")
+        sys.exit(1)
+
+    print(f"Loading {EXCEL_PATH}...")
+    wb = load_workbook(EXCEL_PATH, read_only=True, data_only=True)
+
+    master_conn = connect_master()
+    master_conn = connect_master()
+    master_cur = master_conn.cursor()
+    master_cur = master_conn.cursor()
+
+    print("Building caches...")
+    brand_cache = build_brand_cache(master_cur)
+    model_cache = build_model_cache(master_cur)
+    year_cache = build_year_cache(master_cur)
+    mye_cache = build_mye_cache(master_cur)
+    print(f"  Brands: {len(brand_cache)}, Models: {sum(len(v) for v in model_cache.values())}, Years: {len(year_cache)}, MYE combos: {len(mye_cache)}")
+
+    # Prepare UPSERT statements
+    upsert_catalog_sql = """
+        INSERT INTO supplier_catalog (supplier_name, sku, name, category)
+        VALUES (%s, %s, %s, %s)
+        ON CONFLICT (supplier_name, sku, category) DO UPDATE SET
+            name = EXCLUDED.name,
+            category = EXCLUDED.category
+        RETURNING id
+    """
+
+    insert_compat_sql = """
+        INSERT INTO supplier_catalog_compat
+            (catalog_id, make, model, year, engine, model_year_engine_id, source)
+        VALUES (%s, %s, %s, %s, %s, %s, %s)
+        ON CONFLICT (catalog_id, make, model, year, engine) DO NOTHING
+    """
+
+    insert_interchange_sql = """
+        INSERT INTO supplier_catalog_interchange (catalog_id, brand, part_number)
+        VALUES (%s, %s, %s)
+        ON CONFLICT DO NOTHING
+    """
+
+    # Track stats
+    stats = {
+        'sheets': 0,
+        'rows': 0,
+        'catalog_items': 0,
+        'compat_rows': 0,
+        'interchange_rows': 0,
+        'vehicles_parsed': 0,
+        'vehicles_matched': 0,
+        'mye_matches': 0,
+    }
+
+    # Process each sheet
+    for sheet_name in wb.sheetnames:
+        ws = wb[sheet_name]
+        rows = list(ws.iter_rows(values_only=True))
+        if not rows:
+            continue
+        headers = rows[0]
+        data_rows = rows[1:]
+        stats['sheets'] += 1
+        print(f"\nProcessing sheet '{sheet_name}' with {len(data_rows)} rows...")
+
+        for idx, row in enumerate(data_rows):
+            if idx % 1000 == 0 and idx > 0:
+                print(f"  ...{idx} rows processed")
+
+            # Skip empty rows
+            if not row or not row[1]:
+                continue
+
+            sku = str(row[1]).strip()
+            name = str(row[14]).strip().replace('\n', ' ').replace('\r', '') if row[14] else ''
+            vehicle_raw = str(row[15]).strip().replace('\n', ' ').replace('\r', '') if row[15] else ''
+
+            if not sku or not name:
+                continue
+
+            stats['rows'] += 1
+
+            # Upsert catalog item
+            master_cur.execute(upsert_catalog_sql, (SUPPLIER_NAME, sku, name, sheet_name))
+            catalog_id = master_cur.fetchone()[0]
+            stats['catalog_items'] += 1
+
+            # Parse vehicle
+            parsed = parse_vehicle(vehicle_raw)
+            stats['vehicles_parsed'] += 1
+
+            mye_ids = fuzzy_match_vehicle(parsed, brand_cache, model_cache, year_cache, mye_cache)
+            if mye_ids:
+                stats['vehicles_matched'] += 1
+                stats['mye_matches'] += len(mye_ids)
+
+            # Insert compatibility rows
+            # If we have MYE matches, insert one row per MYE
+            if mye_ids:
+                for mye_id in mye_ids:
+                    master_cur.execute(insert_compat_sql, (
+                        catalog_id,
+                        parsed['make'],
+                        parsed['model'],
+                        parsed['year'],
+                        parsed['engine'],
+                        mye_id,
+                        'fuzzy_match',
+                    ))
+                    stats['compat_rows'] += 1
+            else:
+                # No MYE match: insert with text only
+                master_cur.execute(insert_compat_sql, (
+                    catalog_id,
+                    parsed['make'],
+                    parsed['model'],
+                    parsed['year'],
+                    parsed['engine'],
+                    None,
+                    'import_text',
+                ))
+                stats['compat_rows'] += 1
+
+            # Insert interchanges
+            interchanges = extract_interchanges(row)
+            for brand, pn in interchanges:
+                master_cur.execute(insert_interchange_sql, (catalog_id, brand, pn))
+                stats['interchange_rows'] += 1
+
+        # Commit per sheet
+        master_conn.commit()
+        print(f"  Sheet '{sheet_name}' committed.")
+
+    # Final stats
+    print(f"\n{'='*60}")
+    print("IMPORT COMPLETE")
+    print(f"{'='*60}")
+    print(f"Sheets processed:      {stats['sheets']}")
+    print(f"Total rows read:       {stats['rows']}")
+    print(f"Catalog items:         {stats['catalog_items']}")
+    print(f"Compat rows:           {stats['compat_rows']}")
+    print(f"Interchange rows:      {stats['interchange_rows']}")
+    print(f"Vehicles parsed:       {stats['vehicles_parsed']}")
+    print(f"Vehicles with MYE:     {stats['vehicles_matched']}")
+    print(f"Total MYE matches:     {stats['mye_matches']}")
+
+    master_cur.close()
+    master_cur.close()
+    master_conn.close()
+    master_conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/match_supplier_compat_to_mye.py b/scripts/match_supplier_compat_to_mye.py
new file mode 100755
index 0000000..ad3c5b0
--- /dev/null
+++ b/scripts/match_supplier_compat_to_mye.py
@@ -0,0 +1,369 @@
+#!/usr/bin/env python3
+"""
+Match supplier_catalog_compat rows to model_year_engine ids by fuzzy (make, model, year).
+
+Supports exact match, parenthesis-stripped match, whitespace/dash normalization,
+prefix/substring fallback, model aliases, and year proximity (±2 years).
+
+Usage:
+    python scripts/match_supplier_compat_to_mye.py [--dry-run] <supplier_name|--all>
+"""
+
+import os
+import re
+import sys
+from collections import defaultdict
+
+import psycopg2
+
+MASTER_DB_URL = os.environ.get('MASTER_DB_URL', 'postgresql://postgres@localhost/nexus_autoparts')
+
+MAKE_ALIASES = {
+    'VOLKSWAGEN': 'VW',
+    'VOLKWAGEN': 'VW',
+    'MERCEDES BENZ': 'MERCEDES BENZ',
+    'MERCEDES-BENZ': 'MERCEDES BENZ',
+    'BMW MOTORRAD': 'BMW',
+}
+
+NOISE_SUFFIXES = {
+    'SEDAN', 'SALOON', 'COUPE', 'HATCHBACK', 'HATCH', 'WAGON', 'ESTATE',
+    'SUV', 'VAN', 'PICK', 'UP', 'PICKUP', 'CABRIOLET', 'CONVERTIBLE',
+    'LATINO', 'BRASIL', 'MEXICO', 'USA', 'EUROPA', 'EUROPE', 'NACIO',
+    'LIMITED', 'LTD', 'XLT', 'LE', 'SE', 'XLE', 'SPORT', 'LX', 'EX',
+    '4X2', '4X4', '4WD', 'AWD', 'FWD', 'RWD', '2WD',
+}
+
+# Specific model aliases: (make, supplier_model) -> list of possible master model substrings
+MODEL_ALIASES = {
+    ('INFINITI', 'JX35'): ['JX SUV'],
+    ('INFINITI', 'G35'): ['G Coupe', 'G Saloon', 'G37'],
+    ('INFINITI', 'G37'): ['G Coupe', 'G Saloon', 'G37'],
+    ('HONDA', 'CRX'): ['CRX'],
+    ('MAZDA', 'PROTEGE'): ['PROTEGE'],
+    ('MAZDA', 'PROTEGE5'): ['PROTEGE'],
+    ('KIA', 'SPECTRA'): ['SPECTRA', 'SEPHIA'],
+    ('KIA', 'FORTE5'): ['FORTE'],
+    ('CHEVROLET', 'OPTRA'): ['OPTRA', 'LACETTI'],
+    ('CHEVROLET', 'AGILE'): ['AGILE'],
+    ('FIAT', 'SIENA'): ['SIENA'],
+    ('PONTIAC', 'G4'): ['G4', 'PURSUIT'],
+    ('FORD', 'FIVE HUNDRED'): ['FIVE HUNDRED', '500', 'TAURUS'],
+    ('FORD', 'POLICE INTERCEPTOR UTILITY'): ['POLICE INTERCEPTOR UTILITY', 'EXPLORER'],
+    ('FORD', 'POLICE INTERCEPTOR SEDAN'): ['POLICE INTERCEPTOR SEDAN', 'TAURUS'],
+    ('SCION', 'XA'): ['XA'],
+    ('SAAB', '9-2X'): ['9-2X'],
+    ('BUICK', 'LACROSSE'): ['LACROSSE'],
+    ('DODGE', 'CALIBER'): ['CALIBER'],
+    ('SUZUKI', 'EQUATOR'): ['EQUATOR'],
+    ('CHRYSLER', 'LEBARON K'): ['LEBARON'],
+    ('MERCEDES BENZ', 'A170'): ['A-CLASS'],
+    ('MERCEDES BENZ', 'A210'): ['A-CLASS'],
+}
+
+# Regex-based class extraction for Mercedes: e.g. C350E -> C-Class, SL600 -> SL
+MERCEDES_CLASS_PATTERNS = [
+    # These Mercedes classes use "X-CLASS" in master (C-CLASS, E-CLASS, S-CLASS, etc.)
+    (r'^(A|B|C|E|G|GL|GLA|GLB|GLC|GLE|GLK|GLS|M|R|S|V|X)\d', 'CLASS'),
+    # These use just the letters (SL, SLK, CLS, CL, CLK) without -CLASS
+    (r'^(SL|SLK|CLS|CL|CLK)\d', 'LETTERS'),
+    (r'^(260E|300E|320E|400E|500E)$', 'E-CLASS'),
+    (r'^(300SL|500SL)$', 'SL'),
+    (r'^(400SEL|500SEL|600SEL)$', 'S-CLASS'),
+]
+
+
+def normalize_make(make):
+    if not make:
+        return ''
+    m = str(make).strip().upper()
+    return MAKE_ALIASES.get(m, m)
+
+
+def normalize_model(model):
+    if not model:
+        return ''
+    return ' '.join(str(model).upper().split())
+
+
+def strip_parentheses(text):
+    return re.sub(r'\s*\([^)]*\)', '', text).strip()
+
+
+def strip_noise_suffixes(text):
+    parts = text.split()
+    cleaned = []
+    for p in parts:
+        if p in NOISE_SUFFIXES:
+            break
+        cleaned.append(p)
+    return ' '.join(cleaned)
+
+
+def compact_alnum(text):
+    return re.sub(r'[^A-Z0-9]', '', text)
+
+
+def build_model_variants(model_name):
+    variants = set()
+    base = normalize_model(model_name)
+    if not base:
+        return variants
+    no_paren = strip_parentheses(base)
+    no_noise = strip_noise_suffixes(no_paren)
+    compact = compact_alnum(no_noise)
+    compact_paren = compact_alnum(no_paren)
+    compact_base = compact_alnum(base)
+
+    variants.add(base)
+    if no_paren:
+        variants.add(no_paren)
+    if no_noise:
+        variants.add(no_noise)
+    if compact:
+        variants.add(compact)
+    if compact_paren:
+        variants.add(compact_paren)
+    if compact_base:
+        variants.add(compact_base)
+    return variants
+
+
+def mercedes_class_alias(model):
+    """Return a master model substring for Mercedes class-based models."""
+    m = normalize_model(model)
+    for pat, repl in MERCEDES_CLASS_PATTERNS:
+        match = re.match(pat, m)
+        if match:
+            if repl == 'CLASS':
+                return match.group(1) + '-CLASS'
+            if repl == 'LETTERS':
+                return match.group(1)
+            return repl
+    return None
+
+
+def connect():
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def build_mye_index(cur):
+    print('Building MYE index...')
+    cur.execute('''
+        SELECT b.name_brand, m.name_model, y.year_car, mye.id_mye
+        FROM model_year_engine mye
+        JOIN models m ON m.id_model = mye.model_id
+        JOIN brands b ON b.id_brand = m.brand_id
+        JOIN years y ON y.id_year = mye.year_id
+    ''')
+
+    exact_index = defaultdict(list)
+    compact_index = defaultdict(list)
+    models_by_make = defaultdict(list)
+    # For year proximity: make -> compact_model -> {year: [mye_ids]}
+    year_range_index = defaultdict(lambda: defaultdict(lambda: defaultdict(list)))
+
+    for make, model, year, mye_id in cur.fetchall():
+        nmake = normalize_make(make)
+        if not nmake or not model or year is None:
+            continue
+        variants = build_model_variants(model)
+        for v in variants:
+            exact_index[(nmake, v, year)].append(mye_id)
+
+        compact = compact_alnum(strip_parentheses(normalize_model(model)))
+        if compact:
+            compact_index[(nmake, compact, year)].append(mye_id)
+            year_range_index[nmake][compact][year].append(mye_id)
+
+        models_by_make[nmake].append((normalize_model(model), mye_id, year, compact))
+
+    total_myes = sum(len(v) for v in exact_index.values())
+    print(f'  {len(exact_index):,} exact keys, {total_myes:,} MYE entries')
+    return exact_index, compact_index, models_by_make, year_range_index
+
+
+def find_by_alias(nmake, nmodel, year, models_by_make):
+    """Try specific model aliases and Mercedes class patterns."""
+    aliases = MODEL_ALIASES.get((nmake, nmodel), [])
+    # Mercedes fallback
+    if nmake == 'MERCEDES BENZ':
+        cls = mercedes_class_alias(nmodel)
+        if cls and cls not in aliases:
+            aliases = list(aliases) + [cls]
+
+    if not aliases:
+        return None
+
+    # Try to find a master model that contains any alias substring and matches year
+    for alias in aliases:
+        alias_compact = compact_alnum(alias)
+        for master_model, mye_id, mye_year, master_compact in models_by_make.get(nmake, []):
+            if mye_year != year:
+                continue
+            if alias in master_model or alias_compact in master_compact:
+                return mye_id
+    return None
+
+
+def find_by_year_proximity(nmake, supplier_compact, year, year_range_index, max_diff=2):
+    """If exact year missing, find closest year within ±max_diff for same model."""
+    years = year_range_index.get(nmake, {}).get(supplier_compact)
+    if not years:
+        return None
+    best_y = None
+    best_diff = None
+    for y in years.keys():
+        diff = abs(y - year)
+        if diff <= max_diff:
+            if best_diff is None or diff < best_diff:
+                best_diff = diff
+                best_y = y
+    if best_y is not None:
+        return year_range_index[nmake][supplier_compact][best_y][0]
+    return None
+
+
+def find_mye_id(make, model, year, exact_index, compact_index, models_by_make, year_range_index):
+    nmake = normalize_make(make)
+    nmodel = normalize_model(model)
+    if not nmake or not nmodel:
+        return None
+
+    variants = build_model_variants(nmodel)
+
+    # 1) Exact/near-exact on any variant
+    for v in variants:
+        myes = exact_index.get((nmake, v, year))
+        if myes:
+            return myes[0]
+
+    supplier_compact = compact_alnum(strip_parentheses(nmodel))
+
+    # 2) Compact match
+    myes = compact_index.get((nmake, supplier_compact, year))
+    if myes:
+        return myes[0]
+
+    # 3) Prefix/substring containment
+    for master_model, mye_id, mye_year, master_compact in models_by_make.get(nmake, []):
+        if mye_year != year:
+            continue
+        if not master_compact:
+            continue
+        if supplier_compact in master_compact or master_compact in supplier_compact:
+            return mye_id
+
+    if year is None:
+        return None
+
+    # 4) Model aliases
+    mye_id = find_by_alias(nmake, nmodel, year, models_by_make)
+    if mye_id:
+        return mye_id
+
+    # 5) Year proximity ±3 years (same compact model)
+    if supplier_compact:
+        mye_id = find_by_year_proximity(nmake, supplier_compact, year, year_range_index, max_diff=3)
+        if mye_id:
+            return mye_id
+
+    return None
+
+
+def main():
+    args = sys.argv[1:]
+    dry_run = False
+    if '--dry-run' in args:
+        dry_run = True
+        args.remove('--dry-run')
+
+    if len(args) < 1:
+        print('Usage: match_supplier_compat_to_mye.py [--dry-run] <supplier_name|--all>')
+        sys.exit(1)
+
+    supplier_arg = args[0]
+    suppliers = None if supplier_arg == '--all' else [supplier_arg]
+
+    if dry_run:
+        print('=' * 60)
+        print('DRY RUN MODE — no changes will be made')
+        print('=' * 60)
+
+    conn = connect()
+    cur = conn.cursor()
+
+    exact_index, compact_index, models_by_make, year_range_index = build_mye_index(cur)
+
+    if suppliers:
+        cur.execute('''
+            SELECT scc.id, scc.make, scc.model, scc.year
+            FROM supplier_catalog_compat scc
+            JOIN supplier_catalog sc ON sc.id = scc.catalog_id
+            WHERE sc.supplier_name = ANY(%s) AND scc.model_year_engine_id IS NULL
+        ''', (suppliers,))
+    else:
+        cur.execute('''
+            SELECT scc.id, scc.make, scc.model, scc.year
+            FROM supplier_catalog_compat scc
+            WHERE scc.model_year_engine_id IS NULL
+        ''')
+
+    rows = cur.fetchall()
+    print(f'\nMatching {len(rows):,} compat rows...')
+
+    matched = 0
+    unmatched = 0
+    sample_matches = []
+    sample_unmatched = []
+    updates = []
+
+    for scc_id, make, model, year in rows:
+        mye_id = find_mye_id(make, model, year, exact_index, compact_index, models_by_make, year_range_index)
+        if mye_id:
+            updates.append((mye_id, scc_id))
+            matched += 1
+            if len(sample_matches) < 10:
+                sample_matches.append((make, model, year, mye_id))
+        else:
+            unmatched += 1
+            if len(sample_unmatched) < 10:
+                sample_unmatched.append((make, model, year))
+
+    print(f'Matched: {matched:,}')
+    print(f'Unmatched: {unmatched:,}')
+
+    if sample_matches:
+        print('\nSample matches:')
+        for make, model, year, mye_id in sample_matches:
+            print(f'  {make} {model} {year} -> mye_id={mye_id}')
+
+    if sample_unmatched:
+        print('\nSample unmatched:')
+        for make, model, year in sample_unmatched:
+            print(f'  {make} {model} {year}')
+
+    if dry_run or not updates:
+        cur.close()
+        conn.close()
+        if dry_run:
+            print('\n' + '=' * 60)
+            print('DRY RUN complete. Run without --dry-run to apply.')
+            print('=' * 60)
+        return
+
+    print(f'\nApplying {len(updates):,} updates...')
+    cur.executemany('''
+        UPDATE supplier_catalog_compat
+        SET model_year_engine_id = %s, source = 'matched_fuzzy'
+        WHERE id = %s
+    ''', updates)
+    conn.commit()
+    print('Updates committed.')
+
+    cur.close()
+    conn.close()
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/qwen_batch_compat.py b/scripts/qwen_batch_compat.py
new file mode 100644
index 0000000..f09377c
--- /dev/null
+++ b/scripts/qwen_batch_compat.py
@@ -0,0 +1,231 @@
+#!/usr/bin/env python3
+"""
+Mass QWEN vehicle compatibility processor for Strada.
+Processes inventory items in batches of 5 with parallel workers.
+
+Usage:
+    python3 qwen_batch_compat.py --tenant=28 --batch-size=5 --workers=10 --checkpoint=qwen_progress.json
+"""
+
+import argparse
+import json
+import os
+import sys
+import time
+from concurrent.futures import ThreadPoolExecutor, as_completed
+from threading import Lock
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+import psycopg2
+from tenant_db import get_tenant_conn, get_master_conn
+from services.qwen_fitment import get_vehicle_fitment
+
+DEFAULT_CHECKPOINT_FILE = '/tmp/qwen_progress.json'
+PROGRESS_LOCK = Lock()
+
+
+def load_checkpoint(checkpoint_file):
+    if os.path.exists(checkpoint_file):
+        with open(checkpoint_file, 'r') as f:
+            return set(json.load(f))
+    return set()
+
+
+def save_checkpoint(checkpoint_file, processed_ids):
+    with PROGRESS_LOCK:
+        with open(checkpoint_file, 'w') as f:
+            json.dump(list(processed_ids), f)
+
+
+def get_pending_items(tenant_id, processed_ids, limit=None):
+    """Get inventory items that haven't been processed yet."""
+    conn = get_tenant_conn(tenant_id)
+    cur = conn.cursor()
+    
+    # Get items without vehicle compatibility records
+    if processed_ids:
+        placeholders = ','.join(['%s'] * len(processed_ids))
+        query = f"""
+            SELECT id, part_number, name, brand 
+            FROM inventory 
+            WHERE id NOT IN ({placeholders})
+            AND is_active = true
+            ORDER BY id
+        """
+        cur.execute(query, tuple(processed_ids))
+    else:
+        cur.execute("""
+            SELECT id, part_number, name, brand 
+            FROM inventory 
+            WHERE is_active = true
+            ORDER BY id
+        """)
+    
+    rows = cur.fetchall()
+    cur.close()
+    conn.close()
+    
+    if limit:
+        rows = rows[:limit]
+    return rows
+
+
+def process_single_item(item_id, part_number, name, brand):
+    """Process one item with QWEN."""
+    try:
+        result = get_vehicle_fitment(part_number, name, brand)
+        return {
+            'item_id': item_id,
+            'part_number': part_number,
+            'success': True,
+            'vehicles': result.get('vehicles', []),
+            'confidence': result.get('confidence', 0),
+            'notes': result.get('notes', ''),
+        }
+    except Exception as exc:
+        return {
+            'item_id': item_id,
+            'part_number': part_number,
+            'success': False,
+            'error': str(exc),
+        }
+
+
+def save_results(tenant_id, results):
+    """Save QWEN results to inventory_vehicle_compat."""
+    if not results:
+        return 0
+    
+    conn = get_tenant_conn(tenant_id)
+    cur = conn.cursor()
+    
+    saved = 0
+    for result in results:
+        if not result.get('success'):
+            continue
+        
+        item_id = result['item_id']
+        vehicles = result.get('vehicles', [])[:200]  # Limit to 200 vehicles per item
+        confidence = result.get('confidence', 0)
+        
+        for v in vehicles:
+            mye_id = v.get('mye_id')
+            if mye_id:
+                cur.execute("""
+                    INSERT INTO inventory_vehicle_compat
+                    (inventory_id, model_year_engine_id, source, confidence, make, model, year, created_at)
+                    VALUES (%s, %s, 'qwen_ai', %s, %s, %s, %s, NOW())
+                    ON CONFLICT (inventory_id, model_year_engine_id, make, model, year) DO NOTHING
+                """, (item_id, mye_id, confidence, v.get('make'), v.get('model'), v.get('year')))
+            else:
+                cur.execute("""
+                    INSERT INTO inventory_vehicle_compat
+                    (inventory_id, model_year_engine_id, source, confidence, make, model, year, engine, engine_code, created_at)
+                    VALUES (%s, NULL, 'qwen_ai', %s, %s, %s, %s, %s, %s, NOW())
+                """, (item_id, confidence, v.get('make'), v.get('model'), v.get('year'), v.get('engine'), v.get('engine_code')))
+            saved += 1
+    
+    conn.commit()
+    cur.close()
+    conn.close()
+    return saved
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Batch QWEN vehicle compatibility processor')
+    parser.add_argument('--tenant', type=int, required=True, help='Tenant ID')
+    parser.add_argument('--workers', type=int, default=10, help='Number of parallel workers')
+    parser.add_argument('--limit', type=int, default=None, help='Max items to process (None = all)')
+    parser.add_argument('--checkpoint-file', default=DEFAULT_CHECKPOINT_FILE, help='Progress checkpoint file')
+    args = parser.parse_args()
+    
+    checkpoint_file = args.checkpoint_file
+    
+    print(f"=== QWEN Batch Compatibility Processor ===", flush=True)
+    print(f"Tenant: {args.tenant}", flush=True)
+    print(f"Workers: {args.workers}", flush=True)
+    print(f"Checkpoint: {args.checkpoint_file}", flush=True)
+    print(flush=True)
+    
+    # Load checkpoint
+    processed_ids = load_checkpoint(checkpoint_file)
+    print(f"Previously processed: {len(processed_ids):,} items", flush=True)
+    
+    # Get pending items
+    pending = get_pending_items(args.tenant, processed_ids, args.limit)
+    print(f"Pending items: {len(pending):,}", flush=True)
+    
+    if not pending:
+        print("Nothing to process!", flush=True)
+        return
+    
+    # Process with thread pool
+    total = len(pending)
+    completed = 0
+    success_count = 0
+    fail_count = 0
+    total_vehicles = 0
+    start_time = time.time()
+    
+    with ThreadPoolExecutor(max_workers=args.workers) as executor:
+        future_to_item = {
+            executor.submit(process_single_item, item[0], item[1], item[2], item[3]): item
+            for item in pending
+        }
+        
+        batch_results = []
+        batch_size = 50  # Save to DB every N items
+        
+        for future in as_completed(future_to_item):
+            item = future_to_item[future]
+            try:
+                result = future.result(timeout=180)
+                batch_results.append(result)
+                
+                if result['success']:
+                    success_count += 1
+                    total_vehicles += len(result.get('vehicles', []))
+                else:
+                    fail_count += 1
+                
+                processed_ids.add(result['item_id'])
+                
+            except Exception as exc:
+                fail_count += 1
+                processed_ids.add(item[0])
+                print(f"Worker exception for {item[1]}: {exc}")
+            
+            completed += 1
+            
+            # Save checkpoint and DB batch periodically
+            if len(batch_results) >= batch_size:
+                save_checkpoint(checkpoint_file, list(processed_ids))
+                saved = save_results(args.tenant, batch_results)
+                batch_results = []
+                
+                elapsed = time.time() - start_time
+                rate = completed / elapsed if elapsed > 0 else 0
+                eta = (total - completed) / rate if rate > 0 else 0
+                
+                print(f"  Progress: {completed:,}/{total:,} ({100*completed/total:.1f}%) | "
+                      f"Success: {success_count} | Fail: {fail_count} | "
+                      f"Vehicles: {total_vehicles} | "
+                      f"Rate: {rate:.1f} items/min | ETA: {eta/60:.0f} min", flush=True)
+    
+    # Final save
+    if batch_results:
+        save_results(args.tenant, batch_results)
+    save_checkpoint(checkpoint_file, list(processed_ids))
+    
+    elapsed = time.time() - start_time
+    print(f"\n=== Complete ===", flush=True)
+    print(f"Processed: {completed:,}", flush=True)
+    print(f"Success: {success_count}", flush=True)
+    print(f"Failed: {fail_count}", flush=True)
+    print(f"Total vehicles found: {total_vehicles}", flush=True)
+    print(f"Elapsed: {elapsed/3600:.1f} hours", flush=True)
+    print(f"Avg rate: {completed/(elapsed/60):.1f} items/min", flush=True)
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/sync_estrada_marketplace_full.py b/scripts/sync_estrada_marketplace_full.py
new file mode 100644
index 0000000..1042849
--- /dev/null
+++ b/scripts/sync_estrada_marketplace_full.py
@@ -0,0 +1,321 @@
+#!/usr/bin/env python3
+"""
+Nexus Autoparts — Sync ALL Strada inventory to marketplace (backfill 133k items).
+
+Extends warehouse_inventory with seller listings for parts that don't match
+the OEM catalog. Items that DO match keep their part_id; unmatched items
+get part_id=NULL with seller_part_number / seller_part_name populated.
+
+Usage:
+    export MASTER_DB_URL="postgresql://user:pass@localhost/nexus_autoparts"
+    export TENANT_DB_URL_TEMPLATE="postgresql://user:pass@localhost/{db_name}"
+    python3 sync_estrada_marketplace_full.py --tenant=28 --bodega=7 --branch=1
+
+Safe to re-run: uses UPSERT semantics.
+"""
+
+import argparse
+import csv
+import io
+import os
+import sys
+import tempfile
+import time
+
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+import psycopg2
+from tenant_db import get_tenant_conn
+
+
+BATCH_SIZE = 5000
+
+
+def get_master_conn():
+    from config import MASTER_DB_URL
+    return psycopg2.connect(MASTER_DB_URL)
+
+
+def load_catalog_maps(master_conn):
+    """Pre-load OEM part_number → part_id and cross-reference maps."""
+    cur = master_conn.cursor()
+
+    print("[1/5] Loading OEM catalog...")
+    cur.execute("SELECT id_part, oem_part_number FROM parts")
+    oem_map = {}
+    for row in cur:
+        pn = row[1].strip() if row[1] else ''
+        if pn:
+            oem_map[pn] = row[0]
+
+    print("[2/5] Loading cross-references...")
+    cur.execute("SELECT cross_reference_number, part_id FROM part_cross_references")
+    cross_map = {}
+    for row in cur:
+        pn = row[0].strip() if row[0] else ''
+        if pn:
+            cross_map[pn] = row[1]
+
+    cur.close()
+    print(f"       OEM parts: {len(oem_map):,}  |  Cross-references: {len(cross_map):,}")
+    return oem_map, cross_map
+
+
+def read_tenant_inventory(tenant_conn, branch_id):
+    """Read all active inventory items from tenant DB."""
+    cur = tenant_conn.cursor()
+    print("[3/5] Reading tenant inventory...")
+
+    # Join with categories to get category name
+    cur.execute("""
+        SELECT
+            i.id,
+            i.part_number,
+            i.name,
+            i.price_1,
+            COALESCE(iss.stock, 0) AS stock,
+            c.name AS category_name
+        FROM inventory i
+        LEFT JOIN inventory_stock_summary iss ON iss.inventory_id = i.id
+        LEFT JOIN part_categories c ON c.id = i.category_id
+        WHERE i.is_active = true
+          AND (i.branch_id = %s OR %s IS NULL)
+        ORDER BY i.id
+    """, (branch_id, branch_id))
+
+    items = []
+    for row in cur:
+        items.append({
+            'id': row[0],
+            'part_number': (row[1] or '').strip(),
+            'name': (row[2] or '').strip(),
+            'price': float(row[3] or 0),
+            'stock': int(row[4] or 0),
+            'category': (row[5] or '').strip(),
+        })
+
+    cur.close()
+    print(f"       Tenant items: {len(items):,}")
+    return items
+
+
+def classify_items(items, oem_map, cross_map):
+    """Split items into OEM-matched and seller listings."""
+    matched = []
+    seller = []
+
+    for it in items:
+        pn = it['part_number']
+        if not pn:
+            continue
+
+        # Try exact match on OEM or cross-reference
+        part_id = oem_map.get(pn)
+        if not part_id:
+            # Try without brand prefix (e.g. "4S-86050" → "86050")
+            raw = pn.split('-', 1)[1] if '-' in pn else pn
+            part_id = oem_map.get(raw) or oem_map.get(pn) or cross_map.get(raw) or cross_map.get(pn)
+
+        if part_id:
+            matched.append({**it, 'part_id': part_id})
+        else:
+            seller.append(it)
+
+    print(f"       Matched (OEM): {len(matched):,}  |  Seller listings: {len(seller):,}")
+    return matched, seller
+
+
+def sync_to_warehouse(master_conn, bodega_id, matched, seller):
+    """Bulk upsert into warehouse_inventory using COPY."""
+    cur = master_conn.cursor()
+
+    # Create temp table matching warehouse_inventory structure
+    cur.execute("""
+        CREATE TEMP TABLE tmp_wi (
+            user_id INT,
+            part_id INT,
+            seller_part_number VARCHAR(100),
+            seller_part_name VARCHAR(300),
+            seller_category VARCHAR(100),
+            tenant_inventory_id INT,
+            price NUMERIC(12,2),
+            stock_quantity INT,
+            min_order_quantity INT DEFAULT 1,
+            warehouse_location VARCHAR(100) DEFAULT 'Principal',
+            bodega_id INT,
+            currency VARCHAR(3) DEFAULT 'MXN'
+        ) ON COMMIT DROP
+    """)
+
+    print("[4/5] Preparing batches...")
+    buffer = io.StringIO()
+    writer = csv.writer(buffer, lineterminator='\n',
+                        quoting=csv.QUOTE_MINIMAL)
+
+    total = 0
+    for it in matched + seller:
+        part_id = it.get('part_id')
+        seller_pn = None if part_id else it['part_number']
+        seller_name = None if part_id else (it['name'] or it['part_number'])
+        seller_cat = None if part_id else it['category']
+
+        writer.writerow([
+            1,                      # user_id (legacy FK, must match existing rows for bodega 7)
+            part_id,                # part_id (NULL for seller listings)
+            seller_pn,              # seller_part_number
+            seller_name,            # seller_part_name
+            seller_cat,             # seller_category
+            it['id'],               # tenant_inventory_id
+            it['price'],            # price
+            max(0, it['stock']),    # stock_quantity
+            1,                      # min_order_quantity
+            'Principal',            # warehouse_location
+            bodega_id,              # bodega_id
+            'MXN',                  # currency
+        ])
+        total += 1
+
+        if total % BATCH_SIZE == 0:
+            buffer.seek(0)
+            cur.copy_expert("""
+                COPY tmp_wi (user_id, part_id, seller_part_number, seller_part_name,
+                             seller_category, tenant_inventory_id, price, stock_quantity,
+                             min_order_quantity, warehouse_location, bodega_id, currency)
+                FROM STDIN WITH (FORMAT CSV, NULL '')
+            """, buffer)
+            buffer = io.StringIO()
+            writer = csv.writer(buffer, lineterminator='\n',
+                                quoting=csv.QUOTE_MINIMAL)
+            print(f"       Buffered {total:,} rows...")
+
+    # Final batch
+    if buffer.tell() > 0:
+        buffer.seek(0)
+        cur.copy_expert("""
+            COPY tmp_wi (user_id, part_id, seller_part_number, seller_part_name,
+                         seller_category, tenant_inventory_id, price, stock_quantity,
+                         min_order_quantity, warehouse_location, bodega_id, currency)
+            FROM STDIN WITH (FORMAT CSV, NULL '')
+        """, buffer)
+
+    print(f"[5/5] Upserting {total:,} rows into warehouse_inventory...")
+
+    # --- Update existing OEM-matched rows ---
+    cur.execute("""
+        UPDATE warehouse_inventory wi
+        SET
+            price = tmp.price,
+            stock_quantity = tmp.stock_quantity,
+            user_id = tmp.user_id,
+            currency = tmp.currency,
+            updated_at = NOW()
+        FROM tmp_wi tmp
+        WHERE wi.bodega_id = tmp.bodega_id
+          AND wi.part_id = tmp.part_id
+          AND wi.warehouse_location = tmp.warehouse_location
+          AND tmp.part_id IS NOT NULL
+    """)
+    matched_updated = cur.rowcount
+
+    # --- Insert new OEM-matched rows ---
+    cur.execute("""
+        INSERT INTO warehouse_inventory (
+            user_id, part_id, seller_part_number, seller_part_name,
+            seller_category, tenant_inventory_id, price, stock_quantity,
+            min_order_quantity, warehouse_location, bodega_id, currency, updated_at
+        )
+        SELECT
+            user_id, part_id, seller_part_number, seller_part_name,
+            seller_category, tenant_inventory_id, price, stock_quantity,
+            min_order_quantity, warehouse_location, bodega_id, currency, NOW()
+        FROM tmp_wi tmp
+        WHERE part_id IS NOT NULL
+          AND NOT EXISTS (
+              SELECT 1 FROM warehouse_inventory wi
+              WHERE wi.bodega_id = tmp.bodega_id
+                AND wi.part_id = tmp.part_id
+                AND wi.warehouse_location = tmp.warehouse_location
+          )
+    """)
+    matched_inserted = cur.rowcount
+
+    # --- Update existing seller listings ---
+    cur.execute("""
+        UPDATE warehouse_inventory wi
+        SET
+            price = tmp.price,
+            stock_quantity = tmp.stock_quantity,
+            seller_part_name = tmp.seller_part_name,
+            seller_category = tmp.seller_category,
+            user_id = tmp.user_id,
+            currency = tmp.currency,
+            updated_at = NOW()
+        FROM tmp_wi tmp
+        WHERE wi.bodega_id = tmp.bodega_id
+          AND wi.seller_part_number = tmp.seller_part_number
+          AND wi.warehouse_location = tmp.warehouse_location
+          AND tmp.part_id IS NULL
+    """)
+    seller_updated = cur.rowcount
+
+    # --- Insert new seller listings ---
+    cur.execute("""
+        INSERT INTO warehouse_inventory (
+            user_id, part_id, seller_part_number, seller_part_name,
+            seller_category, tenant_inventory_id, price, stock_quantity,
+            min_order_quantity, warehouse_location, bodega_id, currency, updated_at
+        )
+        SELECT
+            user_id, part_id, seller_part_number, seller_part_name,
+            seller_category, tenant_inventory_id, price, stock_quantity,
+            min_order_quantity, warehouse_location, bodega_id, currency, NOW()
+        FROM tmp_wi tmp
+        WHERE part_id IS NULL
+          AND NOT EXISTS (
+              SELECT 1 FROM warehouse_inventory wi
+              WHERE wi.bodega_id = tmp.bodega_id
+                AND wi.seller_part_number = tmp.seller_part_number
+                AND wi.warehouse_location = tmp.warehouse_location
+          )
+    """)
+    seller_inserted = cur.rowcount
+
+    matched_upserted = matched_updated + matched_inserted
+    seller_upserted = seller_updated + seller_inserted
+
+    master_conn.commit()
+    cur.close()
+
+    print(f"\n✓ Done!")
+    print(f"  OEM matched upserted: {matched_upserted:,}")
+    print(f"  Seller listings upserted: {seller_upserted:,}")
+    print(f"  Total: {matched_upserted + seller_upserted:,}")
+
+
+def main():
+    parser = argparse.ArgumentParser(description='Sync tenant inventory to marketplace')
+    parser.add_argument('--tenant', type=int, required=True, help='Tenant ID')
+    parser.add_argument('--bodega', type=int, required=True, help='Bodega ID in master DB')
+    parser.add_argument('--branch', type=int, default=1, help='Branch ID filter (default all)')
+    args = parser.parse_args()
+
+    start = time.time()
+    print(f"=== Sync tenant {args.tenant} → bodega {args.bodega} ===\n")
+
+    master_conn = get_master_conn()
+    tenant_conn = get_tenant_conn(args.tenant)
+
+    try:
+        oem_map, cross_map = load_catalog_maps(master_conn)
+        items = read_tenant_inventory(tenant_conn, args.branch)
+        matched, seller = classify_items(items, oem_map, cross_map)
+        sync_to_warehouse(master_conn, args.bodega, matched, seller)
+    finally:
+        tenant_conn.close()
+        master_conn.close()
+
+    elapsed = time.time() - start
+    print(f"\nElapsed: {elapsed:.1f}s")
+
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/sync_estrada_to_marketplace.py b/scripts/sync_estrada_to_marketplace.py
new file mode 100644
index 0000000..a34b04b
--- /dev/null
+++ b/scripts/sync_estrada_to_marketplace.py
@@ -0,0 +1,82 @@
+#!/usr/bin/env python3
+"""
+Sync Strada inventory to marketplace warehouse_inventory.
+Matches by OEM part_number and cross-references.
+"""
+import os, sys, io
+sys.path.insert(0, os.path.join(os.path.dirname(__file__), '..', 'pos'))
+from tenant_db import get_tenant_conn, get_master_conn
+
+BODEGA_ID = 7
+USER_ID = 1  # admin user in master DB
+CURRENCY = 'MXN'
+
+def main():
+    tenant_conn = get_tenant_conn(28)
+    tenant_cur = tenant_conn.cursor()
+    
+    # Get active inventory with stock
+    tenant_cur.execute("""
+        SELECT i.id, i.part_number, i.price_1, i.cost, COALESCE(iss.stock, 0) as stock
+        FROM inventory i
+        LEFT JOIN inventory_stock_summary iss ON iss.inventory_id = i.id
+        WHERE i.is_active = true
+    """)
+    items = {r[0]: {'pn': r[1], 'price': r[2], 'cost': r[3], 'stock': r[4]} for r in tenant_cur.fetchall()}
+    print(f"Active inventory: {len(items)}")
+    
+    tenant_cur.close()
+    tenant_conn.close()
+    
+    # Get catalog mappings from master
+    master = get_master_conn()
+    master_cur = master.cursor()
+    
+    master_cur.execute("SELECT id_part, oem_part_number FROM parts WHERE oem_part_number IS NOT NULL")
+    oem_map = {r[1]: r[0] for r in master_cur.fetchall()}
+    
+    master_cur.execute("SELECT part_id, cross_reference_number FROM part_cross_references")
+    cross_map = {r[1]: r[0] for r in master_cur.fetchall()}
+    
+    print(f"OEM parts: {len(oem_map)}, Cross-references: {len(cross_map)}")
+    
+    # Build match list
+    matched = []
+    seen_parts = set()
+    for item_id, data in items.items():
+        pn = data['pn']
+        raw = pn.split('-', 1)[1] if '-' in pn else pn
+        
+        part_id = oem_map.get(raw) or oem_map.get(pn) or cross_map.get(raw) or cross_map.get(pn)
+        if part_id and part_id not in seen_parts:
+            seen_parts.add(part_id)
+            price = data['price'] or data['cost'] or 0
+            stock = data['stock'] or 0
+            matched.append((USER_ID, part_id, price, stock, 1, 'Principal', BODEGA_ID, CURRENCY))
+    
+    print(f"Matched items: {len(matched)}")
+    
+    if not matched:
+        print("Nothing to sync")
+        return
+    
+    # Bulk insert via COPY
+    csv_buffer = io.StringIO()
+    for row in matched:
+        csv_buffer.write(','.join(str(c) for c in row) + '\n')
+    csv_buffer.seek(0)
+    
+    master_cur.copy_expert(
+        """COPY warehouse_inventory (user_id, part_id, price, stock_quantity, min_order_quantity, warehouse_location, bodega_id, currency)
+        FROM STDIN WITH (FORMAT CSV)""",
+        csv_buffer
+    )
+    
+    master.commit()
+    master_cur.close()
+    master.close()
+    
+    print(f"Synced {len(matched)} items to warehouse_inventory")
+
+if __name__ == '__main__':
+    main()
diff --git a/scripts/video_intro_inventario_pos.md b/scripts/video_intro_inventario_pos.md
new file mode 100644
index 0000000..e52da26
--- /dev/null
+++ b/scripts/video_intro_inventario_pos.md
@@ -0,0 +1,262 @@
+# Guion de Video — Introducción a Nexus POS
+## Módulos: Inventario + Punto de Venta
+**Duración estimada:** 4–5 minutos  
+**Formato:** Screen recording con voz en off  
+**Resolución:** 1920×1080 (16:9)  
+**Público:** Dueños de refaccionarias, mostradores, administradores
+
+---
+
+## ESCENA 0 — INTRO / HOOK (0:00–0:25)
+
+**Visual:**
+- Fade in desde negro.
+- Logo de Nexus Autoparts centrado.
+- Transición rápida: montaje de 3–4 tomas del sistema en acción (búsqueda de pieza, ticket imprimiéndose, gráfica de ventas).
+
+**Narración (voz en off, tono energético):**
+> "¿Todavía controlas tu inventario con hojas de Excel o cuadernos?  
+> Pierdes piezas, no sabes qué te queda en bodega y en la caja nunca cuadra.  
+> Te presento Nexus POS: el sistema diseñado específicamente para refaccionarias.  
+> En los próximos minutos vas a ver cómo administrar tu inventario y vender desde cualquier dispositivo."
+
+**Nota técnica:**
+- Música de fondo: upbeat corporativo, volumen bajo durante la narración.
+- Lower third: "Nexus POS — Inventario & Punto de Venta".
+
+---
+
+## ESCENA 1 — INVENTARIO: PANEL GENERAL (0:25–0:55)
+
+**Visual:**
+- Login rápido (no mostrar credenciales reales, usar cuenta demo).
+- Entrar al módulo **Inventario**.
+- Mostrar el dashboard de inventario: badges superiores (Total de piezas, Stock bajo, Sin stock, Valor total).
+
+**Narración:**
+> "Empecemos con el corazón de tu negocio: el inventario.  
+> Desde el panel principal tienes el pulso completo de tu refaccionaria.  
+> Cuántas piezas tienes, cuáles están por acabarse y el valor total de tu stock… todo al instante."
+
+**Nota técnica:**
+- Usar transición suave (slide lateral) al entrar al módulo.
+- Zoom sutil sobre los badges superiores para enfatizar los números.
+
+---
+
+## ESCENA 2 — INVENTARIO: ALTA RÁPIDA DE PRODUCTO (0:55–1:35)
+
+**Visual:**
+- Clic en "Nuevo Artículo".
+- Llenar formulario: Número de parte, nombre, marca, stock inicial, precios.
+- Destacar el campo **Código de barras** (se genera automáticamente).
+- Guardar. Aparece toast de éxito: "Artículo creado".
+
+**Narración:**
+> "Dar de alta una pieza es cosa de segundos.  
+> Capturas el número de parte, la descripción, la marca… y el sistema genera automáticamente un código de barras.  
+> Tú decides el stock inicial y hasta tres niveles de precio.  
+> Guardas… y listo, la pieza ya está en el sistema."
+
+**Nota técnica:**
+- Escribir rápido pero legible (o usar autofill demo).
+- Resaltar con cursor el código de barras generado.
+- Toast de éxito debe ser visible al menos 1.5 segundos.
+
+---
+
+## ESCENA 3 — INVENTARIO: COMPATIBILIDAD CON VEHÍCULOS (1:35–2:05)
+
+**Visual:**
+- Abrir la ficha del artículo recién creado.
+- Clic en pestaña **"Compatibilidad"**.
+- Clic en "Auto-Match con IA (QWEN)".
+- Mostrar spinner de carga breve (3–4 segundos), luego la lista de vehículos aparece (marca, modelo, año, motor).
+- Señalar la etiqueta "IA" en color naranja/azul.
+
+**Narración:**
+> "Aquí viene lo potente.  
+> No sabes exactamente a qué carros le queda esta pieza… pero la inteligencia artificial sí.  
+> Con un solo clic, el sistema busca en segundos todos los vehículos compatibles: marca, modelo, año y motor.  
+> Todo se guarda automáticamente para que tu mostrador lo consulte al instante."
+
+**Nota técnica:**
+- Usar una pieza con resultados claros (ejemplo: filtro de aceite PH8A o bujía BKR5EYA).
+- Si el auto-match tarda mucho en producción, usar un clip grabado previamente o acelerar 2×.
+- Enfatizar la etiqueta "IA" con un círculo o flecha.
+
+---
+
+## ESCENA 4 — INVENTARIO: ENTRADAS, TRASPASOS Y AJUSTES (2:05–2:40)
+
+**Visual:**
+- Volver al listado de inventario.
+- Clic en "Entrada" sobre una fila de stock (simular compra a proveedor: cantidad 10, costo $150).
+- Cambiar a pestaña **"Traspasos"**, mostrar lista de movimientos entre sucursales.
+- Cambiar a pestaña **"Ajustes"**, mostrar ajuste de inventario.
+
+**Narración:**
+> "El inventario se mueve constantemente.  
+> Recibiste mercancía del proveedor — registras la entrada en un clic.  
+> Necesitas enviar 5 piezas a la otra sucursal — traspaso directo.  
+> Y si encuentras una diferencia física contra el sistema, haces un ajuste con comentario.  
+> Todo queda auditado: quién, cuándo y por qué."
+
+**Nota técnica:**
+- Usar transición rápida entre pestañas (corte duro o fade).
+- Mostrar al menos 2–3 filas en cada tabla para que se vea real.
+
+---
+
+## ESCENA 5 — POS: APERTURA DE CAJA (2:40–3:05)
+
+**Visual:**
+- Transición al módulo **Punto de Venta**.
+- Mostrar barra superior: "Sin caja abierta".
+- Clic en "Abrir Caja", llenar número de caja y monto inicial ($500).
+- Guardar. La barra cambia a "Caja #1 abierta".
+
+**Narración:**
+> "Pasemos a la venta.  
+> Antes de vender, abres tu caja: le pones número y efectivo inicial.  
+> El sistema no te deja facturar sin caja abierta, así que siempre hay control.  
+> Una vez abierta, la barra te recuerda en todo momento en qué caja estás."
+
+**Nota técnica:**
+- Transición limpia: slide desde abajo o fade.
+- Close-up en la barra de estado antes y después de abrir la caja.
+
+---
+
+## ESCENA 6 — POS: VENTA RÁPIDA (3:05–3:45)
+
+**Visual:**
+- Buscar producto por número de parte (escanear o teclear).
+- El producto aparece en el carrito con imagen, descripción y precio.
+- Agregar una segunda pieza al carrito.
+- Clic en **"Cobrar"**.
+- Modal de pago: mostrar total, cliente, descuento.
+- Dividir pago: $200 efectivo, resto transferencia.
+- Clic "Finalizar Venta". Ticket/recibo aparece en pantalla.
+
+**Narración:**
+> "Vender es tan simple como buscar la pieza… puede ser por número de parte o escaneando el código de barras.  
+> El carrito muestra todo claro: qué vendes, cuánto cuesta y cuánto llevas.  
+> Al cobrar, aceptas efectivo, transferencia, tarjeta… o una combinación de todo.  
+> Finalizas… y el ticket se genera al instante para el cliente."
+
+**Nota técnica:**
+- Usar búsqueda rápida (autocomplete visible).
+- Animar el producto "volando" al carrito (si el sistema lo tiene) o simple highlight.
+- Mostrar claramente el ticket final con logo y datos de la empresa.
+
+---
+
+## ESCENA 7 — POS: CORTE Z Y CIERRE DE CAJA (3:45–4:10)
+
+**Visual:**
+- Clic en "Corte Z" en la barra de estado.
+- Modal aparece con resumen: ventas por método de pago, entradas, salidas, efectivo esperado.
+- Ingresar efectivo real en caja ($1,247.50).
+- El sistema calcula diferencia automáticamente.
+- Clic "Cerrar Caja". Confirmación.
+
+**Narración:**
+> "Al final del turno, haces tu corte.  
+> El sistema te dice exactamente cuánto deberías tener en caja: ventas, entradas, salidas… todo desglosado.  
+> Tú cuentas el efectivo real, lo capturas y si hay diferencia, la ves inmediatamente.  
+> Cierras caja y listo: turno terminado sin sorpresas."
+
+**Nota técnica:**
+- Hacer scroll dentro del modal para mostrar todos los totales.
+- Enfatizar el número de "diferencia" (positivo o negativo) con color.
+
+---
+
+## ESCENA 8 — CIERRE / CALL TO ACTION (4:10–4:45)
+
+**Visual:**
+- Volver al dashboard principal.
+- Montaje rápido de pantallas vistas: inventario, auto-match, carrito, corte Z.
+- Fade a pantalla final: datos de contacto / sitio web / QR.
+
+**Narración (tono inspirador):**
+> "Desde la primera pieza que entra hasta el último ticket del día, Nexus POS te acompaña.  
+- Inventario inteligente con IA, punto de venta rápido y cortes de caja que sí cuadran.  
+- Todo en un solo sistema, accesible desde tu computadora, tablet o celular.  
+- Agenda tu demo hoy y lleva tu refaccionaria al siguiente nivel."
+
+**Texto en pantalla (overlay):**
+- "¿Listo para modernizar tu refaccionaria?"
+- Botón/CTA: "Agenda tu demo gratis"
+- Web: nexusautoparts.com.mx
+- WhatsApp: [número]
+
+**Nota técnica:**
+- Música sube de volumen en la pantalla final.
+- Logo + CTA deben permanecer 5–7 segundos.
+
+---
+
+## CHECKLIST TÉCNICO PARA GRABACIÓN
+
+| Ítem | Especificación |
+|------|----------------|
+| **Resolución** | 1920×1080 mínimo |
+| **FPS** | 30 fps (60 fps opcional para animaciones suaves) |
+| **Audio** | Voz en off clara, sin eco. Música royalty-free bajo |
+| **Cursor** | Usar cursor grande y resaltado (Halo o similar) |
+| **Transiciones** | Slide lateral 0.3s o fade 0.2s. Nada exagerado |
+| **Datos demo** | Usar piezas reales: BKR5EYA, PH8A, BP6ES. Cliente: "Juan Pérez" |
+| **Cuenta** | Usar usuario demo; NUNCA mostrar contraseñas reales |
+| **Limpieza** | Cerrar notificaciones del OS antes de grabar |
+
+---
+
+## DATOS DE PRUEBA RECOMENDADOS PARA LA GRABACIÓN
+
+### Producto 1 (alta en vivo)
+- Número de parte: `PH8A`
+- Nombre: `Filtro de aceite Motorcraft`
+- Marca: `Motorcraft`
+- Stock inicial: `12`
+- Precio 1: `$185.00`
+
+### Producto 2 (venta rápida)
+- Número de parte: `BKR5EYA`
+- Nombre: `Bujía NGK`
+- Precio: `$145.00`
+
+### Cliente demo
+- Nombre: `Juan Pérez`
+- Teléfono: `555-123-4567`
+
+### Caja
+- Caja #1
+- Apertura: `$500.00`
+- Cierre: `$1,247.50`
+
+---
+
+## NOTAS POST-PRODUCCIÓN
+
+1. **Subtítulos:** Agregar subtítulos en español (accesibilidad + redes sociales sin audio).
+2. **Capítulos:** YouTube chapters recomendados:
+   - 0:00 Intro
+   - 0:25 Inventario
+   - 0:55 Alta de producto
+   - 1:35 Compatibilidad con IA
+   - 2:05 Movimientos de inventario
+   - 2:40 Punto de Venta
+   - 3:05 Venta rápida
+   - 3:45 Corte de caja
+   - 4:10 Demo y contacto
+3. **Thumbnail:** Split screen — mitad inventario, mitad POS. Texto: "Control total de tu refaccionaria".
+4. **Formatos de exportación:**
+   - MP4 H.264 (YouTube / web)
+   - Vertical 9:16 recorte para Reels/TikTok (60 seg version)
+
+---
+
+*Guion generado para Nexus Autoparts — Módulos Inventario & POS*  
+*Versión 1.0 — 2026-05-18*
diff --git a/test_catalog.js b/test_catalog.js
new file mode 100644
index 0000000..6669bc5
--- /dev/null
+++ b/test_catalog.js
@@ -0,0 +1,91 @@
+const { chromium } = require('playwright');
+
+(async () => {
+  const browser = await chromium.launch({ headless: true });
+  const context = await browser.newContext({ viewport: { width: 1280, height: 900 } });
+  const page = await context.newPage();
+
+  // Set token directly via localStorage
+  await page.goto('http://127.0.0.1:5001/pos/catalog', { waitUntil: 'networkidle' });
+  await page.evaluate(() => {
+    localStorage.setItem('pos_token', 'eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJ0eXBlIjoicG9zX2FjY2VzcyIsInRlbmFudF9pZCI6MzEsImVtcGxveWVlX2lkIjoxLCJyb2xlIjoib3duZXIiLCJuYW1lIjoiVGVzdCIsImJyYW5jaF9pZCI6MSwicGVybWlzc2lvbnMiOlsiaW52ZW50b3J5LnZpZXciLCJpbnZlbnRvcnkuZWRpdCIsImludmVudG9yeS5jcmVhdGUiLCJjYXRhbG9nLnZpZXciLCJjb25maWcuZWRpdF9wcmljZXMiXX0.iWLHGSnOeNW-eprH0-U1YkWZksIJqiuBc0ZZ20xdZq0');
+  });
+  await page.reload({ waitUntil: 'networkidle' });
+
+  // Wait for console logs
+  page.on('console', msg => {
+    if (msg.type() === 'error') {
+      console.log('CONSOLE ERROR:', msg.text());
+    }
+  });
+
+  await page.waitForTimeout(2000);
+  await page.screenshot({ path: '/tmp/catalog_initial.png', fullPage: false });
+
+  // Try to select Chevrolet brand
+  const brands = await page.locator('.nav-card').all();
+  console.log('Brands count:', brands.length);
+  
+  for (const b of brands.slice(0, 5)) {
+    const text = await b.textContent();
+    console.log('Brand:', text);
+  }
+
+  // Find Chevrolet
+  const chevy = await page.locator('.nav-card').filter({ hasText: /Chevrolet/i }).first();
+  if (await chevy.isVisible().catch(() => false)) {
+    await chevy.click();
+    await page.waitForTimeout(1500);
+    await page.screenshot({ path: '/tmp/catalog_models.png', fullPage: false });
+
+    // Find Aveo
+    const aveo = await page.locator('.nav-card').filter({ hasText: /Aveo/i }).first();
+    if (await aveo.isVisible().catch(() => false)) {
+      await aveo.click();
+      await page.waitForTimeout(1500);
+      await page.screenshot({ path: '/tmp/catalog_years.png', fullPage: false });
+
+      // Find 2018
+      const y2018 = await page.locator('.nav-card').filter({ hasText: /2018/i }).first();
+      if (await y2018.isVisible().catch(() => false)) {
+        await y2018.click();
+        await page.waitForTimeout(1500);
+        await page.screenshot({ path: '/tmp/catalog_engines.png', fullPage: false });
+
+        // Find 1.5L
+        const engine = await page.locator('.nav-card').filter({ hasText: /1\.5/i }).first();
+        if (await engine.isVisible().catch(() => false)) {
+          await engine.click();
+          await page.waitForTimeout(2500);
+          await page.screenshot({ path: '/tmp/catalog_categories.png', fullPage: false });
+
+          // Try to find Supplier Catalog
+          const sc = await page.locator('.nav-card').filter({ hasText: /Proveedores/i }).first();
+          if (await sc.isVisible().catch(() => false)) {
+            console.log('FOUND Supplier Catalog card');
+            await sc.click();
+            await page.waitForTimeout(2000);
+            await page.screenshot({ path: '/tmp/catalog_subgroups.png', fullPage: false });
+
+            // Find SUSPENSION
+            const susp = await page.locator('.nav-card').filter({ hasText: /Suspension/i }).first();
+            if (await susp.isVisible().catch(() => false)) {
+              await susp.click();
+              await page.waitForTimeout(2000);
+              await page.screenshot({ path: '/tmp/catalog_parts.png', fullPage: false });
+            }
+          } else {
+            console.log('Supplier Catalog card NOT found');
+            const allCards = await page.locator('.nav-card').all();
+            for (const c of allCards) {
+              console.log('Card:', await c.textContent());
+            }
+          }
+        }
+      }
+    }
+  }
+
+  await browser.close();
+  console.log('Done. Screenshots saved to /tmp/catalog_*.png');
+})();