From a33ce5699e0b54a25a2cf6ea3f9e39baeb140122 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 18 Jun 2024 15:26:48 +0200
Subject: [PATCH 01/64] feat: refs #7030 translation proposal

---
 src/components/common/VnBreadcrumbs.vue |   1 +
 src/i18n/locale/en.yml                  | 322 ++++++++---------------
 src/i18n/locale/es.yml                  | 329 ++++++++----------------
 3 files changed, 228 insertions(+), 424 deletions(-)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..75fd6d499 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -37,6 +37,7 @@ function getBreadcrumb(param) {
         locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
+    //TODO modificar para que funcione títulos de página
     if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5ef3a5472..9bf272d61 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -107,6 +107,119 @@ globals:
         aliasUsers: Users
         subRoles: Subroles
         inheritedRoles: Inherited Roles
+        customers: Customers
+        list: List
+        webPayments: Web Payments
+        extendedList: Extended list
+        notifications: Notifications
+        defaulter: Defaulter
+        customerCreate: New customer
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignees: Consignees
+        notes: Notes
+        credits: Credits
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recoveries
+        webAccess: Web access
+        sms: Sms
+        creditManagement: Credit management
+        creditContracts: Credit contracts
+        creditOpinion: Credit opinion
+        others: Others
+        samples: Samples
+        consumption: Consumption
+        mandates: Mandates
+        contacts: Contacts
+        webPayment: Web payment
+        fileManagement: File management
+        unpaid: Unpaid
+        entries: Entries
+        buys: Buys
+        dms: File management
+        entryCreate: New entry
+        latestBuys: Latest buys
+        tickets: Tickets
+        ticketCreate: New Tickets
+        boxing: Boxing
+        sale: Sale
+        claims: Claims
+        claimCreate: New claim
+        lines: Lines
+        photos: Photos
+        development: Development
+        action: Action
+        invoiceOuts: Invoice out
+        negativeBases: Negative Bases
+        globalInvoicing: Global invoicing
+        invoiceOutCreate: Create invoice out
+        shelving: Shelving
+        shelvingList: Shelving List
+        shelvingCreate: New shelving
+        invoiceIns: Invoices In
+        invoiceInCreate: Create invoice in
+        vat: VAT
+        dueDay: Due day
+        intrastat: Intrastat
+        corrective: Corrective
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
+        workers: Workers
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        pbx: Private Branch Exchange
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        roadmap: Roadmap
+        stops: Stops
+        routes: Routes
+        cmrsList: CMRs list
+        RouteList: List
+        routeCreate: New route
+        RouteRoadmap: Roadmaps
+        RouteRoadmapCreate: Create roadmap
+        autonomous: Autonomous
+        suppliers: Suppliers
+        supplier: Supplier
+        supplierCreate: New supplier
+        accounts: Accounts
+        addresses: Addresses
+        agencyTerm: Agency agreement
+        travel: Travels
+        extraCommunity: Extra community
+        travelCreate: New travel
+        history: Log
+        thermographs: Thermograph
+        items: Items
+        diary: Diary
+        tags: Tags
+        create: Create
+        buyRequest: Buy requests
+        fixedPrice: Fixed prices
+        wasteBreakdown: Waste breakdown
+        itemCreate: New item
+        barcode: Barcodes
+        tax: Tax
+        botanical: Botanical
+        itemTypeCreate: New item type
+        family: Item Type
+        lastEntries: Last entries
+        itemType: Item type
+        monitors: Monitors
     created: Created
     worker: Worker
     now: Now
@@ -149,38 +262,6 @@ dashboard:
     pageTitles:
         dashboard: Dashboard
 customer:
-    pageTitles:
-        customers: Customers
-        list: List
-        webPayments: Web Payments
-        extendedList: Extended list
-        notifications: Notifications
-        defaulter: Defaulter
-        customerCreate: New customer
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignees: Consignees
-        notes: Notes
-        credits: Credits
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recoveries
-        webAccess: Web access
-        log: Log
-        sms: Sms
-        creditManagement: Credit management
-        creditContracts: Credit contracts
-        creditOpinion: Credit opinion
-        others: Others
-        samples: Samples
-        consumption: Consumption
-        mandates: Mandates
-        contacts: Contacts
-        webPayment: Web payment
-        fileManagement: File management
-        unpaid: Unpaid
     list:
         phone: Phone
         email: Email
@@ -310,17 +391,6 @@ customer:
             hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
 entry:
-    pageTitles:
-        entries: Entries
-        list: List
-        summary: Summary
-        basicData: Basic data
-        buys: Buys
-        notes: Notes
-        dms: File management
-        log: Log
-        entryCreate: New entry
-        latestBuys: Latest buys
     list:
         newEntry: New entry
         landed: Landed
@@ -432,16 +502,6 @@ entry:
         packingOut: Package out
         landing: Landing
 ticket:
-    pageTitles:
-        tickets: Tickets
-        list: List
-        ticketCreate: New ticket
-        summary: Summary
-        basicData: Basic Data
-        boxing: Boxing
-        sms: Sms
-        notes: Notes
-        sale: Sale
     list:
         nickname: Nickname
         state: State
@@ -516,18 +576,6 @@ ticket:
         warehouse: Warehouse
         agency: Agency
 claim:
-    pageTitles:
-        claims: Claims
-        list: List
-        claimCreate: New claim
-        summary: Summary
-        basicData: Basic Data
-        lines: Lines
-        photos: Photos
-        development: Development
-        log: Audit logs
-        notes: Notes
-        action: Action
     list:
         customer: Customer
         assignedTo: Assigned
@@ -591,14 +639,6 @@ claim:
         noData: 'There are no images/videos, click here or drag and drop the file'
         dragDrop: Drag and drop it here
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Invoice out
-        list: List
-        negativeBases: Negative Bases
-        globalInvoicing: Global invoicing
-        invoiceOutCreate: Create invoice out
-        summary: Summary
-        basicData: Basic Data
     list:
         ref: Reference
         issued: Issued
@@ -666,13 +706,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: CSV download failed
 shelving:
-    pageTitles:
-        shelving: Shelving
-        shelvingList: Shelving List
-        shelvingCreate: New shelving
-        summary: Summary
-        basicData: Basic Data
-        log: Logs
     list:
         parking: Parking
         priority: Priority
@@ -699,17 +732,6 @@ parking:
         info: You can search by parking code
         label: Search parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Invoices In
-        list: List
-        invoiceInCreate: Create invoice in
-        summary: Summary
-        basicData: Basic data
-        vat: VAT
-        dueDay: Due day
-        intrastat: Intrastat
-        corrective: Corrective
-        log: Logs
     list:
         ref: Reference
         supplier: Supplier
@@ -760,15 +782,6 @@ invoiceIn:
         stems: Stems
         country: Country
 order:
-    pageTitles:
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        summary: Summary
-        basicData: Basic Data
-        catalog: Catalog
-        volume: Volume
-        lines: Lines
     field:
         salesPersonFk: Sales Person
         clientFk: Client
@@ -827,23 +840,6 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
-    pageTitles:
-        workers: Workers
-        list: List
-        basicData: Basic data
-        summary: Summary
-        notifications: Notifications
-        workerCreate: New worker
-        department: Department
-        pda: PDA
-        notes: Notas
-        dms: My documentation
-        pbx: Private Branch Exchange
-        log: Log
-        calendar: Calendar
-        timeControl: Time control
-        locker: Locker
-
     list:
         name: Name
         email: Email
@@ -915,15 +911,6 @@ worker:
         bankEntity: Swift / BIC
     imageNotFound: Image not found
 wagon:
-    pageTitles:
-        wagons: Wagons
-        wagonsList: Wagons List
-        wagonCreate: Create wagon
-        wagonEdit: Edit wagon
-        typesList: Types List
-        typeCreate: Create type
-        typeEdit: Edit type
-        wagonCounter: Trolley counter
     type:
         name: Name
         submit: Submit
@@ -952,31 +939,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route/roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
-roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
 route:
-    pageTitles:
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
     cmr:
         list:
             results: results
@@ -992,22 +955,6 @@ route:
             viewCmr: View CMR
             downloadCmrs: Download CMRs
 supplier:
-    pageTitles:
-        suppliers: Suppliers
-        supplier: Supplier
-        list: List
-        supplierCreate: New supplier
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        log: Log
-        accounts: Accounts
-        contacts: Contacts
-        addresses: Addresses
-        consumption: Consumption
-        agencyTerm: Agency agreement
-        dms: File management
     list:
         payMethod: Pay method
         payDeadline: Pay deadline
@@ -1099,15 +1046,6 @@ supplier:
         date: Date
         reference: Reference
 travel:
-    pageTitles:
-        travel: Travels
-        list: List
-        summary: Summary
-        extraCommunity: Extra community
-        travelCreate: New travel
-        basicData: Basic data
-        history: Log
-        thermographs: Thermograph
     summary:
         confirmed: Confirmed
         entryId: Entry Id
@@ -1154,24 +1092,6 @@ travel:
         travelFileDescription: 'Travel id { travelId }'
         file: File
 item:
-    pageTitles:
-        items: Items
-        list: List
-        diary: Diary
-        tags: Tags
-        create: Create
-        buyRequest: Buy requests
-        fixedPrice: Fixed prices
-        wasteBreakdown: Waste breakdown
-        itemCreate: New item
-        barcode: Barcodes
-        tax: Tax
-        log: Log
-        botanical: Botanical
-        shelving: Shelving
-        itemTypeCreate: New item type
-        family: Item Type
-        lastEntries: Last entries
     descriptor:
         item: Item
         buyer: Buyer
@@ -1257,22 +1177,6 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-item/itemType:
-    pageTitles:
-        itemType: Item type
-        basicData: Basic data
-        summary: Summary
-monitor:
-    pageTitles:
-        monitors: Monitors
-        list: List
-zone:
-    pageTitles:
-        zones: Zones
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
-
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cfadd57b3..f33cc8543 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -107,6 +107,120 @@ globals:
         aliasUsers: Usuarios
         subRoles: Subroles
         inheritedRoles: Roles heredados
+        customers: Clientes
+        customerCreate: Nuevo cliente
+        list: Listado
+        webPayments: Pagos Web
+        extendedList: Listado extendido
+        notifications: Notificaciones
+        defaulter: Morosos
+        createCustomer: Crear cliente
+        fiscalData: Datos fiscales
+        billingData: Forma de pago
+        consignees: Consignatarios
+        notes: Notas
+        credits: Créditos
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recobros
+        webAccess: Acceso web
+        sms: Sms
+        creditManagement: Gestión de crédito
+        creditContracts: Contratos de crédito
+        creditOpinion: Opinión de crédito
+        others: Otros
+        samples: Plantillas
+        consumption: Consumo
+        mandates: Mandatos
+        contacts: Contactos
+        webPayment: Pago web
+        fileManagement: Gestión documental
+        unpaid: Impago
+        entries: Entradas
+        buys: Compras
+        dms: Gestión documental
+        entryCreate: Nueva entrada
+        latestBuys: Últimas compras
+        tickets: Tickets
+        ticketCreate: Nuevo ticket
+        boxing: Encajado
+        sale: Lineas del pedido
+        claims: Reclamaciones
+        claimCreate: Crear reclamación
+        lines: Líneas
+        development: Trazabilidad
+        photos: Fotos
+        action: Acción
+        invoiceOuts: Fact. emitidas
+        negativeBases: Bases Negativas
+        globalInvoicing: Facturación global
+        invoiceOutCreate: Crear fact. emitida
+        order: Cesta
+        orderList: Listado
+        orderCreate: Nueva orden
+        catalog: Catálogo
+        volume: Volumen
+        shelving: Carros
+        shelvingList: Listado de carros
+        shelvingCreate: Nuevo carro
+        invoiceIns: Fact. recibidas
+        invoiceInCreate: Crear fact. recibida
+        vat: IVA
+        dueDay: Vencimiento
+        intrastat: Intrastat
+        corrective: Rectificativa
+        workers: Trabajadores
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        pbx: Centralita
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        roadmap: Troncales
+        stops: Paradas
+        routes: Rutas
+        cmrsList: Listado de CMRs
+        RouteList: Listado
+        routeCreate: Nueva ruta
+        RouteRoadmap: Troncales
+        RouteRoadmapCreate: Crear troncal
+        autonomous: Autónomos
+        suppliers: Proveedores
+        supplier: Proveedor
+        supplierCreate: Nuevo proveedor
+        accounts: Cuentas
+        addresses: Direcciones
+        agencyTerm: Acuerdo agencia
+        travel: Envíos
+        create: Crear
+        extraCommunity: Extra comunitarios
+        travelCreate: Nuevo envío
+        history: Historial
+        thermographs: Termógrafos
+        items: Artículos
+        diary: Histórico
+        tags: Etiquetas
+        fixedPrice: Precios fijados
+        buyRequest: Peticiones de compra
+        wasteBreakdown: Deglose de mermas
+        itemCreate: Nuevo artículo
+        tax: 'IVA'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        itemTypeCreate: Nueva familia
+        family: Familia
+        lastEntries: Últimas entradas
+        itemType: Familia
+        monitors: Monitores
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -147,39 +261,6 @@ dashboard:
     pageTitles:
         dashboard: Tablón
 customer:
-    pageTitles:
-        customers: Clientes
-        customerCreate: Nuevo cliente
-        list: Listado
-        webPayments: Pagos Web
-        extendedList: Listado extendido
-        notifications: Notificaciones
-        defaulter: Morosos
-        createCustomer: Crear cliente
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        consignees: Consignatarios
-        notes: Notas
-        credits: Créditos
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recobros
-        webAccess: Acceso web
-        log: Historial
-        sms: Sms
-        creditManagement: Gestión de crédito
-        creditContracts: Contratos de crédito
-        creditOpinion: Opinión de crédito
-        others: Otros
-        samples: Plantillas
-        consumption: Consumo
-        mandates: Mandatos
-        contacts: Contactos
-        webPayment: Pago web
-        fileManagement: Gestión documental
-        unpaid: Impago
     list:
         phone: Teléfono
         email: Email
@@ -308,17 +389,6 @@ customer:
             hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL
 entry:
-    pageTitles:
-        entries: Entradas
-        list: Listado
-        summary: Resumen
-        basicData: Datos básicos
-        buys: Compras
-        notes: Notas
-        dms: Gestión documental
-        log: Historial
-        entryCreate: Nueva entrada
-        latestBuys: Últimas compras
     list:
         newEntry: Nueva entrada
         landed: F. entrega
@@ -430,16 +500,6 @@ entry:
         packingOut: Embalaje envíos
         landing: Llegada
 ticket:
-    pageTitles:
-        tickets: Tickets
-        list: Listado
-        ticketCreate: Nuevo ticket
-        summary: Resumen
-        basicData: Datos básicos
-        boxing: Encajado
-        sms: Sms
-        notes: Notas
-        sale: Lineas del pedido
     list:
         nickname: Alias
         state: Estado
@@ -514,18 +574,6 @@ ticket:
         warehouse: Almacén
         agency: Agencia
 claim:
-    pageTitles:
-        claims: Reclamaciones
-        list: Listado
-        claimCreate: Crear reclamación
-        summary: Resumen
-        basicData: Datos básicos
-        lines: Líneas
-        development: Trazabilidad
-        photos: Fotos
-        log: Historial
-        notes: Notas
-        action: Acción
     list:
         customer: Cliente
         assignedTo: Asignada a
@@ -589,14 +637,6 @@ claim:
         noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
         dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Fact. emitidas
-        list: Listado
-        negativeBases: Bases Negativas
-        globalInvoicing: Facturación global
-        invoiceOutCreate: Crear fact. emitida
-        summary: Resumen
-        basicData: Datos básicos
     list:
         ref: Referencia
         issued: Fecha emisión
@@ -664,15 +704,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: Error al descargar CSV
 order:
-    pageTitles:
-        order: Cesta
-        orderList: Listado
-        orderCreate: Nueva orden
-        summary: Resumen
-        basicData: Datos básicos
-        catalog: Catálogo
-        volume: Volumen
-        lines: Líneas
     field:
         salesPersonFk: Comercial
         clientFk: Cliente
@@ -714,13 +745,6 @@ order:
         price: Precio
         amount: Monto
 shelving:
-    pageTitles:
-        shelving: Carros
-        shelvingList: Listado de carros
-        shelvingCreate: Nuevo carro
-        summary: Resumen
-        basicData: Datos básicos
-        log: Historial
     list:
         parking: Parking
         priority: Prioridad
@@ -746,17 +770,6 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Fact. recibidas
-        list: Listado
-        invoiceInCreate: Crear fact. recibida
-        summary: Resumen
-        basicData: Datos básicos
-        vat: IVA
-        dueDay: Vencimiento
-        intrastat: Intrastat
-        corrective: Rectificativa
-        log: Historial
     list:
         ref: Referencia
         supplier: Proveedor
@@ -822,22 +835,6 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
-    pageTitles:
-        workers: Trabajadores
-        list: Listado
-        basicData: Datos básicos
-        summary: Resumen
-        notifications: Notificaciones
-        workerCreate: Nuevo trabajador
-        department: Departamentos
-        pda: PDA
-        notes: Notas
-        dms: Mi documentación
-        pbx: Centralita
-        log: Historial
-        calendar: Calendario
-        timeControl: Control de horario
-        locker: Taquilla
     list:
         name: Nombre
         email: Email
@@ -900,15 +897,6 @@ worker:
         bankEntity: Swift / BIC
     imageNotFound: No se ha encontrado la imagen
 wagon:
-    pageTitles:
-        wagons: Vagones
-        wagonsList: Listado vagones
-        wagonCreate: Crear tipo
-        wagonEdit: Editar tipo
-        typesList: Listado tipos
-        typeCreate: Crear tipo
-        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
     type:
         name: Nombre
         submit: Guardar
@@ -937,31 +925,7 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route/roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
-roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
 route:
-    pageTitles:
-        routes: Rutas
-        cmrsList: Listado de CMRs
-        RouteList: Listado
-        routeCreate: Nueva ruta
-        basicData: Datos básicos
-        summary: Resumen
-        RouteRoadmap: Troncales
-        RouteRoadmapCreate: Crear troncal
-        tickets: Tickets
-        log: Historial
-        autonomous: Autónomos
     cmr:
         list:
             results: resultados
@@ -977,22 +941,6 @@ route:
             viewCmr: Ver CMR
             downloadCmrs: Descargar CMRs
 supplier:
-    pageTitles:
-        suppliers: Proveedores
-        supplier: Proveedor
-        list: Listado
-        supplierCreate: Nuevo proveedor
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        log: Historial
-        accounts: Cuentas
-        contacts: Contactos
-        addresses: Direcciones
-        consumption: Consumo
-        agencyTerm: Acuerdo agencia
-        dms: Gestión documental
     list:
         payMethod: Método de pago
         payDeadline: Plazo de pago
@@ -1084,16 +1032,6 @@ supplier:
         date: Fecha
         reference: Referencia
 travel:
-    pageTitles:
-        travel: Envíos
-        list: Listado
-        create: Crear
-        summary: Resumen
-        extraCommunity: Extra comunitarios
-        travelCreate: Nuevo envío
-        basicData: Datos básicos
-        history: Historial
-        thermographs: Termógrafos
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1140,24 +1078,6 @@ travel:
         travelFileDescription: 'Id envío { travelId }'
         file: Fichero
 item:
-    pageTitles:
-        items: Artículos
-        list: Listado
-        diary: Histórico
-        tags: Etiquetas
-        fixedPrice: Precios fijados
-        buyRequest: Peticiones de compra
-        wasteBreakdown: Deglose de mermas
-        itemCreate: Nuevo artículo
-        basicData: 'Datos básicos'
-        tax: 'IVA'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        log: Historial
-        shelving: Carros
-        itemTypeCreate: Nueva familia
-        family: Familia
-        lastEntries: Últimas entradas
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1243,27 +1163,6 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-item/itemType:
-    pageTitles:
-        itemType: Familia
-        basicData: Datos básicos
-        summary: Resumen
-zone:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-role:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-monitor:
-    pageTitles:
-        monitors: Monitores
-        list: Listado
 components:
     topbar: {}
     itemsFilterPanel:

From 42c58296acea1071ed890092b2acade504d50319 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 19 Jun 2024 08:44:40 +0200
Subject: [PATCH 02/64] refafctor: changed titles errors

---
 src/components/common/VnBreadcrumbs.vue       | 1 -
 src/i18n/locale/en.yml                        | 8 +++++---
 src/i18n/locale/es.yml                        | 8 +++++---
 src/pages/Claim/Card/ClaimSummary.vue         | 2 +-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 8 ++++----
 src/pages/Travel/Card/TravelSummary.vue       | 8 ++++----
 src/pages/Travel/ExtraCommunity.vue           | 2 +-
 src/pages/Travel/ExtraCommunityFilter.vue     | 2 +-
 src/router/index.js                           | 7 ++-----
 src/router/modules/item.js                    | 9 ---------
 src/stores/useNavigationStore.js              | 4 ++--
 11 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 75fd6d499..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -37,7 +37,6 @@ function getBreadcrumb(param) {
         locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
-    //TODO modificar para que funcione títulos de página
     if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9bf272d61..3cf929f82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -100,8 +100,8 @@ globals:
         modes: Modes
         zones: Zones
         zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        deliveryDays: Delivery days
+        upcomingDeliveries: Upcoming deliveries
         role: Role
         alias: Alias
         aliasUsers: Users
@@ -220,6 +220,8 @@ globals:
         lastEntries: Last entries
         itemType: Item type
         monitors: Monitors
+        dashboard: Dashboard
+        users: Users
     created: Created
     worker: Worker
     now: Now
@@ -260,7 +262,7 @@ verifyEmail:
         verifyEmail: Email verification
 dashboard:
     pageTitles:
-        dashboard: Dashboard
+
 customer:
     list:
         phone: Phone
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f33cc8543..2b4498ced 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -100,8 +100,8 @@ globals:
         modes: Modos
         zones: Zonas
         zonesList: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
+        deliveryDays: Días de entrega
+        upcomingDeliveries: Próximos repartos
         role: Role
         alias: Alias
         aliasUsers: Usuarios
@@ -221,6 +221,8 @@ globals:
         lastEntries: Últimas entradas
         itemType: Familia
         monitors: Monitores
+        dashboard: Tablón
+        users: Usuarios
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -259,7 +261,7 @@ verifyEmail:
         verifyEmail: Verificación de correo
 dashboard:
     pageTitles:
-        dashboard: Tablón
+
 customer:
     list:
         phone: Teléfono
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 36a26008e..241709bdd 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -223,7 +223,7 @@ async function changeState(value) {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
-                    :text="t('claim.pageTitles.basicData')"
+                    :text="t('globals.pageTitles.basicData')"
                 />
                 <VnLv
                     :label="t('claim.summary.created')"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 428e7a7a1..cdf012b2a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -209,7 +209,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -240,7 +240,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -265,7 +265,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -289,7 +289,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 91b36f0cf..f0785cff1 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -49,7 +49,7 @@ const entriesTableColumns = computed(() => {
             showValue: false,
         },
         {
-            label: t('supplier.pageTitles.supplier'),
+            label: t('globals.pageTitles.supplier'),
             field: 'supplierName',
             name: 'supplierName',
             align: 'left',
@@ -247,7 +247,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
@@ -265,7 +265,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
@@ -283,7 +283,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 607ecb560..eb410a489 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -132,7 +132,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('supplier.pageTitles.supplier'),
+        label: t('globals.pageTitles.supplier'),
         field: 'cargoSupplierNickname',
         name: 'cargoSupplierNickname',
         align: 'left',
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 7fe628180..5f9adedfa 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -182,7 +182,7 @@ const decrement = (paramsObj, key) => {
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('supplier.pageTitles.supplier')"
+                        :label="t('globals.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
                         @update:model-value="searchFn()"
                         :options="suppliersOptions"
diff --git a/src/router/index.js b/src/router/index.js
index 41ff4c1da..faa3ab5d4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,6 @@ import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
-import { toLowerCamel } from 'src/filters';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -79,13 +78,11 @@ export default route(function (/* { store, ssrContext } */) {
         let title = t(`login.title`);
 
         const matches = to.matched;
-        let moduleName;
         if (matches && matches.length > 1) {
             const module = matches[1];
             const moduleTitle = module.meta && module.meta.title;
-            moduleName = toLowerCamel(module.name);
             if (moduleTitle) {
-                title = t(`${moduleName}.pageTitles.${moduleTitle}`);
+                title = t(`globals.pageTitles.${moduleTitle}`);
             }
         }
 
@@ -94,7 +91,7 @@ export default route(function (/* { store, ssrContext } */) {
         if (childPageTitle && matches.length > 2) {
             if (title != '') title += ': ';
 
-            const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`;
+            const moduleLocale = `globals.pageTitles.${childPageTitle}`;
             const pageTitle = te(moduleLocale)
                 ? t(moduleLocale)
                 : t(`globals.pageTitles.${childPageTitle}`);
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 6e8659747..06fe680eb 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -201,15 +201,6 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },
-                {
-                    path: 'botanical',
-                    name: 'ItemBotanical',
-                    meta: {
-                        title: 'botanical',
-                        icon: 'vn:botanical',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
-                },
             ],
         },
     ],
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 4dd5ed2ae..51f266800 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -60,7 +60,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,
                 icon,
-                title: `${module}.pageTitles.${title}`,
+                title: `globals.pageTitles.${title}`,
             }));
 
         if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
@@ -70,7 +70,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
             children: menuChildren,
         };
         if (meta) {
-            item.title = `${module}.pageTitles.${meta.title}`;
+            item.title = `globals.pageTitles.${meta.title}`;
             item.icon = meta.icon;
         }
 

From 5712b4789a9a5ac07b8d355cf40930d66afbe01a Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 19 Jun 2024 08:47:14 +0200
Subject: [PATCH 03/64] fix: leftMenu test

---
 test/vitest/__tests__/components/Leftmenu.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index ea1c51f8d..10d9d66fb 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -78,13 +78,13 @@ describe('Leftmenu', () => {
             {
                 children: null,
                 name: 'CustomerList',
-                title: 'customer.pageTitles.list',
+                title: 'globals.pageTitles.list',
                 icon: 'view_list',
             },
             {
                 children: null,
                 name: 'CustomerCreate',
-                title: 'customer.pageTitles.createCustomer',
+                title: 'globals.pageTitles.createCustomer',
                 icon: 'vn:addperson',
             },
         ];

From ec6b54cf13c93729d2d337e25159a098417b6de3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 19 Jun 2024 08:55:03 +0200
Subject: [PATCH 04/64] refactor: refs #7030 shelving translation

---
 src/pages/Shelving/Card/ShelvingSummary.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 168552832..05ff55292 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -46,7 +46,7 @@ const filter = {
                         class="header header-link"
                         :to="{ name: 'ShelvingBasicData', params: { id: entityId } }"
                     >
-                        {{ t('shelving.pageTitles.basicData') }}
+                        {{ t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </RouterLink>
                     <VnLv :label="t('shelving.summary.code')" :value="entity.code" />

From 0afd7f4ae1e32e35b97a6442ee975e1a30027ce4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 10:22:20 -0300
Subject: [PATCH 05/64] Ticket tracking

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Ticket/Card/TicketCreateTracking.vue      |  73 +++++++++++
 src/pages/Ticket/Card/TicketTracking.vue      | 121 ++++++++++++++++++
 src/pages/Ticket/locale/en.yml                |   4 +
 src/pages/Ticket/locale/es.yml                |   4 +
 src/router/modules/ticket.js                  |  11 +-
 7 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketCreateTracking.vue
 create mode 100644 src/pages/Ticket/Card/TicketTracking.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..419c33f8a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        tracking: Tracking
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..192c17c90 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        tracking: Estados
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
new file mode 100644
index 000000000..b340b406a
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -0,0 +1,73 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useState } from 'src/composables/useState';
+
+const emit = defineEmits(['onRequestCreated']);
+
+const route = useRoute();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const stateFetchDataRef = ref(null);
+
+const statesOptions = ref([]);
+const workersOptions = ref([]);
+
+const onStateFkChange = (formData) => (formData.userFk = user.value.id);
+</script>
+<template>
+    <FetchData
+        ref="stateFetchDataRef"
+        url="States"
+        auto-load
+        @on-fetch="(data) => (statesOptions = data)"
+    />
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (workersOptions = data)"
+    />
+    <FormModelPopup
+        :title="t('Create tracking')"
+        url-create="Tickets/state"
+        model="CreateTicketTracking"
+        :form-initial-data="{ ticketFk: route.params.id }"
+        @on-data-saved="() => emit('onRequestCreated')"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    v-model="data.stateFk"
+                    :label="t('tracking.state')"
+                    :options="statesOptions"
+                    @update:model-value="onStateFkChange(data)"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                />
+                <VnSelect
+                    :label="t('tracking.worker')"
+                    v-model="data.userFk"
+                    :options="workersOptions"
+                    hide-selected
+                    option-label="nickname"
+                    option-value="id"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create tracking: Crear estado
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
new file mode 100644
index 000000000..548bba831
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -0,0 +1,121 @@
+<script setup>
+import { ref, computed, watch, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import TicketCreateTracking from './TicketCreateTracking.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+
+const route = useRoute();
+const { t } = useI18n();
+const createTrackingDialogRef = ref(null);
+const paginateRef = ref(null);
+
+watch(
+    () => route.params.id,
+    async (val) => {
+        paginateFilter.where.ticketFk = val;
+        paginateRef.value.fetch();
+    }
+);
+
+const paginateFilter = reactive({
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['id', 'name'],
+                include: {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'state',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+
+    order: ['created DESC'],
+    where: {
+        ticketFk: route.params.id,
+    },
+});
+
+const columns = computed(() => [
+    {
+        label: t('tracking.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        format: (val) => val.name,
+    },
+    {
+        label: t('tracking.worker'),
+        name: 'worker',
+        align: 'left',
+    },
+    {
+        label: t('tracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        format: (val) => toDateTimeFormat(val),
+    },
+]);
+
+const openCreateModal = () => createTrackingDialogRef.value.show();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="TicketTracking"
+            :filter="paginateFilter"
+            url="TicketTrackings"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
+                >
+                    <template #body-cell-worker="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.user?.name }}
+                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+        <QDialog
+            ref="createTrackingDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <TicketCreateTracking @on-request-created="paginateRef.fetch()" />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
+            <QTooltip class="text-no-wrap">
+                {{ t('purchaseRequest.newRequest') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..88f5642cd
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,4 @@
+tracking:
+    state: State
+    worker: Worker
+    created: Created
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..6f68842fb 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,6 @@
+tracking:
+    state: Estado
+    worker: Trabajador
+    created: Fecha creación
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..6f63eb75d 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketTracking'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'tracking',
+                    name: 'TicketTracking',
+                    meta: {
+                        title: 'tracking',
+                        icon: 'vn:eye',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketTracking.vue'),
+                },
             ],
         },
     ],

From 17e9d95702e562b5c721b9f66c47c07fda4de482 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 09:02:29 -0300
Subject: [PATCH 06/64] Ticket notes

---
 src/i18n/locale/en.yml                |   1 +
 src/i18n/locale/es.yml                |   1 +
 src/pages/Ticket/Card/TicketCard.vue  |  24 ++++--
 src/pages/Ticket/Card/TicketNotes.vue | 102 ++++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml        |   8 ++
 src/pages/Ticket/locale/es.yml        |   8 ++
 src/router/modules/ticket.js          |  11 ++-
 7 files changed, 148 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketNotes.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..996ead262 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        observation: Notes
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..8358953eb 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        observation: Notas
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 04363b506..a75cacd6c 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,29 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const searchBarDataKeys = {
+    TicketSummary: 'TicketSummary',
+    TicketNotes: 'TicketNotes',
+};
 </script>
 <template>
     <VnCard
         data-key="Ticket"
-        base-url="Tickets"
-        :descriptor="TicketDescriptor"
         :filter-panel="TicketFilter"
-        search-data-key="TicketList"
-        search-url="Tickets/filter"
-        searchbar-label="Search ticket"
-        searchbar-info="You can search by ticket id or alias"
+        :descriptor="TicketDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="routeName"
+        :searchbar-label="t('card.search')"
+        :searchbar-info="t('card.searchInfo')"
     />
 </template>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
new file mode 100644
index 000000000..732395584
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -0,0 +1,102 @@
+<script setup>
+import { ref, watch, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+const ticketNotesCrudRef = ref(null);
+const observationTypes = ref([]);
+const arrayData = useArrayData('TicketNotes');
+const { store } = arrayData;
+
+const crudModelFilter = computed(() => ({
+    where: { ticketFk: route.params.id },
+    fields: ['id', 'ticketFk', 'observationTypeFk', 'description'],
+}));
+
+const crudModelRequiredData = computed(() => ({ ticketFk: route.params.id }));
+
+watch(
+    () => route.params.id,
+    async () => {
+        store.filter = crudModelFilter.value;
+        await ticketNotesCrudRef.value.reload();
+    }
+);
+</script>
+
+<template>
+    <FetchData
+        @on-fetch="(data) => (observationTypes = data)"
+        auto-load
+        url="ObservationTypes"
+    />
+    <CrudModel
+        ref="ticketNotesCrudRef"
+        data-key="TicketNotes"
+        url="TicketObservations"
+        model="TicketNotes"
+        :filter="crudModelFilter"
+        :data-required="crudModelRequiredData"
+        :default-remove="false"
+        auto-load
+    >
+        <template #body="{ rows }">
+            <QCard class="q-px-lg q-py-md">
+                <div
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="q-mb-md row items-center q-gutter-x-md"
+                >
+                    <VnSelect
+                        :label="t('ticketNotes.observationType')"
+                        :options="observationTypes"
+                        hide-selected
+                        option-label="description"
+                        option-value="id"
+                        v-model="row.observationTypeFk"
+                        :disable="!!row.id"
+                    />
+                    <VnInput
+                        :label="t('ticketNotes.description')"
+                        v-model="row.description"
+                        class="col"
+                    />
+                    <QIcon
+                        name="delete"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="ticketNotesCrudRef.remove([row])"
+                    >
+                        <QTooltip>
+                            {{ t('ticketNotes.removeNote') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+                <VnRow v-if="observationTypes.length > rows.length">
+                    <QIcon
+                        name="add_circle"
+                        class="fill-icon-on-hover q-ml-md"
+                        size="sm"
+                        color="primary"
+                        @click="ticketNotesCrudRef.insert()"
+                    >
+                        <QTooltip>
+                            {{ t('ticketNotes.addNote') }}
+                        </QTooltip>
+                    </QIcon>
+                </VnRow>
+            </QCard>
+        </template>
+    </CrudModel>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..087102a07
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,8 @@
+card:
+    search: Search tickets
+    searchInfo: You can search by ticket id or alias
+ticketNotes:
+    observationType: Observation type
+    description: Description
+    removeNote: Remove note
+    addNote: Add note
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..d596fa217 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,10 @@
+card:
+    search: Buscar tickets
+    searchInfo: Buscar tickets por identificador o alias
+ticketNotes:
+    observationType: Tipo de observación
+    description: Descripción
+    removeNote: Quitar nota
+    addNote: Añadir nota
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..a69a92e84 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketNotes'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'observation',
+                    name: 'TicketNotes',
+                    meta: {
+                        title: 'notes',
+                        icon: 'vn:notes',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketNotes.vue'),
+                },
             ],
         },
     ],

From 91df35fcaecb88f791402ebbd03be6f27378a6f4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 11:12:49 -0300
Subject: [PATCH 07/64] Ticket volume

---
 src/i18n/locale/en.yml                 |   1 +
 src/i18n/locale/es.yml                 |   1 +
 src/pages/Ticket/Card/TicketCard.vue   |  24 +++-
 src/pages/Ticket/Card/TicketVolume.vue | 153 +++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml         |  11 ++
 src/pages/Ticket/locale/es.yml         |  11 ++
 src/router/modules/ticket.js           |  11 +-
 7 files changed, 205 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketVolume.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..4edd310ff 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        volume: Volume
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..ceef27f1a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        volume: Volumen
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 04363b506..9b4e05c93 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -1,17 +1,29 @@
 <script setup>
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import { computed } from 'vue';
+
 import VnCard from 'components/common/VnCard.vue';
 import TicketDescriptor from './TicketDescriptor.vue';
 import TicketFilter from '../TicketFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+
+const routeName = computed(() => route.name);
+const searchBarDataKeys = {
+    TicketSummary: 'TicketSummary',
+    TicketVolume: 'TicketVolume',
+};
 </script>
 <template>
     <VnCard
         data-key="Ticket"
-        base-url="Tickets"
-        :descriptor="TicketDescriptor"
         :filter-panel="TicketFilter"
-        search-data-key="TicketList"
-        search-url="Tickets/filter"
-        searchbar-label="Search ticket"
-        searchbar-info="You can search by ticket id or alias"
+        :descriptor="TicketDescriptor"
+        :search-data-key="searchBarDataKeys[routeName]"
+        :search-custom-route-redirect="routeName"
+        :searchbar-label="t('card.search')"
+        :searchbar-info="t('card.searchInfo')"
     />
 </template>
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
new file mode 100644
index 000000000..93da31e53
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -0,0 +1,153 @@
+<script setup>
+import { ref, computed, onMounted, onUnmounted, watch, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import axios from 'axios';
+
+const route = useRoute();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const salesRef = ref(null);
+
+watch(
+    () => route.params.id,
+    async () => {
+        await nextTick();
+        salesRef.value?.fetch();
+    }
+);
+
+const salesFilter = computed(() => ({
+    include: { relation: 'item' },
+    order: 'concept',
+    where: { ticketFk: route.params.id },
+    limit: 20,
+}));
+
+const sales = ref([]);
+const packingTypeVolume = ref([]);
+const rows = computed(() => sales.value);
+
+const columns = computed(() => [
+    {
+        label: t('volume.item'),
+        name: 'item',
+        align: 'left',
+    },
+    {
+        label: t('volume.description'),
+        name: 'description',
+        align: 'left',
+    },
+    {
+        label: t('volume.packingType'),
+        name: 'quantity',
+        field: (row) => row.item.itemPackingTypeFk,
+        align: 'left',
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('volume.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+    },
+    {
+        label: t('volume.volumeQuantity'),
+        name: 'quantity',
+        field: (row) => row.saleVolume?.volume,
+        align: 'left',
+    },
+]);
+
+const applyVolumes = async (salesData) => {
+    try {
+        if (!salesData.length) return;
+
+        sales.value = salesData;
+        const ticket = sales.value[0].ticketFk;
+        const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
+        const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
+
+        sales.value.forEach((sale) => {
+            sale.saleVolume = volumes.get(sale.id);
+        });
+
+        packingTypeVolume.value = data.packingTypeVolume;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(() => {
+    stateStore.rightDrawer = true;
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        ref="salesRef"
+        url="sales"
+        :filter="salesFilter"
+        @on-fetch="(data) => applyVolumes(data)"
+        auto-load
+    />
+    <RightMenu v-if="packingTypeVolume.length">
+        <template #right-panel>
+            <QCard
+                v-for="(packingType, index) in packingTypeVolume"
+                :key="index"
+                class="q-pa-md q-mb-md q-ma-md color-vn-text"
+                bordered
+                flat
+                style="border-color: black"
+            >
+                <QCardSection class="column items-center" horizontal>
+                    <span>
+                        {{ t('volume.type') }}:
+                        {{ dashIfEmpty(packingType.description) }}
+                    </span>
+                </QCardSection>
+                <QCardSection class="column items-center" horizontal>
+                    <span> {{ t('volume.volume') }}: {{ packingType.volume }} </span>
+                </QCardSection>
+            </QCard>
+        </template>
+    </RightMenu>
+    <QTable
+        :rows="rows"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-item="{ row }">
+            <QTd>
+                <QBtn flat color="primary">
+                    {{ row.itemFk }}
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </QBtn>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd>
+                <div class="column">
+                    <span>{{ row.item.name }}</span>
+                    <span class="color-vn-label">{{ row.item.subName }}</span>
+                    <FetchedTags :item="row.item" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+    </QTable>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..6955fd0dd
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,11 @@
+card:
+    search: Search tickets
+    searchInfo: You can search by ticket id or alias
+volume:
+    item: Item
+    description: Description
+    packingType: Packing Type
+    quantity: Quantity
+    volumeQuantity: m³ per quantity
+    type: Type
+    volume: Volume
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..e4bce2480 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,13 @@
+card:
+    search: Buscar tickets
+    searchInfo: Buscar tickets por identificador o alias
+volume:
+    item: Artículo
+    description: Descripción
+    packingType: Encajado
+    quantity: Cantidad
+    volumeQuantity: m³ por cantidad
+    type: Tipo
+    volume: Volumen
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..1202115fa 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketVolume', 'TicketVolume'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'volume',
+                    name: 'TicketVolume',
+                    meta: {
+                        title: 'volume',
+                        icon: 'vn:volume',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketVolume.vue'),
+                },
             ],
         },
     ],

From fb12d4ddc085b7f0de5a13c78bbb9ddfd586a88d Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 17:24:36 -0300
Subject: [PATCH 08/64] WIP

---
 src/i18n/locale/en.yml                  |  5 +++++
 src/i18n/locale/es.yml                  |  5 +++++
 src/pages/Ticket/Card/TicketService.vue |  1 +
 src/pages/Ticket/locale/en.yml          |  8 ++++++++
 src/pages/Ticket/locale/es.yml          |  8 ++++++++
 src/router/modules/ticket.js            | 25 +++++++++++++++++++++++++
 6 files changed, 52 insertions(+)
 create mode 100644 src/pages/Ticket/Card/TicketService.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..347543092 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,11 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+<<<<<<< Updated upstream
+=======
+        dms: File management
+        services: Service
+>>>>>>> Stashed changes
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..3151d72bf 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,11 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+<<<<<<< Updated upstream
+=======
+        dms: Gestión documental
+        service: Servicios
+>>>>>>> Stashed changes
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
new file mode 100644
index 000000000..25e345de0
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -0,0 +1 @@
+<template>Ticket service</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..b8c21600d
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,8 @@
+service:
+    pay: Pay
+    description: Description
+    quantity: Quantity
+    price: Price
+    removeService: Remove service
+    newService: New service type
+    addService: Add service
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..a8ef0347b 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,10 @@
+service:
+    pay: Abonar
+    description: Descripción
+    quantity: Cantidad
+    price: Precio
+    removeService: Quitar servicio
+    newService: Nuevo tipo de servicio
+    addService: Añadir servicio
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..cbcc4b762 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,11 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
+<<<<<<< Updated upstream
         card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+=======
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms', 'TicketService'],
+>>>>>>> Stashed changes
     },
     children: [
         {
@@ -93,6 +97,27 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+<<<<<<< Updated upstream
+=======
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
+                {
+                    path: 'service',
+                    name: 'TicketService',
+                    meta: {
+                        title: 'service',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketService.vue'),
+                },
+>>>>>>> Stashed changes
             ],
         },
     ],

From 8e538fb4638f705656d7544a3d2578373cffa3b5 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 08:27:25 -0300
Subject: [PATCH 09/64] WIP

---
 src/i18n/locale/en.yml                        |   4 -
 src/i18n/locale/es.yml                        |   4 -
 .../Ticket/Card/TicketCreateServiceType.vue   |  49 +++++++
 src/pages/Ticket/Card/TicketService.vue       | 138 +++++++++++++++++-
 src/pages/Ticket/locale/en.yml                |   1 +
 src/pages/Ticket/locale/es.yml                |   1 +
 src/router/modules/ticket.js                  |  19 +--
 7 files changed, 190 insertions(+), 26 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketCreateServiceType.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 347543092..5e7b3621b 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,11 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
-<<<<<<< Updated upstream
-=======
-        dms: File management
         services: Service
->>>>>>> Stashed changes
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3151d72bf..fd3dad952 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,11 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
-<<<<<<< Updated upstream
-=======
-        dms: Gestión documental
         service: Servicios
->>>>>>> Stashed changes
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCreateServiceType.vue b/src/pages/Ticket/Card/TicketCreateServiceType.vue
new file mode 100644
index 000000000..d392ec206
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketCreateServiceType.vue
@@ -0,0 +1,49 @@
+<script setup>
+import { reactive, ref, onMounted, nextTick } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
+
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+const { t } = useI18n();
+const emit = defineEmits(['onDataSaved']);
+
+const nameInputRef = ref(null);
+const serviceFormData = reactive({});
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+onMounted(async () => {
+    await nextTick();
+    nameInputRef.value.focus();
+});
+</script>
+
+<template>
+    <FormModelPopup
+        url-create="TicketServiceTypes"
+        model="TicketServiceType"
+        :title="t('New service type')"
+        :form-initial-data="serviceFormData"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnInput
+                    ref="nameInputRef"
+                    :label="t('service.description')"
+                    v-model="data.name"
+                    :required="true"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    New service type: Nuevo tipo de servicio
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 25e345de0..af2a5c664 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -1 +1,137 @@
-<template>Ticket service</template>
+<script setup>
+import { ref, watch, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import CrudModel from 'components/CrudModel.vue';
+import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
+import FetchData from 'components/FetchData.vue';
+import TicketCreateServiceType from './TicketCreateServiceType.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useArrayData } from 'src/composables/useArrayData';
+
+const route = useRoute();
+const { t } = useI18n();
+const ticketServiceTypeFetchRef = ref(null);
+const ticketServiceCrudRef = ref(null);
+const ticketServiceOptions = ref([]);
+const arrayData = useArrayData('TicketNotes');
+const { store } = arrayData;
+
+const selectedServices = ref(new Set());
+
+const toggleCheckSelection = (id) => {
+    if (selectedServices.value.has(id)) selectedServices.value.delete(id);
+    else selectedServices.value.add(id);
+};
+
+const crudModelFilter = computed(() => ({
+    where: { ticketFk: route.params.id },
+}));
+
+const crudModelRequiredData = computed(() => ({ ticketFk: route.params.id }));
+
+watch(
+    () => route.params.id,
+    async () => {
+        store.filter = crudModelFilter.value;
+        await ticketServiceCrudRef.value.reload();
+    }
+);
+</script>
+
+<template>
+    <FetchData
+        ref="ticketServiceTypeFetchRef"
+        @on-fetch="(data) => (ticketServiceOptions = data)"
+        auto-load
+        url="TicketServiceTypes"
+    />
+    <!-- <Teleport v-if="" to="#st-actions">
+        <QBtn
+            color="primary"
+            :label="t('service.pay')"
+            :disabled="!selectedServices.size"
+            @click.stop="viewAddObservation(selected)"
+        />
+    </Teleport> -->
+    <CrudModel
+        ref="ticketServiceCrudRef"
+        data-key="TicketService"
+        url="TicketServices"
+        model="TicketService"
+        :filter="crudModelFilter"
+        :data-required="crudModelRequiredData"
+        :default-remove="false"
+        auto-load
+    >
+        <template #body="{ rows }">
+            <QCard class="q-px-lg q-py-md">
+                <div
+                    v-for="(row, index) in rows"
+                    :key="index"
+                    class="q-mb-md row items-center q-gutter-x-md"
+                >
+                    <QCheckbox
+                        size="sm"
+                        @update:model-value="toggleCheckSelection(row.id)"
+                        :model-value="selectedServices.has(row.id)"
+                        :toggle-indeterminate="false"
+                    />
+                    <VnSelectDialog
+                        :label="t('service.description')"
+                        v-model="row.ticketServiceTypeFk"
+                        :options="ticketServiceOptions"
+                        option-label="name"
+                        option-value="id"
+                        hide-selected
+                    >
+                        <template #form>
+                            <TicketCreateServiceType
+                                @on-data-saved="ticketServiceTypeFetchRef.fetch()"
+                            />
+                        </template>
+                    </VnSelectDialog>
+                    <VnInput
+                        :label="t('service.quantity')"
+                        v-model="row.quantity"
+                        type="number"
+                        min="0"
+                        :info="t('service.quantityInfo')"
+                    />
+                    <VnInput
+                        :label="t('service.price')"
+                        v-model="row.price"
+                        type="number"
+                        min="0"
+                    />
+                    <QIcon
+                        name="delete"
+                        size="sm"
+                        class="cursor-pointer"
+                        color="primary"
+                        @click="ticketServiceCrudRef.remove([row])"
+                    >
+                        <QTooltip>
+                            {{ t('service.removeNote') }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+                <QIcon
+                    name="add_circle"
+                    class="fill-icon-on-hover q-ml-md"
+                    size="sm"
+                    color="primary"
+                    @click="ticketServiceCrudRef.insert()"
+                >
+                    <QTooltip>
+                        {{ t('service.addService') }}
+                    </QTooltip>
+                </QIcon>
+            </QCard>
+        </template>
+    </CrudModel>
+    <pre>checkeds: {{ selectedServices }}</pre>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b8c21600d..ff928c492 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -6,3 +6,4 @@ service:
     removeService: Remove service
     newService: New service type
     addService: Add service
+    quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index a8ef0347b..f1326e502 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -6,5 +6,6 @@ service:
     removeService: Quitar servicio
     newService: Nuevo tipo de servicio
     addService: Añadir servicio
+    quantityInfo: Para crear sevicios con cantidades negativas marcar servicio en el ticket origen y apretar el boton abonar.
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index cbcc4b762..eadaa1cab 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,11 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-<<<<<<< Updated upstream
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
-=======
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms', 'TicketService'],
->>>>>>> Stashed changes
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketService'],
     },
     children: [
         {
@@ -97,17 +93,7 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
-<<<<<<< Updated upstream
-=======
-                {
-                    path: 'dms',
-                    name: 'TicketDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'cloud_upload',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
-                },
+
                 {
                     path: 'service',
                     name: 'TicketService',
@@ -117,7 +103,6 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketService.vue'),
                 },
->>>>>>> Stashed changes
             ],
         },
     ],

From a57df459a6be01d2e312ff16477aa3be95143745 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 12:54:21 -0300
Subject: [PATCH 10/64] Add pay button

---
 src/pages/Ticket/Card/TicketService.vue | 39 +++++++++++++++++++++----
 src/pages/Ticket/locale/en.yml          |  1 +
 src/pages/Ticket/locale/es.yml          |  1 +
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index af2a5c664..f071c7baa 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { ref, watch, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CrudModel from 'components/CrudModel.vue';
@@ -8,17 +8,22 @@ import VnSelectDialog from 'src/components/common/VnSelectDialog.vue';
 import FetchData from 'components/FetchData.vue';
 import TicketCreateServiceType from './TicketCreateServiceType.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
+import { useStateStore } from 'stores/useStateStore';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
 
+const stateStore = useStateStore();
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const ticketServiceTypeFetchRef = ref(null);
 const ticketServiceCrudRef = ref(null);
 const ticketServiceOptions = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
+const { notify } = useNotify();
 
 const selectedServices = ref(new Set());
 
@@ -40,6 +45,29 @@ watch(
         await ticketServiceCrudRef.value.reload();
     }
 );
+
+const createRefund = async () => {
+    try {
+        if (!selectedServices.value.size) return;
+
+        const params = {
+            servicesIds: Array.from(selectedServices.value),
+            withWarehouse: false,
+            negative: true,
+        };
+        const { data } = await axios.post('Sales/clone', params);
+        const [refundTicket] = data;
+        notify(
+            t('service.createRefundSuccess', {
+                ticketId: refundTicket.id,
+            }),
+            'positive'
+        );
+        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
+    } catch (error) {
+        console.error(error);
+    }
+};
 </script>
 
 <template>
@@ -49,14 +77,14 @@ watch(
         auto-load
         url="TicketServiceTypes"
     />
-    <!-- <Teleport v-if="" to="#st-actions">
+    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
         <QBtn
             color="primary"
             :label="t('service.pay')"
             :disabled="!selectedServices.size"
-            @click.stop="viewAddObservation(selected)"
+            @click.stop="createRefund()"
         />
-    </Teleport> -->
+    </Teleport>
     <CrudModel
         ref="ticketServiceCrudRef"
         data-key="TicketService"
@@ -133,5 +161,4 @@ watch(
             </QCard>
         </template>
     </CrudModel>
-    <pre>checkeds: {{ selectedServices }}</pre>
 </template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index ff928c492..9162ca945 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -7,3 +7,4 @@ service:
     newService: New service type
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
+    createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index f1326e502..bb02a946f 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -7,5 +7,6 @@ service:
     newService: Nuevo tipo de servicio
     addService: Añadir servicio
     quantityInfo: Para crear sevicios con cantidades negativas marcar servicio en el ticket origen y apretar el boton abonar.
+    createRefundSuccess: 'Se ha creado siguiente ticket de abono: { ticketId }'
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From 1529e2dd4f15dd693abed81c2732c335f618aa84 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 12:58:49 -0300
Subject: [PATCH 11/64] Add tooltip to add state button

---
 src/pages/Ticket/Card/TicketTracking.vue | 2 +-
 src/pages/Ticket/locale/en.yml           | 1 +
 src/pages/Ticket/locale/es.yml           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 548bba831..2ddb278fa 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -114,7 +114,7 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
         <QPageSticky :offset="[20, 20]">
             <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
             <QTooltip class="text-no-wrap">
-                {{ t('purchaseRequest.newRequest') }}
+                {{ t('tracking.addState') }}
             </QTooltip>
         </QPageSticky>
     </QPage>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 88f5642cd..4fe6072b2 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -2,3 +2,4 @@ tracking:
     state: State
     worker: Worker
     created: Created
+    addState: Add state
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 6f68842fb..d116abb12 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -2,5 +2,6 @@ tracking:
     state: Estado
     worker: Trabajador
     created: Fecha creación
+    addState: Añadir estado
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From d409b9ea8688658593c8cdb04a83a20ed5f157da Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 22:51:26 +0200
Subject: [PATCH 12/64] fix: WorkerSelect option format

---
 src/pages/Ticket/Card/TicketCreateTracking.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index b340b406a..399663571 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -59,9 +59,22 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                     v-model="data.userFk"
                     :options="workersOptions"
                     hide-selected
-                    option-label="nickname"
+                    option-label="name"
                     option-value="id"
-                />
+                >
+                    <template #option="{ opt, itemProps }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ opt.name }}
+                                </QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.nickname }}, {{ opt.code }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template></VnSelect
+                >
             </VnRow>
         </template>
     </FormModelPopup>

From 151978160b0f1cf2f02d3ca474d051817f0da14d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 23:01:26 +0200
Subject: [PATCH 13/64] fix: ticket order

---
 src/router/modules/ticket.js | 61 +++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 475552585..2766d034a 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'TicketMain' },
     menus: {
-        main: ['TicketList', 'TicketAdvance', 'TicketFuture'],
+        main: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
         card: [
             'TicketBasicData',
             'TicketBoxing',
@@ -49,13 +49,13 @@ export default {
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
                 {
-                    name: 'TicketAdvance',
-                    path: 'advance',
+                    name: 'TicketWeekly',
+                    path: 'weekly',
                     meta: {
-                        title: 'ticketAdvance',
-                        icon: 'keyboard_double_arrow_left',
+                        title: 'weeklyTickets',
+                        icon: 'access_time',
                     },
-                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
+                    component: () => import('src/pages/Ticket/TicketWeekly.vue'),
                 },
                 {
                     name: 'TicketFuture',
@@ -66,6 +66,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketFuture.vue'),
                 },
+                {
+                    name: 'TicketAdvance',
+                    path: 'advance',
+                    meta: {
+                        title: 'ticketAdvance',
+                        icon: 'keyboard_double_arrow_left',
+                    },
+                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
+                },
             ],
         },
         {
@@ -103,22 +112,14 @@ export default {
                     component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
                 },
                 {
-                    path: 'boxing',
-                    name: 'TicketBoxing',
+                    path: 'request',
+                    name: 'TicketPurchaseRequest',
                     meta: {
-                        title: 'boxing',
-                        icon: 'vn:package',
+                        title: 'purchaseRequest',
+                        icon: 'vn:buyrequest',
                     },
-                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
-                },
-                {
-                    path: 'sms',
-                    name: 'TicketSms',
-                    meta: {
-                        title: 'sms',
-                        icon: 'sms',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
+                    component: () =>
+                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
                 },
                 {
                     path: 'tracking',
@@ -139,14 +140,22 @@ export default {
                     component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
                 },
                 {
-                    path: 'request',
-                    name: 'TicketPurchaseRequest',
+                    path: 'boxing',
+                    name: 'TicketBoxing',
                     meta: {
-                        title: 'purchaseRequest',
-                        icon: 'vn:buyrequest',
+                        title: 'boxing',
+                        icon: 'vn:package',
                     },
-                    component: () =>
-                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
+                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'TicketSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'sms',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
             ],
         },

From 677e71d1a752dad74982f40dbb3ad55a303e9d95 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Jun 2024 08:26:04 +0200
Subject: [PATCH 14/64] refactor: refs #7543 standarized descriptors

---
 src/pages/Agency/Card/AgencyDescriptor.vue    | 21 ++++++++++++
 src/pages/Claim/Card/ClaimDescriptor.vue      | 17 ++++++++++
 .../Customer/Card/CustomerDescriptor.vue      | 14 --------
 src/pages/Entry/Card/EntryDescriptor.vue      |  8 ++++-
 src/pages/Entry/Card/EntryDescriptorProxy.vue |  3 +-
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    | 17 +++++++++-
 .../Card/InvoiceInDescriptorProxy.vue         |  9 +++--
 src/pages/Order/Card/OrderDescriptor.vue      | 21 ++++++++++++
 src/pages/Route/Card/RouteDescriptor.vue      |  7 +++-
 src/pages/Route/Card/RouteDescriptorProxy.vue |  3 +-
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 17 ++++++++++
 .../Shelving/Card/ShelvingDescriptor.vue      | 26 +++++++++++++++
 .../Shelving/Card/ShelvingDescriptorProxy.vue |  5 +--
 src/pages/Ticket/Card/TicketDescriptor.vue    |  6 ++++
 .../Ticket/Card/TicketDescriptorProxy.vue     |  3 +-
 src/pages/Travel/Card/TravelDescriptor.vue    | 33 ++++++++-----------
 .../Travel/Card/TravelDescriptorProxy.vue     |  3 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  1 +
 src/pages/Zone/Card/ZoneDescriptor.vue        | 27 ++++++---------
 src/pages/Zone/Card/ZoneDescriptorProxy.vue   |  3 +-
 20 files changed, 182 insertions(+), 62 deletions(-)

diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index b9772037c..8b6a6603e 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -28,8 +28,29 @@ const card = computed(() => store.data);
         :title="card?.name"
         :subtitle="props.id"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="garage_home"
+                color="white"
+                class="link"
+                :to="{ name: 'RouteList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del modulo
+</i18n>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 5336c4427..e4b96b5b6 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -61,6 +61,22 @@ onMounted(async () => {
         @on-fetch="setData"
         data-key="Claim"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:claims"
+                color="white"
+                class="link"
+                :to="{ name: 'ClaimList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
@@ -171,4 +187,5 @@ onMounted(async () => {
         claimRate: Claming rate
     es:
         claimRate: Ratio de reclamación
+        Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 2d3b17bc9..5e688076a 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -45,20 +45,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :summary="$props.summary"
         data-key="customerData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="sm"
-                icon="vn:Person"
-                color="white"
-                :to="{ name: 'CustomerList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <CustomerDescriptorMenu :customer="entity" />
         </template>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 3c925ead6..317400181 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, watch } from 'vue';
+import { ref, computed, watch, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -10,6 +10,7 @@ import useCardDescription from 'src/composables/useCardDescription';
 import { useState } from 'src/composables/useState';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
+import { getUrl } from 'src/composables/getUrl';
 
 const $props = defineProps({
     id: {
@@ -28,6 +29,7 @@ const { t } = useI18n();
 const { openReport } = usePrintService();
 const state = useState();
 const entryDescriptorRef = ref(null);
+const url = ref();
 
 const entryFilter = {
     include: [
@@ -69,6 +71,9 @@ const entryFilter = {
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+onMounted(async () => {
+    url.value = await getUrl('');
+});
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
@@ -114,6 +119,7 @@ watch;
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="entry"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
diff --git a/src/pages/Entry/Card/EntryDescriptorProxy.vue b/src/pages/Entry/Card/EntryDescriptorProxy.vue
index e1c05f1ac..17b542ec1 100644
--- a/src/pages/Entry/Card/EntryDescriptorProxy.vue
+++ b/src/pages/Entry/Card/EntryDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import EntryDescriptor from './EntryDescriptor.vue';
+import EntrySummary from './EntrySummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <EntryDescriptor v-if="$props.id" :id="$props.id" />
+        <EntryDescriptor v-if="$props.id" :id="$props.id" :summary="EntrySummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 68dc5be4b..1381bdc73 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -9,6 +9,7 @@ import { useRole } from 'src/composables/useRole';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
+import useCardDescription from 'src/composables/useCardDescription';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
@@ -19,7 +20,16 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 
-const $props = defineProps({ id: { type: Number, default: null } });
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+});
 
 const { push, currentRoute } = useRouter();
 
@@ -252,6 +262,9 @@ const createInvoiceInCorrection = async () => {
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 <template>
     <FetchData
@@ -283,6 +296,8 @@ const createInvoiceInCorrection = async () => {
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
         title="supplierRef"
+        @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
index a36656c1d..e9ca762ed 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
-import InvoiceInDescriptor from "pages/InvoiceIn/Card/InvoiceInDescriptor.vue";
+import InvoiceInDescriptor from 'pages/InvoiceIn/Card/InvoiceInDescriptor.vue';
+import InvoiceInSummary from './InvoiceInSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,10 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <InvoiceInDescriptor v-if="$props.id" :id="$props.id" />
+        <InvoiceInDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="InvoiceInSummary"
+        />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 60e86d04e..92bc5ad66 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -87,6 +87,22 @@ const total = ref(null);
         @on-fetch="setData"
         data-key="orderData"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:basket"
+                color="white"
+                class="link"
+                :to="{ name: 'OrderList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #menu="{ entity }">
             <OrderDescriptorMenu :order="entity" />
         </template>
@@ -137,3 +153,8 @@ const total = ref(null);
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index 218764277..a0e0aaf3a 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -74,8 +78,9 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
-        data-key="Routes"
+        data-key="routeData"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
diff --git a/src/pages/Route/Card/RouteDescriptorProxy.vue b/src/pages/Route/Card/RouteDescriptorProxy.vue
index 541f9716a..1ff39a51e 100644
--- a/src/pages/Route/Card/RouteDescriptorProxy.vue
+++ b/src/pages/Route/Card/RouteDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import RouteDescriptor from 'pages/Route/Card/RouteDescriptor.vue';
+import RouteSummary from './RouteSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <RouteDescriptor v-if="$props.id" :id="$props.id" />
+        <RouteDescriptor v-if="$props.id" :id="$props.id" :summary="RouteSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 788173688..78851ef5f 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -39,6 +39,22 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         data-key="Roadmap"
         @on-fetch="setData"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:troncales"
+                color="white"
+                class="link"
+                :to="{ name: 'RouteList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
             <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
@@ -60,4 +76,5 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
 es:
     Roadmap: Troncal
     Carrier: Transportista
+    Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 6beca6d88..0fac92f65 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -14,6 +14,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -51,7 +55,24 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="Shelvings"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:inventory"
+                color="white"
+                class="link"
+                :to="{ name: 'ShelvingList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
@@ -69,3 +90,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al indice del modulo
+</i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue b/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
index 8023271b0..9561b77db 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
-import ShelvingDescriptor from "pages/Shelving/Card/ShelvingDescriptor.vue";
+import ShelvingDescriptor from 'pages/Shelving/Card/ShelvingDescriptor.vue';
+import ShelvingSummary from './ShelvingSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <ShelvingDescriptor v-if="$props.id" :id="$props.id" />
+        <ShelvingDescriptor v-if="$props.id" :id="$props.id" :summary="ShelvingSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index dfbcfc106..3c5e6c80d 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -16,6 +16,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -83,6 +87,7 @@ const setData = (entity) =>
         :subtitle="data.subtitle"
         data-key="ticketData"
         @on-fetch="setData"
+        :summary="$props.summary"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
@@ -153,4 +158,5 @@ const setData = (entity) =>
 <i18n>
 es:
     This ticket is deleted: Este ticket está eliminado
+    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptorProxy.vue b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
index 7799b9ee6..583ba35e7 100644
--- a/src/pages/Ticket/Card/TicketDescriptorProxy.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import TicketDescriptor from './TicketDescriptor.vue';
+import TicketSummary from './TicketSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -10,6 +11,6 @@ const $props = defineProps({
 </script>
 <template>
     <QPopupProxy>
-        <TicketDescriptor v-if="$props.id" :id="$props.id" />
+        <TicketDescriptor v-if="$props.id" :id="$props.id" :summary="TicketSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6d3707828..0b768ef22 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -1,10 +1,11 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
 
 import { toDate } from 'src/filters';
@@ -15,6 +16,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -51,32 +56,22 @@ const filter = {
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+
+const data = ref(useCardDescription());
+const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.id));
 </script>
 
 <template>
     <CardDescriptor
         module="Travel"
         :url="`Travels/${entityId}`"
-        title="ref"
+        :title="data.title"
+        :subtitle="data.subtitle"
         :filter="filter"
-        data-key="Travel"
+        data-key="travelData"
+        :summary="$props.summary"
+        @on-fetch="setData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="local_airport"
-                color="white"
-                class="link"
-                :to="{ name: 'TravelList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
diff --git a/src/pages/Travel/Card/TravelDescriptorProxy.vue b/src/pages/Travel/Card/TravelDescriptorProxy.vue
index ab5c42d7e..eddadb382 100644
--- a/src/pages/Travel/Card/TravelDescriptorProxy.vue
+++ b/src/pages/Travel/Card/TravelDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import TravelDescriptor from './TravelDescriptor.vue';
+import TravelSummary from './TravelSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <TravelDescriptor v-if="$props.id" :id="$props.id" />
+        <TravelDescriptor v-if="$props.id" :id="$props.id" :summary="TravelSummary" />
     </QPopupProxy>
 </template>
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 6739b3356..3ad14cf3f 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -200,4 +200,5 @@ es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
     Change password: Cambiar contraseña
+    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index b3a55bbe0..548ab3427 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -17,6 +17,10 @@ const $props = defineProps({
         required: false,
         default: null,
     },
+    summary: {
+        type: Object,
+        default: null,
+    },
 });
 
 const route = useRoute();
@@ -38,7 +42,6 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-
 const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
@@ -53,23 +56,8 @@ const setData = (entity) => {
         :filter="filter"
         @on-fetch="setData"
         data-key="zoneData"
+        :summary="$props.summary"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:zone"
-                color="white"
-                class="link"
-                :to="{ name: 'ZoneList' }"
-            >
-                <QTooltip>
-                    {{ t('Summary') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
@@ -82,3 +70,8 @@ const setData = (entity) => {
         </template>
     </CardDescriptor>
 </template>
+
+<i18n>
+es:
+    Go to module index: Ir al índice del módulo
+</i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptorProxy.vue b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
index 15c5fb0e5..27102ac07 100644
--- a/src/pages/Zone/Card/ZoneDescriptorProxy.vue
+++ b/src/pages/Zone/Card/ZoneDescriptorProxy.vue
@@ -1,5 +1,6 @@
 <script setup>
 import ZoneDescriptor from './ZoneDescriptor.vue';
+import ZoneSummary from './ZoneSummary.vue';
 
 const $props = defineProps({
     id: {
@@ -11,6 +12,6 @@ const $props = defineProps({
 
 <template>
     <QPopupProxy>
-        <ZoneDescriptor v-if="$props.id" :id="$props.id" />
+        <ZoneDescriptor v-if="$props.id" :id="$props.id" :summary="ZoneSummary" />
     </QPopupProxy>
 </template>

From cd01ba8fe1b90a1abfac8e97660a90f13a6b4d15 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 08:36:17 -0300
Subject: [PATCH 15/64] changes

---
 src/pages/Ticket/Card/TicketNotes.vue | 119 +++++++++++++-------------
 1 file changed, 61 insertions(+), 58 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 732395584..747955e6d 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -40,63 +40,66 @@ watch(
         auto-load
         url="ObservationTypes"
     />
-    <CrudModel
-        ref="ticketNotesCrudRef"
-        data-key="TicketNotes"
-        url="TicketObservations"
-        model="TicketNotes"
-        :filter="crudModelFilter"
-        :data-required="crudModelRequiredData"
-        :default-remove="false"
-        auto-load
-    >
-        <template #body="{ rows }">
-            <QCard class="q-px-lg q-py-md">
-                <div
-                    v-for="(row, index) in rows"
-                    :key="index"
-                    class="q-mb-md row items-center q-gutter-x-md"
-                >
-                    <VnSelect
-                        :label="t('ticketNotes.observationType')"
-                        :options="observationTypes"
-                        hide-selected
-                        option-label="description"
-                        option-value="id"
-                        v-model="row.observationTypeFk"
-                        :disable="!!row.id"
-                    />
-                    <VnInput
-                        :label="t('ticketNotes.description')"
-                        v-model="row.description"
-                        class="col"
-                    />
-                    <QIcon
-                        name="delete"
-                        size="sm"
-                        class="cursor-pointer"
-                        color="primary"
-                        @click="ticketNotesCrudRef.remove([row])"
+    <div class="flex justify-center">
+        <CrudModel
+            ref="ticketNotesCrudRef"
+            data-key="TicketNotes"
+            url="TicketObservations"
+            model="TicketNotes"
+            :filter="crudModelFilter"
+            :data-required="crudModelRequiredData"
+            :default-remove="false"
+            auto-load
+            style="max-width: 800px"
+        >
+            <template #body="{ rows }">
+                <QCard class="q-px-lg q-py-md">
+                    <div
+                        v-for="(row, index) in rows"
+                        :key="index"
+                        class="q-mb-md row items-center q-gutter-x-md"
                     >
-                        <QTooltip>
-                            {{ t('ticketNotes.removeNote') }}
-                        </QTooltip>
-                    </QIcon>
-                </div>
-                <VnRow v-if="observationTypes.length > rows.length">
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketNotesCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('ticketNotes.addNote') }}
-                        </QTooltip>
-                    </QIcon>
-                </VnRow>
-            </QCard>
-        </template>
-    </CrudModel>
+                        <VnSelect
+                            :label="t('ticketNotes.observationType')"
+                            :options="observationTypes"
+                            hide-selected
+                            option-label="description"
+                            option-value="id"
+                            v-model="row.observationTypeFk"
+                            :disable="!!row.id"
+                        />
+                        <VnInput
+                            :label="t('ticketNotes.description')"
+                            v-model="row.description"
+                            class="col"
+                        />
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="ticketNotesCrudRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('ticketNotes.removeNote') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
+                    <VnRow v-if="observationTypes.length > rows.length">
+                        <QIcon
+                            name="add_circle"
+                            class="fill-icon-on-hover q-ml-md"
+                            size="sm"
+                            color="primary"
+                            @click="ticketNotesCrudRef.insert()"
+                        >
+                            <QTooltip>
+                                {{ t('ticketNotes.addNote') }}
+                            </QTooltip>
+                        </QIcon>
+                    </VnRow>
+                </QCard>
+            </template>
+        </CrudModel>
+    </div>
 </template>

From ae73dd047f214d8dcf94882602338898a4209c35 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 08:55:30 -0300
Subject: [PATCH 16/64] changes

---
 src/pages/Ticket/Card/TicketCard.vue       | 1 -
 src/pages/Ticket/Card/TicketDescriptor.vue | 8 ++++----
 src/pages/Ticket/Card/TicketNotes.vue      | 9 +++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 62b112d5d..689a717e6 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -13,7 +13,6 @@ const route = useRoute();
 const routeName = computed(() => route.name);
 const searchBarDataKeys = {
     TicketSummary: 'TicketSummary',
-    TicketNotes: 'TicketNotes',
     TicketSale: 'TicketSale',
     TicketPurchaseRequest: 'TicketPurchaseRequest',
 };
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index dfbcfc106..5fb312b28 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -71,7 +71,7 @@ const filter = {
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.client.name, entity.id));
+    (data.value = useCardDescription(entity.client?.name, entity.id));
 </script>
 
 <template>
@@ -92,7 +92,7 @@ const setData = (entity) =>
                 <template #value>
                     <span class="link">
                         {{ entity.clientFk }}
-                        <CustomerDescriptorProxy :id="entity.client.id" />
+                        <CustomerDescriptorProxy :id="entity.client?.id" />
                     </span>
                 </template>
             </VnLv>
@@ -109,8 +109,8 @@ const setData = (entity) =>
             <VnLv :label="t('ticket.summary.salesPerson')">
                 <template #value>
                     <VnUserLink
-                        :name="entity.client.salesPersonUser?.name"
-                        :worker-id="entity.client.salesPersonFk"
+                        :name="entity.client?.salesPersonUser?.name"
+                        :worker-id="entity.client?.salesPersonFk"
                     />
                 </template>
             </VnLv>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 747955e6d..cfc0c2431 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, computed } from 'vue';
+import { ref, watch, computed, reactive } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -18,17 +18,18 @@ const observationTypes = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
 
-const crudModelFilter = computed(() => ({
+const crudModelFilter = reactive({
     where: { ticketFk: route.params.id },
     fields: ['id', 'ticketFk', 'observationTypeFk', 'description'],
-}));
+});
 
 const crudModelRequiredData = computed(() => ({ ticketFk: route.params.id }));
 
 watch(
     () => route.params.id,
     async () => {
-        store.filter = crudModelFilter.value;
+        crudModelFilter.where.ticketFk = route.params.id;
+        store.filter = crudModelFilter;
         await ticketNotesCrudRef.value.reload();
     }
 );

From 452d1000bc6d37118b32d08392e4ba172222d2c5 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 26 Jun 2024 14:28:21 +0200
Subject: [PATCH 17/64] refactor: refs #7543 requested changes

---
 src/i18n/locale/en.yml                           |  1 +
 src/i18n/locale/es.yml                           |  1 +
 src/pages/Agency/Card/AgencyDescriptor.vue       |  7 +------
 src/pages/Claim/Card/ClaimDescriptor.vue         |  3 +--
 src/pages/Entry/Card/EntryDescriptor.vue         |  6 +-----
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue |  6 +-----
 src/pages/Order/Card/OrderDescriptor.vue         |  7 +------
 src/pages/Route/Card/RouteDescriptor.vue         |  6 +-----
 src/pages/Route/Roadmap/RoadmapDescriptor.vue    |  3 +--
 src/pages/Shelving/Card/ShelvingDescriptor.vue   | 13 ++-----------
 src/pages/Ticket/Card/TicketDescriptor.vue       |  6 +-----
 src/pages/Travel/Card/TravelDescriptor.vue       |  6 +-----
 src/pages/Worker/Card/WorkerDescriptor.vue       |  7 +------
 src/pages/Zone/Card/ZoneDescriptor.vue           |  6 +-----
 14 files changed, 15 insertions(+), 63 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f8850d396..b18c396c0 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -114,6 +114,7 @@ globals:
     new: New
     comment: Comment
     observations: Observations
+    goToModuleIndex: Go to module index
 errors:
     statusUnauthorized: Access denied
     statusInternalServerError: An internal server error has ocurred
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index e5924f93b..e0c563f07 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -115,6 +115,7 @@ globals:
     new: Nuevo
     comment: Comentario
     observations: Observaciones
+    goToModuleIndex: Ir al índice del módulo
 errors:
     statusUnauthorized: Acceso denegado
     statusInternalServerError: Ha ocurrido un error interno del servidor
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 8b6a6603e..46b225ff2 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -40,7 +40,7 @@ const card = computed(() => store.data);
                 :to="{ name: 'RouteList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -49,8 +49,3 @@ const card = computed(() => store.data);
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al índice del modulo
-</i18n>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index e4b96b5b6..9b25aa2d9 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
                 :to="{ name: 'ClaimList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -187,5 +187,4 @@ onMounted(async () => {
         claimRate: Claming rate
     es:
         claimRate: Ratio de reclamación
-        Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index 317400181..a55ad67cd 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -18,10 +18,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -119,7 +115,7 @@ watch;
         :subtitle="data.subtitle"
         @on-fetch="setData"
         data-key="entry"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <QItem v-ripple clickable @click="showEntryReport(entity)">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 1381bdc73..e8428dca1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -25,10 +25,6 @@ const $props = defineProps({
         type: Number,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const { push, currentRoute } = useRouter();
@@ -297,7 +293,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :filter="filter"
         title="supplierRef"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 92bc5ad66..82d7e0d05 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -99,7 +99,7 @@ const total = ref(null);
                 :to="{ name: 'OrderList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -153,8 +153,3 @@ const total = ref(null);
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al índice del módulo
-</i18n>
diff --git a/src/pages/Route/Card/RouteDescriptor.vue b/src/pages/Route/Card/RouteDescriptor.vue
index a0e0aaf3a..2fa0e77e0 100644
--- a/src/pages/Route/Card/RouteDescriptor.vue
+++ b/src/pages/Route/Card/RouteDescriptor.vue
@@ -14,10 +14,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -80,7 +76,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="routeData"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #body="{ entity }">
             <VnLv :label="t('Date')" :value="toDate(entity?.created)" />
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 78851ef5f..0f52f087f 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -51,7 +51,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
                 :to="{ name: 'RouteList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -76,5 +76,4 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
 es:
     Roadmap: Troncal
     Carrier: Transportista
-    Go to module index: Ir al índice del módulo
 </i18n>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 0fac92f65..9322faaa0 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -14,10 +14,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -55,7 +51,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         :subtitle="data.subtitle"
         data-key="Shelvings"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #header-extra-action>
             <QBtn
@@ -69,7 +65,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
                 :to="{ name: 'ShelvingList' }"
             >
                 <QTooltip>
-                    {{ t('Go to module index') }}
+                    {{ t('globals.goToModuleIndex') }}
                 </QTooltip>
             </QBtn>
         </template>
@@ -90,8 +86,3 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         </template>
     </CardDescriptor>
 </template>
-
-<i18n>
-es:
-    Go to module index: Ir al indice del modulo
-</i18n>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 3c5e6c80d..ab95ee643 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -16,10 +16,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -87,7 +83,7 @@ const setData = (entity) =>
         :subtitle="data.subtitle"
         data-key="ticketData"
         @on-fetch="setData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 0b768ef22..b74761b37 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -16,10 +16,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -69,7 +65,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :subtitle="data.subtitle"
         :filter="filter"
         data-key="travelData"
-        :summary="$props.summary"
+        :summary="$attrs"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 3ad14cf3f..82a698878 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -17,10 +17,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -115,7 +111,7 @@ const refetch = async () => await cardDescriptorRef.value.getData();
         :filter="filter"
         :title="data.title"
         :subtitle="data.subtitle"
-        :summary="$props.summary"
+        :summary="$attrs"
         @on-fetch="
             (data) => {
                 worker = data;
@@ -200,5 +196,4 @@ es:
     Click to allow the user to be disabled: Marcar para deshabilitar
     Click to exclude the user from getting disabled: Marcar para no deshabilitar
     Change password: Cambiar contraseña
-    Go to module index: Ir al índice del modulo
 </i18n>
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 548ab3427..602fefde3 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -17,10 +17,6 @@ const $props = defineProps({
         required: false,
         default: null,
     },
-    summary: {
-        type: Object,
-        default: null,
-    },
 });
 
 const route = useRoute();
@@ -56,7 +52,7 @@ const setData = (entity) => {
         :filter="filter"
         @on-fetch="setData"
         data-key="zoneData"
-        :summary="$props.summary"
+        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <ZoneDescriptorMenuItems :zone="entity" />

From 5b07f3015d9be4ffb6fdd8f610b901bf6ceedaf7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 17:02:21 -0300
Subject: [PATCH 18/64] small change

---
 src/pages/Ticket/Card/TicketCard.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketCard.vue b/src/pages/Ticket/Card/TicketCard.vue
index 65abcc010..689a717e6 100644
--- a/src/pages/Ticket/Card/TicketCard.vue
+++ b/src/pages/Ticket/Card/TicketCard.vue
@@ -13,7 +13,6 @@ const route = useRoute();
 const routeName = computed(() => route.name);
 const searchBarDataKeys = {
     TicketSummary: 'TicketSummary',
-    TicketVolume: 'TicketVolume',
     TicketSale: 'TicketSale',
     TicketPurchaseRequest: 'TicketPurchaseRequest',
 };

From 381a9c6d1d82d3d0c82e88ab674fc53ac5eeaabb Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 27 Jun 2024 13:56:20 +0200
Subject: [PATCH 19/64] feat: remake vnInputDate and fix: FormModel has changes
 when error

---
 src/components/FormModel.vue          |  10 +-
 src/components/common/VnInputDate.vue | 150 +++++++++++++-------------
 2 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index f10dee61a..ab9fa921a 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -90,7 +90,7 @@ const $props = defineProps({
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
 ).value;
 const componentIsRendered = ref(false);
 const arrayData = useArrayData(modelValue);
@@ -137,7 +137,7 @@ onMounted(async () => {
                     JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                 isResetting.value = false;
             },
-            { deep: true }
+            { deep: true },
         );
     }
 });
@@ -145,7 +145,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val)
+        (val) => updateAndEmit('onFetch', val),
     );
 
 watch(formUrl, async () => {
@@ -206,11 +206,11 @@ async function save() {
 
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
+        hasChanges.value = false;
     } catch (err) {
         console.error(err);
         notify('errors.writeRequest', 'negative');
     } finally {
-        hasChanges.value = false;
         isLoading.value = false;
     }
 }
@@ -239,7 +239,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        }
+        },
     );
 }
 
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 77ab2692d..f2c6cbe60 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,13 +1,10 @@
 <script setup>
 import { computed, ref } from 'vue';
+import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import isValidDate from 'filters/isValidDate';
 
-const props = defineProps({
-    modelValue: {
-        type: String,
-        default: null,
-    },
+const model = defineModel({ type: String });
+const $props = defineProps({
     readonly: {
         type: Boolean,
         default: false,
@@ -21,64 +18,16 @@ const props = defineProps({
         default: false,
     },
 });
-const hover = ref(false);
 
 const emit = defineEmits(['update:modelValue']);
-
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-const joinDateAndTime = (date, time) => {
-    if (!date) {
-        return null;
-    }
-    if (!time) {
-        return new Date(date).toISOString();
-    }
-    const [year, month, day] = date.split('/');
-    return new Date(`${year}-${month}-${day}T${time}`).toISOString();
-};
-
-const time = computed(() => (props.modelValue ? props.modelValue.split('T')?.[1] : null));
-const value = computed({
-    get() {
-        return props.modelValue;
-    },
-    set(value) {
-        emit(
-            'update:modelValue',
-            props.emitDateFormat ? new Date(value) : joinDateAndTime(value, time.value)
-        );
-    },
-});
-
 const isPopupOpen = ref(false);
-
-const onDateUpdate = (date) => {
-    value.value = date;
-    isPopupOpen.value = false;
-};
-
-const padDate = (value) => value.toString().padStart(2, '0');
-const formatDate = (dateString) => {
-    const date = new Date(dateString || '');
-    return `${date.getFullYear()}/${padDate(date.getMonth() + 1)}/${padDate(
-        date.getDate()
-    )}`;
-};
-const displayDate = (dateString) => {
-    if (!dateString || !isValidDate(dateString)) {
-        return '';
-    }
-    return new Date(dateString).toLocaleDateString([], {
-        year: 'numeric',
-        month: '2-digit',
-        day: '2-digit',
-    });
-};
+const hover = ref(false);
 
 const styleAttrs = computed(() => {
-    return props.isOutlined
+    return $props.isOutlined
         ? {
               dense: true,
               outlined: true,
@@ -86,42 +35,89 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+const dateFormat = 'DD/MM/YYYY';
+const formattedDate = computed({
+    get() {
+        if (!model.value) return model.value;
+        return date.formatDate(new Date(model.value), dateFormat);
+    },
+    set(value) {
+        let newDate;
+        if (value) {
+            // parse input
+            if (value.includes('/') && value.length >= 10) {
+                if (value.at(2) == '/') value = value.split('/').reverse().join('/');
+                value = date.formatDate(
+                    new Date(value).toISOString(),
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                );
+            }
+            let ymd = value.split('-').map((e) => parseInt(e));
+            newDate = new Date(ymd[0], ymd[1] - 1, ymd[2]);
+            if (model.value) {
+                const orgDate =
+                    model.value instanceof Date ? model.value : new Date(model.value);
+
+                newDate.setHours(
+                    orgDate.getHours(),
+                    orgDate.getMinutes(),
+                    orgDate.getSeconds(),
+                    orgDate.getMilliseconds(),
+                );
+            }
+        }
+        if (!isNaN(newDate)) model.value = newDate.toISOString();
+    },
+});
+
+const popupDate = computed(() =>
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
+);
 </script>
 
 <template>
     <div @mouseover="hover = true" @mouseleave="hover = false">
         <QInput
+            v-model="formattedDate"
             class="vn-input-date"
-            readonly
-            :model-value="displayDate(value)"
+            mask="##/##/####"
+            placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
             :rules="$attrs.required ? [requiredFieldRule] : null"
-            @click="isPopupOpen = true"
         >
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !readonly"
-                    @click="onDateUpdate(null)"
-                ></QIcon>
-                <QIcon name="event" class="cursor-pointer">
-                    <QPopupProxy
-                        v-model="isPopupOpen"
-                        cover
-                        transition-show="scale"
-                        transition-hide="scale"
-                        :no-parent-event="props.readonly"
-                    >
-                        <QDate
-                            :today-btn="true"
-                            :model-value="formatDate(value)"
-                            @update:model-value="onDateUpdate"
-                        />
-                    </QPopupProxy>
-                </QIcon>
+                    v-if="hover && model && !readonly"
+                    @click="
+                        model = null;
+                        isPopupOpen = false;
+                    "
+                />
+                <QIcon name="event" class="cursor-pointer" />
             </template>
+            <QMenu
+                transition-show="scale"
+                transition-hide="scale"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+            >
+                <QDate
+                    v-model="popupDate"
+                    :today-btn="true"
+                    @update:model-value="
+                        (date) => {
+                            formattedDate = date;
+                            isPopupOpen = false;
+                        }
+                    "
+                />
+            </QMenu>
         </QInput>
     </div>
 </template>

From db4c3a67995926291f81426e18655c478b182a08 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 27 Jun 2024 11:46:31 -0300
Subject: [PATCH 20/64] Changes

---
 src/i18n/locale/es.yml                  |   2 +-
 src/pages/Ticket/Card/TicketService.vue | 164 ++++++++++++++----------
 src/router/modules/ticket.js            |   4 +-
 3 files changed, 97 insertions(+), 73 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fd3dad952..d528dbb7d 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,7 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
-        service: Servicios
+        services: Servicios
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index f071c7baa..bacad697e 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch, computed } from 'vue';
+import { ref, watch, computed, onMounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
@@ -26,6 +26,7 @@ const { store } = arrayData;
 const { notify } = useNotify();
 
 const selectedServices = ref(new Set());
+const defaultTaxClass = ref(null);
 
 const toggleCheckSelection = (id) => {
     if (selectedServices.value.has(id)) selectedServices.value.delete(id);
@@ -36,7 +37,10 @@ const crudModelFilter = computed(() => ({
     where: { ticketFk: route.params.id },
 }));
 
-const crudModelRequiredData = computed(() => ({ ticketFk: route.params.id }));
+const crudModelRequiredData = computed(() => ({
+    ticketFk: route.params.id,
+    taxClassFk: defaultTaxClass.value?.id,
+}));
 
 watch(
     () => route.params.id,
@@ -68,6 +72,23 @@ const createRefund = async () => {
         console.error(error);
     }
 };
+
+const getDefaultTaxClass = async () => {
+    try {
+        let filter = {
+            where: { code: 'G' },
+        };
+        const { data } = await axios.get('TaxClasses/findOne', {
+            params: { filter: JSON.stringify(filter) },
+        });
+        defaultTaxClass.value = data;
+        console.log('defaultTaxClass', defaultTaxClass.value);
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+onMounted(async () => await getDefaultTaxClass());
 </script>
 
 <template>
@@ -85,80 +106,83 @@ const createRefund = async () => {
             @click.stop="createRefund()"
         />
     </Teleport>
-    <CrudModel
-        ref="ticketServiceCrudRef"
-        data-key="TicketService"
-        url="TicketServices"
-        model="TicketService"
-        :filter="crudModelFilter"
-        :data-required="crudModelRequiredData"
-        :default-remove="false"
-        auto-load
-    >
-        <template #body="{ rows }">
-            <QCard class="q-px-lg q-py-md">
-                <div
-                    v-for="(row, index) in rows"
-                    :key="index"
-                    class="q-mb-md row items-center q-gutter-x-md"
-                >
-                    <QCheckbox
-                        size="sm"
-                        @update:model-value="toggleCheckSelection(row.id)"
-                        :model-value="selectedServices.has(row.id)"
-                        :toggle-indeterminate="false"
-                    />
-                    <VnSelectDialog
-                        :label="t('service.description')"
-                        v-model="row.ticketServiceTypeFk"
-                        :options="ticketServiceOptions"
-                        option-label="name"
-                        option-value="id"
-                        hide-selected
+    <div class="flex justify-center">
+        <CrudModel
+            ref="ticketServiceCrudRef"
+            data-key="TicketService"
+            url="TicketServices"
+            model="TicketService"
+            :filter="crudModelFilter"
+            :data-required="crudModelRequiredData"
+            :default-remove="false"
+            auto-load
+            style="max-width: 800px"
+        >
+            <template #body="{ rows }">
+                <QCard class="q-px-lg q-py-md">
+                    <div
+                        v-for="(row, index) in rows"
+                        :key="index"
+                        class="q-mb-md row items-center q-gutter-x-md"
                     >
-                        <template #form>
-                            <TicketCreateServiceType
-                                @on-data-saved="ticketServiceTypeFetchRef.fetch()"
-                            />
-                        </template>
-                    </VnSelectDialog>
-                    <VnInput
-                        :label="t('service.quantity')"
-                        v-model="row.quantity"
-                        type="number"
-                        min="0"
-                        :info="t('service.quantityInfo')"
-                    />
-                    <VnInput
-                        :label="t('service.price')"
-                        v-model="row.price"
-                        type="number"
-                        min="0"
-                    />
+                        <QCheckbox
+                            size="sm"
+                            @update:model-value="toggleCheckSelection(row.id)"
+                            :model-value="selectedServices.has(row.id)"
+                            :toggle-indeterminate="false"
+                        />
+                        <VnSelectDialog
+                            :label="t('service.description')"
+                            v-model="row.ticketServiceTypeFk"
+                            :options="ticketServiceOptions"
+                            option-label="name"
+                            option-value="id"
+                            hide-selected
+                        >
+                            <template #form>
+                                <TicketCreateServiceType
+                                    @on-data-saved="ticketServiceTypeFetchRef.fetch()"
+                                />
+                            </template>
+                        </VnSelectDialog>
+                        <VnInput
+                            :label="t('service.quantity')"
+                            v-model.number="row.quantity"
+                            type="number"
+                            min="0"
+                            :info="t('service.quantityInfo')"
+                        />
+                        <VnInput
+                            :label="t('service.price')"
+                            v-model.number="row.price"
+                            type="number"
+                            min="0"
+                        />
+                        <QIcon
+                            name="delete"
+                            size="sm"
+                            class="cursor-pointer"
+                            color="primary"
+                            @click="ticketServiceCrudRef.remove([row])"
+                        >
+                            <QTooltip>
+                                {{ t('service.removeNote') }}
+                            </QTooltip>
+                        </QIcon>
+                    </div>
                     <QIcon
-                        name="delete"
+                        name="add_circle"
+                        class="fill-icon-on-hover q-ml-md"
                         size="sm"
-                        class="cursor-pointer"
                         color="primary"
-                        @click="ticketServiceCrudRef.remove([row])"
+                        @click="ticketServiceCrudRef.insert()"
                     >
                         <QTooltip>
-                            {{ t('service.removeNote') }}
+                            {{ t('service.addService') }}
                         </QTooltip>
                     </QIcon>
-                </div>
-                <QIcon
-                    name="add_circle"
-                    class="fill-icon-on-hover q-ml-md"
-                    size="sm"
-                    color="primary"
-                    @click="ticketServiceCrudRef.insert()"
-                >
-                    <QTooltip>
-                        {{ t('service.addService') }}
-                    </QTooltip>
-                </QIcon>
-            </QCard>
-        </template>
-    </CrudModel>
+                </QCard>
+            </template>
+        </CrudModel>
+    </div>
 </template>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index eadaa1cab..ceada90a8 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -98,8 +98,8 @@ export default {
                     path: 'service',
                     name: 'TicketService',
                     meta: {
-                        title: 'service',
-                        icon: 'cloud_upload',
+                        title: 'services',
+                        icon: 'vn:services',
                     },
                     component: () => import('src/pages/Ticket/Card/TicketService.vue'),
                 },

From ec5eeaa30831e09f261e8d61b44665599cb1c497 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Jun 2024 10:14:24 +0200
Subject: [PATCH 21/64] fix: refs #6151 fixed filters and styles

---
 src/pages/Order/Card/OrderCard.vue          |  9 ++----
 src/pages/Order/Card/OrderCatalogFilter.vue | 35 ++++++---------------
 src/pages/Order/Card/OrderCatalogItem.vue   |  2 +-
 src/pages/Order/Card/OrderSummary.vue       | 24 +++++++++-----
 src/pages/Order/OrderCatalog.vue            |  1 +
 src/pages/Order/OrderList.vue               |  8 +++--
 6 files changed, 38 insertions(+), 41 deletions(-)

diff --git a/src/pages/Order/Card/OrderCard.vue b/src/pages/Order/Card/OrderCard.vue
index 5b6896656..12b61e913 100644
--- a/src/pages/Order/Card/OrderCard.vue
+++ b/src/pages/Order/Card/OrderCard.vue
@@ -2,7 +2,6 @@
 import VnCard from 'components/common/VnCard.vue';
 import OrderDescriptor from 'pages/Order/Card/OrderDescriptor.vue';
 import OrderFilter from './OrderFilter.vue';
-import OrderSearchbar from './OrderSearchbar.vue';
 </script>
 <template>
     <VnCard
@@ -11,9 +10,7 @@ import OrderSearchbar from './OrderSearchbar.vue';
         :descriptor="OrderDescriptor"
         :filter-panel="OrderFilter"
         search-data-key="OrderList"
-    >
-        <template #searchbar>
-            <OrderSearchbar />
-        </template>
-    </VnCard>
+        searchbar-label="Search order"
+        searchbar-info="ypu can search by order id or name"
+    />
 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index fd5300122..c354ec94b 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -37,6 +37,10 @@ const selectedOrder = ref(null);
 const selectedOrderField = ref(null);
 const moreFields = ref([]);
 const moreFieldsOrder = ref([]);
+const selectedTag = ref(null);
+const tagValues = ref([{}]);
+const tagOptions = ref([]);
+
 const createValue = (val, done) => {
     if (val.length > 2) {
         if (!tagOptions.value.includes(val)) {
@@ -95,10 +99,6 @@ function exprBuilder(param, value) {
     }
 }
 
-const selectedTag = ref(null);
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
-
 const applyTagFilter = (params, search) => {
     if (!tagValues.value?.length) {
         params.tagGroups = null;
@@ -139,39 +139,23 @@ const onOrderChange = (value, params) => {
 };
 
 const onOrderFieldChange = (value, params) => {
-    const tagObj = JSON.parse(params.orderBy); // esto donde va
-    const fields = {
-        Relevancy: (value) => value + ' DESC, name',
-        ColorAndPrice: 'showOrder, price',
-        Name: 'name',
-        Price: 'price',
-    };
-    let tagField = fields[value];
-    if (!tagField) return;
-
-    if (typeof tagField === 'function') tagField = tagField(value);
-    tagObj.field = tagField;
-    params.orderBy = JSON.stringify(tagObj);
+    const tagObj = JSON.parse(params.orderBy);
     switch (value) {
         case 'Relevancy':
-            tagObj.field = value + ' DESC, name';
+            tagObj.name = value + ' DESC, name';
             params.orderBy = JSON.stringify(tagObj);
-            console.log('params: ', params);
             break;
         case 'ColorAndPrice':
-            tagObj.field = 'showOrder, price';
+            tagObj.name = 'showOrder, price';
             params.orderBy = JSON.stringify(tagObj);
-            console.log('params: ', params);
             break;
         case 'Name':
-            tagObj.field = 'name';
+            tagObj.name = 'name';
             params.orderBy = JSON.stringify(tagObj);
-            console.log('params: ', params);
             break;
         case 'Price':
-            tagObj.field = 'price';
+            tagObj.name = 'price';
             params.orderBy = JSON.stringify(tagObj);
-            console.log('params: ', params);
             break;
     }
 };
@@ -312,6 +296,7 @@ const useLang = (values) => {
                         v-model="selectedOrder"
                         :options="moreFields"
                         option-label="label"
+                        option-value="way"
                         dense
                         outlined
                         rounded
diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 34e22915d..8fa0bb5b9 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -27,7 +27,7 @@ const dialog = ref(null);
     <div class="container order-catalog-item overflow-hidden">
         <QCard class="card shadow-6">
             <div class="img-wrapper">
-                <VnImg :id="item.id" class="image" />
+                <VnImg :id="item.id" zoom-size="lg" class="image" />
                 <div v-if="item.hex" class="item-color-container">
                     <div
                         class="item-color"
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index d82dbaa17..7961b250e 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -7,6 +7,8 @@ import VnLv from 'components/ui/VnLv.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -62,6 +64,10 @@ const detailsColumns = ref([
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
+                    <VnTitle
+                        :url="`#/order/${entity.id}/basic-data`"
+                        :text="t('globals.pageTitles.basicData')"
+                    />
                     <VnLv label="ID" :value="entity.id" />
                     <VnLv :label="t('order.summary.nickname')" dash>
                         <template #value>
@@ -81,6 +87,10 @@ const detailsColumns = ref([
                     />
                 </QCard>
                 <QCard class="vn-one">
+                    <VnTitle
+                        :url="`#/order/${entity.id}/basic-data`"
+                        :text="t('globals.pageTitles.basicData')"
+                    />
                     <VnLv
                         :label="t('order.summary.created')"
                         :value="toDateHourMinSec(entity?.created)"
@@ -116,14 +126,13 @@ const detailsColumns = ref([
                     />
                 </QCard>
                 <QCard class="vn-one">
-                    <p class="header">
-                        {{ t('order.summary.notes') }}
-                    </p>
+                    <VnTitle :text="t('globals.pageTitles.notes')" />
                     <p v-if="entity?.note" class="no-margin">
                         {{ entity?.note }}
                     </p>
                 </QCard>
                 <QCard class="vn-one">
+                    <VnTitle :text="t('order.summary.total')" />
                     <VnLv>
                         <template #label>
                             <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
@@ -152,9 +161,7 @@ const detailsColumns = ref([
                     </VnLv>
                 </QCard>
                 <QCard>
-                    <p class="header">
-                        {{ t('order.summary.details') }}
-                    </p>
+                    <VnTitle :text="t('order.summary.details')" />
                     <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
@@ -168,7 +175,10 @@ const detailsColumns = ref([
                         <template #body="props">
                             <QTr :props="props">
                                 <QTd key="item" :props="props" class="item">
-                                    {{ props.row.item?.id }}
+                                    <span class="link">
+                                        {{ props.row.item?.id }}
+                                        <ItemDescriptorProxy :id="props.row.item?.id" />
+                                    </span>
                                 </QTd>
                                 <QTd key="description" :props="props" class="description">
                                     <div class="name">
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 1d97663d0..081a2cd2f 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -70,6 +70,7 @@ function extractValueTags(items) {
                 :user-params="catalogParams"
                 auto-load
                 @on-fetch="extractTags"
+                :update-router="false"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 247a8e3b2..0e6e11482 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -9,7 +9,7 @@ import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -28,7 +28,11 @@ function navigate(id) {
 }
 </script>
 <template>
-    <OrderSearchbar />
+    <VnSearchbar
+        data-key="OrderList"
+        :label="t('Search order')"
+        :info="t('You can search orders by reference')"
+    />
     <RightMenu>
         <template #right-panel>
             <OrderFilter data-key="OrderList" />

From 369cb9dc75fb0918d82047e030017b8d4f3654f0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Jun 2024 10:56:09 +0200
Subject: [PATCH 22/64] refactor: refs #7030 added translations

---
 src/i18n/locale/en.yml | 1 +
 src/i18n/locale/es.yml | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 3cf929f82..a3570ae82 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -222,6 +222,7 @@ globals:
         monitors: Monitors
         dashboard: Dashboard
         users: Users
+        createTicket: Create ticket
     created: Created
     worker: Worker
     now: Now
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2b4498ced..58e095038 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -223,6 +223,7 @@ globals:
         monitors: Monitores
         dashboard: Tablón
         users: Usuarios
+        createTicket: Crear ticket
     created: Fecha creación
     worker: Trabajador
     now: Ahora

From 68552b8da9bdb61237ed7c356671e3c34d4f4de4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Jun 2024 11:07:32 +0200
Subject: [PATCH 23/64] perf: add QBtn in CardDescriptor instead each
 ModuleDescriptor

---
 src/components/ui/CardDescriptor.vue          | 25 ++++++++++++++++++-
 src/pages/Account/Card/AccountDescriptor.vue  | 14 -----------
 src/pages/Agency/Card/AgencyDescriptor.vue    | 16 ------------
 src/pages/Claim/Card/ClaimDescriptor.vue      | 16 ------------
 .../ItemType/Card/ItemTypeDescriptor.vue      | 14 -----------
 src/pages/Order/Card/OrderDescriptor.vue      | 16 ------------
 src/pages/Route/Roadmap/RoadmapDescriptor.vue | 16 ------------
 .../Shelving/Card/ShelvingDescriptor.vue      | 16 ------------
 .../Supplier/Card/SupplierDescriptor.vue      | 16 ------------
 9 files changed, 24 insertions(+), 125 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..481e2ec12 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -78,13 +78,36 @@ async function getData() {
     }
 }
 const emit = defineEmits(['onFetch']);
+
+const iconModule = computed(() => route.matched[1].meta.icon);
+const toModule = computed(() =>
+    route.matched[1].path.split('/').length > 2
+        ? route.matched[1].redirect
+        : route.matched[1].children[0].redirect
+);
 </script>
 
 <template>
     <div class="descriptor">
         <template v-if="entity && !isLoading">
             <div class="header bg-primary q-pa-sm justify-between">
-                <slot name="header-extra-action" />
+                <slot name="header-extra-action"
+                    ><QBtn
+                        round
+                        flat
+                        dense
+                        size="md"
+                        :icon="iconModule"
+                        color="white"
+                        class="link"
+                        :to="toModule"
+                    >
+                        <QTooltip>
+                            {{ t('globals.goToModuleIndex') }}
+                        </QTooltip>
+                    </QBtn></slot
+                >
+
                 <QBtn
                     @click.stop="viewSummary(entity.id, $props.summary)"
                     round
diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index ddc7c077f..d43266172 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -49,20 +49,6 @@ const hasAccount = ref(false);
         :title="data.title"
         :subtitle="data.subtitle"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="md"
-                color="white"
-                icon="face"
-                :to="{ name: 'AccountList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu>
             <AccountDescriptorMenu :has-account="hasAccount" />
         </template>
diff --git a/src/pages/Agency/Card/AgencyDescriptor.vue b/src/pages/Agency/Card/AgencyDescriptor.vue
index 46b225ff2..b9772037c 100644
--- a/src/pages/Agency/Card/AgencyDescriptor.vue
+++ b/src/pages/Agency/Card/AgencyDescriptor.vue
@@ -28,22 +28,6 @@ const card = computed(() => store.data);
         :title="card?.name"
         :subtitle="props.id"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="garage_home"
-                color="white"
-                class="link"
-                :to="{ name: 'RouteList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity: agency }">
             <VnLv :label="t('globals.name')" :value="agency.name" />
         </template>
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 9b25aa2d9..5336c4427 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -61,22 +61,6 @@ onMounted(async () => {
         @on-fetch="setData"
         data-key="Claim"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:claims"
-                color="white"
-                class="link"
-                :to="{ name: 'ClaimList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <ClaimDescriptorMenu :claim="entity" />
         </template>
diff --git a/src/pages/ItemType/Card/ItemTypeDescriptor.vue b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
index e565a791b..cd12fc238 100644
--- a/src/pages/ItemType/Card/ItemTypeDescriptor.vue
+++ b/src/pages/ItemType/Card/ItemTypeDescriptor.vue
@@ -51,20 +51,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
         data-key="entry"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                size="sm"
-                icon="vn:item"
-                color="white"
-                :to="{ name: 'ItemTypeList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shared.code')" :value="entity.code" />
             <VnLv :label="t('shared.name')" :value="entity.name" />
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 82d7e0d05..60e86d04e 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -87,22 +87,6 @@ const total = ref(null);
         @on-fetch="setData"
         data-key="orderData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:basket"
-                color="white"
-                class="link"
-                :to="{ name: 'OrderList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #menu="{ entity }">
             <OrderDescriptorMenu :order="entity" />
         </template>
diff --git a/src/pages/Route/Roadmap/RoadmapDescriptor.vue b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
index 0f52f087f..788173688 100644
--- a/src/pages/Route/Roadmap/RoadmapDescriptor.vue
+++ b/src/pages/Route/Roadmap/RoadmapDescriptor.vue
@@ -39,22 +39,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         data-key="Roadmap"
         @on-fetch="setData"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:troncales"
-                color="white"
-                class="link"
-                :to="{ name: 'RouteList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('Roadmap')" :value="entity?.name" />
             <VnLv :label="t('ETD')" :value="toDateHourMin(entity?.etd)" />
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 9322faaa0..52b4896ad 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -53,22 +53,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
         :summary="$attrs"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:inventory"
-                color="white"
-                class="link"
-                :to="{ name: 'ShelvingList' }"
-            >
-                <QTooltip>
-                    {{ t('globals.goToModuleIndex') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 4ef76c2f8..a31a3bc8d 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -112,22 +112,6 @@ const getEntryQueryParams = (supplier) => {
         data-key="supplier"
         :summary="$props.summary"
     >
-        <template #header-extra-action>
-            <QBtn
-                round
-                flat
-                dense
-                size="md"
-                icon="vn:supplier"
-                color="white"
-                class="link"
-                :to="{ name: 'SupplierList' }"
-            >
-                <QTooltip>
-                    {{ t('Go to module index') }}
-                </QTooltip>
-            </QBtn>
-        </template>
         <template #body="{ entity }">
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />

From 93c109b70dcb169dc4bcdcb43ae37b51fdb6f68c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Jun 2024 11:25:38 +0200
Subject: [PATCH 24/64] refactor: new translations

---
 src/i18n/locale/en.yml | 18 +++++++++++++-----
 src/i18n/locale/es.yml | 18 +++++++++++++-----
 2 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index bc0fca88b..8fbc1a797 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -223,6 +223,19 @@ globals:
         dashboard: Dashboard
         users: Users
         createTicket: Create ticket
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+        formation: Formation
+        locations: Locations
+        warehouses: Warehouses
+        roles: Roles
+        connections: Connections
+        acls: ACLs
+        mailForwarding: Mail forwarding
+        mailAlias: Mail alias
+        privileges: Privileges
     created: Created
     worker: Worker
     now: Now
@@ -517,10 +530,6 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
-        ticketAdvance: Advance tickets
-        futureTickets: Future tickets
-        purchaseRequest: Purchase request
-        weeklyTickets: Weekly tickets
     list:
         nickname: Nickname
         state: State
@@ -876,7 +885,6 @@ worker:
         timeControl: Time control
         locker: Locker
         balance: Balance
-        formation: Formation
     list:
         name: Name
         email: Email
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 911e8b29f..f09f8e2ce 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -224,6 +224,19 @@ globals:
         dashboard: Tablón
         users: Usuarios
         createTicket: Crear ticket
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        formation: Formación
+        locations: Ubicaciones
+        warehouses: Almacenes
+        roles: Roles
+        connections: Conexiones
+        acls: ACLs
+        mailForwarding: Reenvío de correo
+        mailAlias: Alias de correo
+        privileges: Privilegios
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -515,10 +528,6 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
-        ticketAdvance: Adelantar tickets
-        futureTickets: Tickets a futuro
-        purchaseRequest: Petición de compra
-        weeklyTickets: Tickets programados
     list:
         nickname: Alias
         state: Estado
@@ -871,7 +880,6 @@ worker:
         timeControl: Control de horario
         locker: Taquilla
         balance: Balance
-        formation: Formación
     list:
         name: Nombre
         email: Email

From 52d6eeb9762753ea4249b91f6b67c314c077781a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 28 Jun 2024 16:22:37 +0200
Subject: [PATCH 25/64] fix: vnSearchBar e2e

---
 test/cypress/integration/vnSearchBar.spec.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index f1f3a9e82..75c08825c 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -3,13 +3,10 @@ describe('VnSearchBar', () => {
     const employeeId = ' #1';
     const salesPersonId = ' #18';
     const idGap = '.q-item > .q-item__label';
-    const cardList = '.vn-card-list';
-
-    let url;
+    const vnTableRow = '.q-virtual-scroll__content';
     beforeEach(() => {
         cy.login('developer');
         cy.visit('#/customer/list');
-        cy.url().then((currentUrl) => (url = currentUrl));
     });
 
     it('should redirect to customer summary page', () => {
@@ -19,12 +16,12 @@ describe('VnSearchBar', () => {
 
     it('should stay on the list page if there are several results or none', () => {
         cy.writeSearchbar('salesA{enter}');
-        checkCardListAndUrl(2);
+        checkTableLength(2);
 
         cy.clearSearchbar();
 
         cy.writeSearchbar('0{enter}');
-        checkCardListAndUrl(0);
+        checkTableLength(0);
     });
 
     const searchAndCheck = (searchTerm, expectedText) => {
@@ -33,10 +30,7 @@ describe('VnSearchBar', () => {
         cy.get(idGap).should('have.text', expectedText);
     };
 
-    const checkCardListAndUrl = (expectedLength) => {
-        cy.get(cardList).then(($cardList) => {
-            expect($cardList.find('.q-card').length).to.equal(expectedLength);
-            cy.url().then((currentUrl) => expect(currentUrl).to.contain(url));
-        });
+    const checkTableLength = (expectedLength) => {
+        cy.get(vnTableRow).find('tr').should('have.length', expectedLength)
     };
 });

From e418a647be3e502f6abdc28e235750df733d9db4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 29 Jun 2024 00:06:49 +0200
Subject: [PATCH 26/64] feat: #7648 handle NavBar

---
 public/no-image-dark.png     | Bin 0 -> 7038 bytes
 public/no-image.png          | Bin 0 -> 2181 bytes
 public/no-user.png           | Bin 0 -> 10119 bytes
 src/components/NavBar.vue    |  12 +++---
 src/components/UserPanel.vue |  11 ++++-
 src/components/ui/VnImg.vue  |  78 +++++++++++++++++++++++++++++++++++
 src/composables/useRole.js   |   4 ++
 7 files changed, 98 insertions(+), 7 deletions(-)
 create mode 100644 public/no-image-dark.png
 create mode 100644 public/no-image.png
 create mode 100644 public/no-user.png
 create mode 100644 src/components/ui/VnImg.vue

diff --git a/public/no-image-dark.png b/public/no-image-dark.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a20d7eb4970509bc5f8e9a2bb2b5d33fee3c260
GIT binary patch
literal 7038
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

literal 0
HcmV?d00001

diff --git a/public/no-image.png b/public/no-image.png
new file mode 100644
index 0000000000000000000000000000000000000000..11d5317a90bbc35e52789e30afe20af7f6247a9e
GIT binary patch
literal 2181
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
O0|4*jj;(b3h4v?4J+RdP

literal 0
HcmV?d00001

diff --git a/public/no-user.png b/public/no-user.png
new file mode 100644
index 0000000000000000000000000000000000000000..e090bc2eb440cc53b9c3e3239a5e5b7f1afb0f5a
GIT binary patch
literal 10119
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
B)2{#k

literal 0
HcmV?d00001

diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index c6722d875..980cae5b8 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -8,6 +8,7 @@ import { useQuasar } from 'quasar';
 import PinnedModules from './PinnedModules.vue';
 import UserPanel from 'components/UserPanel.vue';
 import VnBreadcrumbs from './common/VnBreadcrumbs.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -83,11 +84,12 @@ const pinnedModulesRef = ref();
                     id="user"
                 >
                     <QAvatar size="lg">
-                        <QImg
-                            :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
-                            spinner-color="primary"
-                        >
-                        </QImg>
+                        <VnImg
+                            :id="user.id"
+                            collection="user"
+                            size="160x160"
+                            :zoom-size="null"
+                        />
                     </QAvatar>
                     <QTooltip bottom>
                         {{ t('globals.userPanel') }}
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 691d3db8f..38e66d67d 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -11,12 +11,15 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import FetchData from 'components/FetchData.vue';
 import { useClipboard } from 'src/composables/useClipboard';
+import VnImg from 'src/components/ui/VnImg.vue';
+import { useRole } from 'src/composables/useRole';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 const { copyText } = useClipboard();
+
 const userLocale = computed({
     get() {
         return locale.value;
@@ -99,6 +102,7 @@ function saveUserData(param, value) {
     axios.post('UserConfigs/setUserConfig', { [param]: value });
     localUserData();
 }
+const isEmployee = computed(() => useRole().hasAny(['employee']));
 </script>
 
 <template>
@@ -109,12 +113,14 @@ function saveUserData(param, value) {
         auto-load
     />
     <FetchData
+        v-if="isEmployee"
         url="Companies"
         order="name"
         @on-fetch="(data) => (companiesData = data)"
         auto-load
     />
     <FetchData
+        v-if="isEmployee"
         url="Accountings"
         order="name"
         @on-fetch="(data) => (accountBankData = data)"
@@ -149,10 +155,11 @@ function saveUserData(param, value) {
 
             <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
-                    <QImg
+                    <VnImg :id="user.id" size="160x160" />
+                    <!-- <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
                         spinner-color="white"
-                    />
+                    /> -->
                 </QAvatar>
 
                 <div class="text-subtitle1 q-mt-md">
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
new file mode 100644
index 000000000..2c522eaa6
--- /dev/null
+++ b/src/components/ui/VnImg.vue
@@ -0,0 +1,78 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useSession } from 'src/composables/useSession';
+
+const $props = defineProps({
+    storage: {
+        type: [String, Number],
+        default: 'Images',
+    },
+    collection: {
+        type: String,
+        default: 'catalog',
+    },
+    size: {
+        type: String,
+        default: '200x200',
+    },
+    zoomSize: {
+        type: String,
+        required: false,
+        default: 'lg',
+    },
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+const show = ref(false);
+const token = useSession().getTokenMultimedia();
+const timeStamp = ref(`timestamp=${Date.now()}`);
+import noImage from '/public/no-user.png';
+import { useRole } from 'src/composables/useRole';
+const url = computed(() => {
+    const isEmployee = useRole().hasAny(['employee']);
+    return isEmployee
+        ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
+        : noImage;
+});
+const reload = () => {
+    timeStamp.value = `timestamp=${Date.now()}`;
+};
+defineExpose({
+    reload,
+});
+</script>
+<template>
+    <QImg
+        :class="{ zoomIn: $props.zoomSize }"
+        :src="url"
+        v-bind="$attrs"
+        @click="show = !show"
+        spinner-color="primary"
+    />
+    <QDialog v-model="show" v-if="$props.zoomSize">
+        <QImg
+            :src="url"
+            size="full"
+            class="img_zoom"
+            v-bind="$attrs"
+            spinner-color="primary"
+        />
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.q-img {
+    &.zoomIn {
+        cursor: zoom-in;
+    }
+    min-width: 50px;
+}
+.rounded {
+    border-radius: 50%;
+}
+.img_zoom {
+    border-radius: 0%;
+}
+</style>
diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index 95b585283..485687f16 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -27,8 +27,12 @@ export function useRole() {
 
         return false;
     }
+    function isEmployee() {
+        return !hasAny(['employee']);
+    }
 
     return {
+        isEmployee,
         fetch,
         hasAny,
         state,

From 361024abe282a23cbcff0197b5addf72d6ae6884 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 29 Jun 2024 00:07:00 +0200
Subject: [PATCH 27/64] feat: #7648 handle LeftMenu

---
 src/components/LeftMenu.vue      | 7 +++++--
 src/stores/useNavigationStore.js | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 3cccd0d2f..0dfcc812e 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -9,6 +9,7 @@ import { toLowerCamel } from 'src/filters';
 import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
+import { useRole } from 'src/composables/useRole';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -58,6 +59,8 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
+const role = useRole();
+
 function getRoutes() {
     if (props.source === 'main') {
         const modules = Object.assign([], navigation.getModules().value);
@@ -66,9 +69,9 @@ function getRoutes() {
             const moduleDef = routes.find(
                 (route) => toLowerCamel(route.name) === item.module
             );
-            item.children = [];
-
             if (!moduleDef) continue;
+            if (!role.isEmployee()) continue;
+            item.children = [];
 
             addChildren(item.module, moduleDef, item.children);
         }
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 4dd5ed2ae..da06730f7 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -80,7 +80,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
     }
 
     async function fetchPinned() {
-        if (pinnedModules.value.length) return;
+        if (pinnedModules.value.length || !role.isEmployee()) return;
 
         const response = await axios.get('StarredModules/getStarredModules');
         pinnedModules.value = response.data.map((row) => row.moduleFk);

From 4bbf0f29d5d0621efaccbbd19716479d0f60be22 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 29 Jun 2024 00:07:09 +0200
Subject: [PATCH 28/64] feat: #7648 handle EntryList

---
 src/pages/Entry/EntryList.vue | 23 +++++++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e5d37900c..c6c99a651 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -12,6 +12,8 @@ import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+// import { useVnConfirm } from 'composables/useVnConfirm';
+// const { openConfirmationModal } = useVnConfirm();
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -29,6 +31,21 @@ const redirectToCreateView = () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
+import { useQuasar } from 'quasar';
+// import EntryBuys from './Card/EntryBuys.vue';
+import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+
+const quasar = useQuasar();
+
+const printBuys = (rowId) => {
+    // router.push({ path: `/entry/${rowId}/buys` });
+    quasar.dialog({
+        component: EntryBuysTableDialog,
+        componentProps: {
+            id: rowId,
+        },
+    });
+};
 </script>
 <template>
     <VnSearchbar
@@ -107,6 +124,12 @@ onMounted(async () => {
                                 color="primary"
                                 type="submit"
                             />
+                            <QBtn
+                                :label="t('globals.print')"
+                                @click.stop="printBuys(row.id)"
+                                color="primary"
+                                type="submit"
+                            />
                         </template>
                     </CardList>
                 </template>

From 666cb519c5c99ddf52ee3a0f6d08e9b1166520eb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sat, 29 Jun 2024 00:08:35 +0200
Subject: [PATCH 29/64] feat: #7648 handle EntryBuys

---
 src/components/UserPanel.vue             |   2 +-
 src/components/ui/VnImg.vue              |   2 +-
 src/pages/Entry/EntryBuysTableDialog.vue | 184 +++++++++++++++++++++++
 src/pages/Entry/EntryFilter.vue          |  14 +-
 4 files changed, 195 insertions(+), 7 deletions(-)
 create mode 100644 src/pages/Entry/EntryBuysTableDialog.vue

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 38e66d67d..0247bb4d6 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -102,7 +102,7 @@ function saveUserData(param, value) {
     axios.post('UserConfigs/setUserConfig', { [param]: value });
     localUserData();
 }
-const isEmployee = computed(() => useRole().hasAny(['employee']));
+const isEmployee = computed(() => useRole().isEmployee());
 </script>
 
 <template>
diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index 2c522eaa6..8d747963b 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -31,7 +31,7 @@ const timeStamp = ref(`timestamp=${Date.now()}`);
 import noImage from '/public/no-user.png';
 import { useRole } from 'src/composables/useRole';
 const url = computed(() => {
-    const isEmployee = useRole().hasAny(['employee']);
+    const isEmployee = useRole().isEmployee();
     return isEmployee
         ? `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
         : noImage;
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
new file mode 100644
index 000000000..c8056e6ac
--- /dev/null
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -0,0 +1,184 @@
+<script setup>
+import { ref, computed, onMounted, onBeforeMount } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { QBtn } from 'quasar';
+
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+
+import { useQuasar } from 'quasar';
+import { toCurrency } from 'src/filters';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { notify } = useNotify();
+const $props = defineProps({
+    id: {
+        type: String,
+        required: false,
+        default: null,
+    },
+});
+const rowsSelected = ref([]);
+
+const entriesTableColumns = computed(() => [
+    {
+        align: 'left',
+        name: 'item',
+        label: t('entry.summary.item'),
+        field: 'itemFk',
+        format: (row) => row.item.name,
+        // component: 'fetchedTags',
+        // attrs: {
+        //     item: (row) => row.item,
+        // },
+    },
+    {
+        align: 'left',
+        name: 'quantity',
+        label: t('entry.summary.quantity'),
+        field: 'quantity',
+    },
+    {
+        align: 'left',
+        name: 'packagingFk',
+        label: t('entry.summary.package'),
+        field: 'packagingFk',
+    },
+    {
+        align: 'left',
+        name: 'stickers',
+        label: t('entry.summary.stickers'),
+        field: 'stickers',
+    },
+    {
+        align: 'left',
+        name: 'printedStickers',
+        label: t('entry.buys.printedStickers'),
+        field: 'printedStickers',
+    },
+    {
+        align: 'left',
+        name: 'weight',
+        label: t('entry.summary.weight'),
+        field: 'weight',
+    },
+    {
+        align: 'left',
+        name: 'packing',
+        label: t('entry.summary.packing'),
+        field: 'packing',
+    },
+    {
+        align: 'left',
+        name: 'grouping',
+        label: t('entry.summary.grouping'),
+        field: 'grouping',
+    },
+    {
+        align: 'left',
+        name: 'buyingValue',
+        label: t('entry.summary.buyingValue'),
+        field: 'buyingValue',
+        format: ({ buyingValue }) => toCurrency(buyingValue),
+    },
+    {
+        align: 'left',
+        name: 'price2',
+        label: t('entry.buys.groupingPrice'),
+        field: 'price2',
+    },
+    {
+        align: 'left',
+        name: 'price3',
+        label: t('entry.buys.packingPrice'),
+        field: 'price3',
+    },
+    {
+        align: 'left',
+        name: 'import',
+        label: t('entry.summary.import'),
+        format: (row) => toCurrency(row.buyingValue * row.quantity),
+    },
+]);
+
+import { useArrayData } from 'src/composables/useArrayData';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+
+const arrayData = useArrayData('EntryBuys');
+const { store } = arrayData;
+
+const entityId = computed(() => $props.id || route.params.id);
+// import EntryBuysTable from './EntryBuysTable.vue';
+store.userParams = {};
+onBeforeMount(() => {});
+</script>
+
+<template>
+    <QDialog ref="dialogRef" full-width>
+        <QCard>
+            <QCardSection class="row items-center q-pb-none">
+                <QAvatar
+                    :icon="icon"
+                    color="primary"
+                    text-color="white"
+                    size="xl"
+                    v-if="icon"
+                />
+                <span class="text-h6 text-grey">{{ title }}</span>
+                <QSpace />
+                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
+            </QCardSection>
+            <QCardActions align="right">
+                <QBtn
+                    :label="t('globals.print')"
+                    color="primary"
+                    icon="print"
+                    :loading="isLoading"
+                    @click="confirm()"
+                    unelevated
+                    autofocus
+                />
+            </QCardActions>
+            <QCardSection class="row items-center">
+                <VnTable
+                    ref="entryBuysPaginateRef"
+                    data-key="EntryBuys"
+                    :url="`Entries/${entityId}/getBuys`"
+                    auto-load
+                    :columns="entriesTableColumns"
+                    default-mode="table"
+                    :right-search="false"
+                    :is-editable="false"
+                    :use-model="false"
+                >
+                </VnTable> </QCardSection
+        ></QCard>
+    </QDialog>
+</template>
+
+<style lang="scss" scoped>
+.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
+    border-bottom-width: 0px;
+    border-top-width: 2px;
+    border-color: var(--vn-text-color);
+}
+.infoRow > td {
+    color: var(--vn-label-color);
+}
+</style>
+
+<i18n>
+es:
+</i18n>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 194ce0a28..663cb2cb8 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -9,6 +9,7 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
+import { useRole } from 'src/composables/useRole';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -23,6 +24,7 @@ const companiesOptions = ref([]);
 const suppliersOptions = ref([]);
 
 const stateStore = useStateStore();
+const isEmployee = computed(() => useRole().isEmployee());
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -30,6 +32,7 @@ onMounted(async () => {
 
 <template>
     <FetchData
+        v-if="isEmployee"
         ref="companiesRef"
         url="Companies"
         :filter="{ fields: ['id', 'code'] }"
@@ -46,6 +49,7 @@ onMounted(async () => {
         auto-load
     />
     <FetchData
+        v-if="isEmployee"
         url="Suppliers"
         :filter="{ fields: ['id', 'nickname', 'name'] }"
         order="nickname"
@@ -97,7 +101,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
+            <QItem v-if="isEmployee">
                 <QItemSection>
                     <VnSelect
                         :label="t('params.companyFk')"
@@ -129,7 +133,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem>
+            <QItem v-if="isEmployee">
                 <QItemSection>
                     <VnSelect
                         :label="t('params.supplierFk')"
@@ -217,7 +221,7 @@ onMounted(async () => {
 <i18n>
 en:
     params:
-        
+
         invoiceNumber: Invoice number
         travelFk: Travel
         companyFk: Company
@@ -231,7 +235,7 @@ en:
         isOrdered: Ordered
 es:
     params:
-       
+
         invoiceNumber: Núm. factura
         travelFk: Envío
         companyFk: Empresa

From 128303939b5d73cdc16b9189f1a28be383f5dd5e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 1 Jul 2024 07:41:58 +0200
Subject: [PATCH 30/64] fix(ticket router): typo

---
 src/router/modules/ticket.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index c13801fc5..5c03366e0 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -19,7 +19,6 @@ export default {
             'TicketSale',
             'TicketLog',
             'TicketPurchaseRequest',
-            ,
             'TicketService',
         ],
     },

From 7b9e26528a324475dcdf59bb974e0610f9b104d7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 1 Jul 2024 08:08:41 +0200
Subject: [PATCH 31/64] feat(TicketService): use correct format

---
 src/pages/Ticket/Card/TicketService.vue | 145 ++++++++++++------------
 1 file changed, 74 insertions(+), 71 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index bacad697e..5d9688834 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -10,17 +10,16 @@ import TicketCreateServiceType from './TicketCreateServiceType.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 import { useArrayData } from 'src/composables/useArrayData';
-import { useStateStore } from 'stores/useStateStore';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const stateStore = useStateStore();
 const route = useRoute();
 const router = useRouter();
 const { t } = useI18n();
 const ticketServiceTypeFetchRef = ref(null);
 const ticketServiceCrudRef = ref(null);
 const ticketServiceOptions = ref([]);
+const selected = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
 const { notify } = useNotify();
@@ -28,11 +27,6 @@ const { notify } = useNotify();
 const selectedServices = ref(new Set());
 const defaultTaxClass = ref(null);
 
-const toggleCheckSelection = (id) => {
-    if (selectedServices.value.has(id)) selectedServices.value.delete(id);
-    else selectedServices.value.add(id);
-};
-
 const crudModelFilter = computed(() => ({
     where: { ticketFk: route.params.id },
 }));
@@ -50,6 +44,8 @@ watch(
     }
 );
 
+onMounted(async () => await getDefaultTaxClass());
+
 const createRefund = async () => {
     try {
         if (!selectedServices.value.size) return;
@@ -88,7 +84,29 @@ const getDefaultTaxClass = async () => {
     }
 };
 
-onMounted(async () => await getDefaultTaxClass());
+const columns = computed(() => [
+    {
+        name: 'description',
+        label: t('service.description'),
+        field: (row) => row.ticketServiceTypeFk,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'quantity',
+        label: t('service.quantity'),
+        field: (row) => row.quantity,
+        sortable: true,
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('service.price'),
+        field: (row) => row.price,
+        sortable: true,
+        align: 'left',
+    },
+]);
 </script>
 
 <template>
@@ -98,41 +116,37 @@ onMounted(async () => await getDefaultTaxClass());
         auto-load
         url="TicketServiceTypes"
     />
-    <Teleport to="#st-actions" v-if="stateStore?.isSubToolbarShown()">
-        <QBtn
-            color="primary"
-            :label="t('service.pay')"
-            :disabled="!selectedServices.size"
-            @click.stop="createRefund()"
-        />
-    </Teleport>
-    <div class="flex justify-center">
-        <CrudModel
-            ref="ticketServiceCrudRef"
-            data-key="TicketService"
-            url="TicketServices"
-            model="TicketService"
-            :filter="crudModelFilter"
-            :data-required="crudModelRequiredData"
-            :default-remove="false"
-            auto-load
-            style="max-width: 800px"
-        >
-            <template #body="{ rows }">
-                <QCard class="q-px-lg q-py-md">
-                    <div
-                        v-for="(row, index) in rows"
-                        :key="index"
-                        class="q-mb-md row items-center q-gutter-x-md"
-                    >
-                        <QCheckbox
-                            size="sm"
-                            @update:model-value="toggleCheckSelection(row.id)"
-                            :model-value="selectedServices.has(row.id)"
-                            :toggle-indeterminate="false"
-                        />
+    <CrudModel
+        ref="ticketServiceCrudRef"
+        data-key="TicketService"
+        url="TicketServices"
+        model="TicketService"
+        :filter="crudModelFilter"
+        :data-required="crudModelRequiredData"
+        auto-load
+        v-model:selected="selected"
+    >
+        <template #moreBeforeActions>
+            <QBtn
+                color="primary"
+                :label="t('service.pay')"
+                :disabled="!selectedServices.size"
+                @click.stop="createRefund()"
+            />
+        </template>
+        <template #body="{ rows }">
+            <QTable
+                :columns="columns"
+                :rows="rows"
+                row-key="$index"
+                selection="multiple"
+                v-model:selected="selected"
+                table-header-class="text-left"
+            >
+                <template #body-cell-description="{ row, col }">
+                    <QTd auto-width>
                         <VnSelectDialog
-                            :label="t('service.description')"
+                            :label="col.label"
                             v-model="row.ticketServiceTypeFk"
                             :options="ticketServiceOptions"
                             option-label="name"
@@ -145,44 +159,33 @@ onMounted(async () => await getDefaultTaxClass());
                                 />
                             </template>
                         </VnSelectDialog>
+                    </QTd>
+                </template>
+                <template #body-cell-quantity="{ row, col }">
+                    <QTd auto-width>
                         <VnInput
-                            :label="t('service.quantity')"
+                            :label="col.label"
                             v-model.number="row.quantity"
                             type="number"
                             min="0"
                             :info="t('service.quantityInfo')"
                         />
+                    </QTd>
+                </template>
+                <template #body-cell-price="{ row, col }">
+                    <QTd auto-width>
                         <VnInput
-                            :label="t('service.price')"
+                            :label="col.label"
                             v-model.number="row.price"
                             type="number"
                             min="0"
                         />
-                        <QIcon
-                            name="delete"
-                            size="sm"
-                            class="cursor-pointer"
-                            color="primary"
-                            @click="ticketServiceCrudRef.remove([row])"
-                        >
-                            <QTooltip>
-                                {{ t('service.removeNote') }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
-                    <QIcon
-                        name="add_circle"
-                        class="fill-icon-on-hover q-ml-md"
-                        size="sm"
-                        color="primary"
-                        @click="ticketServiceCrudRef.insert()"
-                    >
-                        <QTooltip>
-                            {{ t('service.addService') }}
-                        </QTooltip>
-                    </QIcon>
-                </QCard>
-            </template>
-        </CrudModel>
-    </div>
+                    </QTd>
+                </template>
+            </QTable>
+        </template>
+    </CrudModel>
+    <QPageSticky position="bottom-right" :offset="[25, 25]">
+        <QBtn fab color="primary" icon="add" @click="ticketServiceCrudRef.insert()" />
+    </QPageSticky>
 </template>

From 3b18375cdbc1417e7080584b0dbba15463b47d46 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 1 Jul 2024 08:13:49 +0200
Subject: [PATCH 32/64] fix(TicketService): pay use selected

---
 src/pages/Ticket/Card/TicketService.vue | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 5d9688834..1ec072dd2 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -19,12 +19,11 @@ const { t } = useI18n();
 const ticketServiceTypeFetchRef = ref(null);
 const ticketServiceCrudRef = ref(null);
 const ticketServiceOptions = ref([]);
-const selected = ref([]);
 const arrayData = useArrayData('TicketNotes');
 const { store } = arrayData;
 const { notify } = useNotify();
 
-const selectedServices = ref(new Set());
+const selected = ref([]);
 const defaultTaxClass = ref(null);
 
 const crudModelFilter = computed(() => ({
@@ -48,10 +47,10 @@ onMounted(async () => await getDefaultTaxClass());
 
 const createRefund = async () => {
     try {
-        if (!selectedServices.value.size) return;
+        if (!selected.value.length) return;
 
         const params = {
-            servicesIds: Array.from(selectedServices.value),
+            servicesIds: selected.value.map((s) => s.id),
             withWarehouse: false,
             negative: true,
         };
@@ -130,7 +129,7 @@ const columns = computed(() => [
             <QBtn
                 color="primary"
                 :label="t('service.pay')"
-                :disabled="!selectedServices.size"
+                :disabled="!selected.length"
                 @click.stop="createRefund()"
             />
         </template>

From f4975d1f157d908edf2b73aa6fe8cde972c28212 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 1 Jul 2024 09:00:45 +0200
Subject: [PATCH 33/64] fix: ticketFilter adapt VnInputDate

---
 src/components/common/VnInputDate.vue | 25 ++++++++++++++++++-------
 src/pages/Ticket/TicketFilter.vue     | 15 +--------------
 src/pages/Ticket/TicketList.vue       |  4 ++--
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index f2c6cbe60..60fd67c0f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { onMounted, watch, computed, ref } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
 
@@ -19,12 +19,18 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['update:modelValue']);
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
+const dateFormat = 'DD/MM/YYYY';
 const isPopupOpen = ref(false);
 const hover = ref(false);
+const mask = ref();
+
+onMounted(() => {
+    // fix quasar bug
+    mask.value = '##/##/####';
+});
 
 const styleAttrs = computed(() => {
     return $props.isOutlined
@@ -36,7 +42,6 @@ const styleAttrs = computed(() => {
         : {};
 });
 
-const dateFormat = 'DD/MM/YYYY';
 const formattedDate = computed({
     get() {
         if (!model.value) return model.value;
@@ -50,7 +55,7 @@ const formattedDate = computed({
                 if (value.at(2) == '/') value = value.split('/').reverse().join('/');
                 value = date.formatDate(
                     new Date(value).toISOString(),
-                    'YYYY-MM-DDTHH:mm:ss.SSSZ',
+                    'YYYY-MM-DDTHH:mm:ss.SSSZ'
                 );
             }
             let ymd = value.split('-').map((e) => parseInt(e));
@@ -63,7 +68,7 @@ const formattedDate = computed({
                     orgDate.getHours(),
                     orgDate.getMinutes(),
                     orgDate.getSeconds(),
-                    orgDate.getMilliseconds(),
+                    orgDate.getMilliseconds()
                 );
             }
         }
@@ -72,7 +77,13 @@ const formattedDate = computed({
 });
 
 const popupDate = computed(() =>
-    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value,
+    model.value ? date.formatDate(new Date(model.value), 'YYYY/MM/DD') : model.value
+);
+
+watch(
+    () => model.value,
+    (val) => (formattedDate.value = val),
+    { immediate: true }
 );
 </script>
 
@@ -81,7 +92,7 @@ const popupDate = computed(() =>
         <QInput
             v-model="formattedDate"
             class="vn-input-date"
-            mask="##/##/####"
+            :mask="mask"
             placeholder="dd/mm/aaaa"
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7b74117bb..63ac48393 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -17,15 +17,6 @@ const props = defineProps({
     },
 });
 
-const from = Date.vnNew();
-const to = Date.vnNew();
-to.setDate(to.getDate() + 1);
-
-const defaultParams = {
-    from: toDateString(from),
-    to: toDateString(to),
-};
-
 const workers = ref();
 const provinces = ref();
 const states = ref();
@@ -44,11 +35,7 @@ const warehouses = ref();
         @on-fetch="(data) => (workers = data)"
         auto-load
     />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :params="defaultParams"
-        :search-button="true"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c065cf6bf..16d7aac5d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -26,8 +26,8 @@ const to = Date.vnNew();
 to.setDate(to.getDate() + 1);
 
 const userParams = {
-    from: toDateString(from),
-    to: toDateString(to),
+    from: from.toISOString(),
+    to: to.toISOString(),
 };
 
 function navigate(id) {

From 379d90d4c909390976486ec02a9743f3b39d8f32 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 11:40:57 +0200
Subject: [PATCH 34/64] updates

---
 src/components/LeftMenu.vue              |  2 +-
 src/composables/useRole.js               |  2 +-
 src/pages/Entry/EntryBuysTableDialog.vue | 66 +++++++++++++-----------
 src/pages/Entry/EntryList.vue            |  3 +-
 4 files changed, 41 insertions(+), 32 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 0dfcc812e..51e99808b 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -70,7 +70,7 @@ function getRoutes() {
                 (route) => toLowerCamel(route.name) === item.module
             );
             if (!moduleDef) continue;
-            if (!role.isEmployee()) continue;
+            // if (!role.isEmployee()) continue;
             item.children = [];
 
             addChildren(item.module, moduleDef, item.children);
diff --git a/src/composables/useRole.js b/src/composables/useRole.js
index 485687f16..d1a6d6ef3 100644
--- a/src/composables/useRole.js
+++ b/src/composables/useRole.js
@@ -28,7 +28,7 @@ export function useRole() {
         return false;
     }
     function isEmployee() {
-        return !hasAny(['employee']);
+        return hasAny(['employee']);
     }
 
     return {
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index c8056e6ac..4cec9a04b 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -17,6 +17,8 @@ import { useQuasar } from 'quasar';
 import { toCurrency } from 'src/filters';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify.js';
+import { usePrintService } from 'composables/usePrintService';
+const { openReport } = usePrintService();
 
 const quasar = useQuasar();
 const route = useRoute();
@@ -31,18 +33,14 @@ const $props = defineProps({
     },
 });
 const rowsSelected = ref([]);
+const entityId = computed(() => $props.id || route.params.id);
 
 const entriesTableColumns = computed(() => [
     {
         align: 'left',
         name: 'item',
         label: t('entry.summary.item'),
-        field: 'itemFk',
-        format: (row) => row.item.name,
-        // component: 'fetchedTags',
-        // attrs: {
-        //     item: (row) => row.item,
-        // },
+        field: (row) => row.item.name,
     },
     {
         align: 'left',
@@ -90,8 +88,7 @@ const entriesTableColumns = computed(() => [
         align: 'left',
         name: 'buyingValue',
         label: t('entry.summary.buyingValue'),
-        field: 'buyingValue',
-        format: ({ buyingValue }) => toCurrency(buyingValue),
+        field: ({ buyingValue }) => toCurrency(buyingValue),
     },
     {
         align: 'left',
@@ -109,20 +106,9 @@ const entriesTableColumns = computed(() => [
         align: 'left',
         name: 'import',
         label: t('entry.summary.import'),
-        format: (row) => toCurrency(row.buyingValue * row.quantity),
+        field: (row) => toCurrency(row.buyingValue * row.quantity),
     },
 ]);
-
-import { useArrayData } from 'src/composables/useArrayData';
-import VnTable from 'src/components/VnTable/VnTable.vue';
-
-const arrayData = useArrayData('EntryBuys');
-const { store } = arrayData;
-
-const entityId = computed(() => $props.id || route.params.id);
-// import EntryBuysTable from './EntryBuysTable.vue';
-store.userParams = {};
-onBeforeMount(() => {});
 </script>
 
 <template>
@@ -142,28 +128,49 @@ onBeforeMount(() => {});
             </QCardSection>
             <QCardActions align="right">
                 <QBtn
-                    :label="t('globals.print')"
+                    :label="t('Print buys')"
                     color="primary"
                     icon="print"
                     :loading="isLoading"
-                    @click="confirm()"
+                    @click="openReport(`Entries/${entityId}/buy-label`)"
                     unelevated
                     autofocus
                 />
             </QCardActions>
             <QCardSection class="row items-center">
-                <VnTable
+                <VnPaginate
                     ref="entryBuysPaginateRef"
                     data-key="EntryBuys"
                     :url="`Entries/${entityId}/getBuys`"
                     auto-load
-                    :columns="entriesTableColumns"
-                    default-mode="table"
-                    :right-search="false"
-                    :is-editable="false"
-                    :use-model="false"
                 >
-                </VnTable> </QCardSection
+                    <template #body="{ rows }">
+                        <QTable
+                            :rows="rows"
+                            :columns="entriesTableColumns"
+                            selection="multiple"
+                            row-key="id"
+                            class="full-width q-mt-md"
+                            :grid="$q.screen.lt.md"
+                            v-model:selected="rowsSelected"
+                            :no-data-label="t('globals.noResults')"
+                        >
+                            <template #body="props">
+                                <QTr>
+                                    <QTd>
+                                        <QCheckbox v-model="props.selected" />
+                                    </QTd>
+                                    <QTd v-for="col in props.cols" :key="col.name">
+                                        {{ col.value }}
+                                        <FetchedTags
+                                            v-if="col.name === 'item'"
+                                            :item="props.row['item']"
+                                        ></FetchedTags>
+                                    </QTd>
+                                </QTr>
+                            </template>
+                        </QTable> </template
+                ></VnPaginate> </QCardSection
         ></QCard>
     </QDialog>
 </template>
@@ -181,4 +188,5 @@ onBeforeMount(() => {});
 
 <i18n>
 es:
+    Print buys: Imprimir compras
 </i18n>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index c6c99a651..0933eb88a 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -125,7 +125,7 @@ const printBuys = (rowId) => {
                                 type="submit"
                             />
                             <QBtn
-                                :label="t('globals.print')"
+                                :label="t('Print buys')"
                                 @click.stop="printBuys(row.id)"
                                 color="primary"
                                 type="submit"
@@ -146,6 +146,7 @@ const printBuys = (rowId) => {
 
 <i18n>
 es:
+    Print buys: Imprimir compras
     Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas

From 9b7ffbf3d2d4998c3e7a6ad5deaf23ae7e6cdf13 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 11:48:27 +0200
Subject: [PATCH 35/64] fix: fix pagination issue & skip url query param

---
 src/components/ui/VnFilterPanel.vue | 11 +++++++----
 src/components/ui/VnSearchbar.vue   |  1 +
 src/composables/useArrayData.js     | 20 +++++++++-----------
 src/stores/useArrayDataStore.js     |  1 +
 4 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9eff3d322..adfff37e7 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
-        default: () => {}
+        default: () => {},
     },
     dataKey: {
         type: String,
@@ -67,9 +67,9 @@ const arrayData = useArrayData($props.dataKey, {
 });
 const route = useRoute();
 const store = arrayData.store;
-const userParams = ref({})
+const userParams = ref({});
 onMounted(() => {
-    userParams.value = $props.modelValue ?? {}
+    userParams.value = $props.modelValue ?? {};
     emit('init', { params: userParams.value });
 });
 
@@ -102,6 +102,7 @@ async function search(evt) {
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
+    store.page = 1;
     const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
@@ -114,7 +115,8 @@ async function search(evt) {
 async function reload() {
     isLoading.value = true;
     const params = Object.values(userParams.value).filter((param) => param);
-
+    store.skip = 0;
+    store.page = 1;
     await arrayData.fetch({ append: false });
     if (!$props.showAll && !params.length) store.data = [];
     isLoading.value = false;
@@ -126,6 +128,7 @@ async function clearFilters() {
     store.userParamsChanged = true;
     store.filter.skip = 0;
     store.skip = 0;
+    store.page = 1;
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
         $props.unremovableParams.includes(param)
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 4e048e238..eab04f04c 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -104,6 +104,7 @@ async function search() {
         ([key, value]) => value && (props.staticParams || []).includes(key)
     );
     store.skip = 0;
+    store.page = 1;
 
     if (props.makeFetch)
         await arrayData.applyFilter({
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index f6f476f87..b40699bbb 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -1,4 +1,4 @@
-import { onMounted, ref, computed } from 'vue';
+import { onMounted, computed } from 'vue';
 import { useRouter, useRoute } from 'vue-router';
 import axios from 'axios';
 import { useArrayDataStore } from 'stores/useArrayDataStore';
@@ -16,8 +16,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     const router = useRouter();
     let canceller = null;
 
-    const page = ref(1);
-
     onMounted(() => {
         setOptions();
         store.skip = 0;
@@ -87,13 +85,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        Object.assign(store.filter, { ...filter, skip: store.skip });
-        const params = {
-            filter: JSON.stringify(store.filter),
-        };
+        Object.assign(store.filter, filter);
+        const params = { filter: store.filter };
 
         Object.assign(params, userParams);
+        params.filter.skip = store.skip;
 
+        params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
         store.isLoading = true;
         const response = await axios.get(store.url, {
@@ -154,8 +152,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.userParams = userParams;
         store.skip = 0;
         store.filter.skip = 0;
-        page.value = 1;
-
+        store.page = 1;
         await fetch({ append: false });
         return { filter, params };
     }
@@ -187,10 +184,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     async function loadMore() {
         if (!store.hasMoreData) return;
 
-        store.skip = store.limit * page.value;
-        page.value += 1;
+        store.skip = store.limit * store.page;
+        store.page += 1;
 
         await fetch({ append: true });
+        updateStateParams();
     }
 
     async function refresh() {
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ebe32f8d0..2debdad7f 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -23,6 +23,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
             exprBuilder: null,
             searchUrl: 'params',
             navigate: null,
+            page: 1,
         };
     }
 

From 71900b15a6d6b6ec908ec7258b88de49e7b4f6f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 12:18:58 +0200
Subject: [PATCH 36/64] feat: newsection and i18n

---
 src/i18n/locale/en.yml                   |   1 +
 src/i18n/locale/es.yml                   |   1 +
 src/pages/Entry/EntryBuysTableDialog.vue |  52 ++------
 src/pages/Entry/EntryList.vue            |  23 ----
 src/pages/Entry/MyEntries.vue            | 149 +++++++++++++++++++++++
 src/pages/Entry/locale/en.yml            |   1 +
 src/pages/Entry/locale/es.yml            |   1 +
 src/router/modules/entry.js              |  11 +-
 8 files changed, 171 insertions(+), 68 deletions(-)
 create mode 100644 src/pages/Entry/MyEntries.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 645e12b7a..e6d323708 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -314,6 +314,7 @@ entry:
     pageTitles:
         entries: Entries
         list: List
+        eti: Labeler
         summary: Summary
         basicData: Basic data
         buys: Buys
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 29373efd0..a14318a60 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -312,6 +312,7 @@ entry:
     pageTitles:
         entries: Entradas
         list: Listado
+        eti: Etiquetar
         summary: Resumen
         basicData: Datos básicos
         buys: Compras
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 4cec9a04b..80fcfc516 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -38,15 +38,15 @@ const entityId = computed(() => $props.id || route.params.id);
 const entriesTableColumns = computed(() => [
     {
         align: 'left',
-        name: 'item',
-        label: t('entry.summary.item'),
-        field: (row) => row.item.name,
+        name: 'itemFk',
+        field: 'itemFk',
+        label: t('globals.id'),
     },
     {
         align: 'left',
-        name: 'quantity',
-        label: t('entry.summary.quantity'),
-        field: 'quantity',
+        name: 'item',
+        label: t('entry.summary.item'),
+        field: (row) => row.item.name,
     },
     {
         align: 'left',
@@ -60,18 +60,6 @@ const entriesTableColumns = computed(() => [
         label: t('entry.summary.stickers'),
         field: 'stickers',
     },
-    {
-        align: 'left',
-        name: 'printedStickers',
-        label: t('entry.buys.printedStickers'),
-        field: 'printedStickers',
-    },
-    {
-        align: 'left',
-        name: 'weight',
-        label: t('entry.summary.weight'),
-        field: 'weight',
-    },
     {
         align: 'left',
         name: 'packing',
@@ -84,36 +72,12 @@ const entriesTableColumns = computed(() => [
         label: t('entry.summary.grouping'),
         field: 'grouping',
     },
-    {
-        align: 'left',
-        name: 'buyingValue',
-        label: t('entry.summary.buyingValue'),
-        field: ({ buyingValue }) => toCurrency(buyingValue),
-    },
-    {
-        align: 'left',
-        name: 'price2',
-        label: t('entry.buys.groupingPrice'),
-        field: 'price2',
-    },
-    {
-        align: 'left',
-        name: 'price3',
-        label: t('entry.buys.packingPrice'),
-        field: 'price3',
-    },
-    {
-        align: 'left',
-        name: 'import',
-        label: t('entry.summary.import'),
-        field: (row) => toCurrency(row.buyingValue * row.quantity),
-    },
 ]);
 </script>
 
 <template>
-    <QDialog ref="dialogRef" full-width>
-        <QCard>
+    <QDialog ref="dialogRef">
+        <QCard style="min-width: 800px">
             <QCardSection class="row items-center q-pb-none">
                 <QAvatar
                     :icon="icon"
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 0933eb88a..353b215af 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -12,8 +12,6 @@ import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
-// import { useVnConfirm } from 'composables/useVnConfirm';
-// const { openConfirmationModal } = useVnConfirm();
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -31,21 +29,6 @@ const redirectToCreateView = () => {
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
-import { useQuasar } from 'quasar';
-// import EntryBuys from './Card/EntryBuys.vue';
-import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
-
-const quasar = useQuasar();
-
-const printBuys = (rowId) => {
-    // router.push({ path: `/entry/${rowId}/buys` });
-    quasar.dialog({
-        component: EntryBuysTableDialog,
-        componentProps: {
-            id: rowId,
-        },
-    });
-};
 </script>
 <template>
     <VnSearchbar
@@ -124,12 +107,6 @@ const printBuys = (rowId) => {
                                 color="primary"
                                 type="submit"
                             />
-                            <QBtn
-                                :label="t('Print buys')"
-                                @click.stop="printBuys(row.id)"
-                                color="primary"
-                                type="submit"
-                            />
                         </template>
                     </CardList>
                 </template>
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
new file mode 100644
index 000000000..32cc871ee
--- /dev/null
+++ b/src/pages/Entry/MyEntries.vue
@@ -0,0 +1,149 @@
+<script setup>
+import { onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import CardList from 'src/components/ui/CardList.vue';
+import EntrySummary from './Card/EntrySummary.vue';
+import EntryFilter from './EntryFilter.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RightMenu from 'src/components/common/RightMenu.vue';
+import { useQuasar } from 'quasar';
+import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+const quasar = useQuasar();
+
+function navigate(id) {
+    router.push({ path: `/entry/${id}` });
+}
+
+const redirectToCreateView = () => {
+    router.push({ name: 'EntryCreate' });
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
+const printBuys = (rowId) => {
+    quasar.dialog({
+        component: EntryBuysTableDialog,
+        componentProps: {
+            id: rowId,
+        },
+    });
+};
+</script>
+<template>
+    <VnSearchbar
+        data-key="EntryList"
+        url="Entries/filter"
+        :label="t('Search entries')"
+        :info="t('You can search by entry reference')"
+    />
+    <RightMenu>
+        <template #right-panel>
+            <EntryFilter data-key="EntryList" />
+        </template>
+    </RightMenu>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="EntryList"
+                url="Entries/filter"
+                :order="['landed DESC', 'id DESC']"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :title="row.reference"
+                        @click="navigate(row.id)"
+                        :id="row.id"
+                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
+                    >
+                        <template #info-icons>
+                            <QIcon
+                                v-if="row.isExcludedFromAvailable"
+                                name="vn:inventory"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
+                            </QIcon>
+                            <QIcon
+                                v-if="row.isRaid"
+                                name="vn:net"
+                                color="primary"
+                                size="xs"
+                            >
+                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                        <template #list-items>
+                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
+                            <VnLv
+                                :label="t('entry.list.booked')"
+                                :value="!!row.isBooked"
+                            />
+                            <VnLv
+                                :label="t('entry.list.invoiceNumber')"
+                                :value="row.invoiceNumber"
+                            />
+                            <VnLv
+                                :label="t('entry.list.confirmed')"
+                                :value="!!row.isConfirmed"
+                            />
+                            <VnLv
+                                :label="t('entry.list.supplier')"
+                                :value="row.supplierName"
+                            />
+                            <VnLv
+                                :label="t('entry.list.ordered')"
+                                :value="!!row.isOrdered"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, EntrySummary)"
+                                color="primary"
+                                type="submit"
+                            />
+                            <QBtn
+                                :label="t('Print buys')"
+                                @click.stop="printBuys(row.id)"
+                                color="primary"
+                                type="submit"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+    <QPageSticky :offset="[20, 20]">
+        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
+        <QTooltip>
+            {{ t('entry.list.newEntry') }}
+        </QTooltip>
+    </QPageSticky>
+</template>
+
+<i18n>
+es:
+    Print buys: Imprimir compras
+    Inventory entry: Es inventario
+    Virtual entry: Es una redada
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+</i18n>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 9a476c80c..e4ad5ea62 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,4 +1,5 @@
 entryList:
+    eti: eti
     list:
         inventoryEntry: Inventory entry
         virtualEntry: Virtual entry
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index fba6c5460..d3fe60c7a 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,6 +1,7 @@
 Search entries: Buscar entradas
 You can search by entry reference: Puedes buscar por referencia de la entrada
 entryList:
+    eti: Etiquetas
     list:
         inventoryEntry: Es inventario
         virtualEntry: Es una redada
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 67fc41824..9bdda0bb5 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'EntryMain' },
     menus: {
-        main: ['EntryList', 'EntryLatestBuys'],
+        main: ['EntryList', 'MyEntries', 'EntryLatestBuys'],
         card: ['EntryBasicData', 'EntryBuys', 'EntryNotes', 'EntryDms', 'EntryLog'],
     },
     children: [
@@ -30,6 +30,15 @@ export default {
                     },
                     component: () => import('src/pages/Entry/EntryList.vue'),
                 },
+                {
+                    path: 'list',
+                    name: 'MyEntries',
+                    meta: {
+                        title: 'eti',
+                        icon: 'sell',
+                    },
+                    component: () => import('src/pages/Entry/MyEntries.vue'),
+                },
                 {
                     path: 'create',
                     name: 'EntryCreate',

From eeab4ed91566abdcbabda343f617cd59f1eac1db Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 13:18:19 +0200
Subject: [PATCH 37/64] updates

---
 src/pages/Entry/MyEntries.vue | 135 ++++++++++++++--------------------
 src/router/modules/entry.js   |   2 +-
 2 files changed, 58 insertions(+), 79 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 32cc871ee..8ab61bc13 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
@@ -21,18 +21,57 @@ const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
 
-function navigate(id) {
-    router.push({ path: `/entry/${id}` });
-}
-
-const redirectToCreateView = () => {
-    router.push({ name: 'EntryCreate' });
-};
-
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        columnFilter: {
+            component: 'select',
+            name: 'search',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'name',
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'left',
+        name: 'socialName',
+        label: t('customer.extendedList.tableVisibleColumns.socialName'),
+        isTitle: true,
+        create: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        computed,
+        actions: [
+            {
+                title: t('Print buys'),
+                icon: 'print',
+                action: (row) => printBuys(row.id),
+            },
+        ],
+    },
+]);
+
 const printBuys = (rowId) => {
     quasar.dialog({
         component: EntryBuysTableDialog,
@@ -41,6 +80,7 @@ const printBuys = (rowId) => {
         },
     });
 };
+import VnTable from 'components/VnTable/VnTable.vue';
 </script>
 <template>
     <VnSearchbar
@@ -56,79 +96,18 @@ const printBuys = (rowId) => {
     </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
-            <VnPaginate
-                data-key="EntryList"
+            <VnTable
+                ref="myEntriesRef"
+                data-key="myentriesList"
                 url="Entries/filter"
                 :order="['landed DESC', 'id DESC']"
+                :columns="columns"
+                default-mode="table"
+                redirect="customer"
                 auto-load
+                :create="null"
             >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :title="row.reference"
-                        @click="navigate(row.id)"
-                        :id="row.id"
-                        :has-info-icons="!!row.isExcludedFromAvailable || !!row.isRaid"
-                    >
-                        <template #info-icons>
-                            <QIcon
-                                v-if="row.isExcludedFromAvailable"
-                                name="vn:inventory"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Inventory entry') }}</QTooltip>
-                            </QIcon>
-                            <QIcon
-                                v-if="row.isRaid"
-                                name="vn:net"
-                                color="primary"
-                                size="xs"
-                            >
-                                <QTooltip>{{ t('Virtual entry') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                        <template #list-items>
-                            <VnLv :label="t('landed')" :value="toDate(row.landed)" />
-                            <VnLv
-                                :label="t('entry.list.booked')"
-                                :value="!!row.isBooked"
-                            />
-                            <VnLv
-                                :label="t('entry.list.invoiceNumber')"
-                                :value="row.invoiceNumber"
-                            />
-                            <VnLv
-                                :label="t('entry.list.confirmed')"
-                                :value="!!row.isConfirmed"
-                            />
-                            <VnLv
-                                :label="t('entry.list.supplier')"
-                                :value="row.supplierName"
-                            />
-                            <VnLv
-                                :label="t('entry.list.ordered')"
-                                :value="!!row.isOrdered"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, EntrySummary)"
-                                color="primary"
-                                type="submit"
-                            />
-                            <QBtn
-                                :label="t('Print buys')"
-                                @click.stop="printBuys(row.id)"
-                                color="primary"
-                                type="submit"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
+            </VnTable>
         </div>
     </QPage>
     <QPageSticky :offset="[20, 20]">
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index 9bdda0bb5..e88ff57cd 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -31,7 +31,7 @@ export default {
                     component: () => import('src/pages/Entry/EntryList.vue'),
                 },
                 {
-                    path: 'list',
+                    path: 'my',
                     name: 'MyEntries',
                     meta: {
                         title: 'eti',

From d2292601de6333250c82e384a16db51da1be1b6d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 14:05:52 +0200
Subject: [PATCH 38/64] feat: use VnTable

---
 src/pages/Entry/EntryList.vue |  1 -
 src/pages/Entry/MyEntries.vue | 47 ++++++++++++++++++-----------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 353b215af..e5d37900c 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -123,7 +123,6 @@ onMounted(async () => {
 
 <i18n>
 es:
-    Print buys: Imprimir compras
     Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 8ab61bc13..2d8f5c954 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -34,28 +34,33 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
-        columnFilter: {
-            component: 'select',
-            name: 'search',
-            attrs: {
-                url: 'Clients',
-                fields: ['id', 'name'],
-            },
-        },
+        isTitle: false,
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.name'),
-        name: 'name',
-        isTitle: true,
+        label: t('globals.shipped'),
+        name: 'shipped',
+        isTitle: false,
         create: true,
+        cardVisible: true,
+        format: ({ shipped }) => toDate(shipped),
     },
     {
         align: 'left',
-        name: 'socialName',
-        label: t('customer.extendedList.tableVisibleColumns.socialName'),
-        isTitle: true,
+        label: t('globals.landed'),
+        name: 'landed',
+        isTitle: false,
         create: true,
+        cardVisible: true,
+        format: ({ landed }) => toDate(landed),
+    },
+    {
+        align: 'left',
+        label: t('globals.wareHouseIn'),
+        name: 'wareouseIn',
+        isTitle: false,
+        cardVisible: true,
+        create: false,
     },
     {
         align: 'right',
@@ -102,25 +107,21 @@ import VnTable from 'components/VnTable/VnTable.vue';
                 url="Entries/filter"
                 :order="['landed DESC', 'id DESC']"
                 :columns="columns"
-                default-mode="table"
+                default-mode="card"
                 redirect="customer"
                 auto-load
-                :create="null"
+                :options="[]"
+                :right-search="false"
             >
+                <template #top-left></template>
             </VnTable>
         </div>
     </QPage>
-    <QPageSticky :offset="[20, 20]">
-        <QBtn fab icon="add" color="primary" @click="redirectToCreateView()" />
-        <QTooltip>
-            {{ t('entry.list.newEntry') }}
-        </QTooltip>
-    </QPageSticky>
 </template>
 
 <i18n>
 es:
-    Print buys: Imprimir compras
+    Print buys: Imprimir etiquetas
     Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas

From 814056d92060671fd1ab6c204adc8dbb68cb9fbb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 14:20:31 +0200
Subject: [PATCH 39/64] feat: showLabelerDialog

---
 src/pages/Entry/EntryBuysTableDialog.vue | 42 +++++++-----------------
 src/pages/Entry/MyEntries.vue            |  7 ++--
 src/pages/Entry/locale/en.yml            |  1 +
 src/pages/Entry/locale/es.yml            |  2 ++
 4 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 80fcfc516..c6ab4033c 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -1,30 +1,15 @@
 <script setup>
-import { ref, computed, onMounted, onBeforeMount } from 'vue';
-import { useRoute, useRouter } from 'vue-router';
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';
 
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-
-import { useQuasar } from 'quasar';
-import { toCurrency } from 'src/filters';
-import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
 import { usePrintService } from 'composables/usePrintService';
 const { openReport } = usePrintService();
 
-const quasar = useQuasar();
 const route = useRoute();
-const router = useRouter();
 const { t } = useI18n();
-const { notify } = useNotify();
 const $props = defineProps({
     id: {
         type: String,
@@ -32,7 +17,6 @@ const $props = defineProps({
         default: null,
     },
 });
-const rowsSelected = ref([]);
 const entityId = computed(() => $props.id || route.params.id);
 
 const entriesTableColumns = computed(() => [
@@ -112,30 +96,28 @@ const entriesTableColumns = computed(() => [
                         <QTable
                             :rows="rows"
                             :columns="entriesTableColumns"
-                            selection="multiple"
                             row-key="id"
-                            class="full-width q-mt-md"
+                            flat
+                            dense
+                            class="q-ml-lg"
                             :grid="$q.screen.lt.md"
-                            v-model:selected="rowsSelected"
                             :no-data-label="t('globals.noResults')"
                         >
                             <template #body="props">
                                 <QTr>
-                                    <QTd>
+                                    <!-- <QTd>
                                         <QCheckbox v-model="props.selected" />
-                                    </QTd>
+                                    </QTd> -->
                                     <QTd v-for="col in props.cols" :key="col.name">
                                         {{ col.value }}
-                                        <FetchedTags
-                                            v-if="col.name === 'item'"
-                                            :item="props.row['item']"
-                                        ></FetchedTags>
                                     </QTd>
                                 </QTr>
                             </template>
-                        </QTable> </template
-                ></VnPaginate> </QCardSection
-        ></QCard>
+                        </QTable>
+                    </template></VnPaginate
+                >
+            </QCardSection></QCard
+        >
     </QDialog>
 </template>
 
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 2d8f5c954..a21e1dc1e 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -38,7 +38,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.shipped'),
+        label: t('shipped'),
         name: 'shipped',
         isTitle: false,
         create: true,
@@ -47,7 +47,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('globals.landed'),
+        label: t('landed'),
         name: 'landed',
         isTitle: false,
         create: true,
@@ -69,7 +69,7 @@ const columns = computed(() => [
         computed,
         actions: [
             {
-                title: t('Print buys'),
+                title: t('printBuys'),
                 icon: 'print',
                 action: (row) => printBuys(row.id),
             },
@@ -121,7 +121,6 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 <i18n>
 es:
-    Print buys: Imprimir etiquetas
     Inventory entry: Es inventario
     Virtual entry: Es una redada
     Search entries: Buscar entradas
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index e4ad5ea62..00ea4cf9d 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -9,3 +9,4 @@ entryFilter:
         reference: Reference
 landed: Landed
 shipped: Shipped
+printBuys: Print buys
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index d3fe60c7a..cf4d9297f 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -1,5 +1,6 @@
 Search entries: Buscar entradas
 You can search by entry reference: Puedes buscar por referencia de la entrada
+
 entryList:
     eti: Etiquetas
     list:
@@ -12,3 +13,4 @@ entryFilter:
 
 landed: F. llegada
 shipped: F. salida
+printBuys: Imprimir etiquetas

From 79d986b9eca086edda5d458b6328b53ba02bd53a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 14:33:07 +0200
Subject: [PATCH 40/64] perf: remove warnings

---
 src/components/LeftMenu.vue   | 3 ---
 src/components/NavBar.vue     | 3 ---
 src/pages/Entry/MyEntries.vue | 8 --------
 3 files changed, 14 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 51e99808b..213c08d7e 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -9,7 +9,6 @@ import { toLowerCamel } from 'src/filters';
 import routes from 'src/router/modules';
 import LeftMenuItem from './LeftMenuItem.vue';
 import LeftMenuItemGroup from './LeftMenuItemGroup.vue';
-import { useRole } from 'src/composables/useRole';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -59,7 +58,6 @@ function addChildren(module, route, parent) {
 }
 
 const items = ref([]);
-const role = useRole();
 
 function getRoutes() {
     if (props.source === 'main') {
@@ -70,7 +68,6 @@ function getRoutes() {
                 (route) => toLowerCamel(route.name) === item.module
             );
             if (!moduleDef) continue;
-            // if (!role.isEmployee()) continue;
             item.children = [];
 
             addChildren(item.module, moduleDef, item.children);
diff --git a/src/components/NavBar.vue b/src/components/NavBar.vue
index 980cae5b8..3051e8b99 100644
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@@ -1,7 +1,6 @@
 <script setup>
 import { onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useSession } from 'src/composables/useSession';
 import { useState } from 'src/composables/useState';
 import { useStateStore } from 'stores/useStateStore';
 import { useQuasar } from 'quasar';
@@ -15,8 +14,6 @@ const stateStore = useStateStore();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const appName = 'Lilium';
 
 onMounted(() => stateStore.setMounted());
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index a21e1dc1e..bab8b6cc3 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -1,24 +1,16 @@
 <script setup>
 import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
-import EntrySummary from './Card/EntrySummary.vue';
 import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
-import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 
 const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
-const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
 
 onMounted(async () => {

From ae713213394796e34ba0d4a5cf0007fa986eac5b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 14:43:39 +0200
Subject: [PATCH 41/64] fix: map selected

---
 src/pages/Ticket/Card/TicketService.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 1ec072dd2..4cc8207ef 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -50,7 +50,7 @@ const createRefund = async () => {
         if (!selected.value.length) return;
 
         const params = {
-            servicesIds: selected.value.map((s) => s.id),
+            servicesIds: selected.value.map((s) => +s.ticketFk),
             withWarehouse: false,
             negative: true,
         };

From 150c446d706383ea9f3e5df91a3592c011e0b4b8 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 14:46:28 +0200
Subject: [PATCH 42/64] fix: refs #7652 update url

---
 src/components/common/VnCard.vue     | 11 ++++++++++-
 src/components/ui/CardDescriptor.vue | 27 +++++++++++++++++++++------
 src/composables/useArrayData.js      | 16 ++++++++--------
 3 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 8517525df..8be7b9221 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -1,6 +1,6 @@
 <script setup>
 import { onBeforeMount, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, onBeforeRouteUpdate } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
 import useCardSize from 'src/composables/useCardSize';
@@ -41,6 +41,15 @@ onBeforeMount(async () => {
     if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
     await arrayData.fetch({ append: false });
 });
+
+if (props.baseUrl) {
+    onBeforeRouteUpdate(async (to, from) => {
+        if (to.params.id !== from.params.id) {
+            arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
+            await arrayData.fetch({ append: false });
+        }
+    });
+}
 </script>
 <template>
     <QDrawer
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 8bb2a603e..f3860ea46 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -46,7 +46,7 @@ let arrayData;
 let store;
 let entity;
 const isLoading = ref(false);
-
+const isSameDataKey = computed(() => $props.dataKey === route.meta.moduleName);
 defineExpose({ getData });
 
 onBeforeMount(async () => {
@@ -58,10 +58,12 @@ onBeforeMount(async () => {
     store = arrayData.store;
     entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
     // It enables to load data only once if the module is the same as the dataKey
-    if ($props.dataKey !== route.meta.moduleName || !route.params.id) await getData();
+    if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
         () => [$props.url, $props.filter],
-        async () => await getData()
+        async () => {
+            if (!isSameDataKey.value) await getData();
+        }
     );
 });
 
@@ -77,6 +79,19 @@ async function getData() {
         isLoading.value = false;
     }
 }
+
+function getValueFromPath(path) {
+    if (!path) return;
+    const keys = path.split('.');
+    let current = entity.value;
+
+    for (let i = 0; i < keys.length; i++) {
+        if (current[keys[i]] === undefined) return undefined;
+        else current = current[keys[i]];
+    }
+    return current;
+}
+
 const emit = defineEmits(['onFetch']);
 </script>
 
@@ -139,8 +154,8 @@ const emit = defineEmits(['onFetch']);
                 <QList dense>
                     <QItemLabel header class="ellipsis text-h5" :lines="1">
                         <div class="title">
-                            <span v-if="$props.title" :title="$props.title">
-                                {{ entity[title] ?? $props.title }}
+                            <span v-if="$props.title" :title="getValueFromPath(title)">
+                                {{ getValueFromPath(title) ?? $props.title }}
                             </span>
                             <slot v-else name="description" :entity="entity">
                                 <span :title="entity.name">
@@ -151,7 +166,7 @@ const emit = defineEmits(['onFetch']);
                     </QItemLabel>
                     <QItem dense>
                         <QItemLabel class="subtitle" caption>
-                            #{{ $props.subtitle ?? entity.id }}
+                            #{{ getValueFromPath(subtitle) ?? entity.id }}
                         </QItemLabel>
                     </QItem>
                 </QList>
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index b40699bbb..f8412f33a 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -198,6 +198,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     function updateStateParams() {
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
+        const { matched: matches } = router.currentRoute.value;
+        const { path } = matches.at(-1);
+
+        const to =
+            store?.data?.length === 1
+                ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
+                : path.replace(/:id.*/, '');
 
         if (store.navigate) {
             const { customRouteRedirectName, searchText } = store.navigate;
@@ -206,13 +213,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                     name: customRouteRedirectName,
                     params: { id: searchText },
                 });
-            const { matched: matches } = router.currentRoute.value;
-            const { path } = matches.at(-1);
-
-            const to =
-                store?.data?.length === 1
-                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
-                    : path.replace(/:id.*/, '');
 
             if (route.path != to) {
                 const pushUrl = { path: to };
@@ -223,7 +223,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             }
         }
 
-        router.replace(newUrl);
+        if (store.currentFilter?.search) router.replace({ ...newUrl, path: to });
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);

From 269fe18a9a8b94955b386fd2e42bf9d3fed1b546 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 14:47:04 +0200
Subject: [PATCH 43/64] refactor: refs #7652 Update ClaimDescriptor and
 ParkingDescriptor

---
 src/pages/Claim/Card/ClaimDescriptor.vue     |  3 +--
 src/pages/Parking/Card/ParkingDescriptor.vue | 16 +++++-------
 src/pages/Parking/Card/ParkingSummary.vue    | 26 +++++++-------------
 3 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 5336c4427..ecf16f4c6 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -56,8 +56,7 @@ onMounted(async () => {
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
-        :title="data.title"
-        :subtitle="data.subtitle"
+        title="client.name"
         @on-fetch="setData"
         data-key="Claim"
     >
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index b5c8820ed..b57bfb0cc 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -2,7 +2,6 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 
@@ -17,8 +16,7 @@ const props = defineProps({
 const { t } = useI18n();
 const route = useRoute();
 const entityId = computed(() => props.id || route.params.id);
-const { store } = useArrayData('Parking');
-const parking = computed(() => store.data);
+
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -29,15 +27,13 @@ const filter = {
         module="Parking"
         data-key="Parking"
         :url="`Parkings/${entityId}`"
-        :title="parking?.code"
-        :subtitle="parking?.id"
+        title="code"
         :filter="filter"
-        @on-fetch="(data) => (parking = data)"
     >
-        <template #body>
-            <VnLv :label="t('globals.code')" :value="parking.code" />
-            <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
-            <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
+        <template #body="{ entity }">
+            <VnLv :label="t('globals.code')" :value="entity.code" />
+            <VnLv :label="t('parking.pickingOrder')" :value="entity.pickingOrder" />
+            <VnLv :label="t('parking.sector')" :value="entity.sector?.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index 7406856b9..95620ebfd 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -1,10 +1,9 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     id: {
@@ -15,9 +14,7 @@ const $props = defineProps({
 const router = useRoute();
 const { t } = useI18n();
 const entityId = computed(() => $props.id || router.params.id);
-const { store } = useArrayData('Parking');
 
-const parking = ref(store.data);
 const filter = {
     fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
@@ -26,14 +23,9 @@ const filter = {
 
 <template>
     <div class="q-pa-md">
-        <CardSummary
-            :url="`Parkings/${entityId}`"
-            :filter="filter"
-            @on-fetch="(data) => (parking = data)"
-            data-key="Parking"
-        >
-            <template #header>{{ parking.code }}</template>
-            <template #body>
+        <CardSummary :url="`Parkings/${entityId}`" data-key="Parking" :filter="filter">
+            <template #header="{ entity }">{{ entity.code }}</template>
+            <template #body="{ entity }">
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
                         <a
@@ -44,17 +36,17 @@ const filter = {
                             <QIcon name="open_in_new" />
                         </a>
                     </QCardSection>
-                    <VnLv :label="t('globals.code')" :value="parking.code" />
+                    <VnLv :label="t('globals.code')" :value="entity.code" />
                     <VnLv
                         :label="t('parking.pickingOrder')"
-                        :value="parking.pickingOrder"
+                        :value="entity.pickingOrder"
                     />
                     <VnLv
                         :label="t('parking.sector')"
-                        :value="parking.sector?.description"
+                        :value="entity.sector?.description"
                     />
-                    <VnLv :label="t('parking.row')" :value="parking.row" />
-                    <VnLv :label="t('parking.column')" :value="parking.column" />
+                    <VnLv :label="t('parking.row')" :value="entity.row" />
+                    <VnLv :label="t('parking.column')" :value="entity.column" />
                 </QCard>
             </template>
         </CardSummary>

From 93d7aee127873d7e43e4ee13234ee7b24a1c3f40 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 1 Jul 2024 17:25:20 +0200
Subject: [PATCH 44/64] chore: refs #7652 fix redirection

---
 src/components/common/VnCard.vue     |  2 +-
 src/components/ui/CardDescriptor.vue |  2 +-
 src/composables/useArrayData.js      | 16 ++++++++--------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index 8be7b9221..c81bcd8e2 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -46,7 +46,7 @@ if (props.baseUrl) {
     onBeforeRouteUpdate(async (to, from) => {
         if (to.params.id !== from.params.id) {
             arrayData.store.url = `${props.baseUrl}/${to.params.id}`;
-            await arrayData.fetch({ append: false });
+            await arrayData.fetch({ append: false, updateRouter: false });
         }
     });
 }
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index f3860ea46..3f1f0a00c 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -82,7 +82,7 @@ async function getData() {
 
 function getValueFromPath(path) {
     if (!path) return;
-    const keys = path.split('.');
+    const keys = path.toString().split('.');
     let current = entity.value;
 
     for (let i = 0; i < keys.length; i++) {
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index f8412f33a..b40699bbb 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -198,13 +198,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     function updateStateParams() {
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
-        const { matched: matches } = router.currentRoute.value;
-        const { path } = matches.at(-1);
-
-        const to =
-            store?.data?.length === 1
-                ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
-                : path.replace(/:id.*/, '');
 
         if (store.navigate) {
             const { customRouteRedirectName, searchText } = store.navigate;
@@ -213,6 +206,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                     name: customRouteRedirectName,
                     params: { id: searchText },
                 });
+            const { matched: matches } = router.currentRoute.value;
+            const { path } = matches.at(-1);
+
+            const to =
+                store?.data?.length === 1
+                    ? path.replace(/\/(list|:id)|-list/, `/${store.data[0].id}`)
+                    : path.replace(/:id.*/, '');
 
             if (route.path != to) {
                 const pushUrl = { path: to };
@@ -223,7 +223,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             }
         }
 
-        if (store.currentFilter?.search) router.replace({ ...newUrl, path: to });
+        router.replace(newUrl);
     }
 
     const totalRows = computed(() => (store.data && store.data.length) || 0);

From 5d1873808d4ed75506e95c94675928705c43b1a6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 19:03:05 +0200
Subject: [PATCH 45/64] feat: restore component

---
 src/pages/Entry/EntryFilter.vue | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 663cb2cb8..194ce0a28 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { onMounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
@@ -9,7 +9,6 @@ import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'components/FetchData.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
-import { useRole } from 'src/composables/useRole';
 
 const { t } = useI18n();
 const props = defineProps({
@@ -24,7 +23,6 @@ const companiesOptions = ref([]);
 const suppliersOptions = ref([]);
 
 const stateStore = useStateStore();
-const isEmployee = computed(() => useRole().isEmployee());
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
@@ -32,7 +30,6 @@ onMounted(async () => {
 
 <template>
     <FetchData
-        v-if="isEmployee"
         ref="companiesRef"
         url="Companies"
         :filter="{ fields: ['id', 'code'] }"
@@ -49,7 +46,6 @@ onMounted(async () => {
         auto-load
     />
     <FetchData
-        v-if="isEmployee"
         url="Suppliers"
         :filter="{ fields: ['id', 'nickname', 'name'] }"
         order="nickname"
@@ -101,7 +97,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem v-if="isEmployee">
+            <QItem>
                 <QItemSection>
                     <VnSelect
                         :label="t('params.companyFk')"
@@ -133,7 +129,7 @@ onMounted(async () => {
                     />
                 </QItemSection>
             </QItem>
-            <QItem v-if="isEmployee">
+            <QItem>
                 <QItemSection>
                     <VnSelect
                         :label="t('params.supplierFk')"
@@ -221,7 +217,7 @@ onMounted(async () => {
 <i18n>
 en:
     params:
-
+        
         invoiceNumber: Invoice number
         travelFk: Travel
         companyFk: Company
@@ -235,7 +231,7 @@ en:
         isOrdered: Ordered
 es:
     params:
-
+       
         invoiceNumber: Núm. factura
         travelFk: Envío
         companyFk: Empresa

From 68298b9ba66a272e05b37476a74b4cc82be1ac83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 19:03:17 +0200
Subject: [PATCH 46/64] feat: rreplace eti by labeler

---
 src/i18n/locale/en.yml        | 2 +-
 src/i18n/locale/es.yml        | 2 +-
 src/pages/Entry/locale/en.yml | 2 +-
 src/pages/Entry/locale/es.yml | 2 +-
 src/router/modules/entry.js   | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ef2d6bf30..ac5e99da6 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -314,7 +314,7 @@ entry:
     pageTitles:
         entries: Entries
         list: List
-        eti: Labeler
+        labeler: Labeler
         summary: Summary
         basicData: Basic data
         buys: Buys
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 8b282963c..12707d33a 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -313,7 +313,7 @@ entry:
     pageTitles:
         entries: Entradas
         list: Listado
-        eti: Etiquetar
+        labeler: Etiquetar
         summary: Resumen
         basicData: Datos básicos
         buys: Compras
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 00ea4cf9d..164b501af 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,5 +1,5 @@
 entryList:
-    eti: eti
+    labeler: Labeler
     list:
         inventoryEntry: Inventory entry
         virtualEntry: Virtual entry
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index cf4d9297f..7f85d2659 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -2,7 +2,7 @@ Search entries: Buscar entradas
 You can search by entry reference: Puedes buscar por referencia de la entrada
 
 entryList:
-    eti: Etiquetas
+    labeler: Etiquetas
     list:
         inventoryEntry: Es inventario
         virtualEntry: Es una redada
diff --git a/src/router/modules/entry.js b/src/router/modules/entry.js
index e88ff57cd..4f5f05231 100644
--- a/src/router/modules/entry.js
+++ b/src/router/modules/entry.js
@@ -34,7 +34,7 @@ export default {
                     path: 'my',
                     name: 'MyEntries',
                     meta: {
-                        title: 'eti',
+                        title: 'labeler',
                         icon: 'sell',
                     },
                     component: () => import('src/pages/Entry/MyEntries.vue'),

From f2304ab6f03c0a4b4dc33f2e20179f51f828dee2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 19:05:59 +0200
Subject: [PATCH 47/64] feat: myEntries

---
 src/pages/Entry/MyEntries.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index bab8b6cc3..b990211f0 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -8,6 +8,7 @@ import { toDate } from 'src/filters/index';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -43,7 +44,7 @@ const columns = computed(() => [
         name: 'landed',
         isTitle: false,
         create: true,
-        cardVisible: true,
+        cardVisible: false,
         format: ({ landed }) => toDate(landed),
     },
     {
@@ -56,7 +57,6 @@ const columns = computed(() => [
     },
     {
         align: 'right',
-        label: '',
         name: 'tableActions',
         computed,
         actions: [
@@ -77,7 +77,6 @@ const printBuys = (rowId) => {
         },
     });
 };
-import VnTable from 'components/VnTable/VnTable.vue';
 </script>
 <template>
     <VnSearchbar
@@ -100,12 +99,8 @@ import VnTable from 'components/VnTable/VnTable.vue';
                 :order="['landed DESC', 'id DESC']"
                 :columns="columns"
                 default-mode="card"
-                redirect="customer"
                 auto-load
-                :options="[]"
-                :right-search="false"
             >
-                <template #top-left></template>
             </VnTable>
         </div>
     </QPage>
@@ -113,8 +108,6 @@ import VnTable from 'components/VnTable/VnTable.vue';
 
 <i18n>
 es:
-    Inventory entry: Es inventario
-    Virtual entry: Es una redada
     Search entries: Buscar entradas
     You can search by entry reference: Puedes buscar por referencia de la entrada
 </i18n>

From aa2885e6ca558a48eca4ef4a601f47f0d2d77862 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 21:12:21 +0200
Subject: [PATCH 48/64] feat: remove isEmployee by acl.back

---
 src/stores/useNavigationStore.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index da06730f7..4dd5ed2ae 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -80,7 +80,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
     }
 
     async function fetchPinned() {
-        if (pinnedModules.value.length || !role.isEmployee()) return;
+        if (pinnedModules.value.length) return;
 
         const response = await axios.get('StarredModules/getStarredModules');
         pinnedModules.value = response.data.map((row) => row.moduleFk);

From 956ccf93c0e450c7ccd0b4178aa99de6f2a595d9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 21:12:44 +0200
Subject: [PATCH 49/64] perf: remove unnecessary code

---
 src/pages/Entry/MyEntries.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index b990211f0..74547ac31 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
-import EntryFilter from './EntryFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
@@ -85,11 +83,6 @@ const printBuys = (rowId) => {
         :label="t('Search entries')"
         :info="t('You can search by entry reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <EntryFilter data-key="EntryList" />
-        </template>
-    </RightMenu>
     <QPage class="column items-center q-pa-md">
         <div class="vn-card-list">
             <VnTable

From cb5c33dcc9187ea8a275d3e27c17cdb0c93af397 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 08:06:31 +0200
Subject: [PATCH 50/64] feat: rework VnInputTime and fix VnInputDate bugs

---
 src/components/VnTable/VnFilter.vue   |  12 ++
 src/components/common/VnInputDate.vue |  23 ++--
 src/components/common/VnInputTime.vue | 168 ++++++++++++--------------
 src/pages/Zone/Card/ZoneBasicData.vue |   2 +-
 4 files changed, 99 insertions(+), 106 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 3d489cf73..9ce050fe9 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -7,6 +7,7 @@ import { useArrayData } from 'composables/useArrayData';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 
 const $props = defineProps({
@@ -75,6 +76,17 @@ const components = {
         },
         forceAttrs,
     },
+    time: {
+        component: markRaw(VnInputTime),
+        event: updateEvent,
+        attrs: {
+            ...defaultAttrs,
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
     checkbox: {
         component: markRaw(QCheckbox),
         event: updateEvent,
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 60fd67c0f..26df2e3ba 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -5,10 +5,6 @@ import { useI18n } from 'vue-i18n';
 
 const model = defineModel({ type: String });
 const $props = defineProps({
-    readonly: {
-        type: Boolean,
-        default: false,
-    },
     isOutlined: {
         type: Boolean,
         default: false,
@@ -48,6 +44,7 @@ const formattedDate = computed({
         return date.formatDate(new Date(model.value), dateFormat);
     },
     set(value) {
+        if (value == model.value) return;
         let newDate;
         if (value) {
             // parse input
@@ -97,12 +94,18 @@ watch(
             v-bind="{ ...$attrs, ...styleAttrs }"
             :class="{ required: $attrs.required }"
             :rules="$attrs.required ? [requiredFieldRule] : null"
+            :clearable="false"
         >
             <template #append>
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && model && !readonly"
+                    v-if="
+                        ($attrs.clearable != undefined || $attrs.clearable) &&
+                        hover &&
+                        model &&
+                        !$attrs.disable
+                    "
                     @click="
                         model = null;
                         isPopupOpen = false;
@@ -132,13 +135,3 @@ watch(
         </QInput>
     </div>
 </template>
-
-<style lang="scss">
-.vn-input-date.q-field--standard.q-field--readonly .q-field__control:before {
-    border-bottom-style: solid;
-}
-
-.vn-input-date.q-field--outlined.q-field--readonly .q-field__control:before {
-    border-style: solid;
-}
-</style>
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 5c84951cb..29d10cac2 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,14 +1,11 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import isValidDate from 'filters/isValidDate';
+import { date } from 'quasar';
 
+const model = defineModel({ type: String });
 const props = defineProps({
-    modelValue: {
-        type: String,
-        default: null,
-    },
-    readonly: {
+    timeOnly: {
         type: Boolean,
         default: false,
     },
@@ -17,44 +14,33 @@ const props = defineProps({
         default: false,
     },
 });
-const emit = defineEmits(['update:modelValue']);
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
-const value = computed({
+const dateFormat = 'HH:mm';
+const isPopupOpen = ref();
+const hover = ref();
+const formattedTime = computed({
     get() {
-        return props.modelValue;
+        if (!model.value || model.value?.length <= 5) return model.value;
+        return dateToTime(model.value);
     },
     set(value) {
-        const [hours, minutes] = value.split(':');
-        const date = new Date(props.modelValue);
-        date.setHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0);
-        emit('update:modelValue', value ? date.toISOString() : null);
+        if (value == model.value) return;
+        let time = value;
+        if (time) {
+            if (time?.length > 5) time = dateToTime(time);
+            if (!props.timeOnly) {
+                const hours = time.split(':');
+                const date = new Date();
+                date.setHours(hours[0], hours[1], 0);
+                time = date.toISOString();
+            }
+        }
+        model.value = time;
     },
 });
 
-const isPopupOpen = ref(false);
-const onDateUpdate = (date) => {
-    internalValue.value = date;
-};
-
-const save = () => {
-    value.value = internalValue.value;
-};
-const formatTime = (dateString) => {
-    if (!dateString || !isValidDate(dateString)) {
-        return '';
-    }
-
-    const date = new Date(dateString || '');
-    return date.toLocaleTimeString([], {
-        hour: '2-digit',
-        minute: '2-digit',
-    });
-};
-
-const internalValue = ref(formatTime(value));
-
 const styleAttrs = computed(() => {
     return props.isOutlined
         ? {
@@ -64,64 +50,66 @@ const styleAttrs = computed(() => {
           }
         : {};
 });
+
+function dateToTime(newDate) {
+    return date.formatDate(new Date(newDate), dateFormat);
+}
+
+watch(
+    () => model.value,
+    (val) => (formattedTime.value = val),
+    { immediate: true }
+);
 </script>
 
 <template>
-    <QInput
-        class="vn-input-time"
-        readonly
-        :model-value="formatTime(value)"
-        v-bind="{ ...$attrs, ...styleAttrs }"
-        :class="{ required: $attrs.required }"
-        :rules="$attrs.required ? [requiredFieldRule] : null"
-        @click="isPopupOpen = true"
-    >
-        <template #append>
-            <QIcon name="Schedule" class="cursor-pointer">
-                <QPopupProxy
-                    v-model="isPopupOpen"
-                    cover
-                    transition-show="scale"
-                    transition-hide="scale"
-                    :no-parent-event="props.readonly"
-                >
-                    <QTime
-                        :format24h="false"
-                        :model-value="formatTime(value)"
-                        @update:model-value="onDateUpdate"
-                    >
-                        <div class="row items-center justify-end q-gutter-sm">
-                            <QBtn
-                                :label="t('Cancel')"
-                                color="primary"
-                                flat
-                                v-close-popup
-                            />
-                            <QBtn
-                                label="Ok"
-                                color="primary"
-                                flat
-                                @click="save"
-                                v-close-popup
-                            />
-                        </div>
-                    </QTime>
-                </QPopupProxy>
-            </QIcon>
-        </template>
-    </QInput>
+    <div @mouseover="hover = true" @mouseleave="hover = false">
+        <QInput
+            class="vn-input-time"
+            mask="##:##"
+            placeholder="--:--"
+            v-model="formattedTime"
+            v-bind="{ ...$attrs, ...styleAttrs }"
+            :class="{ required: $attrs.required }"
+            style="min-width: 100px"
+            :rules="$attrs.required ? [requiredFieldRule] : null"
+        >
+            <template #append>
+                <QIcon
+                    name="close"
+                    size="xs"
+                    v-if="
+                        ($attrs.clearable != undefined || $attrs.clearable) &&
+                        hover &&
+                        model &&
+                        !$attrs.disable
+                    "
+                    @click="
+                        model = null;
+                        isPopupOpen = false;
+                    "
+                />
+                <QIcon name="Schedule" class="cursor-pointer" />
+            </template>
+            <QMenu
+                transition-show="scale"
+                transition-hide="scale"
+                v-model="isPopupOpen"
+                anchor="bottom left"
+                self="top start"
+                :no-focus="true"
+            >
+                <QTime
+                    :format24h="false"
+                    v-model="formattedTime"
+                    mask="HH:mm"
+                    landscape
+                    now-btn
+                />
+            </QMenu>
+        </QInput>
+    </div>
 </template>
-
-<style lang="scss">
-.vn-input-time.q-field--standard.q-field--readonly .q-field__control:before {
-    border-bottom-style: solid;
-}
-
-.vn-input-time.q-field--outlined.q-field--readonly .q-field__control:before {
-    border-style: solid;
-}
-</style>
-
 <i18n>
 es:
     Cancel: Cancelar
diff --git a/src/pages/Zone/Card/ZoneBasicData.vue b/src/pages/Zone/Card/ZoneBasicData.vue
index 7a2c505fa..9f2195766 100644
--- a/src/pages/Zone/Card/ZoneBasicData.vue
+++ b/src/pages/Zone/Card/ZoneBasicData.vue
@@ -74,7 +74,7 @@ const agencyOptions = ref([]);
                     type="number"
                     min="0"
                 />
-                <VnInputTime v-model="data.hour" :label="t('Closing')" clearable />
+                <VnInputTime v-model="data.hour" :label="t('Closing')" />
             </VnRow>
 
             <VnRow class="row q-gutter-md q-mb-md">

From d714788923600edb3a4ec412e9b2b4c40f75c1ac Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 08:29:55 +0200
Subject: [PATCH 51/64] test: fix intermitent e2e

---
 test/cypress/integration/invoiceIn/invoiceInList.spec.js | 3 +--
 test/cypress/integration/parking/parkingList.spec.js     | 2 +-
 test/cypress/support/commands.js                         | 4 ----
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInList.spec.js b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
index 5e2a5aa4c..b2fa10d52 100644
--- a/test/cypress/integration/invoiceIn/invoiceInList.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInList.spec.js
@@ -5,12 +5,11 @@ describe('InvoiceInList', () => {
         ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
     const firstDetailBtn = '.q-card:nth-child(1) .q-btn:nth-child(2)';
     const summaryHeaders = '.summaryBody .header-link';
-    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
 
     beforeEach(() => {
+        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/invoice-in/list`);
-        cy.get(screen).click();
     });
 
     it('should redirect on clicking a invoice', () => {
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index 3ac46f8cd..b78a660d1 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -8,9 +8,9 @@ describe('ParkingList', () => {
     const summaryHeader = '.summaryBody .header';
 
     beforeEach(() => {
+        cy.viewport(1920, 1080);
         cy.login('developer');
         cy.visit(`/#/parking/list`);
-        cy.closeSideMenu();
     });
 
     it('should redirect on clicking a parking', () => {
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 055cb8021..240a97908 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -221,10 +221,6 @@ Cypress.Commands.add('openLeftMenu', (element) => {
     if (element) cy.waitForElement(element);
     cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
 });
-Cypress.Commands.add('closeSideMenu', (element) => {
-    if (element) cy.waitForElement(element);
-    cy.get('.fullscreen.q-drawer__backdrop:not(.hidden)').click();
-});
 
 Cypress.Commands.add('clearSearchbar', (element) => {
     if (element) cy.waitForElement(element);

From 0384123564bcc165e1ddc1b29a806753863f9ae4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 12:24:33 +0200
Subject: [PATCH 52/64] fix: vntable filter where

---
 src/components/common/VnInput.vue   |  7 ++++++-
 src/components/common/VnSelect.vue  | 13 ++++++++++---
 src/components/ui/VnFilterPanel.vue | 22 ++++++++++++++++++----
 src/pages/Customer/CustomerList.vue |  2 ++
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 4cd964012..33b97e29d 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -93,7 +93,12 @@ const inputRules = [
                     name="close"
                     size="xs"
                     v-if="hover && value && !$attrs.disabled && $props.clearable"
-                    @click="value = null"
+                    @click="
+                        () => {
+                            value = null;
+                            emit('remove');
+                        }
+                    "
                 ></QIcon>
                 <QIcon v-if="info" name="info">
                     <QTooltip max-width="350px">
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 52cb68438..3e5cd4216 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -61,6 +61,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    useLike: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const { t } = useI18n();
@@ -114,11 +118,14 @@ async function fetchFilter(val) {
     if (!$props.url || !dataRef.value) return;
 
     const { fields, sortBy, limit } = $props;
-    let key = optionLabel.value;
+    let key = optionFilter.value ?? optionLabel.value;
 
-    if (new RegExp(/\d/g).test(val)) key = optionFilter.value ?? optionValue.value;
+    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
 
-    const where = { ...{ [key]: { like: `%${val}%` } }, ...$props.where };
+    const defaultWhere = $props.useLike
+        ? { [key]: { like: `%${val}%` } }
+        : { [key]: val };
+    const where = { ...defaultWhere, ...$props.where };
     const fetchOptions = { where, order: sortBy, limit };
     if (fields) fetchOptions.fields = fields;
     return dataRef.value.fetch(fetchOptions);
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 9eff3d322..16217946b 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -10,7 +10,7 @@ const { t } = useI18n();
 const $props = defineProps({
     modelValue: {
         type: Object,
-        default: () => {}
+        default: () => {},
     },
     dataKey: {
         type: String,
@@ -58,7 +58,14 @@ const $props = defineProps({
     },
 });
 
-const emit = defineEmits(['refresh', 'clear', 'search', 'init', 'remove']);
+const emit = defineEmits([
+    'update:modelValue',
+    'refresh',
+    'clear',
+    'search',
+    'init',
+    'remove',
+]);
 
 const arrayData = useArrayData($props.dataKey, {
     exprBuilder: $props.exprBuilder,
@@ -67,9 +74,9 @@ const arrayData = useArrayData($props.dataKey, {
 });
 const route = useRoute();
 const store = arrayData.store;
-const userParams = ref({})
+const userParams = ref({});
 onMounted(() => {
-    userParams.value = $props.modelValue ?? {}
+    userParams.value = $props.modelValue ?? {};
     emit('init', { params: userParams.value });
 });
 
@@ -92,6 +99,11 @@ watch(
     (val) => setUserParams(val)
 );
 
+watch(
+    () => $props.modelValue,
+    (val) => (userParams.value = val ?? {})
+);
+
 const isLoading = ref(false);
 async function search(evt) {
     if (evt && $props.disableSubmitEvent) return;
@@ -145,6 +157,7 @@ async function clearFilters() {
 
     isLoading.value = false;
     emit('clear');
+    emit('update:modelValue', userParams.value);
 }
 
 const tagsList = computed(() => {
@@ -168,6 +181,7 @@ async function remove(key) {
     userParams.value[key] = undefined;
     search();
     emit('remove', key);
+    emit('update:modelValue', userParams.value);
 }
 
 function formatValue(value) {
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index ccd53e8b2..32980bc29 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -65,6 +65,8 @@ const columns = computed(() => [
             url: 'Workers/activeWithInheritedRole',
             fields: ['id', 'name'],
             where: { role: 'salesPerson' },
+            optionFilter: 'firstName',
+            useLike: false,
         },
         create: true,
         columnField: {

From 2961c813a514cabe54acac3656ae9d73d10a23a0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 12:41:25 +0200
Subject: [PATCH 54/64] build: increase version 2430

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 4668d2d56..71d80d401 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.28.1",
+    "version": "24.30.1",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 739be5fe7c1379c6be3a1138353242160d94baec Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 13:49:29 +0200
Subject: [PATCH 55/64] fix(VnInputDate & VnInputTime): fix clearable

---
 src/components/common/VnInputDate.vue   | 10 +++-------
 src/components/common/VnInputTime.vue   | 23 ++++++++++++-----------
 src/pages/Item/Card/ItemLastEntries.vue |  8 +-------
 src/pages/Item/ItemRequestFilter.vue    |  2 --
 src/pages/Monitor/SalesClientsTable.vue |  2 --
 5 files changed, 16 insertions(+), 29 deletions(-)

diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 26df2e3ba..a88540ebf 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -9,18 +9,14 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
-    emitDateFormat: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const { t } = useI18n();
 const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 
 const dateFormat = 'DD/MM/YYYY';
-const isPopupOpen = ref(false);
-const hover = ref(false);
+const isPopupOpen = ref();
+const hover = ref();
 const mask = ref();
 
 onMounted(() => {
@@ -101,7 +97,7 @@ watch(
                     name="close"
                     size="xs"
                     v-if="
-                        ($attrs.clearable != undefined || $attrs.clearable) &&
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
                         model &&
                         !$attrs.disable
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 29d10cac2..08a99ec56 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -20,6 +20,17 @@ const requiredFieldRule = (val) => !!val || t('globals.fieldRequired');
 const dateFormat = 'HH:mm';
 const isPopupOpen = ref();
 const hover = ref();
+
+const styleAttrs = computed(() => {
+    return props.isOutlined
+        ? {
+              dense: true,
+              outlined: true,
+              rounded: true,
+          }
+        : {};
+});
+
 const formattedTime = computed({
     get() {
         if (!model.value || model.value?.length <= 5) return model.value;
@@ -41,16 +52,6 @@ const formattedTime = computed({
     },
 });
 
-const styleAttrs = computed(() => {
-    return props.isOutlined
-        ? {
-              dense: true,
-              outlined: true,
-              rounded: true,
-          }
-        : {};
-});
-
 function dateToTime(newDate) {
     return date.formatDate(new Date(newDate), dateFormat);
 }
@@ -79,7 +80,7 @@ watch(
                     name="close"
                     size="xs"
                     v-if="
-                        ($attrs.clearable != undefined || $attrs.clearable) &&
+                        ($attrs.clearable == undefined || $attrs.clearable) &&
                         hover &&
                         model &&
                         !$attrs.disable
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 9071cc6eb..a3ae99da6 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -200,16 +200,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             <VnInputDate
                 :label="t('lastEntries.since')"
                 dense
-                emit-date-format
                 v-model="from"
                 class="q-mr-lg"
             />
-            <VnInputDate
-                :label="t('lastEntries.to')"
-                dense
-                emit-date-format
-                v-model="to"
-            />
+            <VnInputDate :label="t('lastEntries.to')" dense v-model="to" />
         </div>
         <QSpace />
         <div id="st-actions"></div>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 2c056acc6..2fbe849d1 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -192,7 +192,6 @@ const decrement = (paramsObj, key) => {
                             v-model="params.from"
                             @update:model-value="searchFn()"
                             is-outlined
-                            emit-date-format
                         />
                     </QItemSection>
                 </QItem>
@@ -203,7 +202,6 @@ const decrement = (paramsObj, key) => {
                             v-model="params.to"
                             @update:model-value="searchFn()"
                             is-outlined
-                            emit-date-format
                         />
                     </QItemSection>
                 </QItem>
diff --git a/src/pages/Monitor/SalesClientsTable.vue b/src/pages/Monitor/SalesClientsTable.vue
index 3f2389471..8008b1fda 100644
--- a/src/pages/Monitor/SalesClientsTable.vue
+++ b/src/pages/Monitor/SalesClientsTable.vue
@@ -169,7 +169,6 @@ const columns = computed(() => [
                         <VnInputDate
                             :label="t('salesClientsTable.from')"
                             dense
-                            emit-date-format
                             v-model="from"
                             class="q-mr-lg"
                             style="width: 150px"
@@ -177,7 +176,6 @@ const columns = computed(() => [
                         <VnInputDate
                             :label="t('salesClientsTable.to')"
                             dense
-                            emit-date-format
                             v-model="to"
                             style="width: 150px"
                         />

From 249aedeaf54e07d6b5f9d6154a78b286da4ae860 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 13:51:33 +0200
Subject: [PATCH 56/64] remove unnecessary translation

---
 src/components/common/VnInputTime.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 08a99ec56..3d482933a 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -111,7 +111,3 @@ watch(
         </QInput>
     </div>
 </template>
-<i18n>
-es:
-    Cancel: Cancelar
-</i18n>

From 22f42ca7f926e546a6ddb670d9d47fbaecaa829a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 14:55:32 +0200
Subject: [PATCH 57/64] feat(VnTable): add slots for columns

---
 src/components/VnTable/VnTable.vue | 38 ++++++++++++++++++------------
 1 file changed, 23 insertions(+), 15 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 493f1480e..9ddc858fb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -175,7 +175,7 @@ function columnName(col) {
 }
 
 function getColAlign(col) {
-    return 'text-' + (col.align ?? 'left')
+    return 'text-' + (col.align ?? 'left');
 }
 defineExpose({
     reload,
@@ -310,13 +310,15 @@ defineExpose({
                             class="no-margin q-px-xs"
                             :class="getColAlign(col)"
                         >
-                            <VnTableColumn
-                                :column="col"
-                                :row="row"
-                                :is-editable="false"
-                                v-model="row[col.name]"
-                                component-prop="columnField"
-                            />
+                            <slot :name="`column-${col.name}`" :col="col" :row="row">
+                                <VnTableColumn
+                                    :column="col"
+                                    :row="row"
+                                    :is-editable="false"
+                                    v-model="row[col.name]"
+                                    component-prop="columnField"
+                                />
+                            </slot>
                         </QTd>
                     </template>
                     <template #body-cell-tableActions="{ col, row }">
@@ -412,14 +414,20 @@ defineExpose({
                                                             stopEventPropagation($event)
                                                         "
                                                     >
-                                                        <VnTableColumn
-                                                            :column="col"
+                                                        <slot
+                                                            :name="`column-${col.name}`"
+                                                            :col="col"
                                                             :row="row"
-                                                            :is-editable="false"
-                                                            v-model="row[col.name]"
-                                                            component-prop="columnField"
-                                                            :show-label="true"
-                                                        />
+                                                        >
+                                                            <VnTableColumn
+                                                                :column="col"
+                                                                :row="row"
+                                                                :is-editable="false"
+                                                                v-model="row[col.name]"
+                                                                component-prop="columnField"
+                                                                :show-label="true"
+                                                            />
+                                                        </slot>
                                                     </span>
                                                 </template>
                                             </VnLv>

From 6d12c0f00c8347f47e01a5c4db52dbca724c756c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 2 Jul 2024 15:01:43 +0200
Subject: [PATCH 58/64] feat(VnTable): add selected funcitionality

---
 src/components/VnTable/VnTable.vue | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9ddc858fb..56d1cbe8f 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -59,6 +59,10 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    hasSubtoolbar: {
+        type: Boolean,
+        default: true,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -177,9 +181,12 @@ function columnName(col) {
 function getColAlign(col) {
     return 'text-' + (col.align ?? 'left');
 }
+
+const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
     redirect: redirectFn,
+    selected,
 });
 </script>
 <template>
@@ -225,11 +232,18 @@ defineExpose({
             :search-url="searchUrl"
             :disable-infinite-scroll="mode == TABLE_MODE"
             @save-changes="reload"
-            :has-subtoolbar="isEditable"
+            :has-subtoolbar="$attrs['hasSubtoolbar'] ?? isEditable"
         >
+            <template
+                v-for="(_, slotName) in $slots"
+                #[slotName]="slotData"
+                :key="slotName"
+            >
+                <slot :name="slotName" v-bind="slotData ?? {}" :key="slotName" />
+            </template>
             <template #body="{ rows }">
                 <QTable
-                    v-bind="$attrs['QTable']"
+                    v-bind="$attrs['q-table']"
                     class="vnTable"
                     :columns="splittedColumns.columns"
                     :rows="rows"
@@ -246,6 +260,7 @@ defineExpose({
                             CrudModelRef.vnPaginateRef.paginate()
                     "
                     @row-click="(_, row) => rowClickFunction(row)"
+                    @update:selected="emit('update:selected', $event)"
                 >
                     <template #top-left>
                         <slot name="top-left"></slot>
@@ -485,6 +500,7 @@ defineExpose({
                         default="input"
                         v-model="data[column.name]"
                         :show-label="true"
+                        component-prop="columnCreate"
                     />
                     <slot name="more-create-dialog" :data="data" />
                 </div>

From 5c2c9d080584394ed21b5af1583d9e32afe43139 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 2 Jul 2024 20:41:37 +0200
Subject: [PATCH 59/64] perf: change field column

---
 src/pages/Entry/MyEntries.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 74547ac31..faabb4541 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -48,7 +48,7 @@ const columns = computed(() => [
     {
         align: 'left',
         label: t('globals.wareHouseIn'),
-        name: 'wareouseIn',
+        name: 'warehouseInName',
         isTitle: false,
         cardVisible: true,
         create: false,

From 7e374c258e0cdb2b1e8cd17e5bdbe156d9963e07 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 01:47:14 +0200
Subject: [PATCH 60/64] test: test:e2e

---
 src/pages/Entry/EntryBuysTableDialog.vue      |  1 +
 src/pages/Entry/MyEntries.vue                 |  2 +-
 .../cypress/integration/entry/myEntry.spec.js | 20 +++++++++++++++++++
 test/cypress/support/commands.js              |  5 ++---
 4 files changed, 24 insertions(+), 4 deletions(-)
 create mode 100644 test/cypress/integration/entry/myEntry.spec.js

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index c6ab4033c..02976f9a0 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -88,6 +88,7 @@ const entriesTableColumns = computed(() => [
             <QCardSection class="row items-center">
                 <VnPaginate
                     ref="entryBuysPaginateRef"
+                    :limit="0"
                     data-key="EntryBuys"
                     :url="`Entries/${entityId}/getBuys`"
                     auto-load
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index faabb4541..58a69f70c 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -87,7 +87,7 @@ const printBuys = (rowId) => {
         <div class="vn-card-list">
             <VnTable
                 ref="myEntriesRef"
-                data-key="myentriesList"
+                data-key="myEntriesList"
                 url="Entries/filter"
                 :order="['landed DESC', 'id DESC']"
                 :columns="columns"
diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
new file mode 100644
index 000000000..e1d132b41
--- /dev/null
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -0,0 +1,20 @@
+describe('WagonTypeCreate', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/entry/my`, {
+            onBeforeLoad(win) {
+                cy.stub(win, 'open');
+            },
+        });
+        cy.waitForElement('.q-page', 6000);
+    });
+
+    it('should create edit and remove new dms', () => {
+        cy.get(
+            '[to="/null/2"] > .q-card > .column > .q-btn > .q-btn__content > .q-icon'
+        ).click();
+        cy.get('.q-card__actions > .q-btn').click();
+        cy.window().its('open').should('be.called');
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 240a97908..4ed940ecd 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -50,8 +50,8 @@ Cypress.Commands.add('login', (user) => {
     });
 });
 
-Cypress.Commands.add('waitForElement', (element) => {
-    cy.get(element, { timeout: 5000 }).should('be.visible');
+Cypress.Commands.add('waitForElement', (element, timeout = 5000) => {
+    cy.get(element, { timeout }).should('be.visible');
 });
 
 Cypress.Commands.add('getValue', (selector) => {
@@ -241,4 +241,3 @@ Cypress.Commands.add('validateContent', (selector, expectedValue) => {
 Cypress.Commands.add('openActionsDescriptor', () => {
     cy.get('.descriptor > .header > .q-btn').click();
 });
-// registerCommands();

From dbbc8a4de6143ce83719603350321386e77b80cc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 01:48:06 +0200
Subject: [PATCH 61/64] test: change user

---
 test/cypress/integration/entry/myEntry.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/integration/entry/myEntry.spec.js b/test/cypress/integration/entry/myEntry.spec.js
index e1d132b41..14c09176e 100644
--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@@ -1,7 +1,7 @@
 describe('WagonTypeCreate', () => {
     beforeEach(() => {
         cy.viewport(1920, 1080);
-        cy.login('developer');
+        cy.login('customer');
         cy.visit(`/#/entry/my`, {
             onBeforeLoad(win) {
                 cy.stub(win, 'open');

From 147d17301f2d2b77f2d51c4734438788929db6cb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 01:50:45 +0200
Subject: [PATCH 62/64] remove unnussed tags

---
 src/pages/Entry/EntryBuysTableDialog.vue | 16 ----------------
 src/pages/Entry/locale/es.yml            |  2 +-
 2 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 02976f9a0..e5ac8b3a0 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -121,19 +121,3 @@ const entriesTableColumns = computed(() => [
         >
     </QDialog>
 </template>
-
-<style lang="scss" scoped>
-.q-table--horizontal-separator tbody tr:nth-child(odd) > td {
-    border-bottom-width: 0px;
-    border-top-width: 2px;
-    border-color: var(--vn-text-color);
-}
-.infoRow > td {
-    color: var(--vn-label-color);
-}
-</style>
-
-<i18n>
-es:
-    Print buys: Imprimir compras
-</i18n>
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 7f85d2659..9522c113c 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -13,4 +13,4 @@ entryFilter:
 
 landed: F. llegada
 shipped: F. salida
-printBuys: Imprimir etiquetas
+Print buys: Imprimir etiquetas

From 363abb899f955465724d457567350a572456157c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 3 Jul 2024 08:20:16 +0200
Subject: [PATCH 63/64] fix: refs #7543 fix changed descriptors

---
 src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue | 13 +------------
 src/pages/Ticket/Card/TicketDescriptor.vue       |  4 ----
 2 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index e8428dca1..68dc5be4b 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -9,7 +9,6 @@ import { useRole } from 'src/composables/useRole';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useArrayData } from 'src/composables/useArrayData';
 import { usePrintService } from 'composables/usePrintService';
-import useCardDescription from 'src/composables/useCardDescription';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import FetchData from 'src/components/FetchData.vue';
@@ -20,12 +19,7 @@ import { useCapitalize } from 'src/composables/useCapitalize';
 import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import InvoiceInToBook from '../InvoiceInToBook.vue';
 
-const $props = defineProps({
-    id: {
-        type: Number,
-        default: null,
-    },
-});
+const $props = defineProps({ id: { type: Number, default: null } });
 
 const { push, currentRoute } = useRouter();
 
@@ -258,9 +252,6 @@ const createInvoiceInCorrection = async () => {
     );
     push({ path: `/invoice-in/${correctingId}/summary` });
 };
-
-const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
 </script>
 <template>
     <FetchData
@@ -292,8 +283,6 @@ const setData = (entity) => (data.value = useCardDescription(entity.name, entity
         :url="`InvoiceIns/${entityId}`"
         :filter="filter"
         title="supplierRef"
-        @on-fetch="setData"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <InvoiceInToBook>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 46dbf04f9..b753d0b4c 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -70,8 +70,6 @@ const filter = {
 };
 
 const data = ref(useCardDescription());
-const setData = (entity) =>
-    (data.value = useCardDescription(entity.client?.name, entity.id));
 </script>
 
 <template>
@@ -82,8 +80,6 @@ const setData = (entity) =>
         :title="data.title"
         :subtitle="data.subtitle"
         data-key="ticketData"
-        @on-fetch="setData"
-        :summary="$attrs"
     >
         <template #menu="{ entity }">
             <TicketDescriptorMenu :ticket="entity" />

From d15dc7336b1a49720e6efd04b11139cbb1c81ca4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 08:26:27 +0200
Subject: [PATCH 64/64] Merge branch 'dev' into 7648_dev_customerEntries

---
 src/i18n/locale/en.yml                        | 309 ++++++++---------
 src/i18n/locale/es.yml                        | 316 ++++++++----------
 src/pages/Claim/Card/ClaimSummary.vue         |   2 +-
 src/pages/Entry/EntryBuysTableDialog.vue      |  11 +-
 src/pages/Entry/locale/en.yml                 |   1 -
 src/pages/Entry/locale/es.yml                 |   1 -
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |   8 +-
 src/pages/Shelving/Card/ShelvingSummary.vue   |   2 +-
 src/pages/Travel/Card/TravelSummary.vue       |   8 +-
 src/pages/Travel/ExtraCommunity.vue           |   2 +-
 src/pages/Travel/ExtraCommunityFilter.vue     |   2 +-
 src/router/index.js                           |   7 +-
 src/router/modules/item.js                    |   9 -
 src/stores/useNavigationStore.js              |   4 +-
 .../__tests__/components/Leftmenu.spec.js     |   4 +-
 15 files changed, 288 insertions(+), 398 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 8f586cd01..891ede724 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -100,13 +100,143 @@ globals:
         modes: Modes
         zones: Zones
         zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
+        deliveryDays: Delivery days
+        upcomingDeliveries: Upcoming deliveries
         role: Role
         alias: Alias
         aliasUsers: Users
         subRoles: Subroles
         inheritedRoles: Inherited Roles
+        customers: Customers
+        list: List
+        webPayments: Web Payments
+        extendedList: Extended list
+        notifications: Notifications
+        defaulter: Defaulter
+        customerCreate: New customer
+        fiscalData: Fiscal data
+        billingData: Billing data
+        consignees: Consignees
+        notes: Notes
+        credits: Credits
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recoveries
+        webAccess: Web access
+        sms: Sms
+        creditManagement: Credit management
+        creditContracts: Credit contracts
+        creditOpinion: Credit opinion
+        others: Others
+        samples: Samples
+        consumption: Consumption
+        mandates: Mandates
+        contacts: Contacts
+        webPayment: Web payment
+        fileManagement: File management
+        unpaid: Unpaid
+        entries: Entries
+        buys: Buys
+        dms: File management
+        entryCreate: New entry
+        latestBuys: Latest buys
+        tickets: Tickets
+        ticketCreate: New Tickets
+        boxing: Boxing
+        sale: Sale
+        claims: Claims
+        claimCreate: New claim
+        lines: Lines
+        photos: Photos
+        development: Development
+        action: Action
+        invoiceOuts: Invoice out
+        negativeBases: Negative Bases
+        globalInvoicing: Global invoicing
+        invoiceOutCreate: Create invoice out
+        shelving: Shelving
+        shelvingList: Shelving List
+        shelvingCreate: New shelving
+        invoiceIns: Invoices In
+        invoiceInCreate: Create invoice in
+        vat: VAT
+        dueDay: Due day
+        intrastat: Intrastat
+        corrective: Corrective
+        order: Orders
+        orderList: List
+        orderCreate: New order
+        catalog: Catalog
+        volume: Volume
+        workers: Workers
+        workerCreate: New worker
+        department: Department
+        pda: PDA
+        pbx: Private Branch Exchange
+        calendar: Calendar
+        timeControl: Time control
+        locker: Locker
+        wagons: Wagons
+        wagonsList: Wagons List
+        wagonCreate: Create wagon
+        wagonEdit: Edit wagon
+        typesList: Types List
+        typeCreate: Create type
+        typeEdit: Edit type
+        wagonCounter: Trolley counter
+        roadmap: Roadmap
+        stops: Stops
+        routes: Routes
+        cmrsList: CMRs list
+        RouteList: List
+        routeCreate: New route
+        RouteRoadmap: Roadmaps
+        RouteRoadmapCreate: Create roadmap
+        autonomous: Autonomous
+        suppliers: Suppliers
+        supplier: Supplier
+        labeler: Labeler
+        supplierCreate: New supplier
+        accounts: Accounts
+        addresses: Addresses
+        agencyTerm: Agency agreement
+        travel: Travels
+        extraCommunity: Extra community
+        travelCreate: New travel
+        history: Log
+        thermographs: Thermograph
+        items: Items
+        diary: Diary
+        tags: Tags
+        create: Create
+        buyRequest: Buy requests
+        fixedPrice: Fixed prices
+        wasteBreakdown: Waste breakdown
+        itemCreate: New item
+        barcode: Barcodes
+        tax: Tax
+        botanical: Botanical
+        itemTypeCreate: New item type
+        family: Item Type
+        lastEntries: Last entries
+        itemType: Item type
+        monitors: Monitors
+        dashboard: Dashboard
+        users: Users
+        createTicket: Create ticket
+        ticketAdvance: Advance tickets
+        futureTickets: Future tickets
+        purchaseRequest: Purchase request
+        weeklyTickets: Weekly tickets
+        formation: Formation
+        locations: Locations
+        warehouses: Warehouses
+        roles: Roles
+        connections: Connections
+        acls: ACLs
+        mailForwarding: Mail forwarding
+        mailAlias: Mail alias
+        privileges: Privileges
     created: Created
     worker: Worker
     now: Now
@@ -148,40 +278,8 @@ verifyEmail:
         verifyEmail: Email verification
 dashboard:
     pageTitles:
-        dashboard: Dashboard
+
 customer:
-    pageTitles:
-        customers: Customers
-        list: List
-        webPayments: Web Payments
-        extendedList: Extended list
-        notifications: Notifications
-        defaulter: Defaulter
-        customerCreate: New customer
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        consignees: Consignees
-        notes: Notes
-        credits: Credits
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recoveries
-        webAccess: Web access
-        log: Log
-        sms: Sms
-        creditManagement: Credit management
-        creditContracts: Credit contracts
-        creditOpinion: Credit opinion
-        others: Others
-        samples: Samples
-        consumption: Consumption
-        mandates: Mandates
-        contacts: Contacts
-        webPayment: Web payment
-        fileManagement: File management
-        unpaid: Unpaid
     list:
         phone: Phone
         email: Email
@@ -314,7 +412,6 @@ entry:
     pageTitles:
         entries: Entries
         list: List
-        labeler: Labeler
         summary: Summary
         basicData: Basic data
         buys: Buys
@@ -527,18 +624,6 @@ ticket:
         warehouse: Warehouse
         agency: Agency
 claim:
-    pageTitles:
-        claims: Claims
-        list: List
-        claimCreate: New claim
-        summary: Summary
-        basicData: Basic Data
-        lines: Lines
-        photos: Photos
-        development: Development
-        log: Audit logs
-        notes: Notes
-        action: Action
     list:
         customer: Customer
         assignedTo: Assigned
@@ -602,14 +687,6 @@ claim:
         noData: 'There are no images/videos, click here or drag and drop the file'
         dragDrop: Drag and drop it here
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Invoice out
-        list: List
-        negativeBases: Negative Bases
-        globalInvoicing: Global invoicing
-        invoiceOutCreate: Create invoice out
-        summary: Summary
-        basicData: Basic Data
     list:
         ref: Reference
         issued: Issued
@@ -677,13 +754,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: CSV download failed
 shelving:
-    pageTitles:
-        shelving: Shelving
-        shelvingList: Shelving List
-        shelvingCreate: New shelving
-        summary: Summary
-        basicData: Basic Data
-        log: Logs
     list:
         parking: Parking
         priority: Priority
@@ -710,17 +780,6 @@ parking:
         info: You can search by parking code
         label: Search parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Invoices In
-        list: List
-        invoiceInCreate: Create invoice in
-        summary: Summary
-        basicData: Basic data
-        vat: VAT
-        dueDay: Due day
-        intrastat: Intrastat
-        corrective: Corrective
-        log: Logs
     list:
         ref: Reference
         supplier: Supplier
@@ -771,15 +830,6 @@ invoiceIn:
         stems: Stems
         country: Country
 order:
-    pageTitles:
-        order: Orders
-        orderList: List
-        orderCreate: New order
-        summary: Summary
-        basicData: Basic Data
-        catalog: Catalog
-        volume: Volume
-        lines: Lines
     field:
         salesPersonFk: Sales Person
         clientFk: Client
@@ -855,7 +905,6 @@ worker:
         timeControl: Time control
         locker: Locker
         balance: Balance
-        formation: Formation
     list:
         name: Name
         email: Email
@@ -944,15 +993,6 @@ worker:
             credit: Have
             concept: Concept
 wagon:
-    pageTitles:
-        wagons: Wagons
-        wagonsList: Wagons List
-        wagonCreate: Create wagon
-        wagonEdit: Edit wagon
-        typesList: Types List
-        typeCreate: Create type
-        typeEdit: Edit type
-        wagonCounter: Trolley counter
     type:
         name: Name
         submit: Submit
@@ -981,31 +1021,7 @@ wagon:
         minHeightBetweenTrays: 'The minimum height between trays is '
         maxWagonHeight: 'The maximum height of the wagon is '
         uncompleteTrays: There are incomplete trays
-route/roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
-roadmap:
-    pageTitles:
-        roadmap: Roadmap
-        summary: Summary
-        basicData: Basic Data
-        stops: Stops
 route:
-    pageTitles:
-        routes: Routes
-        cmrsList: CMRs list
-        RouteList: List
-        routeCreate: New route
-        basicData: Basic Data
-        summary: Summary
-        RouteRoadmap: Roadmaps
-        RouteRoadmapCreate: Create roadmap
-        tickets: Tickets
-        log: Log
-        autonomous: Autonomous
     cmr:
         list:
             results: results
@@ -1033,22 +1049,6 @@ route:
         volume: Volume
         finished: Finished
 supplier:
-    pageTitles:
-        suppliers: Suppliers
-        supplier: Supplier
-        list: List
-        supplierCreate: New supplier
-        summary: Summary
-        basicData: Basic data
-        fiscalData: Fiscal data
-        billingData: Billing data
-        log: Log
-        accounts: Accounts
-        contacts: Contacts
-        addresses: Addresses
-        consumption: Consumption
-        agencyTerm: Agency agreement
-        dms: File management
     list:
         payMethod: Pay method
         payDeadline: Pay deadline
@@ -1140,15 +1140,6 @@ supplier:
         date: Date
         reference: Reference
 travel:
-    pageTitles:
-        travel: Travels
-        list: List
-        summary: Summary
-        extraCommunity: Extra community
-        travelCreate: New travel
-        basicData: Basic data
-        history: Log
-        thermographs: Thermograph
     summary:
         confirmed: Confirmed
         entryId: Entry Id
@@ -1195,24 +1186,6 @@ travel:
         travelFileDescription: 'Travel id { travelId }'
         file: File
 item:
-    pageTitles:
-        items: Items
-        list: List
-        diary: Diary
-        tags: Tags
-        create: Create
-        buyRequest: Buy requests
-        fixedPrice: Fixed prices
-        wasteBreakdown: Waste breakdown
-        itemCreate: New item
-        barcode: Barcodes
-        tax: Tax
-        log: Log
-        botanical: Botanical
-        shelving: Shelving
-        itemTypeCreate: New item type
-        family: Item Type
-        lastEntries: Last entries
     descriptor:
         item: Item
         buyer: Buyer
@@ -1298,22 +1271,6 @@ item:
         minSalesQuantity: 'Cantidad mínima de venta'
         genus: 'Genus'
         specie: 'Specie'
-item/itemType:
-    pageTitles:
-        itemType: Item type
-        basicData: Basic data
-        summary: Summary
-monitor:
-    pageTitles:
-        monitors: Monitors
-        list: List
-zone:
-    pageTitles:
-        zones: Zones
-        zonesList: Zones
-        deliveryList: Delivery days
-        upcomingList: Upcoming deliveries
-
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 3a3330d11..8c9b894fc 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -100,14 +100,144 @@ globals:
         modes: Modos
         zones: Zonas
         zonesList: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
+        deliveryDays: Días de entrega
+        upcomingDeliveries: Próximos repartos
         role: Role
         alias: Alias
         aliasUsers: Usuarios
         subRoles: Subroles
         inheritedRoles: Roles heredados
+        customers: Clientes
+        customerCreate: Nuevo cliente
+        list: Listado
+        webPayments: Pagos Web
+        extendedList: Listado extendido
+        notifications: Notificaciones
+        defaulter: Morosos
+        createCustomer: Crear cliente
+        fiscalData: Datos fiscales
+        billingData: Forma de pago
+        consignees: Consignatarios
+        notes: Notas
+        credits: Créditos
+        greuges: Greuges
+        balance: Balance
+        recoveries: Recobros
+        webAccess: Acceso web
+        sms: Sms
+        creditManagement: Gestión de crédito
+        creditContracts: Contratos de crédito
+        creditOpinion: Opinión de crédito
+        others: Otros
+        samples: Plantillas
+        consumption: Consumo
+        mandates: Mandatos
+        contacts: Contactos
+        webPayment: Pago web
+        fileManagement: Gestión documental
+        unpaid: Impago
+        entries: Entradas
+        buys: Compras
+        dms: Gestión documental
+        entryCreate: Nueva entrad_ö ñ,a
+        latestBuys: Últimas compras
+        tickets: Tickets
+        ticketCreate: Nuevo ticket
+        boxing: Encajado
+        sale: Lineas del pedido
+        claims: Reclamaciones
+        claimCreate: Crear reclamación
+        lines: Líneas
+        development: Trazabilidad
+        photos: Fotos
+        action: Acción
+        invoiceOuts: Fact. emitidas
+        negativeBases: Bases Negativas
+        globalInvoicing: Facturación global
+        invoiceOutCreate: Crear fact. emitida
+        order: Cesta
+        orderList: Listado
+        orderCreate: Nueva orden
+        catalog: Catálogo
+        volume: Volumen
+        shelving: Carros
+        shelvingList: Listado de carros
+        shelvingCreate: Nuevo carro
+        invoiceIns: Fact. recibidas
+        invoiceInCreate: Crear fact. recibida
+        vat: IVA
+        labeler: Etiquetas
+        dueDay: Vencimiento
+        intrastat: Intrastat
+        corrective: Rectificativa
         workers: Trabajadores
+        workerCreate: Nuevo trabajador
+        department: Departamentos
+        pda: PDA
+        pbx: Centralita
+        calendar: Calendario
+        timeControl: Control de horario
+        locker: Taquilla
+        wagons: Vagones
+        wagonsList: Listado vagones
+        wagonCreate: Crear tipo
+        wagonEdit: Editar tipo
+        typesList: Listado tipos
+        typeCreate: Crear tipo
+        typeEdit: Editar tipo
+        wagonCounter: Contador de carros
+        roadmap: Troncales
+        stops: Paradas
+        routes: Rutas
+        cmrsList: Listado de CMRs
+        RouteList: Listado
+        routeCreate: Nueva ruta
+        RouteRoadmap: Troncales
+        RouteRoadmapCreate: Crear troncal
+        autonomous: Autónomos
+        suppliers: Proveedores
+        supplier: Proveedor
+        supplierCreate: Nuevo proveedor
+        accounts: Cuentas
+        addresses: Direcciones
+        agencyTerm: Acuerdo agencia
+        travel: Envíos
+        create: Crear
+        extraCommunity: Extra comunitarios
+        travelCreate: Nuevo envío
+        history: Historial
+        thermographs: Termógrafos
+        items: Artículos
+        diary: Histórico
+        tags: Etiquetas
+        fixedPrice: Precios fijados
+        buyRequest: Peticiones de compra
+        wasteBreakdown: Deglose de mermas
+        itemCreate: Nuevo artículo
+        tax: 'IVA'
+        botanical: 'Botánico'
+        barcode: 'Código de barras'
+        itemTypeCreate: Nueva familia
+        family: Familia
+        lastEntries: Últimas entradas
+        itemType: Familia
+        monitors: Monitores
+        dashboard: Tablón
+        users: Usuarios
+        createTicket: Crear ticket
+        ticketAdvance: Adelantar tickets
+        futureTickets: Tickets a futuro
+        purchaseRequest: Petición de compra
+        weeklyTickets: Tickets programados
+        formation: Formación
+        locations: Ubicaciones
+        warehouses: Almacenes
+        roles: Roles
+        connections: Conexiones
+        acls: ACLs
+        mailForwarding: Reenvío de correo
+        mailAlias: Alias de correo
+        privileges: Privilegios
     created: Fecha creación
     worker: Trabajador
     now: Ahora
@@ -147,41 +277,8 @@ verifyEmail:
         verifyEmail: Verificación de correo
 dashboard:
     pageTitles:
-        dashboard: Tablón
+
 customer:
-    pageTitles:
-        customers: Clientes
-        customerCreate: Nuevo cliente
-        list: Listado
-        webPayments: Pagos Web
-        extendedList: Listado extendido
-        notifications: Notificaciones
-        defaulter: Morosos
-        createCustomer: Crear cliente
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        consignees: Consignatarios
-        notes: Notas
-        credits: Créditos
-        greuges: Greuges
-        balance: Balance
-        recoveries: Recobros
-        webAccess: Acceso web
-        log: Historial
-        sms: Sms
-        creditManagement: Gestión de crédito
-        creditContracts: Contratos de crédito
-        creditOpinion: Opinión de crédito
-        others: Otros
-        samples: Plantillas
-        consumption: Consumo
-        mandates: Mandatos
-        contacts: Contactos
-        webPayment: Pago web
-        fileManagement: Gestión documental
-        unpaid: Impago
     list:
         phone: Teléfono
         email: Email
@@ -313,7 +410,6 @@ entry:
     pageTitles:
         entries: Entradas
         list: Listado
-        labeler: Etiquetar
         summary: Resumen
         basicData: Datos básicos
         buys: Compras
@@ -526,18 +622,6 @@ ticket:
         warehouse: Almacén
         agency: Agencia
 claim:
-    pageTitles:
-        claims: Reclamaciones
-        list: Listado
-        claimCreate: Crear reclamación
-        summary: Resumen
-        basicData: Datos básicos
-        lines: Líneas
-        development: Trazabilidad
-        photos: Fotos
-        log: Historial
-        notes: Notas
-        action: Acción
     list:
         customer: Cliente
         assignedTo: Asignada a
@@ -601,14 +685,6 @@ claim:
         noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
         dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
-    pageTitles:
-        invoiceOuts: Fact. emitidas
-        list: Listado
-        negativeBases: Bases Negativas
-        globalInvoicing: Facturación global
-        invoiceOutCreate: Crear fact. emitida
-        summary: Resumen
-        basicData: Datos básicos
     list:
         ref: Referencia
         issued: Fecha emisión
@@ -676,15 +752,6 @@ invoiceOut:
         errors:
             downloadCsvFailed: Error al descargar CSV
 order:
-    pageTitles:
-        order: Cesta
-        orderList: Listado
-        orderCreate: Nueva orden
-        summary: Resumen
-        basicData: Datos básicos
-        catalog: Catálogo
-        volume: Volumen
-        lines: Líneas
     field:
         salesPersonFk: Comercial
         clientFk: Cliente
@@ -726,13 +793,6 @@ order:
         price: Precio
         amount: Monto
 shelving:
-    pageTitles:
-        shelving: Carros
-        shelvingList: Listado de carros
-        shelvingCreate: Nuevo carro
-        summary: Resumen
-        basicData: Datos básicos
-        log: Historial
     list:
         parking: Parking
         priority: Prioridad
@@ -758,17 +818,6 @@ parking:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 invoiceIn:
-    pageTitles:
-        invoiceIns: Fact. recibidas
-        list: Listado
-        invoiceInCreate: Crear fact. recibida
-        summary: Resumen
-        basicData: Datos básicos
-        vat: IVA
-        dueDay: Vencimiento
-        intrastat: Intrastat
-        corrective: Rectificativa
-        log: Historial
     list:
         ref: Referencia
         supplier: Proveedor
@@ -851,7 +900,6 @@ worker:
         timeControl: Control de horario
         locker: Taquilla
         balance: Balance
-        formation: Formación
     list:
         name: Nombre
         email: Email
@@ -931,15 +979,6 @@ worker:
             credit: Haber
             concept: Concepto
 wagon:
-    pageTitles:
-        wagons: Vagones
-        wagonsList: Listado vagones
-        wagonCreate: Crear tipo
-        wagonEdit: Editar tipo
-        typesList: Listado tipos
-        typeCreate: Crear tipo
-        typeEdit: Editar tipo
-        wagonCounter: Contador de carros
     type:
         name: Nombre
         submit: Guardar
@@ -968,31 +1007,7 @@ wagon:
         minHeightBetweenTrays: 'La distancia mínima entre bandejas es '
         maxWagonHeight: 'La altura máxima del vagón es '
         uncompleteTrays: Hay bandejas sin completar
-route/roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
-roadmap:
-    pageTitles:
-        roadmap: Troncales
-        summary: Resumen
-        basicData: Datos básicos
-        stops: Paradas
 route:
-    pageTitles:
-        routes: Rutas
-        cmrsList: Listado de CMRs
-        RouteList: Listado
-        routeCreate: Nueva ruta
-        basicData: Datos básicos
-        summary: Resumen
-        RouteRoadmap: Troncales
-        RouteRoadmapCreate: Crear troncal
-        tickets: Tickets
-        log: Historial
-        autonomous: Autónomos
     cmr:
         list:
             results: resultados
@@ -1020,22 +1035,6 @@ route:
         volume: Volumen
         finished: Finalizada
 supplier:
-    pageTitles:
-        suppliers: Proveedores
-        supplier: Proveedor
-        list: Listado
-        supplierCreate: Nuevo proveedor
-        summary: Resumen
-        basicData: Datos básicos
-        fiscalData: Datos fiscales
-        billingData: Forma de pago
-        log: Historial
-        accounts: Cuentas
-        contacts: Contactos
-        addresses: Direcciones
-        consumption: Consumo
-        agencyTerm: Acuerdo agencia
-        dms: Gestión documental
     list:
         payMethod: Método de pago
         payDeadline: Plazo de pago
@@ -1127,16 +1126,6 @@ supplier:
         date: Fecha
         reference: Referencia
 travel:
-    pageTitles:
-        travel: Envíos
-        list: Listado
-        create: Crear
-        summary: Resumen
-        extraCommunity: Extra comunitarios
-        travelCreate: Nuevo envío
-        basicData: Datos básicos
-        history: Historial
-        thermographs: Termógrafos
     summary:
         confirmed: Confirmado
         entryId: Id entrada
@@ -1183,24 +1172,6 @@ travel:
         travelFileDescription: 'Id envío { travelId }'
         file: Fichero
 item:
-    pageTitles:
-        items: Artículos
-        list: Listado
-        diary: Histórico
-        tags: Etiquetas
-        fixedPrice: Precios fijados
-        buyRequest: Peticiones de compra
-        wasteBreakdown: Deglose de mermas
-        itemCreate: Nuevo artículo
-        basicData: 'Datos básicos'
-        tax: 'IVA'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        log: Historial
-        shelving: Carros
-        itemTypeCreate: Nueva familia
-        family: Familia
-        lastEntries: Últimas entradas
     descriptor:
         item: Artículo
         buyer: Comprador
@@ -1286,27 +1257,6 @@ item:
         achieved: 'Conseguido'
         concept: 'Concepto'
         state: 'Estado'
-item/itemType:
-    pageTitles:
-        itemType: Familia
-        basicData: Datos básicos
-        summary: Resumen
-zone:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-role:
-    pageTitles:
-        zones: Zonas
-        list: Zonas
-        deliveryList: Días de entrega
-        upcomingList: Próximos repartos
-monitor:
-    pageTitles:
-        monitors: Monitores
-        list: Listado
 components:
     topbar: {}
     itemsFilterPanel:
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 1a2d3c251..55d59822d 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -224,7 +224,7 @@ async function changeState(value) {
             <QCard class="vn-one">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
-                    :text="t('claim.pageTitles.basicData')"
+                    :text="t('globals.pageTitles.basicData')"
                 />
                 <VnLv
                     :label="t('claim.summary.created')"
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index e5ac8b3a0..c2b04c291 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -106,18 +106,15 @@ const entriesTableColumns = computed(() => [
                         >
                             <template #body="props">
                                 <QTr>
-                                    <!-- <QTd>
-                                        <QCheckbox v-model="props.selected" />
-                                    </QTd> -->
                                     <QTd v-for="col in props.cols" :key="col.name">
                                         {{ col.value }}
                                     </QTd>
                                 </QTr>
                             </template>
                         </QTable>
-                    </template></VnPaginate
-                >
-            </QCardSection></QCard
-        >
+                    </template>
+                </VnPaginate>
+            </QCardSection>
+        </QCard>
     </QDialog>
 </template>
diff --git a/src/pages/Entry/locale/en.yml b/src/pages/Entry/locale/en.yml
index 164b501af..677c3c055 100644
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@@ -1,5 +1,4 @@
 entryList:
-    labeler: Labeler
     list:
         inventoryEntry: Inventory entry
         virtualEntry: Virtual entry
diff --git a/src/pages/Entry/locale/es.yml b/src/pages/Entry/locale/es.yml
index 9522c113c..10b77c2ee 100644
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@@ -2,7 +2,6 @@ Search entries: Buscar entradas
 You can search by entry reference: Puedes buscar por referencia de la entrada
 
 entryList:
-    labeler: Etiquetas
     list:
         inventoryEntry: Es inventario
         virtualEntry: Es una redada
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 428e7a7a1..cdf012b2a 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -209,7 +209,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -240,7 +240,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -265,7 +265,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv
@@ -289,7 +289,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('invoiceIn.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <QCardSection class="q-pa-none">
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 08d05626e..94175b0c1 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -51,7 +51,7 @@ const filter = {
                         class="header header-link"
                         :to="{ name: 'ShelvingBasicData', params: { id: entityId } }"
                     >
-                        {{ t('shelving.pageTitles.basicData') }}
+                        {{ t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </RouterLink>
                     <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 88ddee9a2..de539e949 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -49,7 +49,7 @@ const entriesTableColumns = computed(() => {
             showValue: false,
         },
         {
-            label: t('supplier.pageTitles.supplier'),
+            label: t('globals.pageTitles.supplier'),
             field: 'supplierName',
             name: 'supplierName',
             align: 'left',
@@ -248,7 +248,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
@@ -266,7 +266,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
@@ -284,7 +284,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <QCardSection class="q-pa-none">
                     <VnTitle
                         :url="getLink('basic-data')"
-                        :text="t('travel.pageTitles.basicData')"
+                        :text="t('globals.pageTitles.basicData')"
                     />
                 </QCardSection>
                 <VnLv :label="t('globals.agency')" :value="travel.agency?.name" />
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 98648512f..4dc7eb052 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -140,7 +140,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('supplier.pageTitles.supplier'),
+        label: t('globals.pageTitles.supplier'),
         field: 'cargoSupplierNickname',
         name: 'cargoSupplierNickname',
         align: 'left',
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 78905ee5f..c51151451 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -218,7 +218,7 @@ warehouses();
             <QItem>
                 <QItemSection>
                     <VnSelect
-                        :label="t('supplier.pageTitles.supplier')"
+                        :label="t('globals.pageTitles.supplier')"
                         v-model="params.cargoSupplierFk"
                         :options="suppliersOptions"
                         option-value="id"
diff --git a/src/router/index.js b/src/router/index.js
index 41ff4c1da..faa3ab5d4 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -11,7 +11,6 @@ import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { useRole } from 'src/composables/useRole';
 import { useUserConfig } from 'src/composables/useUserConfig';
-import { toLowerCamel } from 'src/filters';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
 
@@ -79,13 +78,11 @@ export default route(function (/* { store, ssrContext } */) {
         let title = t(`login.title`);
 
         const matches = to.matched;
-        let moduleName;
         if (matches && matches.length > 1) {
             const module = matches[1];
             const moduleTitle = module.meta && module.meta.title;
-            moduleName = toLowerCamel(module.name);
             if (moduleTitle) {
-                title = t(`${moduleName}.pageTitles.${moduleTitle}`);
+                title = t(`globals.pageTitles.${moduleTitle}`);
             }
         }
 
@@ -94,7 +91,7 @@ export default route(function (/* { store, ssrContext } */) {
         if (childPageTitle && matches.length > 2) {
             if (title != '') title += ': ';
 
-            const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`;
+            const moduleLocale = `globals.pageTitles.${childPageTitle}`;
             const pageTitle = te(moduleLocale)
                 ? t(moduleLocale)
                 : t(`globals.pageTitles.${childPageTitle}`);
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
index 6e8659747..06fe680eb 100644
--- a/src/router/modules/item.js
+++ b/src/router/modules/item.js
@@ -201,15 +201,6 @@ export default {
                     },
                     component: () => import('src/pages/Item/Card/ItemLog.vue'),
                 },
-                {
-                    path: 'botanical',
-                    name: 'ItemBotanical',
-                    meta: {
-                        title: 'botanical',
-                        icon: 'vn:botanical',
-                    },
-                    component: () => import('src/pages/Item/Card/ItemBotanical.vue'),
-                },
             ],
         },
     ],
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 4dd5ed2ae..51f266800 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -60,7 +60,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
             menuChildren = menuChildren.map(({ name, title, icon }) => ({
                 name,
                 icon,
-                title: `${module}.pageTitles.${title}`,
+                title: `globals.pageTitles.${title}`,
             }));
 
         if (meta && meta.roles && role.hasAny(meta.roles) === false) return;
@@ -70,7 +70,7 @@ export const useNavigationStore = defineStore('navigationStore', () => {
             children: menuChildren,
         };
         if (meta) {
-            item.title = `${module}.pageTitles.${meta.title}`;
+            item.title = `globals.pageTitles.${meta.title}`;
             item.icon = meta.icon;
         }
 
diff --git a/test/vitest/__tests__/components/Leftmenu.spec.js b/test/vitest/__tests__/components/Leftmenu.spec.js
index ea1c51f8d..10d9d66fb 100644
--- a/test/vitest/__tests__/components/Leftmenu.spec.js
+++ b/test/vitest/__tests__/components/Leftmenu.spec.js
@@ -78,13 +78,13 @@ describe('Leftmenu', () => {
             {
                 children: null,
                 name: 'CustomerList',
-                title: 'customer.pageTitles.list',
+                title: 'globals.pageTitles.list',
                 icon: 'view_list',
             },
             {
                 children: null,
                 name: 'CustomerCreate',
-                title: 'customer.pageTitles.createCustomer',
+                title: 'globals.pageTitles.createCustomer',
                 icon: 'vn:addperson',
             },
         ];