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/26] 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/26] 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/26] 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/26] 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 369cb9dc75fb0918d82047e030017b8d4f3654f0 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Jun 2024 10:56:09 +0200
Subject: [PATCH 05/26] 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 93c109b70dcb169dc4bcdcb43ae37b51fdb6f68c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 28 Jun 2024 11:25:38 +0200
Subject: [PATCH 06/26] 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 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 07/26] 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
zcmZ`*eLU0KAOEUh#$_boN?(sPNm;idQqyFUr#r@|xH8FeG4fQaO(JU;mJR7w=|QoV
zd5WQ1E;eLcX+pSd9x9QC%1Uv+{eHju``tfouX8@1b6)S)`Ml3LpL1UCb22^Moqs^+
zBLD#S0guBHpjP<J;7X9MAXQ$08l|HLow2~mw{o@lRvv_?oWS|T0f6e7Z>9ini*+GT
znSyt7QkE*{sp^{C1vValAU%o`iLyT?Dk>zJ0_=|s38I9M!Bb(B<DfI%&C~as`Z_3V
z8jr<zCk{@R46}=DkV=Q7;+@Qe<rvOyt0MKD1dzvNZ+jRb24)p;c+7aC2<A<p;&7e1
zG8iy|jZ*=TFaYxp?mI9B_{Y)Tg&~@MGX*#s$~4OIr9GzUaq5_x8P;laQp9+IATvX_
zO$}ZhgyLJSsi@5lL527o*y!>TO|2D-8oF5PQyhoOg|}|Y$iVf-U#n$*J+oCXY{gyT
zF|4iLdyU05KrotVa@3P}V-v#GK%JniXw)30A2!4;S6JLBc$Z>ZDvoUqpl7SBpLdjJ
z0kb}4*6py%riI{<{>)l-F5qFOR_evlB<m_Q9JYFKI<eD+*;^OoPkRwvf7L^gw9crb
zOG>ku6t17`Uw@%=-65`h8hCotquMt@v|vBz=OedwxwAw{OrRDJVg<uD%FEkUFG*<(
zna%5hndthw#>%7*f|Fl14~K5?zOA!41N5?RCK4Aft{yV$LJv$Q9A$i(4blxaz&3Dw
zQBLDHctw28V$t{v0AF<${IBC%X2-M_$1V1!H*KM33+t`U3*Xh+*AKb1pKS8*{yZw?
zyYemb_?Au)kDF9)7-bONWN%%&S6}Xe3gaHQcrB-~5}FHpZW@7BqyOZ#J?UK0<%j;8
zCH{A&b_*Lf?8_Obl8o%-e|ih-Y8Or?KudOt7zsx9?&>8R;rUv(rzR~Zm*qo;mFnQ(
zZ>I$3BW$@hlfn{aH@hideB4GC7fXJgkP9wZGqhoTTl=TtCGQjsPbI@(ershmJuM2q
z*)UVh8Q@ffVVrW<hC!9LaDL;7GYyAzI6U2s+?}czN!vEHtTT5bD?;Xx7>SvX^(;Ip
zCF#@fKF8>$x&$A)ycy-UERXj)RHT#XU+kF#myb((OdQG(j>pfGI@@BggLNT-{yvyr
za!H^6{Ds<&k40|549by?+a4GsHMO7B)f*gm|5c##kHI5NR!~xgbnpZrXl$HxWvkVg
zKf1$N{>0rJf3?k@z$!1l_BAKG+<?qVgPrWzvh(<5_S{;IOpnaEq$(|a6BoLAviNO+
z;1ya}-EBQCu8-=n7qJ!RoR!6yqkTq_?zv}(!T9wB<hwMv1v+%ei%8UV)}orl*<TOS
zM~i$EMf}LRYHTMzzx5@OXtNSIk?51lz4<Rz<j+W|{L5ToD#vtL@z=S;7p@b9t2ksj
zO|Ec+U6#7C{MBqt#?n`Z@->wK99yBO3S$0wbcy>dk9QGewd}^q>vqf2&p5#@<`~wc
zXoFj|?5D3y`=^NaYI_%()mmp~@^*EhfA>G=$0iVo6uZqmxwbctX$87zl7r>!yOsy_
z(lO9oT6v?PNp#7Sd~Vsx8!g(UV{5qh88Ns0Q<BzXv4OfWY``MmY$z{0xLluFT^AnR
zSb6Yciq^+xjC|4<ZciSFOG^_Pcx}grvp^h~eqttx=}TtiPvDWJkGeIN224?p^FTO<
z?n(p6>Sz^O4zvxp;{*r=!Wgnm5`VO_lmo+z<hJUXJUH`}TXvchJW<HS*GZy{gwzu~
z!y0qmF8KcVMW>WIp-j}u1My*AA<v1aMV()m6t7G_oXRH2J88{@5}(JHRw(tAQ=<NK
z1fSM9C+o;Qwd?lsn<1|ESYkf;&4-H(G*I|}BTIFl-cJ$4Y;Z6U>1^-l`@>yvz;mMT
z(dhf<hr|XEhH`SwRx%Sc-CFI+B1|N<?MGmYn^2{>vMN@FP{0B^c3QZxX!0Z`?~3mD
zf{<#4-w_vCMSG<k(>_XOhI+JgxU!Nbo*RpZIlLO87>&O&SwpNLg&kww;lSXpMaR@}
zJX)j!y$Kx$=%sZl)R0hc^r;EJaW`i*iw7oWtt;wQ@J6DQx9C9GI$niL>&7S=(Q|Ci
zsyQA~{4t`+=Md(L%V5hpy`UNre17Eo@T1TYZ=?nMR|^dCYMbMKj0VC18URrMPmU^h
zVgMls)R3T>eJ^<jFEFbu`Chz6YRjhL*V4-&sH7fL>{&2o@q&Mrgp#>WNnsxnfc@pp
zHk|Bnvh%xtAM`RmpB|JGq+1BMrlC@}=k-;y#B|q^`fcsF(M3ptO^&x7wpv#uaaarX
zrTQW<^Y+xnfucC~#!A74TD2jvOUQ{HC>xk^oS~Ga?PLTA>Sv9o$IeN1lQwGJh%N{b
zX=xTNYl|0tiI|}=darG|VR>-I-t}nxkm8gnZBM(#h1EpZ6#}uqo4B^JS@nZPsGs?0
z%jq>0@qHV*_mOOw9l=lLG+mLC#Sr<er}$1jR!dHY-j4Vq$}6_{*5+~{rAIU#`?4Tf
zYBOotg@&Y%%g{d$8b1h}WXcjtZKR&X6i*jCJLKWQfj*jjfMxFJq&icEn<~gKSZ?V^
zcyN7bOcDrEUxFncEe<4#5&u)`|LgX*-gjX5s=o{T-$K3v|HU-xxU6t7N)=niC8j{X
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 08/26] 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 09/26] 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 10/26] 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 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 11/26] 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 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 12/26] 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 13/26] 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 14/26] 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 15/26] 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 16/26] 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 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 17/26] 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 18/26] 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 19/26] 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 20/26] 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 21/26] 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 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 22/26] 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 23/26] 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 24/26] 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 25/26] 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 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 26/26] 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',
             },
         ];