Merge branch 'dev' into 6917-inputDate_inpuTime

2024-07-03 06:48:59 +00:00 · 2024-07-03 06:48:59 +00:00 · 4272990a7a
parent e70162d342 69a395c61f
commit 4272990a7a
27 changed files with 582 additions and 432 deletions
--- a/public/no-image-dark.png
+++ b/public/no-image-dark.png
--- a/public/no-image.png
+++ b/public/no-image.png
--- a/public/no-user.png
+++ b/public/no-user.png
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@ -58,6 +58,7 @@ function addChildren(module, route, parent) {
 }

 const items = ref([]);
+
 function getRoutes() {
    if (props.source === 'main') {
        const modules = Object.assign([], navigation.getModules().value);
@ -66,9 +67,8 @@ function getRoutes() {
            const moduleDef = routes.find(
                (route) => toLowerCamel(route.name) === item.module
            );
-            item.children = [];
-
            if (!moduleDef) continue;
+            item.children = [];

            addChildren(item.module, moduleDef, item.children);
        }
--- a/src/components/NavBar.vue
+++ b/src/components/NavBar.vue
@ -1,21 +1,19 @@
 <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';
 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();
 const quasar = useQuasar();
 const state = useState();
 const user = state.getUser();
-const { getTokenMultimedia } = useSession();
-const token = getTokenMultimedia();
 const appName = 'Lilium';

 onMounted(() => stateStore.setMounted());
@ -83,11 +81,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') }}
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@ -12,12 +12,14 @@ 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 +101,7 @@ function saveUserData(param, value) {
    axios.post('UserConfigs/setUserConfig', { [param]: value });
    localUserData();
 }
+const isEmployee = computed(() => useRole().isEmployee());
 </script>

 <template>
@ -109,12 +112,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)"
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
+import { ref, computed } from 'vue';
 import { useSession } from 'src/composables/useSession';

 const $props = defineProps({
@ -28,21 +28,29 @@ const $props = defineProps({
 const show = ref(false);
 const token = useSession().getTokenMultimedia();
 const timeStamp = ref(`timestamp=${Date.now()}`);
-const url = computed(
-    () =>
-        `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
-);
+import noImage from '/public/no-user.png';
+import { useRole } from 'src/composables/useRole';
+const url = computed(() => {
+    const isEmployee = useRole().isEmployee();
+    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,
 });
-
-onMounted(() => {});
 </script>
 <template>
-    <QImg :src="url" v-bind="$attrs" @click="show = !show" spinner-color="primary" />
+    <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"
@ -56,7 +64,9 @@ onMounted(() => {});

 <style lang="scss" scoped>
 .q-img {
-    cursor: zoom-in;
+    &.zoomIn {
+        cursor: zoom-in;
+    }
    min-width: 50px;
 }
 .rounded {
--- 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,
--- 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
@ -311,17 +409,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
@ -526,18 +613,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
@ -601,14 +676,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
@ -676,13 +743,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
@ -709,17 +769,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
@ -770,15 +819,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
@ -854,7 +894,6 @@ worker:
        timeControl: Time control
        locker: Locker
        balance: Balance
-        formation: Formation
    list:
        name: Name
        email: Email
@ -943,15 +982,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
@ -980,31 +1010,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
@ -1032,22 +1038,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
@ -1139,15 +1129,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
@ -1194,24 +1175,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
@ -1297,22 +1260,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:
--- 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 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
+        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
@ -310,17 +407,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
@ -525,18 +611,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
@ -600,14 +674,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
@ -675,15 +741,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
@ -725,13 +782,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
@ -757,17 +807,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
@ -850,7 +889,6 @@ worker:
        timeControl: Control de horario
        locker: Taquilla
        balance: Balance
-        formation: Formación
    list:
        name: Nombre
        email: Email
@ -930,15 +968,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
@ -967,31 +996,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
@ -1019,22 +1024,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
@ -1126,16 +1115,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
@ -1182,24 +1161,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
@ -1285,27 +1246,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:
--- 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')"
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@ -0,0 +1,120 @@
+<script setup>
+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 { usePrintService } from 'composables/usePrintService';
+const { openReport } = usePrintService();
+
+const route = useRoute();
+const { t } = useI18n();
+const $props = defineProps({
+    id: {
+        type: String,
+        required: false,
+        default: null,
+    },
+});
+const entityId = computed(() => $props.id || route.params.id);
+
+const entriesTableColumns = computed(() => [
+    {
+        align: 'left',
+        name: 'itemFk',
+        field: 'itemFk',
+        label: t('globals.id'),
+    },
+    {
+        align: 'left',
+        name: 'item',
+        label: t('entry.summary.item'),
+        field: (row) => row.item.name,
+    },
+    {
+        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: 'packing',
+        label: t('entry.summary.packing'),
+        field: 'packing',
+    },
+    {
+        align: 'left',
+        name: 'grouping',
+        label: t('entry.summary.grouping'),
+        field: 'grouping',
+    },
+]);
+</script>
+
+<template>
+    <QDialog ref="dialogRef">
+        <QCard style="min-width: 800px">
+            <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('Print buys')"
+                    color="primary"
+                    icon="print"
+                    :loading="isLoading"
+                    @click="openReport(`Entries/${entityId}/buy-label`)"
+                    unelevated
+                    autofocus
+                />
+            </QCardActions>
+            <QCardSection class="row items-center">
+                <VnPaginate
+                    ref="entryBuysPaginateRef"
+                    :limit="0"
+                    data-key="EntryBuys"
+                    :url="`Entries/${entityId}/getBuys`"
+                    auto-load
+                >
+                    <template #body="{ rows }">
+                        <QTable
+                            :rows="rows"
+                            :columns="entriesTableColumns"
+                            row-key="id"
+                            flat
+                            dense
+                            class="q-ml-lg"
+                            :grid="$q.screen.lt.md"
+                            :no-data-label="t('globals.noResults')"
+                        >
+                            <template #body="props">
+                                <QTr>
+                                    <QTd v-for="col in props.cols" :key="col.name">
+                                        {{ col.value }}
+                                    </QTd>
+                                </QTr>
+                            </template>
+                        </QTable>
+                    </template>
+                </VnPaginate>
+            </QCardSection>
+        </QCard>
+    </QDialog>
+</template>
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@ -0,0 +1,106 @@
+<script setup>
+import { computed, onMounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import { useStateStore } from 'stores/useStateStore';
+import { toDate } from 'src/filters/index';
+import { useQuasar } from 'quasar';
+import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+const quasar = useQuasar();
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+});
+
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+        isTitle: false,
+    },
+    {
+        align: 'left',
+        label: t('shipped'),
+        name: 'shipped',
+        isTitle: false,
+        create: true,
+        cardVisible: true,
+        format: ({ shipped }) => toDate(shipped),
+    },
+    {
+        align: 'left',
+        label: t('landed'),
+        name: 'landed',
+        isTitle: false,
+        create: true,
+        cardVisible: false,
+        format: ({ landed }) => toDate(landed),
+    },
+    {
+        align: 'left',
+        label: t('globals.wareHouseIn'),
+        name: 'warehouseInName',
+        isTitle: false,
+        cardVisible: true,
+        create: false,
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        computed,
+        actions: [
+            {
+                title: t('printBuys'),
+                icon: 'print',
+                action: (row) => printBuys(row.id),
+            },
+        ],
+    },
+]);
+
+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')"
+    />
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnTable
+                ref="myEntriesRef"
+                data-key="myEntriesList"
+                url="Entries/filter"
+                :order="['landed DESC', 'id DESC']"
+                :columns="columns"
+                default-mode="card"
+                auto-load
+            >
+            </VnTable>
+        </div>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    Search entries: Buscar entradas
+    You can search by entry reference: Puedes buscar por referencia de la entrada
+</i18n>
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@ -8,3 +8,4 @@ entryFilter:
        reference: Reference
 landed: Landed
 shipped: Shipped
+printBuys: Print buys
--- 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:
    list:
        inventoryEntry: Es inventario
@ -11,3 +12,4 @@ entryFilter:

 landed: F. llegada
 shipped: F. salida
+Print buys: Imprimir etiquetas
--- 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">
--- 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" />
--- 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" />
--- 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',
--- 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"
--- 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}`);
--- 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: 'my',
+                    name: 'MyEntries',
+                    meta: {
+                        title: 'labeler',
+                        icon: 'sell',
+                    },
+                    component: () => import('src/pages/Entry/MyEntries.vue'),
+                },
                {
                    path: 'create',
                    name: 'EntryCreate',
--- 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'),
-                },
            ],
        },
    ],
--- 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;
        }

--- a/test/cypress/integration/entry/myEntry.spec.js
+++ b/test/cypress/integration/entry/myEntry.spec.js
@ -0,0 +1,20 @@
+describe('WagonTypeCreate', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('customer');
+        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');
+    });
+});
--- 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();
--- 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',
            },
        ];