From fc3a025047cd58894c2106541645f077171b146f Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 1 Oct 2024 13:03:55 +0200
Subject: [PATCH 01/89] feat: manualInvoice with address

---
 src/components/CreateManualInvoiceForm.vue    | 155 ------------------
 src/components/VnTable/VnTable.vue            |   4 +-
 src/components/common/VnInputDate.vue         |   3 +-
 src/composables/useArrayData.js               |   2 +-
 .../Card/InvoiceOutDescriptorMenu.vue         |   3 -
 src/pages/InvoiceOut/InvoiceOutList.vue       |  17 ++
 src/pages/InvoiceOut/locale/en.yml            |  17 +-
 src/pages/InvoiceOut/locale/es.yml            |  19 ++-
 src/pages/Order/Card/OrderCreateDialog.vue    |   7 +-
 9 files changed, 41 insertions(+), 186 deletions(-)
 delete mode 100644 src/components/CreateManualInvoiceForm.vue

diff --git a/src/components/CreateManualInvoiceForm.vue b/src/components/CreateManualInvoiceForm.vue
deleted file mode 100644
index da006e024..000000000
--- a/src/components/CreateManualInvoiceForm.vue
+++ /dev/null
@@ -1,155 +0,0 @@
-<script setup>
-import { reactive, ref, computed } from 'vue';
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-
-import FetchData from 'components/FetchData.vue';
-import VnRow from 'components/ui/VnRow.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import FormModelPopup from './FormModelPopup.vue';
-import VnInputDate from './common/VnInputDate.vue';
-
-const emit = defineEmits(['onDataSaved']);
-
-const { t } = useI18n();
-const router = useRouter();
-
-const manualInvoiceFormData = reactive({
-    maxShipped: Date.vnNew(),
-});
-
-const formModelPopupRef = ref();
-const invoiceOutSerialsOptions = ref([]);
-const taxAreasOptions = ref([]);
-const ticketsOptions = ref([]);
-const clientsOptions = ref([]);
-const isLoading = computed(() => formModelPopupRef.value?.isLoading);
-
-const onDataSaved = async (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
-    if (requestResponse && requestResponse.id)
-        router.push({ name: 'InvoiceOutSummary', params: { id: requestResponse.id } });
-};
-</script>
-
-<template>
-    <FetchData
-        url="InvoiceOutSerials"
-        :filter="{ where: { code: { neq: 'R' } }, order: ['code'] }"
-        @on-fetch="(data) => (invoiceOutSerialsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="TaxAreas"
-        :filter="{ order: ['code'] }"
-        @on-fetch="(data) => (taxAreasOptions = data)"
-        auto-load
-    />
-    <FormModelPopup
-        ref="formModelPopupRef"
-        :title="t('Create manual invoice')"
-        url-create="InvoiceOuts/createManualInvoice"
-        model="invoiceOut"
-        :form-initial-data="manualInvoiceFormData"
-        @on-data-saved="onDataSaved"
-    >
-        <template #form-inputs="{ data }">
-            <span v-if="isLoading" class="text-primary invoicing-text">
-                <QIcon name="warning" class="fill-icon q-mr-sm" size="md" />
-                {{ t('Invoicing in progress...') }}
-            </span>
-            <VnRow>
-                <VnSelect
-                    :label="t('Ticket')"
-                    :options="ticketsOptions"
-                    hide-selected
-                    option-label="id"
-                    option-value="id"
-                    v-model="data.ticketFk"
-                    @update:model-value="data.clientFk = null"
-                    url="Tickets"
-                    :where="{ refFk: null }"
-                    :fields="['id', 'nickname']"
-                    :filter-options="{ order: 'shipped DESC' }"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <span class="row items-center" style="max-width: max-content">{{
-                    t('Or')
-                }}</span>
-                <VnSelect
-                    :label="t('Client')"
-                    :options="clientsOptions"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="data.clientFk"
-                    @update:model-value="data.ticketFk = null"
-                    url="Clients"
-                    :fields="['id', 'name']"
-                    :filter-options="{ order: 'name ASC' }"
-                />
-                <VnInputDate :label="t('Max date')" v-model="data.maxShipped" />
-            </VnRow>
-            <VnRow>
-                <VnSelect
-                    :label="t('Serial')"
-                    :options="invoiceOutSerialsOptions"
-                    hide-selected
-                    option-label="description"
-                    option-value="code"
-                    v-model="data.serial"
-                />
-                <VnSelect
-                    :label="t('Area')"
-                    :options="taxAreasOptions"
-                    hide-selected
-                    option-label="code"
-                    option-value="code"
-                    v-model="data.taxArea"
-                />
-            </VnRow>
-            <VnRow>
-                <VnInput
-                    :label="t('Reference')"
-                    type="textarea"
-                    v-model="data.reference"
-                    fill-input
-                    autogrow
-                />
-            </VnRow>
-        </template>
-    </FormModelPopup>
-</template>
-
-<style lang="scss" scoped>
-.invoicing-text {
-    display: flex;
-    justify-content: center;
-    align-items: center;
-    color: $primary;
-    font-size: 24px;
-    margin-bottom: 8px;
-}
-</style>
-
-<i18n>
-es:
-    Create manual invoice: Crear factura manual
-    Ticket: Ticket
-    Client: Cliente
-    Max date: Fecha límite
-    Serial: Serie
-    Area: Area
-    Reference: Referencia
-    Or: O
-    Invoicing in progress...: Facturación en progreso...
-</i18n>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 572dbf144..c9867dd07 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -162,9 +162,7 @@ onMounted(() => {
             : $props.defaultMode;
     stateStore.rightDrawer = quasar.screen.gt.xs;
     columnsVisibilitySkipped.value = [
-        ...splittedColumns.value.columns
-            .filter((c) => c.visible == false)
-            .map((c) => c.name),
+        ...splittedColumns.value.columns.filter((c) => !c.visible).map((c) => c.name),
         ...['tableActions'],
     ];
     createForm.value = $props.create;
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 3d5afaf80..57335d293 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -1,8 +1,7 @@
 <script setup>
-import { onMounted, watch, computed, ref } from 'vue';
+import { onMounted, watch, computed, ref, useAttrs } from 'vue';
 import { date } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useAttrs } from 'vue';
 
 const model = defineModel({ type: [String, Date] });
 const $props = defineProps({
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index b1c150410..0652329bc 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -95,7 +95,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
+        if (store.order?.length) params.filter.order = store.order;
         else delete params.filter.order;
 
         params.filter = JSON.stringify(params.filter);
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 08b21fb4a..70d38cb93 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -9,7 +9,6 @@ import RefundInvoiceForm from 'src/components/RefundInvoiceForm.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
 import useNotify from 'src/composables/useNotify';
-import { useSession } from 'src/composables/useSession';
 import { usePrintService } from 'composables/usePrintService';
 import { useVnConfirm } from 'composables/useVnConfirm';
 import { getUrl } from 'src/composables/getUrl';
@@ -30,8 +29,6 @@ const $props = defineProps({
 
 const { notify } = useNotify();
 const router = useRouter();
-const session = useSession();
-const token = session.getToken();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const { openConfirmationModal } = useVnConfirm();
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 5157d957b..89704df2c 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -13,6 +13,7 @@ import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
+import axios from 'axios';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -24,6 +25,12 @@ const selectedRows = ref([]);
 const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
+const addressOptions = ref([]);
+
+async function fetchClientAddress(id) {
+    const { data } = await axios.get(`Clients/${id}/addresses`);
+    addressOptions.value = data;
+}
 
 const columns = computed(() => [
     {
@@ -246,7 +253,17 @@ watchEffect(selectedRows);
                 :options="customerOptions"
                 option-label="name"
                 option-value="id"
+                @update:model-value="fetchClientAddress"
             />
+            <VnSelect
+                v-model="data.addressFk"
+                :label="t('invoiceOutModule.address')"
+                :options="addressOptions"
+                option-value="id"
+                option-label="nickname"
+                :disable="!data.clientFk"
+            />
+
             <VnSelect
                 url="InvoiceOutSerials"
                 v-model="data.serial"
diff --git a/src/pages/InvoiceOut/locale/en.yml b/src/pages/InvoiceOut/locale/en.yml
index 5ad92ed09..8cefe8bdc 100644
--- a/src/pages/InvoiceOut/locale/en.yml
+++ b/src/pages/InvoiceOut/locale/en.yml
@@ -2,6 +2,7 @@ invoiceOutModule:
     customer: Client
     amount: Amount
     company: Company
+    address: Address
 invoiceOutList:
     tableVisibleColumns:
         id: ID
@@ -15,11 +16,11 @@ invoiceOutList:
 DownloadPdf: Download PDF
 InvoiceOutSummary: Summary
 negativeBases:
-        country: Country
-        clientId: Client ID
-        base: Base
-        ticketId: Ticket
-        active: Active
-        hasToInvoice: Has to invoice
-        verifiedData: Verified data
-        commercial: Commercial
\ No newline at end of file
+    country: Country
+    clientId: Client ID
+    base: Base
+    ticketId: Ticket
+    active: Active
+    hasToInvoice: Has to invoice
+    verifiedData: Verified data
+    commercial: Commercial
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index a05125630..6a18c5fdf 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -4,6 +4,7 @@ invoiceOutModule:
     customer: Cliente
     amount: Importe
     company: Empresa
+    address: Consignatario
 invoiceOutList:
     tableVisibleColumns:
         id: ID
@@ -20,12 +21,12 @@ invoiceOutList:
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:
-        country: País
-        clientId: ID del cliente
-        client: Cliente
-        base: Base
-        ticketId: Ticket
-        active: Activo
-        hasToInvoice: Debe facturar
-        verifiedData: Datos verificados
-        commercial: Comercial
\ No newline at end of file
+    country: País
+    clientId: ID del cliente
+    client: Cliente
+    base: Base
+    ticketId: Ticket
+    active: Activo
+    hasToInvoice: Debe facturar
+    verifiedData: Datos verificados
+    commercial: Comercial
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index 9d5c9281e..f97d62420 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -1,6 +1,6 @@
 <script setup>
-import { useRoute, useRouter } from 'vue-router';
-import { onMounted, ref } from 'vue';
+import { useRouter } from 'vue-router';
+import { reactive, onMounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
@@ -9,16 +9,13 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
-import { reactive } from 'vue';
 import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
-const route = useRoute();
 const state = useState();
 const ORDER_MODEL = 'order';
 
 const router = useRouter();
-const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);

From 6d088758098fa32ffa4aa355d0c8d38a908fefb6 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 2 Oct 2024 15:37:05 +0200
Subject: [PATCH 02/89] fix: icons

---
 src/components/VnSelectProvince.vue | 2 +-
 src/router/modules/Supplier.js      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnSelectProvince.vue b/src/components/VnSelectProvince.vue
index 606799e50..9fcbef11e 100644
--- a/src/components/VnSelectProvince.vue
+++ b/src/components/VnSelectProvince.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, watch } from 'vue';
+import { ref } from 'vue';
 import { useValidator } from 'src/composables/useValidator';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/router/modules/Supplier.js b/src/router/modules/Supplier.js
index 143d7c824..c08fb5961 100644
--- a/src/router/modules/Supplier.js
+++ b/src/router/modules/Supplier.js
@@ -113,7 +113,7 @@ export default {
                     name: 'SupplierAccounts',
                     meta: {
                         title: 'accounts',
-                        icon: 'vn:account',
+                        icon: 'vn:credit',
                     },
                     component: () =>
                         import('src/pages/Supplier/Card/SupplierAccounts.vue'),

From 789e70b7a81eb6b1d286c0d4f357f5bba81484ea Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 2 Oct 2024 16:37:58 +0200
Subject: [PATCH 03/89] feat: all clients just with global series

---
 src/i18n/locale/en.yml                        | 1 +
 src/i18n/locale/es.yml                        | 1 +
 src/pages/InvoiceOut/InvoiceOutGlobalForm.vue | 4 ++--
 src/stores/invoiceOutGlobal.js                | 9 +++++++++
 4 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index af0ba0996..a6994dfe3 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -607,6 +607,7 @@ invoiceOut:
             invoiceWithFutureDate: Exists an invoice with a future date
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
+            invalidSerialTypeForAll: The serial type must be global when invoicing all clients
         table:
             client: Client
             addressId: Address id
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f56cd6761..5c2d73dfd 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -616,6 +616,7 @@ invoiceOut:
             invoiceWithFutureDate: Existe una factura con una fecha futura
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
+            invalidSerialTypeForAll: El tipo de serie debe ser global cuando se facturan todos los clientes
         table:
             client: Cliente
             addressId: Id dirección
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
index 5bcb21001..31928c776 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
@@ -184,7 +184,7 @@ onMounted(async () => {
 <i18n>
 en:
     invoiceDate: Invoice date
-    maxShipped: Max date
+    maxShipped: Max date ticket
     allClients: All clients
     oneClient: One client
     company: Company
@@ -196,7 +196,7 @@ en:
 
 es:
     invoiceDate: Fecha de factura
-    maxShipped: Fecha límite
+    maxShipped: Fecha límite ticket
     allClients: Todos los clientes
     oneClient: Un solo cliente
     company: Empresa
diff --git a/src/stores/invoiceOutGlobal.js b/src/stores/invoiceOutGlobal.js
index 42acac013..5212fc6f0 100644
--- a/src/stores/invoiceOutGlobal.js
+++ b/src/stores/invoiceOutGlobal.js
@@ -161,6 +161,15 @@ export const useInvoiceOutGlobalStore = defineStore({
                 );
                 throw new Error('Invalid Serial Type');
             }
+
+            if (clientsToInvoice === 'all' && params.serialType !== 'global') {
+                notify(
+                    'invoiceOut.globalInvoices.errors.invalidSerialTypeForAll',
+                    'negative'
+                );
+                throw new Error('For "all" clients, the serialType must be "global"');
+            }
+
             if (!params.companyFk) {
                 notify('invoiceOut.globalInvoices.errors.chooseValidCompany', 'negative');
                 throw new Error('Invalid company');

From 6eb0c93802235e86ce1cecf9a7694a9f0cca9d55 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 3 Oct 2024 10:17:36 +0200
Subject: [PATCH 04/89] feat: manual invoice in two lines

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 102 +++++++++++++-----------
 1 file changed, 57 insertions(+), 45 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index ba0a1d113..8a3a618ac 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -230,42 +230,58 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
-            <div class="flex no-wrap flex-center">
-                <VnSelect
-                    url="Tickets"
-                    v-model="data.ticketFk"
-                    :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                    option-label="id"
-                    option-value="id"
-                >
-                    <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
-                            <QItemSection>
-                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                <QItemLabel caption>{{ scope.opt?.nickname }}</QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </template>
-                </VnSelect>
-                <span class="q-ml-md">O</span>
+            <div class="row q-col-gutter-md">
+                <div class="col-12">
+                    <VnSelect
+                        url="Tickets"
+                        v-model="data.ticketFk"
+                        :label="t('invoiceOutList.tableVisibleColumns.ticket')"
+                        option-label="id"
+                        option-value="id"
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelect>
+                </div>
+            </div>
+            <div class="row q-col-gutter-md">
+                <div class="col-12">
+                    <span class="q-ml-md q-mt-md">O</span>
+                </div>
+            </div>
+            <div class="row q-col-gutter-md">
+                <div class="col-12">
+                    <VnSelect
+                        url="Clients"
+                        v-model="data.clientFk"
+                        :label="t('invoiceOutModule.customer')"
+                        :options="customerOptions"
+                        option-label="name"
+                        option-value="id"
+                        @update:model-value="fetchClientAddress"
+                    />
+                </div>
+            </div>
+            <div class="row q-col-gutter-md">
+                <div class="col-12">
+                    <VnSelect
+                        v-model="data.addressFk"
+                        :label="t('invoiceOutModule.address')"
+                        :options="addressOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        :disable="!data.clientFk"
+                    />
+                </div>
             </div>
-            <VnSelect
-                url="Clients"
-                v-model="data.clientFk"
-                :label="t('invoiceOutModule.customer')"
-                :options="customerOptions"
-                option-label="name"
-                option-value="id"
-                @update:model-value="fetchClientAddress"
-            />
-            <VnSelect
-                v-model="data.addressFk"
-                :label="t('invoiceOutModule.address')"
-                :options="addressOptions"
-                option-value="id"
-                option-label="nickname"
-                :disable="!data.clientFk"
-            />
 
             <VnSelect
                 url="InvoiceOutSerials"
@@ -294,20 +310,16 @@ watchEffect(selectedRows);
         </template>
     </VnTable>
 </template>
-
 <i18n>
-en:
+    en:
     searchInvoice: Search issued invoice
     fileDenied: Browser denied file download...
     fileAllowed: Successful download of CSV file
     youCanSearchByInvoiceReference: You can search by invoice reference
-    createInvoice: Make invoice
-    Create manual invoice: Create manual invoice
-es:
-    searchInvoice: Buscar factura emitida
-    fileDenied: El navegador denegó la descarga de archivos...
-    fileAllowed: Descarga exitosa de archivo CSV
+    createInvoice: Make invoice Create manual invoice: Create manual invoice
+    es:
+    searchInvoice: Buscar factura emitida fileDenied: El navegador denegó la
+    descarga de archivos... fileAllowed: Descarga exitosa de archivo CSV
     youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    createInvoice: Crear factura
-    Create manual invoice: Crear factura manual
+    createInvoice: Crear factura Create manual invoice: Crear factura manual
 </i18n>

From 2877ef8a335271cb18d4b2cfb3a08ac0453aae6f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 4 Oct 2024 11:50:55 +0200
Subject: [PATCH 05/89] feat: refs #7346 #7346 improve form

---
 src/i18n/locale/en.yml                  |  1 +
 src/pages/InvoiceOut/InvoiceOutList.vue | 45 +++++++++++++++----------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b75e4239c..cab1070d2 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1154,6 +1154,7 @@ components:
         clone: Clone
         openCard: View
         openSummary: Summary
+        viewSummary: Summary
     cardDescriptor:
         mainList: Main list
         summary: Summary
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 8a3a618ac..5b5b266a6 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -6,8 +6,8 @@ import VnInputDate from 'src/components/common/VnInputDate.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import { usePrintService } from 'composables/usePrintService';
-import VnTable from 'components/VnTable/VnTable.vue';
+import { usePrintService } from 'src/composables/usePrintService';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
@@ -133,6 +133,7 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
@@ -230,8 +231,8 @@ watchEffect(selectedRows);
             </span>
         </template>
         <template #more-create-dialog="{ data }">
-            <div class="row q-col-gutter-md">
-                <div class="col-12">
+            <div class="row q-col-gutter-md" style="grid-column-start: div 0">
+                <div class="col-12" style="display: flex">
                     <VnSelect
                         url="Tickets"
                         v-model="data.ticketFk"
@@ -250,14 +251,17 @@ watchEffect(selectedRows);
                             </QItem>
                         </template>
                     </VnSelect>
-                </div>
+                    <!-- </div>
             </div>
             <div class="row q-col-gutter-md">
-                <div class="col-12">
+                <div class="col-12"> -->
                     <span class="q-ml-md q-mt-md">O</span>
                 </div>
             </div>
-            <div class="row q-col-gutter-md">
+            <div
+                class="row q-col-gutter-md"
+                style="border: 1px solid grey; padding-right: 10px; padding-bottom: 10px"
+            >
                 <div class="col-12">
                     <VnSelect
                         url="Clients"
@@ -269,8 +273,8 @@ watchEffect(selectedRows);
                         @update:model-value="fetchClientAddress"
                     />
                 </div>
-            </div>
-            <div class="row q-col-gutter-md">
+                <!-- </div>
+            <div class="row q-col-gutter-md"> -->
                 <div class="col-12">
                     <VnSelect
                         v-model="data.addressFk"
@@ -284,6 +288,7 @@ watchEffect(selectedRows);
             </div>
 
             <VnSelect
+                style="grid-row: 2; margin-top: 10px"
                 url="InvoiceOutSerials"
                 v-model="data.serial"
                 :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
@@ -296,6 +301,7 @@ watchEffect(selectedRows);
                 v-model="data.maxShipped"
             />
             <VnSelect
+                style="grid-row: 3; margin-top: 10px"
                 url="TaxAreas"
                 v-model="data.taxArea"
                 :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
@@ -312,14 +318,17 @@ watchEffect(selectedRows);
 </template>
 <i18n>
     en:
-    searchInvoice: Search issued invoice
-    fileDenied: Browser denied file download...
-    fileAllowed: Successful download of CSV file
-    youCanSearchByInvoiceReference: You can search by invoice reference
-    createInvoice: Make invoice Create manual invoice: Create manual invoice
+        searchInvoice: Search issued invoice
+        fileDenied: Browser denied file download...
+        fileAllowed: Successful download of CSV file
+        youCanSearchByInvoiceReference: You can search by invoice reference
+        createInvoice: Make invoice
+        Create manual invoice: Create manual invoice
     es:
-    searchInvoice: Buscar factura emitida fileDenied: El navegador denegó la
-    descarga de archivos... fileAllowed: Descarga exitosa de archivo CSV
-    youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    createInvoice: Crear factura Create manual invoice: Crear factura manual
+        searchInvoice: Buscar factura emitida
+        fileDenied: El navegador denegó la descarga de archivos...
+        fileAllowed: Descarga exitosa de archivo CSV
+        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+        createInvoice: Crear factura
+        Create manual invoice: Crear factura manual
 </i18n>

From 16ef5d372296ef2a5609ea319edb162c30337dc5 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 17 Oct 2024 08:30:45 +0200
Subject: [PATCH 06/89] fix: refs #7306 clean warning

---
 src/pages/Customer/Card/CustomerUnpaid.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerUnpaid.vue b/src/pages/Customer/Card/CustomerUnpaid.vue
index ad00cbf59..6fa5b7f01 100644
--- a/src/pages/Customer/Card/CustomerUnpaid.vue
+++ b/src/pages/Customer/Card/CustomerUnpaid.vue
@@ -2,10 +2,9 @@
 import { computed, onBeforeMount, ref, watch, nextTick } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
-
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
+import VnRow from 'components/ui/VnRow.vue';
 import axios from 'axios';
 import useNotify from 'src/composables/useNotify';
 import { useStateStore } from 'stores/useStateStore';

From 608e6c717ab6748238446eb8c06f700a09790a01 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 17 Oct 2024 09:34:48 +0200
Subject: [PATCH 07/89] fix: refs #7310 clean warning

---
 src/pages/Travel/Card/TravelThermographs.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 6d83581ee..e4a060889 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -19,7 +19,7 @@ const router = useRouter();
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const thermographPaginateRef = ref(null);
+const thermographPaginateRef = ref();
 const warehouses = ref([]);
 
 const thermographFilter = {
@@ -137,7 +137,6 @@ const removeThermograph = async (id) => {
         data-key="TravelThermographs"
         url="TravelThermographs"
         :filter="thermographFilter"
-        :params="{ travelFk: id }"
         auto-load
     >
         <template #body="{ rows }">

From 58e88f605c8f4138c835c13c671eec195e65b1bd Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 08:04:52 +0200
Subject: [PATCH 08/89] refactor: refs #7132 delete duplicate translations'
 keys

---
 .../InvoiceIn/Card/InvoiceInDescriptor.vue    |  6 +-
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue | 10 +--
 src/pages/InvoiceIn/InvoiceInCreate.vue       |  2 +-
 src/pages/InvoiceIn/InvoiceInList.vue         |  4 +-
 src/pages/InvoiceIn/locale/en.yml             |  7 --
 src/pages/InvoiceIn/locale/es.yml             |  6 --
 src/pages/InvoiceOut/locale/es.yml            | 21 +++---
 src/pages/Item/Card/CreateIntrastatForm.vue   |  2 +-
 src/pages/Item/Card/ItemDiary.vue             |  2 +-
 src/pages/Item/Card/ItemLastEntries.vue       |  8 +--
 src/pages/Item/Card/ItemTags.vue              |  2 +-
 src/pages/Item/locale/en.yml                  |  7 --
 src/pages/Item/locale/es.yml                  |  7 --
 src/pages/ItemType/locale/es.yml              |  5 --
 src/pages/Monitor/MonitorOrders.vue           |  4 +-
 src/pages/Monitor/Ticket/MonitorTickets.vue   |  6 +-
 src/pages/Monitor/locale/en.yml               |  5 --
 src/pages/Monitor/locale/es.yml               |  5 --
 .../Card/BasicData/TicketBasicDataForm.vue    | 18 ++---
 src/pages/Ticket/Card/ExpeditionNewTicket.vue |  2 +-
 src/pages/Ticket/Card/TicketComponents.vue    | 24 +++----
 src/pages/Ticket/Card/TicketCreateRequest.vue |  9 +--
 .../Ticket/Card/TicketCreateServiceType.vue   |  2 +-
 .../Ticket/Card/TicketCreateTracking.vue      |  4 +-
 src/pages/Ticket/Card/TicketExpedition.vue    |  6 +-
 src/pages/Ticket/Card/TicketNotes.vue         |  2 +-
 src/pages/Ticket/Card/TicketPackage.vue       |  2 +-
 .../Ticket/Card/TicketPurchaseRequest.vue     | 21 +++---
 src/pages/Ticket/Card/TicketSale.vue          | 16 ++---
 src/pages/Ticket/Card/TicketSaleTracking.vue  | 20 +++---
 src/pages/Ticket/Card/TicketService.vue       |  6 +-
 src/pages/Ticket/Card/TicketTracking.vue      |  6 +-
 src/pages/Ticket/Card/TicketTransfer.vue      | 14 ++--
 src/pages/Ticket/Card/TicketVolume.vue        |  6 +-
 src/pages/Ticket/TicketAdvance.vue            |  2 +-
 src/pages/Ticket/TicketFuture.vue             | 24 +++----
 src/pages/Ticket/TicketWeekly.vue             |  6 +-
 src/pages/Ticket/locale/en.yml                | 65 -------------------
 src/pages/Ticket/locale/es.yml                | 64 ------------------
 src/pages/Zone/Card/ZoneCreateWarehouse.vue   |  2 +-
 src/pages/Zone/Card/ZoneDescriptor.vue        | 10 +--
 .../Zone/Card/ZoneEventExclusionForm.vue      |  4 +-
 .../Zone/Card/ZoneEventInclusionForm.vue      | 16 ++---
 src/pages/Zone/Card/ZoneEventsPanel.vue       | 14 ++--
 src/pages/Zone/Card/ZoneLocations.vue         |  2 +-
 src/pages/Zone/Card/ZoneSummary.vue           | 14 ++--
 src/pages/Zone/Card/ZoneWarehouses.vue        |  6 +-
 src/pages/Zone/ZoneClosingTable.vue           | 12 ++--
 src/pages/Zone/ZoneCreate.vue                 | 14 ++--
 src/pages/Zone/ZoneDeliveryPanel.vue          |  4 +-
 src/pages/Zone/ZoneFilterPanel.vue            |  6 +-
 src/pages/Zone/ZoneList.vue                   |  4 +-
 src/pages/Zone/ZoneUpcoming.vue               |  4 +-
 src/pages/Zone/locale/en.yml                  | 50 ++------------
 src/pages/Zone/locale/es.yml                  | 53 ++-------------
 55 files changed, 189 insertions(+), 454 deletions(-)

diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
index 9bc4856a8..92f3fffca 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
@@ -355,10 +355,10 @@ const createInvoiceInCorrection = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('invoiceIn.card.issued')" :value="toDate(entity.issued)" />
+            <VnLv :label="t('invoiceIn.list.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('invoiceIn.summary.booked')" :value="toDate(entity.booked)" />
-            <VnLv :label="t('invoiceIn.card.amount')" :value="toCurrency(totalAmount)" />
-            <VnLv :label="t('invoiceIn.summary.supplier')">
+            <VnLv :label="t('invoiceIn.list.amount')" :value="toCurrency(totalAmount)" />
+            <VnLv :label="t('invoiceIn.list.supplier')">
                 <template #value>
                     <span class="link">
                         {{ entity?.supplier?.nickname }}
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 801a04342..08fc11f69 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -95,7 +95,7 @@ const dueDayColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoiceIn.summary.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => row.amount,
         format: (value) => toCurrency(value),
         sortable: true,
@@ -123,7 +123,7 @@ const intrastatColumns = ref([
     },
     {
         name: 'amount',
-        label: 'invoiceIn.summary.amount',
+        label: 'invoiceIn.list.amount',
         field: (row) => toCurrency(row.amount),
         sortable: true,
         align: 'left',
@@ -210,7 +210,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     />
                 </QCardSection>
                 <VnLv
-                    :label="t('invoiceIn.summary.supplier')"
+                    :label="t('invoiceIn.list.supplier')"
                     :value="entity.supplier?.name"
                 >
                     <template #value>
@@ -221,7 +221,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('invoiceIn.summary.supplierRef')"
+                    :label="t('invoiceIn.list.supplierRef')"
                     :value="entity.supplierRef"
                 />
                 <VnLv
@@ -271,7 +271,7 @@ const getLink = (param) => `#/invoice-in/${entityId.value}/${param}`;
                     :value="entity.expenseDeductible?.name"
                 />
                 <VnLv
-                    :label="t('invoiceIn.summary.company')"
+                    :label="t('invoiceIn.card.company')"
                     :value="entity.company?.code"
                 />
                 <VnLv :label="t('invoiceIn.isBooked')" :value="invoiceIn?.isBooked" />
diff --git a/src/pages/InvoiceIn/InvoiceInCreate.vue b/src/pages/InvoiceIn/InvoiceInCreate.vue
index e6863beb1..c809e032b 100644
--- a/src/pages/InvoiceIn/InvoiceInCreate.vue
+++ b/src/pages/InvoiceIn/InvoiceInCreate.vue
@@ -83,7 +83,7 @@ const redirectToInvoiceInBasicData = (__, { id }) => {
                         </template>
                     </VnSelect>
                     <VnInput
-                        :label="t('invoiceIn.summary.supplierRef')"
+                        :label="t('invoiceIn.list.supplierRef')"
                         v-model="data.supplierRef"
                     />
                 </VnRow>
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..d64876858 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -50,7 +50,7 @@ const cols = computed(() => [
     {
         align: 'left',
         name: 'serial',
-        label: t('invoiceIn.list.serial'),
+        label: t('invoiceIn.serial'),
     },
     {
         align: 'left',
@@ -151,7 +151,7 @@ const cols = computed(() => [
                 </template>
             </VnSelect>
             <VnInput
-                :label="t('invoiceIn.summary.supplierRef')"
+                :label="t('invoiceIn.list.supplierRef')"
                 v-model="data.supplierRef"
             />
             <VnSelect
diff --git a/src/pages/InvoiceIn/locale/en.yml b/src/pages/InvoiceIn/locale/en.yml
index b09340c81..b39511f29 100644
--- a/src/pages/InvoiceIn/locale/en.yml
+++ b/src/pages/InvoiceIn/locale/en.yml
@@ -5,14 +5,11 @@ invoiceIn:
         ref: Reference
         supplier: Supplier
         supplierRef: Supplier ref.
-        serial: Serial
         file: File
         issued: Issued
         awb: AWB
         amount: Amount
     card:
-        issued: Issued
-        amount: Amount
         client: Client
         company: Company
         customerCard: Customer card
@@ -21,8 +18,6 @@ invoiceIn:
         dueDay: Due day
         intrastat: Intrastat
     summary:
-        supplier: Supplier
-        supplierRef: Supplier ref.
         currency: Currency
         issued: Expedition date
         operated: Operation date
@@ -30,7 +25,6 @@ invoiceIn:
         bookedDate: Booked date
         sage: Sage withholding
         vat: Undeductible VAT
-        company: Company
         expense: Expense
         taxableBase: Taxable base
         rate: Rate
@@ -38,7 +32,6 @@ invoiceIn:
         sageTransaction: Sage transaction
         dueDay: Date
         bank: Bank
-        amount: Amount
         foreignValue: Foreign value
         dueTotal: Due day
         noMatch: Do not match
diff --git a/src/pages/InvoiceIn/locale/es.yml b/src/pages/InvoiceIn/locale/es.yml
index 31d41fc97..5f483dd08 100644
--- a/src/pages/InvoiceIn/locale/es.yml
+++ b/src/pages/InvoiceIn/locale/es.yml
@@ -11,8 +11,6 @@ invoiceIn:
         awb: AWB
         amount: Importe
     card:
-        issued: Fecha emisión
-        amount: Importe
         client: Cliente
         company: Empresa
         customerCard: Ficha del cliente
@@ -20,8 +18,6 @@ invoiceIn:
         vat: Iva
         dueDay: Fecha de vencimiento
     summary:
-        supplier: Proveedor
-        supplierRef: Ref. proveedor
         currency: Divisa
         docNumber: Número documento
         issued: Fecha de expedición
@@ -30,14 +26,12 @@ invoiceIn:
         bookedDate: Fecha contable
         sage: Retención sage
         vat: Iva no deducible
-        company: Empresa
         expense: Gasto
         taxableBase: Base imp.
         rate: Tasa
         sageTransaction: Sage transación
         dueDay: Fecha
         bank: Caja
-        amount: Importe
         foreignValue: Divisa
         dueTotal: Vencimiento
         code: Código
diff --git a/src/pages/InvoiceOut/locale/es.yml b/src/pages/InvoiceOut/locale/es.yml
index a05125630..192f5b26f 100644
--- a/src/pages/InvoiceOut/locale/es.yml
+++ b/src/pages/InvoiceOut/locale/es.yml
@@ -9,9 +9,6 @@ invoiceOutList:
         id: ID
         ref: Referencia
         issued: Fecha emisión
-        customer: Cliente
-        company: Empresa
-        amount: Importe
         created: F. creación
         dueDate: F. máxima
         invoiceOutSerial: Serial
@@ -20,12 +17,12 @@ invoiceOutList:
 DownloadPdf: Descargar PDF
 InvoiceOutSummary: Resumen
 negativeBases:
-        country: País
-        clientId: ID del cliente
-        client: Cliente
-        base: Base
-        ticketId: Ticket
-        active: Activo
-        hasToInvoice: Debe facturar
-        verifiedData: Datos verificados
-        commercial: Comercial
\ No newline at end of file
+    country: País
+    clientId: ID del cliente
+    client: Cliente
+    base: Base
+    ticketId: Ticket
+    active: Activo
+    hasToInvoice: Debe facturar
+    verifiedData: Datos verificados
+    commercial: Comercial
diff --git a/src/pages/Item/Card/CreateIntrastatForm.vue b/src/pages/Item/Card/CreateIntrastatForm.vue
index 5fe254759..443615d7e 100644
--- a/src/pages/Item/Card/CreateIntrastatForm.vue
+++ b/src/pages/Item/Card/CreateIntrastatForm.vue
@@ -42,7 +42,7 @@ onMounted(async () => {
                     :required="true"
                 />
                 <VnInput
-                    :label="t('createIntrastatForm.description')"
+                    :label="t('itemBasicData.description')"
                     v-model="data.description"
                     :required="true"
                 />
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 68633caa2..a59bfa367 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -62,7 +62,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('itemDiary.reference'),
+        label: t('itemBasicData.reference'),
         field: 'reference',
         name: 'reference',
         align: 'left',
diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index b211790ca..5c0251ea8 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -59,7 +59,7 @@ const columns = computed(() => [
         align: 'center',
     },
     {
-        label: t('lastEntries.warehouse'),
+        label: t('itemDiary.warehouse'),
         name: 'warehouse',
         field: 'warehouse',
         align: 'left',
@@ -94,7 +94,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('lastEntries.packing'),
+        label: t('shelvings.packing'),
         name: 'packing',
         align: 'center',
     },
@@ -104,7 +104,7 @@ const columns = computed(() => [
         align: 'center',
     },
     {
-        label: t('lastEntries.stems'),
+        label: t('itemBasicData.stems'),
         name: 'stems',
         field: 'stems',
         align: 'center',
@@ -188,7 +188,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
     <VnSubToolbar>
         <template #st-data>
             <VnInputDate
-                :label="t('lastEntries.since')"
+                :label="t('itemDiary.since')"
                 dense
                 v-model="from"
                 class="q-mr-lg"
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 6f31d0cf8..de34cb9fe 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -147,7 +147,7 @@ const insertTag = (rows) => {
                                 :is-clearable="false"
                             />
                             <VnInput
-                                :label="t('itemTags.relevancy')"
+                                :label="t('itemBasicData.relevancy')"
                                 type="number"
                                 v-model="row.priority"
                                 :required="true"
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index c32ee493c..647a01810 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -16,7 +16,6 @@ itemDiary:
     date: Date
     origin: Origin
     state: State
-    reference: Reference
     entity: Entity
     in: In
     out: Out
@@ -48,22 +47,17 @@ itemBasicData:
 createIntrastatForm:
     title: New intrastat
     identifier: Identifier
-    description: Description
 tax:
     country: Country
     class: Class
 lastEntries:
-    since: Since
     to: To
     ig: Ig
-    warehouse: Warehouse
     landed: Landed
     entry: Entry
     pvp: PVP
     label: Label
-    packing: Packing
     grouping: Grouping
-    stems: Stems
     quantity: Quantity
     cost: Cost
     kg: Kg.
@@ -77,7 +71,6 @@ itemTags:
     addTag: Add tag
     tag: Tag
     value: Value
-    relevancy: Relevancy
 searchbar:
     label: Search item
     info: Search by item id
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index d32cb7885..80eab8f26 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -16,7 +16,6 @@ itemDiary:
     date: Fecha
     origin: Origen
     state: Estado
-    reference: Referencia
     entity: Entidad
     in: Entrada
     out: Salida
@@ -48,22 +47,17 @@ itemBasicData:
 createIntrastatForm:
     title: Nuevo intrastat
     identifier: Identificador
-    description: Descripción
 tax:
     country: País
     class: Clase
 lastEntries:
-    since: Desde
     to: Hasta
     ig: Ig
-    warehouse: Almacén
     landed: F. Entrega
     entry: Entrada
     pvp: PVP
     label: Etiquetas
-    packing: Packing
     grouping: Grouping
-    stems: Tallos
     quantity: Cantidad
     cost: Coste
     kg: Kg.
@@ -77,7 +71,6 @@ itemTags:
     addTag: Añadir etiqueta
     tag: Etiqueta
     value: Valor
-    relevancy: Relevancia
 searchbar:
     label: Buscar artículo
     info: Buscar por id de artículo
diff --git a/src/pages/ItemType/locale/es.yml b/src/pages/ItemType/locale/es.yml
index 9a94dceb6..5a32d09a5 100644
--- a/src/pages/ItemType/locale/es.yml
+++ b/src/pages/ItemType/locale/es.yml
@@ -6,11 +6,6 @@ shared:
     temperature: Temperatura
 summary:
     id: id
-    code: Código
-    name: Nombre
-    worker: Trabajador
-    category: Reino
-    temperature: Temperatura
     life: Vida
     promo: Promoción
     itemPackingType: Tipo de embalaje
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index fac601735..326fae0ee 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -44,7 +44,7 @@ const columns = computed(() => [
         format: (row) => toDateTimeFormat(row.date_make),
     },
     {
-        label: t('salesOrdersTable.client'),
+        label: t('salesClientsTable.client'),
         name: 'clientFk',
         align: 'left',
         columnFilter: {
@@ -63,7 +63,7 @@ const columns = computed(() => [
         columnFilter: false,
     },
     {
-        label: t('salesOrdersTable.salesPerson'),
+        label: t('salesClientsTable.salesPerson'),
         name: 'salesPersonFk',
         align: 'left',
         optionFilter: 'firstName',
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index d24230c64..406bf5f29 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -77,7 +77,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.client'),
+        label: t('salesClientsTable.client'),
         name: 'clientFk',
         align: 'left',
         field: 'nickname',
@@ -91,7 +91,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.salesPerson'),
+        label: t('salesClientsTable.salesPerson'),
         name: 'salesPersonFk',
         field: 'userName',
         align: 'left',
@@ -108,7 +108,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('salesTicketsTable.date'),
+        label: t('salesClientsTable.date'),
         name: 'shippedDate',
         align: 'left',
         columnFilter: {
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..2f839e5f5 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -13,8 +13,6 @@ salesOrdersTable:
     delete: Delete
     dateSend: Send date
     dateMake: Make date
-    client: Client
-    salesPerson: Salesperson
     deleteConfirmMessage: All the selected elements will be deleted. Are you sure you want to continue?
     agency: Agency
     import: Import
@@ -29,9 +27,6 @@ salesTicketsTable:
     componentLack: Component lack
     tooLittle: Ticket too little
     identifier: Identifier
-    client: Client
-    salesPerson: Salesperson
-    date: Date
     theoretical: Theoretical
     practical: Practical
     province: Province
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..5b7f4f551 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -13,8 +13,6 @@ salesOrdersTable:
     delete: Eliminar
     dateSend: Fecha de envío
     dateMake: Fecha de realización
-    client: Cliente
-    salesPerson: Comercial
     deleteConfirmMessage: Todos los elementos seleccionados serán eliminados. ¿Seguro que quieres continuar?
     agency: Agencia
     import: Importe
@@ -29,9 +27,6 @@ salesTicketsTable:
     componentLack: Faltan componentes
     tooLittle: Ticket demasiado pequeño
     identifier: Identificador
-    client: Cliente
-    salesPerson: Comercial
-    date: Fecha
     theoretical: Teórica
     practical: Práctica
     province: Provincia
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index fdc75abda..90c579c4c 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -297,7 +297,7 @@ onMounted(() => onFormModelInit());
     <QForm>
         <VnRow>
             <VnSelect
-                :label="t('basicData.client')"
+                :label="t('ticketList.client')"
                 v-model="clientId"
                 option-value="id"
                 option-label="name"
@@ -320,7 +320,7 @@ onMounted(() => onFormModelInit());
                 </template>
             </VnSelect>
             <VnSelect
-                :label="t('basicData.warehouse')"
+                :label="t('ticketList.warehouse')"
                 v-model="warehouseId"
                 option-value="id"
                 option-label="name"
@@ -328,7 +328,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('basicData.warehouse')"
+                :rules="validate('ticketList.warehouse')"
             />
         </VnRow>
         <VnRow>
@@ -394,7 +394,7 @@ onMounted(() => onFormModelInit());
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
             <VnSelect
-                :label="t('basicData.company')"
+                :label="t('ticketList.company')"
                 v-model="formData.companyFk"
                 option-value="id"
                 option-label="code"
@@ -402,7 +402,7 @@ onMounted(() => onFormModelInit());
                 hide-selected
                 map-options
                 :required="true"
-                :rules="validate('basicData.company')"
+                :rules="validate('ticketList.company')"
             />
             <VnSelect
                 :label="t('basicData.agency')"
@@ -416,7 +416,7 @@ onMounted(() => onFormModelInit());
                 :rules="validate('basicData.agency')"
             />
             <VnSelect
-                :label="t('basicData.zone')"
+                :label="t('ticketList.zone')"
                 v-model="zoneId"
                 option-value="id"
                 option-label="name"
@@ -428,7 +428,7 @@ onMounted(() => onFormModelInit());
                 map-options
                 :required="true"
                 @focus="zonesFetchRef.fetch()"
-                :rules="validate('basicData.zone')"
+                :rules="validate('ticketList.zone')"
             >
                 <template #option="scope">
                     <QItem v-bind="scope.itemProps">
@@ -445,10 +445,10 @@ onMounted(() => onFormModelInit());
         </VnRow>
         <VnRow>
             <VnInputDate
-                :label="t('basicData.shipped')"
+                :label="t('ticketList.shipped')"
                 v-model="formData.shipped"
                 :required="true"
-                :rules="validate('basicData.shipped')"
+                :rules="validate('ticketList.shipped')"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 9183ae405..4a6ca966d 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -66,7 +66,7 @@ const createTicket = async () => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <VnInputDate
-                    :label="t('expedition.landed')"
+                    :label="t('basicData.landed')"
                     v-model="data.landed"
                     :model-value="date"
                 />
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 0bccdaacd..a9573443b 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -72,7 +72,7 @@ const salesFilter = computed(() => ({
 
 const columns = computed(() => [
     {
-        label: t('ticketComponents.item'),
+        label: t('basicData.item'),
         name: 'item',
         align: 'left',
     },
@@ -92,13 +92,13 @@ const columns = computed(() => [
         columnFilter: false,
     },
     {
-        label: t('ticketComponents.description'),
+        label: t('basicData.description'),
         name: 'description',
         align: 'left',
         columnClass: 'expand',
     },
     {
-        label: t('ticketComponents.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -116,12 +116,12 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('ticketComponents.import'),
+        label: t('advanceTickets.import'),
         name: 'import',
         align: 'left',
     },
     {
-        label: t('ticketComponents.total'),
+        label: t('basicData.total'),
         name: 'total',
         align: 'left',
     },
@@ -196,7 +196,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         <QCard class="q-pa-sm color-vn-text" bordered flat style="border-color: black">
             <QCardSection horizontal>
                 <span class="text-weight-bold text-subtitle1 text-center full-width">
-                    {{ t('ticketComponents.total') }}
+                    {{ t('basicData.total') }}
                 </span>
             </QCardSection>
             <QCardSection horizontal>
@@ -238,9 +238,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </span>
             </QCardSection>
             <QCardSection horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.price') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('basicData.price') }}: </span>
                 <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
             </QCardSection>
             <QCardSection horizontal>
@@ -250,18 +248,14 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
             </QCardSection>
             <QCardSection horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.zone') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketList.zone') }}: </span>
                 <span class="link">
                     {{ dashIfEmpty(ticketData?.zone?.name) }}
                     <ZoneDescriptorProxy :id="ticketData?.zone?.id" />
                 </span>
             </QCardSection>
             <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
-                <span class="q-mr-xs color-vn-label">
-                    {{ t('ticketComponents.volume') }}:
-                </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('volume.volume') }}: </span>
                 <span>{{ ticketVolume }}</span>
             </QCardSection>
             <QCardSection horizontal>
diff --git a/src/pages/Ticket/Card/TicketCreateRequest.vue b/src/pages/Ticket/Card/TicketCreateRequest.vue
index ffe009516..539780a6a 100644
--- a/src/pages/Ticket/Card/TicketCreateRequest.vue
+++ b/src/pages/Ticket/Card/TicketCreateRequest.vue
@@ -32,10 +32,7 @@ const attendersOptions = ref([]);
     >
         <template #form-inputs="{ data }">
             <VnRow>
-                <VnInput
-                    v-model="data.description"
-                    :label="t('purchaseRequest.description')"
-                />
+                <VnInput v-model="data.description" :label="t('basicData.description')" />
                 <VnSelect
                     :label="t('purchaseRequest.atender')"
                     v-model="data.attenderFk"
@@ -48,13 +45,13 @@ const attendersOptions = ref([]);
             <VnRow>
                 <VnInput
                     v-model="data.quantity"
-                    :label="t('purchaseRequest.quantity')"
+                    :label="t('basicData.quantity')"
                     type="number"
                     min="1"
                 />
                 <VnInput
                     v-model="data.price"
-                    :label="t('purchaseRequest.price')"
+                    :label="t('basicData.price')"
                     type="number"
                     min="0"
                 />
diff --git a/src/pages/Ticket/Card/TicketCreateServiceType.vue b/src/pages/Ticket/Card/TicketCreateServiceType.vue
index 067d7dee8..2f5857e86 100644
--- a/src/pages/Ticket/Card/TicketCreateServiceType.vue
+++ b/src/pages/Ticket/Card/TicketCreateServiceType.vue
@@ -34,7 +34,7 @@ onMounted(async () => {
             <VnRow>
                 <VnInput
                     ref="nameInputRef"
-                    :label="t('service.description')"
+                    :label="t('basicData.description')"
                     v-model="data.name"
                     :required="true"
                 />
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index d692f550d..3ea762c6c 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -39,7 +39,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
             <VnRow>
                 <VnSelect
                     v-model="data.stateFk"
-                    :label="t('tracking.state')"
+                    :label="t('ticketList.state')"
                     :options="statesOptions"
                     @update:model-value="onStateFkChange(data)"
                     hide-selected
@@ -47,7 +47,7 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                     option-value="id"
                 />
                 <VnSelect
-                    :label="t('tracking.worker')"
+                    :label="t('expedition.worker')"
                     v-model="data.userFk"
                     url="Workers/search"
                     fields=" ['id', 'name']"
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index 4becb3db3..fc408272d 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -81,7 +81,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('expedition.item'),
+        label: t('basicData.item'),
         name: 'packagingItemFk',
         align: 'left',
         cardVisible: true,
@@ -131,7 +131,7 @@ const columns = computed(() => [
         format: (row) => toDateTimeFormat(row.created),
     },
     {
-        label: t('expedition.state'),
+        label: t('ticketList.state'),
         name: 'state',
         align: 'left',
         cardVisible: true,
@@ -153,7 +153,7 @@ const columns = computed(() => [
 
 const logTableColumns = computed(() => [
     {
-        label: t('expedition.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'center',
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index b5302d15f..12f7ba2c6 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -88,7 +88,7 @@ async function handleSave() {
                             :disable="!!row.id"
                         />
                         <VnInput
-                            :label="t('ticketNotes.description')"
+                            :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
diff --git a/src/pages/Ticket/Card/TicketPackage.vue b/src/pages/Ticket/Card/TicketPackage.vue
index c0418bcf6..04d6020f3 100644
--- a/src/pages/Ticket/Card/TicketPackage.vue
+++ b/src/pages/Ticket/Card/TicketPackage.vue
@@ -93,7 +93,7 @@ watch(
                             </template>
                         </VnSelect>
                         <VnInput
-                            :label="t('package.quantity')"
+                            :label="t('basicData.quantity')"
                             v-model.number="row.quantity"
                             class="col"
                             type="number"
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index d0af9efd0..7715e9e21 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -81,7 +81,7 @@ const crudModelFilter = reactive({
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('purchaseRequest.id'),
+        label: t('ticketList.id'),
         name: 'id',
         chip: {
             condition: () => true,
@@ -90,13 +90,13 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.description'),
+        label: t('basicData.description'),
         name: 'description',
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('purchaseRequest.created'),
+        label: t('expedition.created'),
         name: 'created',
         format: (row) => toDateFormat(row.created),
         cardVisible: true,
@@ -117,12 +117,12 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
     },
     {
         align: 'left',
-        label: t('purchaseRequest.price'),
+        label: t('basicData.price'),
         name: 'price',
     },
     {
@@ -133,7 +133,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('purchaseRequest.state'),
+        label: t('ticketList.state'),
         name: 'isOk',
         cardVisible: true,
     },
@@ -248,10 +248,7 @@ onMounted(() => (stateStore.rightDrawer = false));
         </template>
 
         <template #more-create-dialog="{ data }">
-            <VnInput
-                v-model="data.description"
-                :label="t('purchaseRequest.description')"
-            />
+            <VnInput v-model="data.description" :label="t('basicData.description')" />
             <VnSelect
                 :label="t('purchaseRequest.atender')"
                 v-model="data.attenderFk"
@@ -262,13 +259,13 @@ onMounted(() => (stateStore.rightDrawer = false));
             />
             <VnInput
                 v-model="data.quantity"
-                :label="t('purchaseRequest.quantity')"
+                :label="t('basicData.quantity')"
                 type="number"
                 min="1"
             />
             <VnInput
                 v-model="data.price"
-                :label="t('purchaseRequest.price')"
+                :label="t('basicData.price')"
                 type="number"
                 min="0"
             />
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 43af8d528..d49007e9d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -90,25 +90,25 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketSale.id'),
+        label: t('ticketList.id'),
         name: 'itemFk',
     },
     {
         align: 'left',
-        label: t('ticketSale.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         format: (row) => toCurrency(row.quantity),
     },
     {
         align: 'left',
-        label: t('ticketSale.item'),
+        label: t('basicData.item'),
         name: 'item',
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
     {
         align: 'left',
-        label: t('ticketSale.price'),
+        label: t('basicData.price'),
         name: 'price',
         format: (row) => toCurrency(row.price),
     },
@@ -120,7 +120,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('ticketSale.amount'),
+        label: t('ticketList.amount'),
         name: 'amount',
         format: (row) => parseInt(row.amount * row.quantity),
     },
@@ -516,7 +516,7 @@ watch(
                 <QBtnDropdown
                     ref="stateBtnDropdownRef"
                     color="primary"
-                    :label="t('ticketSale.state')"
+                    :label="t('ticketList.state')"
                     :disable="!isTicketEditable"
                 >
                     <VnSelect
@@ -587,7 +587,7 @@ watch(
                 }}</span>
             </QCardSection>
             <QCardSection class="justify-end text-weight-bold text-subtitle1" horizontal>
-                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
+                <span class="q-mr-xs color-vn-label"> {{ t('basicData.total') }}: </span>
                 <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
             </QCardSection>
         </div></QDrawer
@@ -753,7 +753,7 @@ watch(
                 >
                     <VnInput
                         v-model.number="edit.price"
-                        :label="t('ticketSale.price')"
+                        :label="t('basicData.price')"
                         type="number"
                     />
                 </TicketEditManaProxy>
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index e7830bf37..4d1b82bec 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -42,19 +42,19 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.item'),
+        label: t('basicData.item'),
         name: 'item',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.description'),
+        label: t('basicData.description'),
         name: 'description',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -78,7 +78,7 @@ const columns = computed(() => [
 
 const logTableColumns = computed(() => [
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -92,20 +92,20 @@ const logTableColumns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
@@ -116,13 +116,13 @@ const logTableColumns = computed(() => [
 
 const shelvingsTableColumns = computed(() => [
     {
-        label: t('ticketSaleTracking.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         align: 'left',
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
         sortable: true,
@@ -140,7 +140,7 @@ const shelvingsTableColumns = computed(() => [
         sortable: true,
     },
     {
-        label: t('ticketSaleTracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 45a870f7f..285890e08 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -85,21 +85,21 @@ const getDefaultTaxClass = async () => {
 const columns = computed(() => [
     {
         name: 'description',
-        label: t('service.description'),
+        label: t('basicData.description'),
         field: (row) => row.ticketServiceTypeFk,
         sortable: true,
         align: 'left',
     },
     {
         name: 'quantity',
-        label: t('service.quantity'),
+        label: t('basicData.quantity'),
         field: (row) => row.quantity,
         sortable: true,
         align: 'left',
     },
     {
         name: 'price',
-        label: t('service.price'),
+        label: t('basicData.price'),
         field: (row) => row.price,
         sortable: true,
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 00b517765..f5ed03b0d 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -52,19 +52,19 @@ const paginateFilter = reactive({
 
 const columns = computed(() => [
     {
-        label: t('tracking.state'),
+        label: t('ticketList.state'),
         name: 'state',
         field: 'state',
         align: 'left',
         format: (val) => val.name,
     },
     {
-        label: t('tracking.worker'),
+        label: t('expedition.worker'),
         name: 'worker',
         align: 'left',
     },
     {
-        label: t('tracking.created'),
+        label: t('expedition.created'),
         name: 'created',
         field: 'created',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index e1a011a84..d7aff3ef7 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -33,19 +33,19 @@ const _transfer = ref();
 
 const transferLinesColumns = computed(() => [
     {
-        label: t('ticketSale.id'),
+        label: t('ticketList.id'),
         name: 'itemFk',
         field: 'itemFk',
         align: 'left',
     },
     {
-        label: t('ticketSale.item'),
+        label: t('basicData.item'),
         name: 'item',
         field: 'concept',
         align: 'left',
     },
     {
-        label: t('ticketSale.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
@@ -54,26 +54,26 @@ const transferLinesColumns = computed(() => [
 
 const destinationTicketColumns = computed(() => [
     {
-        label: t('ticketSale.id'),
+        label: t('ticketList.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('ticketSale.shipped'),
+        label: t('ticketList.shipped'),
         name: 'item',
         field: 'shipped',
         align: 'left',
         format: (val) => toDateFormat(val),
     },
     {
-        label: t('ticketSale.agency'),
+        label: t('basicData.agency'),
         name: 'agency',
         field: 'agencyName',
         align: 'left',
     },
     {
-        label: t('ticketSale.address'),
+        label: t('basicData.address'),
         name: 'address',
         field: 'address',
         align: 'left',
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 2cf7ffc42..15b79dad7 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -39,7 +39,7 @@ const packingTypeVolume = ref([]);
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('volume.item'),
+        label: t('basicData.item'),
         name: 'itemFk',
         chip: {
             condition: () => true,
@@ -48,7 +48,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('volume.description'),
+        label: t('basicData.description'),
         name: 'concept',
         columnClass: 'expand',
         cardVisible: true,
@@ -62,7 +62,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('volume.quantity'),
+        label: t('basicData.quantity'),
         name: 'quantity',
         cardVisible: true,
     },
diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 43b500dc0..1fc45f713 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -127,7 +127,7 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('advanceTickets.state'),
+        label: t('ticketList.state'),
         name: 'state',
         align: 'left',
         sortable: true,
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 2078d0595..35c0f6eb2 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -95,7 +95,7 @@ const ticketColumns = computed(() => [
         columnFilter: null,
     },
     {
-        label: t('futureTickets.ticketId'),
+        label: t('advanceTickets.ticketId'),
         name: 'ticketId',
         align: 'center',
         sortable: true,
@@ -118,7 +118,7 @@ const ticketColumns = computed(() => [
         columnFilter: null,
     },
     {
-        label: t('futureTickets.ipt'),
+        label: t('advanceTickets.ipt'),
         name: 'ipt',
         field: 'ipt',
         align: 'left',
@@ -139,14 +139,14 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.state'),
+        label: t('ticketList.state'),
         name: 'state',
         align: 'left',
         sortable: true,
         columnFilter: null,
     },
     {
-        label: t('futureTickets.liters'),
+        label: t('advanceTickets.liters'),
         name: 'liters',
         field: 'liters',
         align: 'left',
@@ -162,7 +162,7 @@ const ticketColumns = computed(() => [
         },
     },
     {
-        label: t('futureTickets.import'),
+        label: t('advanceTickets.import'),
         field: 'import',
         name: 'import',
         align: 'left',
@@ -186,7 +186,7 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.futureId'),
+        label: t('advanceTickets.futureId'),
         name: 'futureId',
         align: 'left',
         sortable: true,
@@ -211,7 +211,7 @@ const ticketColumns = computed(() => [
     },
 
     {
-        label: t('futureTickets.futureIpt'),
+        label: t('advanceTickets.futureIpt'),
         name: 'futureIpt',
         field: 'futureIpt',
         align: 'left',
@@ -232,7 +232,7 @@ const ticketColumns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('futureTickets.futureState'),
+        label: t('advanceTickets.futureState'),
         name: 'futureState',
         align: 'right',
         sortable: true,
@@ -259,7 +259,7 @@ const moveTicketsFuture = async () => {
 
         let params = { tickets: ticketsToMove };
         await axios.post('Tickets/merge', params);
-        notify(t('futureTickets.moveTicketSuccess'), 'positive');
+        notify(t('advanceTickets.moveTicketSuccess'), 'positive');
         selectedTickets.value = [];
         arrayData.fetch({ append: false });
     } catch (error) {
@@ -333,14 +333,14 @@ onMounted(async () => {
                         colspan="8"
                         translate
                     >
-                        {{ t('futureTickets.origin') }}
+                        {{ t('advanceTickets.origin') }}
                     </QTh>
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"
                         colspan="4"
                         translate
                     >
-                        {{ t('futureTickets.destination') }}
+                        {{ t('advanceTickets.destination') }}
                     </QTh>
                 </QTr>
                 <QTr>
@@ -409,7 +409,7 @@ onMounted(async () => {
                         size="xs"
                     >
                         <QTooltip>
-                            {{ t('futureTickets.noVisible') }}
+                            {{ t('ticketSale.noVisible') }}
                         </QTooltip>
                     </QIcon>
                     <QIcon
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index d68d18c24..05477d2fb 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -47,7 +47,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'clientFk',
-        label: t('weeklyTickets.client'),
+        label: t('ticketList.client'),
         isTitle: true,
         cardVisible: true,
         component: 'select',
@@ -79,7 +79,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('weeklyTickets.agency'),
+        label: t('basicData.agency'),
         name: 'agencyModeFk',
         cardVisible: true,
         columnFilter: {
@@ -95,7 +95,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseFk',
-        label: t('weeklyTickets.warehouse'),
+        label: t('ticketList.warehouse'),
         cardVisible: true,
         columnFilter: {
             component: 'select',
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..41c393a42 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -2,16 +2,12 @@ card:
     search: Search tickets
     searchInfo: You can search by ticket id or alias
 volume:
-    item: Item
-    description: Description
     packingType: Packing Type
-    quantity: Quantity
     volumeQuantity: m³ per quantity
     type: Type
     volume: Volume
 ticketNotes:
     observationType: Observation type
-    description: Description
     removeNote: Remove note
     addNote: Add note
     observationTypes:
@@ -25,29 +21,18 @@ ticketNotes:
         DropOff: Drop Off
         Sustitución: Sustitution
 ticketSale:
-    id: Id
     visible: Visible
     available: Available
-    quantity: Quantity
-    item: Item
-    price: Price
     discount: Disc
-    amount: Amount
     packaging: Packaging
     subtotal: Subtotal
     tax: VAT
-    total: Total
     history: History
     claim: Claim
     reserved: Reserved
-    noVisible: Not visible
     hasComponentLack: Component lack
     ok: Ok
-    state: State
     more: More
-    shipped: Shipped
-    agency: Agency
-    address: Address
 advanceTickets:
     preparation: Preparation
     origin: Origin
@@ -56,7 +41,6 @@ advanceTickets:
     destinationAgency: 'Destination agency: {agency}'
     ticketId: ID
     ipt: IPT
-    state: State
     liters: Liters
     lines: Lines
     import: Import
@@ -81,17 +65,9 @@ advanceTickets:
     searchInfo: Search advance tickets by ID or client ID
 futureTickets:
     problems: Problems
-    ticketId: ID
     shipped: Date
-    ipt: IPT
-    state: State
-    liters: Liters
-    import: Import
     availableLines: Available lines
-    futureId: ID
     futureShipped: Date
-    futureIpt: IPT
-    futureState: State
     noVerified: No verified data
     noVisible: Not visible
     purchaseRequest: Purchase request
@@ -99,11 +75,8 @@ futureTickets:
     componentLack: Component lack
     rounding: Rounding
     risk: Risk
-    origin: Origin
-    destination: Destination
     moveTicketTitle: Move tickets
     moveTicketDialogSubtitle: 'Do you want to move {selectedTickets} tickets to the future?'
-    moveTicketSuccess: Tickets moved successfully!
     searchInfo: Search future tickets by date
     futureTicket: Future tickets
     FREE: Free
@@ -113,17 +86,14 @@ futureTickets:
     DELIVERED: Delivered
 expedition:
     id: Expedition
-    item: Item
     name: Name
     packageType: Package type
     counter: Counter
     externalId: external Id
     created: Created
-    state: State
     historyAction: Status log
     newTicketWithRoute: New ticket with route
     newTicketWithoutRoute: New ticket without route
-    landed: Landed
     routeId: Route id
     deleteExpedition: Delete expedition
     expeditionRemoved: Expedition removed
@@ -138,17 +108,12 @@ basicData:
     next: Next
     back: Back
     finalize: Finalize
-    client: Client
-    warehouse: Warehouse
     address: Address
     inactive: (Inactive)
     noDeliveryZoneAvailable: No delivery zone available for this landing date
     editAddress: Edit address
     alias: Alias
-    company: Company
     agency: Agency
-    zone: Zone
-    shipped: Shipped
     landed: Landed
     shippedHour: Shipped hour
     priceDifference: Price difference
@@ -171,37 +136,22 @@ basicData:
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
 purchaseRequest:
-    id: Id
-    description: Description
-    created: Created
     requester: Requester
     atender: Atender
-    quantity: Quantity
-    price: Price
     saleFk: Item id
-    state: State
     newRequest: New request
 weeklyTickets:
     id: Ticket ID
-    client: Client
     shipment: Shipment
-    agency: Agency
-    warehouse: Warehouse
     salesperson: Salesperson
     search: Search weekly tickets
     searchInfo: Search weekly tickets by id or client id
 ticketSaleTracking:
     isChecked: Is checked
-    item: Item
-    description: Description
-    quantity: Quantity
     parking: Parking
     historyAction: Log states
     shelvingAction: Shelvings sale
     original: Original
-    worker: Worker
-    state: State
-    created: Created
     shelving: Shelving
     saleGroupDetail: sale group detail
     previousSelected: previous selected
@@ -210,40 +160,25 @@ ticketSaleTracking:
     checked: checked
 service:
     pay: Pay
-    description: Description
-    quantity: Quantity
-    price: Price
     removeService: Remove service
     newService: New service type
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
 ticketComponents:
-    item: Item
-    description: Description
-    quantity: Quantity
     serie: Serie
     components: Components
-    import: Import
-    total: Total
     baseToCommission: Base to commission
     totalWithoutVat: Total without VAT
     zoneBreakdown: Zone breakdown
-    price: Price
     bonus: Bonus
-    zone: Zone
-    volume: Volume
     theoricalCost: Theorical cost
     totalPrice: Total price
     packages: Packages
 tracking:
-    state: State
-    worker: Worker
-    created: Created
     addState: Add state
 package:
     package: Package
-    quantity: Quantity
     added: Added
     addPackage: Add package
     removePackage: Remove package
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index b372e48ef..2f7e2add8 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,32 +1,22 @@
 service:
     pay: Abonar
-    description: Descripción
-    quantity: Cantidad
-    price: Precio
     removeService: Quitar servicio
     newService: Nuevo tipo de servicio
     addService: Añadir servicio
     quantityInfo: Para crear sevicios con cantidades negativas marcar servicio en el ticket origen y apretar el boton abonar.
     createRefundSuccess: 'Se ha creado siguiente ticket de abono: { ticketId }'
 tracking:
-    state: Estado
-    worker: Trabajador
-    created: Fecha creación
     addState: Añadir estado
 card:
     search: Buscar tickets
     searchInfo: Buscar tickets por identificador o alias
 volume:
-    item: Artículo
-    description: Descripción
     packingType: Encajado
-    quantity: Cantidad
     volumeQuantity: m³ por cantidad
     type: Tipo
     volume: Volumen
 ticketNotes:
     observationType: Tipo de observación
-    description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
     observationTypes:
@@ -42,31 +32,20 @@ ticketNotes:
         Accepted: Aceptado
         Denied: Denegado
 purchaseRequest:
-    Id: Id
-    description: Descripción
-    created: Fecha creación
     requester: Solicitante
     atender: Comprador
-    quantity: Cantidad
-    price: Precio
     saleFk: Id artículo
-    state: Estado
     newRequest: Crear petición
 basicData:
     next: Siguiente
     back: Anterior
     finalize: Finalizar
-    client: Cliente
-    warehouse: Almacén
     address: Consignatario
     inactive: (Inactivo)
     noDeliveryZoneAvailable: No hay una zona de reparto disponible para la fecha de envío seleccionada
     editAddress: Editar dirección
     alias: Alias
-    company: Empresa
     agency: Agencia
-    zone: Zona
-    shipped: F. Envío
     landed: F. Entrega
     shippedHour: Hora de envío
     priceDifference: Diferencia de precio
@@ -90,10 +69,7 @@ basicData:
     unroutedTicket: El ticket ha sido desenrutado
 weeklyTickets:
     id: ID Ticket
-    client: Cliente
     shipment: Salida
-    agency: Agencia
-    warehouse: Almacén
     salesperson: Comercial
     search: Buscar por tickets programados
     searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
@@ -105,7 +81,6 @@ advanceTickets:
     destinationAgency: 'Agencia destino: {agency}'
     ticketId: ID
     ipt: IPT
-    state: Estado
     liters: Litros
     lines: Líneas
     import: Importe
@@ -130,29 +105,17 @@ advanceTickets:
     searchInfo: Buscar tickets adelantados por el identificador o el identificador del cliente
 futureTickets:
     problems: Problemas
-    ticketId: ID
     shipped: Fecha
-    ipt: IPT
-    state: Estado
-    liters: Litros
-    import: Importe
     availableLines: Líneas disponibles
-    futureId: ID
     futureShipped: Fecha
-    futureIpt: IPT
-    futureState: Estado
     noVerified: Sin datos comprobados
-    noVisible: No visible
     purchaseRequest: Petición de compra
     clientFrozen: Cliente congelado
     risk: Riesgo
     componentLack: Faltan componentes
     rounding: Redondeo
-    origin: Origen
-    destination: Destino
     moveTicketTitle: Mover tickets
     moveTicketDialogSubtitle: '¿Desea mover {selectedTickets} tickets hacia el futuro?'
-    moveTicketSuccess: Tickets movidos correctamente
     searchInfo: Buscar tickets por fecha
     futureTicket: Tickets a futuro
     FREE: Libre
@@ -161,60 +124,40 @@ futureTickets:
     PACKED: Encajado
     DELIVERED: Servido
 ticketSale:
-    id: Id
     visible: Visible
     available: Disponible
-    quantity: Cantidad
-    item: Artículo
-    price: Precio
     discount: Dto
-    amount: Importe
     packaging: Encajado
     subtotal: Subtotal
     tax: IVA
-    total: Total
     history: Historial
     claim: Reclamación
     reserved: Reservado
     noVisible: No visible
     hasComponentLack: Faltan componentes
     ok: Ok
-    state: Estado
     more: Más
-    shipped: F. Envío
-    agency: Agencia
     address: Consignatario
 ticketComponents:
-    item: Artículo
-    description: Descripción
-    quantity: Cantidad
     serie: Serie
     components: Componentes
-    import: Importe
-    total: Total
     baseToCommission: Base comisionable
     totalWithoutVat: Total sin IVA
     zoneBreakdown: Desglose zona
-    price: Precio
     bonus: Bonificación
-    zone: Zona
-    volume: Volúmen
     theoricalCost: Porte teórico
     totalPrice: Precio total
     packages: Bultos
 expedition:
     id: Expedición
-    item: Artículo
     name: Nombre
     packageType: Embalaje
     counter: Contador
     externalId: ID externo
     created: Fecha creación
-    state: Estado
     historyAction: Historial de estados
     newTicketWithRoute: Nuevo ticket con ruta
     newTicketWithoutRoute: Nuevo ticket sin ruta
-    landed: F. entrega
     routeId: Id ruta
     deleteExpedition: Eliminar expedición
     expeditionRemoved: Expedición eliminada
@@ -227,22 +170,15 @@ expedition:
     removeExpedition: Eliminar expedición
 package:
     package: Embalaje
-    quantity: Cantidad
     added: Añadido
     addPackage: Añadir embalaje
     removePackage: Quitar embalaje
 ticketSaleTracking:
     isChecked: Comprobado
-    item: Artículo
-    description: Descripción
-    quantity: Cantidad
     parking: Parking
     historyAction: Historial estados
     shelvingAction: Carros línea
     original: Original
-    worker: Trabajador
-    state: Estado
-    created: Fecha creación
     shelving: Matrícula
     saleGroupDetail: detalle grupo líneas
     previousSelected: previa seleccionado
diff --git a/src/pages/Zone/Card/ZoneCreateWarehouse.vue b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
index 86c4dcc72..a46ec2e6c 100644
--- a/src/pages/Zone/Card/ZoneCreateWarehouse.vue
+++ b/src/pages/Zone/Card/ZoneCreateWarehouse.vue
@@ -32,7 +32,7 @@ const warehousesOptions = ref([]);
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('warehouses.warehouse')"
+                        :label="t('list.warehouse')"
                         v-model="ZoneWarehouseFormData.warehouseFk"
                         :options="warehousesOptions"
                         option-value="id"
diff --git a/src/pages/Zone/Card/ZoneDescriptor.vue b/src/pages/Zone/Card/ZoneDescriptor.vue
index 04fb22ba5..f991818fb 100644
--- a/src/pages/Zone/Card/ZoneDescriptor.vue
+++ b/src/pages/Zone/Card/ZoneDescriptor.vue
@@ -57,11 +57,11 @@ const setData = (entity) => {
             <ZoneDescriptorMenuItems :zone="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('summary.agency')" :value="entity.agencyMode.name" />
-            <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(entity.hour)" />
-            <VnLv :label="t('summary.travelingDays')" :value="entity.travelingDays" />
-            <VnLv :label="t('summary.price')" :value="toCurrency(entity.price)" />
-            <VnLv :label="t('summary.bonus')" :value="toCurrency(entity.bonus)" />
+            <VnLv :label="t('list.agency')" :value="entity.agencyMode.name" />
+            <VnLv :label="t('zone.closing')" :value="toTimeFormat(entity.hour)" />
+            <VnLv :label="t('zone.travelingDays')" :value="entity.travelingDays" />
+            <VnLv :label="t('list.price')" :value="toCurrency(entity.price)" />
+            <VnLv :label="t('zone.bonus')" :value="toCurrency(entity.bonus)" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 215c12f46..72c02a5cd 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -186,8 +186,8 @@ onMounted(() => {
                 class="q-mr-sm"
                 @click="
                     openConfirmationModal(
-                        t('eventsPanel.deleteTitle'),
-                        t('eventsPanel.deleteSubtitle'),
+                        t('zone.deleteTitle'),
+                        t('zone.deleteSubtitle'),
                         () => deleteEvent()
                     )
                 "
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 66e41607f..8b1645426 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -153,7 +153,7 @@ onMounted(() => {
                 <div class="col flex justify-center">
                     <VnInputDate
                         v-if="inclusionType === 'day'"
-                        :label="t('eventsInclusionForm.day')"
+                        :label="t('eventsExclusionForm.day')"
                         v-model="eventInclusionFormData.dated"
                         class="full-width"
                     />
@@ -176,11 +176,11 @@ onMounted(() => {
             <VnRow>
                 <VnInputTime
                     v-model="eventInclusionFormData.hour"
-                    :label="t('eventsInclusionForm.closing')"
+                    :label="t('zone.closing')"
                 />
                 <VnInput
                     v-model="eventInclusionFormData.travelingDays"
-                    :label="t('eventsInclusionForm.travelingDays')"
+                    :label="t('zone.travelingDays')"
                     type="number"
                     min="0"
                 />
@@ -188,13 +188,13 @@ onMounted(() => {
             <VnRow>
                 <VnInput
                     v-model="eventInclusionFormData.price"
-                    :label="t('eventsInclusionForm.price')"
+                    :label="t('list.price')"
                     type="number"
                     min="0"
                 />
                 <VnInput
                     v-model="eventInclusionFormData.bonus"
-                    :label="t('eventsInclusionForm.bonus')"
+                    :label="t('zone.bonus')"
                     type="number"
                     min="0"
                 />
@@ -202,7 +202,7 @@ onMounted(() => {
             <VnRow>
                 <VnInput
                     v-model="eventInclusionFormData.m3Max"
-                    :label="t('eventsInclusionForm.m3Max')"
+                    :label="t('zone.m3Max')"
                     type="number"
                     min="0"
                 />
@@ -224,8 +224,8 @@ onMounted(() => {
                 class="q-mr-sm"
                 @click="
                     openConfirmationModal(
-                        t('eventsPanel.deleteTitle'),
-                        t('eventsPanel.deleteSubtitle'),
+                        t('zone.deleteTitle'),
+                        t('zone.deleteSubtitle'),
                         () => deleteEvent()
                     )
                 "
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 2cfa98246..55bc27ebe 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -150,31 +150,31 @@ onMounted(async () => {
                         </span>
                     </div>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.closing') }}:
+                        {{ t('zone.closing') }}:
                         <span class="color-vn-text q-ml-xs">
                             {{ dashIfEmpty(toTimeFormat(event.hour)) }}
                         </span>
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.travelingDays') }}:
+                        {{ t('zone.travelingDays') }}:
                         <span class="color-vn-text">
                             {{ dashIfEmpty(event.travelingDays) }}
                         </span>
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.price') }}:
+                        {{ t('list.price') }}:
                         <span class="color-vn-text">
                             {{ dashOrCurrency(event.price)() }}</span
                         >
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.bonus') }}:
+                        {{ t('zone.bonus') }}:
                         <span class="color-vn-text">
                             {{ dashOrCurrency(event.bonus)() }}</span
                         >
                     </span>
                     <span class="color-vn-label">
-                        {{ t('eventsPanel.m3Max') }}:
+                        {{ t('zone.m3Max') }}:
                         <span class="color-vn-text"> {{ dashIfEmpty(event.m3Max) }}</span>
                     </span>
                 </QItemSection>
@@ -187,8 +187,8 @@ onMounted(async () => {
                         color="primary"
                         @click.stop="
                             openConfirmationModal(
-                                t('eventsPanel.deleteTitle'),
-                                t('eventsPanel.deleteSubtitle'),
+                                t('zone.deleteTitle'),
+                                t('zone.deleteSubtitle'),
                                 () => deleteEvent(event.id)
                             )
                         "
diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue
index f357e9e5b..321748f00 100644
--- a/src/pages/Zone/Card/ZoneLocations.vue
+++ b/src/pages/Zone/Card/ZoneLocations.vue
@@ -23,7 +23,7 @@ const onSelected = async (val, node) => {
 <template>
     <QPage class="column items-center q-pa-md">
         <QCard class="full-width q-pa-md" style="max-width: 800px">
-            <ZoneLocationsTree :root-label="t('zoneLocations.locations')">
+            <ZoneLocationsTree :root-label="t('zone.pageTitles.locations')">
                 <template #content="{ node }">
                     <span v-if="!node.id">{{ node.name }}</span>
                     <QCheckbox
diff --git a/src/pages/Zone/Card/ZoneSummary.vue b/src/pages/Zone/Card/ZoneSummary.vue
index d46282c10..384ee1fe9 100644
--- a/src/pages/Zone/Card/ZoneSummary.vue
+++ b/src/pages/Zone/Card/ZoneSummary.vue
@@ -40,7 +40,7 @@ const filter = computed(() => {
 
 const columns = computed(() => [
     {
-        label: t('summary.name'),
+        label: t('list.name'),
         name: 'name',
         field: 'warehouse',
         align: 'left',
@@ -82,22 +82,22 @@ onMounted(async () => {
         <template #body="{ entity: zone }">
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
-                <VnLv :label="t('summary.agency')" :value="zone.agencyMode?.name" />
-                <VnLv :label="t('summary.price')" :value="toCurrency(zone.price)" />
-                <VnLv :label="t('summary.bonus')" :value="toCurrency(zone.bonus)" />
+                <VnLv :label="t('list.agency')" :value="zone.agencyMode?.name" />
+                <VnLv :label="t('list.price')" :value="toCurrency(zone.price)" />
+                <VnLv :label="t('zone.bonus')" :value="toCurrency(zone.bonus)" />
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :url="zoneUrl + `basic-data`" :text="t('summary.basicData')" />
                 <VnLv :label="t('summary.closeHour')" :value="toTimeFormat(zone.hour)" />
-                <VnLv :label="t('summary.travelingDays')" :value="zone.travelingDays" />
+                <VnLv :label="t('zone.travelingDays')" :value="zone.travelingDays" />
                 <QCheckbox
-                    :label="t('summary.volumetric')"
+                    :label="t('zone.volumetric')"
                     v-model="zone.isVolumetric"
                     :disable="true"
                 />
             </QCard>
             <QCard class="full-width">
-                <VnTitle :url="zoneUrl + `warehouses`" :text="t('summary.warehouse')" />
+                <VnTitle :url="zoneUrl + `warehouses`" :text="t('list.warehouse')" />
                 <QTable
                     :columns="columns"
                     :rows="warehouses"
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 6b2933224..e61aae9ec 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -90,14 +90,14 @@ const openCreateWarehouseForm = () => createWarehouseDialogRef.value.show();
                                         color="primary"
                                         @click="
                                             openConfirmationModal(
-                                                t('warehouses.deleteTitle'),
-                                                t('warehouses.deleteSubtitle'),
+                                                t('zone.deleteTitle'),
+                                                t('zone.deleteSubtitle'),
                                                 () => deleteWarehouse(row, rows, rowIndex)
                                             )
                                         "
                                     >
                                         <QTooltip>
-                                            {{ t('warehouses.delete') }}
+                                            {{ t('eventsPanel.delete') }}
                                         </QTooltip>
                                     </QIcon>
                                 </QTd>
diff --git a/src/pages/Zone/ZoneClosingTable.vue b/src/pages/Zone/ZoneClosingTable.vue
index ce0c91af7..049f82271 100644
--- a/src/pages/Zone/ZoneClosingTable.vue
+++ b/src/pages/Zone/ZoneClosingTable.vue
@@ -23,28 +23,28 @@ defineProps({
 
 const columns = computed(() => [
     {
-        label: t('zoneClosingTable.id'),
+        label: t('list.id'),
         name: 'id',
         field: 'id',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.name'),
+        label: t('list.name'),
         name: 'name',
         field: 'name',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.agency'),
+        label: t('list.agency'),
         name: 'agency',
         field: 'agencyModeName',
         sortable: true,
         align: 'left',
     },
     {
-        label: t('zoneClosingTable.closing'),
+        label: t('zone.closing'),
         name: 'close',
         field: 'hour',
         sortable: true,
@@ -52,7 +52,7 @@ const columns = computed(() => [
         format: (val) => toTimeFormat(val),
     },
     {
-        label: t('zoneClosingTable.price'),
+        label: t('list.price'),
         name: 'price',
         field: 'price',
         sortable: true,
@@ -73,7 +73,7 @@ const redirectToZoneSummary = (id) => {
 <template>
     <div>
         <div class="header">
-            <span>{{ t('zoneClosingTable.zones') }}</span>
+            <span>{{ t('zone.pageTitles.zones') }}</span>
         </div>
         <QTable
             :rows="rows"
diff --git a/src/pages/Zone/ZoneCreate.vue b/src/pages/Zone/ZoneCreate.vue
index 7d7fa24a3..6db83c51d 100644
--- a/src/pages/Zone/ZoneCreate.vue
+++ b/src/pages/Zone/ZoneCreate.vue
@@ -54,13 +54,13 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.name"
-                        :label="t('create.name')"
+                        :label="t('list.name')"
                         :required="true"
                     />
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('create.warehouse')"
+                        :label="t('list.warehouse')"
                         :options="warehousesOptions"
                         hide-selected
                         option-label="name"
@@ -68,7 +68,7 @@ const redirectToZoneLocations = (_, { id }) => {
                         v-model="data.warehouseFk"
                     />
                     <VnSelect
-                        :label="t('create.agency')"
+                        :label="t('list.agency')"
                         :options="agencyOptions"
                         hide-selected
                         option-label="name"
@@ -80,7 +80,7 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.travelingDays"
-                        :label="t('create.travelingDays')"
+                        :label="t('zone.travelingDays')"
                         type="number"
                         min="0"
                     />
@@ -90,20 +90,20 @@ const redirectToZoneLocations = (_, { id }) => {
                 <VnRow>
                     <VnInput
                         v-model="data.price"
-                        :label="t('create.price')"
+                        :label="t('list.price')"
                         type="number"
                         min="0"
                     />
                     <VnInput
                         v-model="data.bonus"
-                        :label="t('create.bonus')"
+                        :label="t('zone.bonus')"
                         type="number"
                         min="0"
                     />
                 </VnRow>
                 <VnRow>
                     <QCheckbox
-                        :label="t('create.volumetric')"
+                        :label="t('zone.volumetric')"
                         v-model="data.isVolumetric"
                         :toggle-indeterminate="false"
                     />
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 423095d6e..a2d215ed6 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -117,7 +117,7 @@ watch(
             <VnSelect
                 data-key="delivery"
                 v-if="deliveryMethodFk == 'delivery'"
-                :label="t('deliveryPanel.agency')"
+                :label="t('list.agency')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
@@ -132,7 +132,7 @@ watch(
             />
             <VnSelect
                 v-else
-                :label="t('deliveryPanel.warehouse')"
+                :label="t('list.warehouse')"
                 v-model="formData.agencyModeFk"
                 url="AgencyModes/isActive"
                 :fields="['id', 'name']"
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 25c55d75c..efe710360 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -38,11 +38,7 @@ const agencies = ref([]);
         <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
-                    <VnInput
-                        :label="t('filterPanel.name')"
-                        v-model="params.name"
-                        is-outlined
-                    />
+                    <VnInput :label="t('list.name')" v-model="params.name" is-outlined />
                 </QItemSection>
             </QItem>
             <QItem>
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index d160ea6b5..060b266ab 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -174,13 +174,13 @@ onMounted(() => (stateStore.rightDrawer = true));
             />
             <VnInput
                 v-model="data.bonus"
-                :label="t('list.bonus')"
+                :label="t('zone.bonus')"
                 min="0"
                 type="number"
             />
             <VnInput
                 v-model="data.travelingDays"
-                :label="t('list.travelingDays')"
+                :label="t('zone.travelingDays')"
                 type="number"
                 min="0"
             />
diff --git a/src/pages/Zone/ZoneUpcoming.vue b/src/pages/Zone/ZoneUpcoming.vue
index ecf82bf4f..c74ae6078 100644
--- a/src/pages/Zone/ZoneUpcoming.vue
+++ b/src/pages/Zone/ZoneUpcoming.vue
@@ -22,13 +22,13 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('upcomingDeliveries.closing'),
+        label: t('zone.closing'),
         name: 'closing',
         field: 'hour',
         align: 'left',
     },
     {
-        label: t('upcomingDeliveries.id'),
+        label: t('list.id'),
         name: 'id',
         field: 'zoneFk',
         align: 'left',
diff --git a/src/pages/Zone/locale/en.yml b/src/pages/Zone/locale/en.yml
index 2608c071c..bf7d8f0de 100644
--- a/src/pages/Zone/locale/en.yml
+++ b/src/pages/Zone/locale/en.yml
@@ -8,6 +8,13 @@ zone:
         upcomingDeliveries: Upcoming deliveries
         warehouses: Warehouses
         calendar: Calendar
+    m3Max: Max m³
+    deleteTitle: This item will be deleted
+    deleteSubtitle: Are you sure you want to continue?
+    volumetric: Volumetric
+    bonus: Bonus
+    closing: Closing
+    travelingDays: Traveling days
 list:
     clone: Clone
     id: Id
@@ -22,74 +29,38 @@ list:
     searchInfo: Search zone by id or name
     confirmCloneTitle: All it's properties will be copied
     confirmCloneSubtitle: Do you want to clone this zone?
-    travelingDays: Traveling days
     warehouse: Warehouse
-    bonus: Bonus
-    isVolumetric: Volumetric
     createZone: Create zone
     zoneSummary: Summary
 create:
     name: Name
-    warehouse: Warehouse
-    agency: Agency
-    travelingDays: Traveling days
     closingHour: Closing hour
-    price: Price
-    bonus: Bonus
-    volumetric: Volumetric
     itemMaxSize: Max m³
     inflation: Inflation
 summary:
-    agency: Agency
-    price: Price
     basicData: Basic data
-    bonus: Bonus
     closeHour: Close hour
-    travelingDays: Traveling days
-    volumetric: Volumetric
-    warehouse: Warehouse
-    name: Name
 filterPanel:
-    name: Name
     agencyModeFk: Agency
-zoneLocations:
-    locations: Locations
 deliveryPanel:
     pickup: Pick up
     delivery: Delivery
     postcode: Postcode
-    agency: Agency
-    warehouse: Warehouse
     query: Query
     noEventsWarning: No service for the specified zone
 zoneClosingTable:
-    id: Id
-    name: Name
-    agency: Agency
-    closing: Closing
-    price: Price
     preview: Preview
-    zones: Zones
 warehouses:
-    delete: Delete
     deleteTitle: This item will be deleted
     deleteSubtitle: Are you sure you want to continue?
-    warehouse: Warehouse
     add: Add
 eventsPanel:
     editMode: Edit mode
     include: Include
     exclude: Exclude
     events: Events
-    closing: Closing
-    travelingDays: Traveling days
-    price: Price
-    bonus: Bonus
-    m3Max: Max m³
     everyday: Everyday
     delete: Delete
-    deleteTitle: This item will be deleted
-    deleteSubtitle: Are you sure you want to continue?
 eventsExclusionForm:
     addExclusion: Add exclusion
     editExclusion: Edit exclusion
@@ -103,15 +74,8 @@ eventsInclusionForm:
     oneDay: One day
     indefinitely: Indefinitely
     rangeOfDates: Range of dates
-    day: Day
-    closing: Closing
-    travelingDays: Traveling days
-    price: Price
-    bonus: Bonus
-    m3Max: Max m³
     from: From
     to: To
 upcomingDeliveries:
     province: Province
     closing: Closing
-    id: Id
diff --git a/src/pages/Zone/locale/es.yml b/src/pages/Zone/locale/es.yml
index 7ecfb580d..91541bea3 100644
--- a/src/pages/Zone/locale/es.yml
+++ b/src/pages/Zone/locale/es.yml
@@ -8,6 +8,13 @@ zone:
         upcomingDeliveries: Próximos repartos
         warehouses: Almacenes
         calendar: Calendario
+    m3Max: Medida máxima
+    deleteTitle: Este elemento será eliminado
+    deleteSubtitle: ¿Seguro que quieres continuar?
+    volumetric: Volumétrico
+    bonus: Bonificación
+    closing: Cierre
+    travelingDays: Días de viaje
 list:
     clone: Clonar
     id: Id
@@ -22,76 +29,38 @@ list:
     searchInfo: Buscar zonas por identificador o nombre
     confirmCloneTitle: Todas sus propiedades serán copiadas
     confirmCloneSubtitle: ¿Seguro que quieres clonar esta zona?
-    travelingDays: Días de viaje
     warehouse: Almacén
-    bonus: Bonus
     isVolumetric: Volumétrico
     createZone: Crear zona
     zoneSummary: Resumen
 create:
-    name: Nombre
-    warehouse: Almacén
-    agency: Agencia
-    travelingDays: Días de viaje
     closingHour: Hora de cierre
-    price: Precio
-    bonus: Bonificación
-    volumetric: Volumétrico
     itemMaxSize: Medida máxima
     inflation: Inflación
 summary:
-    agency: Agencia
-    price: Precio
     basicData: Datos básicos
-    bonus: Bonificación
     closeHour: Hora de cierre
-    travelingDays: Días de viaje
-    volumetric: Volumétrico
-    warehouse: Almacén
-    name: Nombre
 filterPanel:
-    name: Nombre
     agencyModeFk: Agencia
-zoneLocations:
-    locations: Localizaciones
 deliveryPanel:
     pickup: Recogida
     delivery: Entrega
     postcode: Código postal
-    agency: Agencia
-    warehouse: Almacén
     query: Consultar
     noEventsWarning: No hay servicio para la zona especificada
 zoneClosingTable:
-    id: Id
-    name: Nombre
-    agency: Agencia
-    closing: Cierre
     preview: Vista previa
-    price: Precio
-    zones: Zonas
 Search zones: Buscar zonas
 You can search by zone reference: Puedes buscar por referencia de la zona
 warehouses:
-    delete: Eliminar
-    deleteTitle: Este elemento será eliminado
-    deleteSubtitle: ¿Seguro que quieres continuar?
-    warehouse: Almacén
     add: Añadir
 eventsPanel:
     editMode: Modo edición
     include: Incluir
     exclude: Excluir
     events: Eventos
-    closing: Cierre
-    travelingDays: Días de viaje
-    price: Precio
-    bonus: Bonificación
-    m3Max: Medida máxima
     everyday: Todos los días
     delete: Eliminar
-    deleteTitle: Este elemento será eliminado
-    deleteSubtitle: ¿Seguro que quieres continuar?
 eventsExclusionForm:
     addExclusion: Añadir exclusión
     editExclusion: Editar exclusión
@@ -105,15 +74,7 @@ eventsInclusionForm:
     oneDay: Un día
     indefinitely: Indefinido
     rangeOfDates: Rango de fechas
-    day: Día
-    closing: Cierre
-    travelingDays: Días de viaje
-    price: Precio
-    bonus: Bonificación
-    m3Max: Medida máxima
     from: Desde
     to: Hasta
 upcomingDeliveries:
     province: Provincia
-    closing: Cierre
-    id: Id

From 8eef9c0009a47fcf9ac5d29b3c3299ce8725adfc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 09:21:18 +0200
Subject: [PATCH 09/89] refactor: refs #7132 customer's module translations

---
 src/pages/Customer/Card/CustomerBasicData.vue | 14 +++----
 .../Customer/Card/CustomerDescriptor.vue      | 18 ++++++---
 src/pages/Customer/Card/CustomerSummary.vue   |  6 +--
 src/pages/Customer/CustomerFilter.vue         |  4 +-
 src/pages/Customer/CustomerList.vue           | 22 +++++------
 src/pages/Customer/locale/en.yml              | 39 -------------------
 src/pages/Customer/locale/es.yml              | 38 ------------------
 7 files changed, 35 insertions(+), 106 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
index d31669b43..a77d2f865 100644
--- a/src/pages/Customer/Card/CustomerBasicData.vue
+++ b/src/pages/Customer/Card/CustomerBasicData.vue
@@ -55,7 +55,7 @@ const exprBuilder = (param, value) => {
                 />
                 <VnSelect
                     :input-debounce="0"
-                    :label="t('customer.basicData.businessType')"
+                    :label="t('customer.summary.businessType')"
                     :options="businessTypes"
                     :rules="validate('client.businessTypeFk')"
                     emit-value
@@ -67,13 +67,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.basicData.contact')"
+                    :label="t('customer.summary.contact')"
                     :rules="validate('client.contact')"
                     clearable
                     v-model="data.contact"
                 />
                 <VnInput
-                    :label="t('customer.basicData.email')"
+                    :label="t('globals.params.email')"
                     :rules="validate('client.email')"
                     clearable
                     type="email"
@@ -90,13 +90,13 @@ const exprBuilder = (param, value) => {
             </VnRow>
             <VnRow>
                 <VnInput
-                    :label="t('customer.basicData.phone')"
+                    :label="t('customer.extendedList.tableVisibleColumns.phone')"
                     :rules="validate('client.phone')"
                     clearable
                     v-model="data.phone"
                 />
                 <VnInput
-                    :label="t('customer.basicData.mobile')"
+                    :label="t('customer.summary.mobile')"
                     :rules="validate('client.mobile')"
                     clearable
                     v-model="data.mobile"
@@ -106,7 +106,7 @@ const exprBuilder = (param, value) => {
                 <VnSelect
                     url="Workers/search"
                     v-model="data.salesPersonFk"
-                    :label="t('customer.basicData.salesPerson')"
+                    :label="t('customer.summary.salesPerson')"
                     :params="{
                         departmentCodes: ['VT', 'shopping'],
                     }"
@@ -144,7 +144,7 @@ const exprBuilder = (param, value) => {
                     option-value="id"
                     option-label="name"
                     emit-value
-                    :label="t('customer.basicData.contactChannel')"
+                    :label="t('customer.summary.contactChannel')"
                     map-options
                     :rules="validate('client.contactChannelFk')"
                     :input-debounce="0"
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 43103bd68..b73354386 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -53,11 +53,17 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
             <CustomerDescriptorMenu :customer="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('customer.card.payMethod')" :value="entity.payMethod.name" />
-
-            <VnLv :label="t('customer.card.credit')" :value="toCurrency(entity.credit)" />
             <VnLv
-                :label="t('customer.card.securedCredit')"
+                :label="t('customer.summary.payMethod')"
+                :value="entity.payMethod.name"
+            />
+
+            <VnLv
+                :label="t('customer.summary.credit')"
+                :value="toCurrency(entity.credit)"
+            />
+            <VnLv
+                :label="t('customer.summary.securedCredit')"
                 :value="toCurrency(entity.creditInsurance)"
             />
 
@@ -66,7 +72,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 :value="toCurrency(entity.debt)"
                 :info="t('customer.summary.riskInfo')"
             />
-            <VnLv :label="t('customer.card.salesPerson')">
+            <VnLv :label="t('customer.summary.salesPerson')">
                 <template #value>
                     <VnUserLink
                         v-if="entity.salesPersonUser"
@@ -77,7 +83,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 </template>
             </VnLv>
             <VnLv
-                :label="t('customer.card.businessTypeFk')"
+                :label="t('customer.extendedList.tableVisibleColumns.businessTypeFk')"
                 :value="entity.businessType.description"
             />
         </template>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 8b5f0f2c2..047c46016 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -79,7 +79,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv :label="t('customer.summary.contact')" :value="entity.contact" />
                 <VnLv :value="entity.phone">
                     <template #label>
-                        {{ t('customer.summary.phone') }}
+                        {{ t('customer.extendedList.tableVisibleColumns.phone') }}
                         <VnLinkPhone :phone-number="entity.phone" />
                     </template>
                 </VnLv>
@@ -89,7 +89,7 @@ const sumRisk = ({ clientRisks }) => {
                         <VnLinkPhone :phone-number="entity.mobile" />
                     </template>
                 </VnLv>
-                <VnLv :label="t('customer.summary.email')" :value="entity.email" copy />
+                <VnLv :label="t('globals.params.email')" :value="entity.email" copy />
                 <VnLv
                     :label="t('customer.summary.salesPerson')"
                     :value="entity?.salesPersonUser?.name"
@@ -201,7 +201,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.defaultAddress.city"
                 />
                 <VnLv
-                    :label="t('customer.summary.addressStreet')"
+                    :label="t('customer.summary.street')"
                     :value="entity.defaultAddress.street"
                 />
             </QCard>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..ae3a42514 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -34,7 +34,7 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         is-outlined
                     />
@@ -43,7 +43,7 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('customerFilter.filter.socialName')"
+                        :label="t('customer.summary.socialName')"
                         v-model="params.socialName"
                         is-outlined
                     />
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..0cf984f20 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -78,7 +78,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.credit'),
+        label: t('customer.summary.credit'),
         name: 'credit',
         columnFilter: {
             component: 'number',
@@ -116,7 +116,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.mobile'),
+        label: t('customer.summary.mobile'),
         name: 'mobile',
         cardVisible: true,
         columnFilter: {
@@ -163,17 +163,17 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.city'),
+        label: t('customer.summary.city'),
         name: 'city',
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.postcode'),
+        label: t('customer.summary.postcode'),
         name: 'postcode',
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.email'),
+        label: t('globals.params.email'),
         name: 'email',
         cardVisible: true,
     },
@@ -208,7 +208,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.payMethodFk'),
+        label: t('customer.summary.payMethodFk'),
         name: 'payMethodFk',
         columnFilter: {
             component: 'select',
@@ -251,7 +251,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isActive'),
+        label: t('customer.summary.isActive'),
         name: 'isActive',
         chip: {
             color: null,
@@ -280,7 +280,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.isEqualizated'),
+        label: t('customer.summary.isEqualizated'),
         name: 'isEqualizated',
         create: true,
         columnFilter: {
@@ -326,7 +326,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasLcr'),
+        label: t('customer.summary.hasLcr'),
         name: 'hasLcr',
         columnFilter: {
             inWhere: true,
@@ -334,7 +334,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('customer.extendedList.tableVisibleColumns.hasCoreVnl'),
+        label: t('customer.summary.hasCoreVnl'),
         name: 'hasCoreVnl',
         columnFilter: {
             inWhere: true,
@@ -425,7 +425,7 @@ function handleLocation(data, location) {
             <VnSelect
                 url="Workers/search"
                 v-model="data.salesPersonFk"
-                :label="t('customer.basicData.salesPerson')"
+                :label="t('customer.summary.salesPerson')"
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
diff --git a/src/pages/Customer/locale/en.yml b/src/pages/Customer/locale/en.yml
index 545c3f274..07ec53964 100644
--- a/src/pages/Customer/locale/en.yml
+++ b/src/pages/Customer/locale/en.yml
@@ -1,21 +1,5 @@
-customerFilter:
-    filter:
-        name: Name
-        socialName: Social name
 customer:
-    list:
-        phone: Phone
-        email: Email
-        customerOrders: Display customer orders
-        moreOptions: More options
     card:
-        customerList: Customer list
-        customerId: Claim ID
-        salesPerson: Sales person
-        credit: Credit
-        risk: Risk
-        securedCredit: Secured credit
-        payMethod: Pay method
         debt: Debt
         isFrozen: Customer frozen
         hasDebt: Customer has debt
@@ -23,9 +7,7 @@ customer:
         notChecked: Customer no checked
         webAccountInactive: Web account inactive
         noWebAccess: Web access is disabled
-        businessType: Business type
         passwordRequirements: 'The password must have at least { length } length characters, {nAlpha} alphabetic characters, {nUpper} capital letters, {nDigits} digits and {nPunct} symbols (Ex: $%&.)\n'
-        businessTypeFk: Business type
     summary:
         basicData: Basic data
         fiscalAddress: Fiscal address
@@ -37,9 +19,7 @@ customer:
         customerId: Customer ID
         name: Name
         contact: Contact
-        phone: Phone
         mobile: Mobile
-        email: Email
         salesPerson: Sales person
         contactChannel: Contact channel
         socialName: Social name
@@ -63,7 +43,6 @@ customer:
         hasB2BVnl: Has B2B VNL
         addressName: Address name
         addressCity: City
-        addressStreet: Street
         username: Username
         webAccess: Web access
         totalGreuge: Total greuge
@@ -92,45 +71,27 @@ customer:
         goToLines: Go to lines
     basicData:
         socialName: Fiscal name
-        businessType: Business type
-        contact: Contact
         youCanSaveMultipleEmails: You can save multiple emails
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        salesPerson: Sales person
-        contactChannel: Contact channel
         previousClient: Previous client
     extendedList:
         tableVisibleColumns:
             id: Identifier
-            name: Name
             socialName: Social name
             fi: Tax number
             salesPersonFk: Salesperson
-            credit: Credit
             creditInsurance: Credit insurance
             phone: Phone
-            mobile: Mobile
             street: Street
             countryFk: Country
             provinceFk: Province
-            city: City
-            postcode: Postcode
-            email: Email
             created: Created
             businessTypeFk: Business type
-            payMethodFk: Billing data
             sageTaxTypeFk: Sage tax type
             sageTransactionTypeFk: Sage tr. type
-            isActive: Active
             isVies: Vies
             isTaxDataChecked: Verified data
-            isEqualizated: Is equalizated
             isFreezed: Freezed
             hasToInvoice: Invoice
             hasToInvoiceByAddress: Invoice by address
             isToBeMailed: Mailing
-            hasLcr: Received LCR
-            hasCoreVnl: VNL core received
             hasSepaVnl: VNL B2B received
diff --git a/src/pages/Customer/locale/es.yml b/src/pages/Customer/locale/es.yml
index 451784425..36a266497 100644
--- a/src/pages/Customer/locale/es.yml
+++ b/src/pages/Customer/locale/es.yml
@@ -1,22 +1,7 @@
 Search customer: Buscar cliente
 You can search by customer id or name: Puedes buscar por id o nombre del cliente
-customerFilter:
-    filter:
-        name: Nombre
-        socialName: Razón Social
 customer:
-    list:
-        phone: Teléfono
-        email: Email
-        customerOrders: Mostrar órdenes del cliente
-        moreOptions: Más opciones
     card:
-        customerId: ID cliente
-        salesPerson: Comercial
-        credit: Crédito
-        risk: Riesgo
-        securedCredit: Crédito asegurado
-        payMethod: Método de pago
         debt: Riesgo
         isFrozen: Cliente congelado
         hasDebt: Cliente con riesgo
@@ -24,9 +9,7 @@ customer:
         notChecked: Cliente no comprobado
         webAccountInactive: Sin acceso web
         noWebAccess: El acceso web está desactivado
-        businessType: Tipo de negocio
         passwordRequirements: 'La contraseña debe tener al menos { length } caracteres de longitud, {nAlpha} caracteres alfabéticos, {nUpper} letras mayúsculas, {nDigits} dígitos y {nPunct} símbolos (Ej: $%&.)'
-        businessTypeFk: Tipo de negocio
     summary:
         basicData: Datos básicos
         fiscalAddress: Dirección fiscal
@@ -38,9 +21,7 @@ customer:
         customerId: ID cliente
         name: Nombre
         contact: Contacto
-        phone: Teléfono
         mobile: Móvil
-        email: Email
         salesPerson: Comercial
         contactChannel: Canal de contacto
         socialName: Razón social
@@ -64,7 +45,6 @@ customer:
         hasB2BVnl: Recibido B2B VNL
         addressName: Nombre de la dirección
         addressCity: Ciudad
-        addressStreet: Calle
         username: Usuario
         webAccess: Acceso web
         totalGreuge: Greuge total
@@ -93,45 +73,27 @@ customer:
         goToLines: Ir a líneas
     basicData:
         socialName: Nombre fiscal
-        businessType: Tipo de negocio
-        contact: Contacto
         youCanSaveMultipleEmails: Puede guardar varios correos electrónicos encadenándolos mediante comas sin espacios{','} ejemplo{':'} user{'@'}dominio{'.'}com, user2{'@'}dominio{'.'}com siendo el primer correo electrónico el principal
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        salesPerson: Comercial
-        contactChannel: Canal de contacto
         previousClient: Cliente anterior
     extendedList:
         tableVisibleColumns:
             id: Identificador
-            name: Nombre
             socialName: Razón social
             fi: NIF / CIF
             salesPersonFk: Comercial
-            credit: Crédito
             creditInsurance: Crédito asegurado
             phone: Teléfono
-            mobile: Móvil
             street: Dirección fiscal
             countryFk: País
             provinceFk: Provincia
-            city: Población
-            postcode: Código postal
-            email: Email
             created: Fecha creación
             businessTypeFk: Tipo de negocio
-            payMethodFk: Forma de pago
             sageTaxTypeFk: Tipo de impuesto Sage
             sageTransactionTypeFk: Tipo tr. sage
-            isActive: Activo
             isVies: Vies
             isTaxDataChecked: Datos comprobados
-            isEqualizated: Recargo de equivalencias
             isFreezed: Congelado
             hasToInvoice: Factura
             hasToInvoiceByAddress: Factura por consigna
             isToBeMailed: Env. emails
-            hasLcr: Recibido LCR
-            hasCoreVnl: Recibido core VNL
             hasSepaVnl: Recibido B2B VNL

From 0e77d4b68f9f62d2516337179bb6ab5e7d98d33e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 10:40:40 +0200
Subject: [PATCH 10/89] refactor: refs #7132 account's module translations

---
 src/pages/Account/AccountCreate.vue           |  8 +--
 src/pages/Account/AccountFilter.vue           |  2 +-
 src/pages/Account/AccountLdap.vue             |  8 +--
 src/pages/Account/AccountSamba.vue            |  6 +--
 src/pages/Account/Alias/AliasCreateForm.vue   |  7 +--
 .../Account/Alias/Card/AliasBasicData.vue     |  4 +-
 .../Account/Alias/Card/AliasDescriptor.vue    |  2 +-
 src/pages/Account/Alias/Card/AliasSummary.vue |  4 +-
 src/pages/Account/Card/AccountBasicData.vue   |  2 +-
 src/pages/Account/Role/AccountRolesFilter.vue |  2 +-
 src/pages/Account/Role/Card/RoleBasicData.vue |  7 +--
 .../Account/Role/Card/RoleDescriptor.vue      |  2 +-
 src/pages/Account/Role/Card/RoleForm.vue      |  7 +--
 src/pages/Account/Role/Card/RoleSummary.vue   |  6 +--
 src/pages/Account/locale/en.yml               | 49 ++----------------
 src/pages/Account/locale/es.yml               | 50 ++-----------------
 16 files changed, 35 insertions(+), 131 deletions(-)

diff --git a/src/pages/Account/AccountCreate.vue b/src/pages/Account/AccountCreate.vue
index e584a1acd..6b7c049c8 100644
--- a/src/pages/Account/AccountCreate.vue
+++ b/src/pages/Account/AccountCreate.vue
@@ -37,7 +37,7 @@ const redirectToAccountBasicData = (_, { id }) => {
             <div class="column q-gutter-sm">
                 <VnInput
                     v-model="data.name"
-                    :label="t('account.create.name')"
+                    :label="t('globals.name')"
                     :rules="validate('VnUser.name')"
                 />
                 <VnInput
@@ -47,12 +47,12 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.email"
-                    :label="t('account.create.email')"
+                    :label="t('globals.params.email')"
                     type="email"
                     :rules="validate('VnUser.email')"
                 />
                 <VnSelect
-                    :label="t('account.create.role')"
+                    :label="t('account.card.role')"
                     v-model="data.roleFk"
                     :options="rolesOptions"
                     option-value="id"
@@ -63,7 +63,7 @@ const redirectToAccountBasicData = (_, { id }) => {
                 />
                 <VnInput
                     v-model="data.password"
-                    :label="t('account.create.password')"
+                    :label="t('ldap.password')"
                     type="password"
                     :rules="validate('VnUser.password')"
                 />
diff --git a/src/pages/Account/AccountFilter.vue b/src/pages/Account/AccountFilter.vue
index 1775aa06b..22c167d43 100644
--- a/src/pages/Account/AccountFilter.vue
+++ b/src/pages/Account/AccountFilter.vue
@@ -44,7 +44,7 @@ const rolesOptions = ref([]);
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('account.card.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 7b8433e73..84d8f1cde 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -102,11 +102,11 @@ onMounted(async () => await getInitialLdapConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('ldap.testConnection')"
+                    :label="t('account.card.testConnection')"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('ldap.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -114,7 +114,7 @@ onMounted(async () => await getInitialLdapConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('ldap.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
@@ -146,7 +146,7 @@ onMounted(async () => await getInitialLdapConfig());
                     />
                     <VnInput :label="t('ldap.userDN')" clearable v-model="data.userDn" />
                     <VnInput
-                        :label="t('ldap.groupDN')"
+                        :label="t('account.card.groupDN')"
                         clearable
                         v-model="data.groupDn"
                     />
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 7af9f4364..15b886f27 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -110,12 +110,12 @@ onMounted(async () => await getInitialSambaConfig());
                 <QBtn
                     class="q-ml-none"
                     color="primary"
-                    :label="t('samba.testConnection')"
+                    :label="t('account.card.testConnection')"
                     :disable="formModel.hasChanges"
                     @click="onTestConection()"
                 >
                     <QTooltip>
-                        {{ t('samba.testConnection') }}
+                        {{ t('account.card.testConnection') }}
                     </QTooltip>
                 </QBtn>
             </template>
@@ -123,7 +123,7 @@ onMounted(async () => await getInitialSambaConfig());
                 <VnRow class="row q-gutter-md">
                     <div class="col">
                         <QCheckbox
-                            :label="t('samba.enableSync')"
+                            :label="t('account.card.enableSync')"
                             v-model="data.hasData"
                             @update:model-value="($event) => (hasData = $event)"
                             :toggle-indeterminate="false"
diff --git a/src/pages/Account/Alias/AliasCreateForm.vue b/src/pages/Account/Alias/AliasCreateForm.vue
index b21099555..e401b6d54 100644
--- a/src/pages/Account/Alias/AliasCreateForm.vue
+++ b/src/pages/Account/Alias/AliasCreateForm.vue
@@ -36,15 +36,12 @@ const onDataSaved = ({ id }) => {
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
+                    <VnInput v-model="data.alias" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('mailAlias.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasBasicData.vue b/src/pages/Account/Alias/Card/AliasBasicData.vue
index ba940cda5..c78dfb4df 100644
--- a/src/pages/Account/Alias/Card/AliasBasicData.vue
+++ b/src/pages/Account/Alias/Card/AliasBasicData.vue
@@ -11,8 +11,8 @@ const { t } = useI18n();
     <FormModel model="Alias">
         <template #form="{ data }">
             <div class="column q-gutter-y-md">
-                <VnInput v-model="data.alias" :label="t('mailAlias.name')" />
-                <VnInput v-model="data.description" :label="t('mailAlias.description')" />
+                <VnInput v-model="data.alias" :label="t('globals.name')" />
+                <VnInput v-model="data.description" :label="t('role.description')" />
                 <QCheckbox :label="t('mailAlias.isPublic')" v-model="data.isPublic" />
             </div>
         </template>
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 963f84547..713cecf75 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -71,7 +71,7 @@ const removeAlias = () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('mailAlias.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Alias/Card/AliasSummary.vue b/src/pages/Account/Alias/Card/AliasSummary.vue
index b2dc1f0fc..1f76fe7c2 100644
--- a/src/pages/Account/Alias/Card/AliasSummary.vue
+++ b/src/pages/Account/Alias/Card/AliasSummary.vue
@@ -42,8 +42,8 @@ const entityId = computed(() => $props.id || route.params.id);
                         <QIcon name="open_in_new" />
                     </router-link>
                 </QCardSection>
-                <VnLv :label="t('mailAlias.id')" :value="alias.id" />
-                <VnLv :label="t('mailAlias.description')" :value="alias.description" />
+                <VnLv :label="t('role.id')" :value="alias.id" />
+                <VnLv :label="t('role.description')" :value="alias.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index f1cdaf9df..e6c9da6fe 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -36,7 +36,7 @@ watch(
             <div class="q-gutter-y-sm">
                 <VnInput v-model="data.name" :label="t('account.card.nickname')" />
                 <VnInput v-model="data.nickname" :label="t('account.card.alias')" />
-                <VnInput v-model="data.email" :label="t('account.card.email')" />
+                <VnInput v-model="data.email" :label="t('globals.params.email')" />
                 <VnSelect
                     url="Languages"
                     v-model="data.lang"
diff --git a/src/pages/Account/Role/AccountRolesFilter.vue b/src/pages/Account/Role/AccountRolesFilter.vue
index 8340b965d..ff4411897 100644
--- a/src/pages/Account/Role/AccountRolesFilter.vue
+++ b/src/pages/Account/Role/AccountRolesFilter.vue
@@ -29,7 +29,7 @@ const props = defineProps({
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInput
-                        :label="t('role.name')"
+                        :label="t('globals.name')"
                         v-model="params.name"
                         lazy-rules
                         is-outlined
diff --git a/src/pages/Account/Role/Card/RoleBasicData.vue b/src/pages/Account/Role/Card/RoleBasicData.vue
index 56f4f0c27..1de9ff387 100644
--- a/src/pages/Account/Role/Card/RoleBasicData.vue
+++ b/src/pages/Account/Role/Card/RoleBasicData.vue
@@ -12,15 +12,12 @@ const { t } = useI18n();
         <template #form="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index e4af3ed13..af018565a 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -58,7 +58,7 @@ const removeRole = async () => {
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('role.card.description')" :value="entity.description" />
+            <VnLv :label="t('role.description')" :value="entity.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Account/Role/Card/RoleForm.vue b/src/pages/Account/Role/Card/RoleForm.vue
index 382639beb..09a098085 100644
--- a/src/pages/Account/Role/Card/RoleForm.vue
+++ b/src/pages/Account/Role/Card/RoleForm.vue
@@ -22,15 +22,12 @@ const { t } = useI18n();
         <template #form-inputs="{ data }">
             <VnRow>
                 <div class="col">
-                    <VnInput v-model="data.name" :label="t('role.card.name')" />
+                    <VnInput v-model="data.name" :label="t('globals.name')" />
                 </div>
             </VnRow>
             <VnRow>
                 <div class="col">
-                    <VnInput
-                        v-model="data.description"
-                        :label="t('role.card.description')"
-                    />
+                    <VnInput v-model="data.description" :label="t('role.description')" />
                 </div>
             </VnRow>
         </template>
diff --git a/src/pages/Account/Role/Card/RoleSummary.vue b/src/pages/Account/Role/Card/RoleSummary.vue
index 76c72e947..fef85f919 100644
--- a/src/pages/Account/Role/Card/RoleSummary.vue
+++ b/src/pages/Account/Role/Card/RoleSummary.vue
@@ -44,9 +44,9 @@ const filter = {
                         <QIcon name="open_in_new" />
                     </a>
                 </QCardSection>
-                <VnLv :label="t('role.card.id')" :value="role.id" />
-                <VnLv :label="t('role.card.name')" :value="role.name" />
-                <VnLv :label="t('role.card.description')" :value="role.description" />
+                <VnLv :label="t('role.id')" :value="role.id" />
+                <VnLv :label="t('globals.name')" :value="role.name" />
+                <VnLv :label="t('role.description')" :value="role.description" />
             </QCard>
         </template>
     </CardSummary>
diff --git a/src/pages/Account/locale/en.yml b/src/pages/Account/locale/en.yml
index fe8707eb8..f2f563923 100644
--- a/src/pages/Account/locale/en.yml
+++ b/src/pages/Account/locale/en.yml
@@ -1,32 +1,15 @@
 account:
-    pageTitles:
-        users: Users
-        list: Users
-        roles: Roles
-        alias: Mail aliasses
-        accounts: Accounts
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Connections
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-        newRole: New role
-        privileges: Privileges
-        mailAlias: Mail Alias
-        mailForwarding: Mail Forwarding
-        accountCreate: New user
-        aliasUsers: Users
     card:
-        name: Name
         nickname: User
         role: Role
-        email: Email
         alias: Alias
         lang: Language
         roleFk: Role
         newUser: New user
         ticketTracking: Ticket tracking
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Can delegate privileges
         enabled: Account enabled!
@@ -74,11 +57,7 @@ account:
     search: Search user
     searchInfo: You can search by id, name or nickname
     create:
-        name: Name
         nickname: Nickname
-        email: Email
-        role: Role
-        password: Password
         active: Active
     mailForwarding:
         forwardingMail: Forward email
@@ -86,50 +65,30 @@ account:
         enableMailForwarding: Enable mail forwarding
         mailInputInfo: All emails will be forwarded to the specified address.
 role:
-    pageTitles:
-        inheritedRoles: Inherited Roles
-        subRoles: Sub Roles
-    card:
-        description: Description
-        id: Id
-        name: Name
     newRole: New role
     searchRoles: Search role
     searchInfo: Search role by id or name
-    name: Name
     description: Description
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Users
     search: Search mail alias
     searchInfo: Search alias by id or name
-    alias: Alias
-    description: Description
-    id: Id
     newAlias: New alias
-    name: Name
     isPublic: Public
 ldap:
-    enableSync: Enable synchronization
     server: Server
     rdn: RDN
     userDN: User DN
     filter: Filter
-    groupDN: Group DN
-    testConnection: Test connection
     success: LDAP connection established!
     password: Password
 samba:
-    enableSync: Enable synchronization
     domainController: Domain controller
     domainAD: AD domain
     userAD: AD user
-    groupDN: Group DN
     passwordAD: AD password
     domainPart: User DN (without domain part)
     verifyCertificate: Verify certificate
-    testConnection: Test connection
     success: Samba connection established!
 accounts:
     homedir: Homedir base
@@ -147,8 +106,6 @@ connections:
     created: Created
     killSession: Kill session
 acls:
-    role: Role
-    accessType: Access type
     permissions: Permission
     search: Search acls
     searchInfo: Search acls by model name
diff --git a/src/pages/Account/locale/es.yml b/src/pages/Account/locale/es.yml
index 112ffe9cc..ba559f2c3 100644
--- a/src/pages/Account/locale/es.yml
+++ b/src/pages/Account/locale/es.yml
@@ -1,27 +1,7 @@
 account:
-    pageTitles:
-        users: Usuarios
-        list: Usuarios
-        roles: Roles
-        alias: Alias de correo
-        accounts: Cuentas
-        ldap: LDAP
-        samba: Samba
-        acls: ACLs
-        connections: Conexiones
-        inheritedRoles: Roles heredados
-        newRole: Nuevo rol
-        subRoles: Subroles
-        privileges: Privilegios
-        mailAlias: Alias de correo
-        mailForwarding: Reenvío de correo
-        accountCreate: Nuevo usuario
-        aliasUsers: Usuarios
     card:
         nickname: Usuario
-        name: Nombre
         role: Rol
-        email: Mail
         alias: Alias
         lang: Idioma
         roleFk: Rol
@@ -33,6 +13,9 @@ account:
         deactivated: ¡Usuario desactivado!
         newUser: Nuevo usuario
         twoFactor: Doble factor
+        enableSync: Habilitar sincronización
+        groupDN: DN grupos
+        testConnection: Probar conexión
         privileges:
             delegate: Puede delegar privilegios
         actions:
@@ -73,11 +56,7 @@ account:
     search: Buscar usuario
     searchInfo: Puedes buscar por id, nombre o usuario
     create:
-        name: Nombre
         nickname: Nombre mostrado
-        email: Email
-        role: Rol
-        password: Contraseña
         active: Activo
     mailForwarding:
         forwardingMail: Dirección de reenvío
@@ -85,51 +64,30 @@ account:
         enableMailForwarding: Habilitar redirección de correo
         mailInputInfo: Todos los correos serán reenviados a la dirección especificada, no se mantendrá copia de los mismos en el buzón del usuario.
 role:
-    pageTitles:
-        inheritedRoles: Roles heredados
-        subRoles: Subroles
-        newRole: Nuevo rol
-    card:
-        description: Descripción
-        id: Id
-        name: Nombre
     newRole: Nuevo rol
     searchRoles: Buscar roles
     searchInfo: Buscar rol por id o nombre
-    name: Nombre
     description: Descripción
     id: Id
 mailAlias:
-    pageTitles:
-        aliasUsers: Usuarios
     search: Buscar alias de correo
     searchInfo: Buscar alias por id o nombre
-    alias: Alias
-    description: Descripción
-    id: Id
     newAlias: Nuevo alias
-    name: Nombre
     isPublic: Público
 ldap:
     password: Contraseña
-    enableSync: Habilitar sincronización
     server: Servidor
     rdn: RDN
     userDN: DN usuarios
     filter: Filtro
-    groupDN: DN grupos
-    testConnection: Probar conexión
     success: ¡Conexión con LDAP establecida!
 samba:
-    enableSync: Habilitar sincronización
     domainController: Controlador de dominio
     domainAD: Dominio AD
-    groupDN: DN grupos
     userAD: Usuario AD
     passwordAD: Contraseña AD
     domainPart: DN usuarios (sin la parte del dominio)
     verifyCertificate: Verificar certificado
-    testConnection: Probar conexión
     success: ¡Conexión con Samba establecida!
 accounts:
     homedir: Directorio base para carpetas de usuario
@@ -147,8 +105,6 @@ connections:
     created: Creado
     killSession: Matar sesión
 acls:
-    role: Rol
-    accessType: Tipo de acceso
     permissions: Permiso
     search: Buscar acls
     searchInfo: Buscar acls por nombre

From 89cb9aacec0ebbca0b539fbfa69586e65ed45f15 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 18 Oct 2024 12:54:21 +0200
Subject: [PATCH 11/89] refactor: refs #7132 1st wave of changes in global
 translations files

---
 src/components/FilterTravelForm.vue           |  4 +-
 src/components/common/VnDms.vue               |  2 +-
 src/i18n/locale/en.yml                        | 71 +------------------
 src/i18n/locale/es.yml                        | 68 ------------------
 .../Department/Card/DepartmentBasicData.vue   |  4 +-
 .../Department/Card/DepartmentSummary.vue     |  6 +-
 src/pages/Entry/Card/EntryBasicData.vue       |  5 +-
 src/pages/Entry/Card/EntryBuys.vue            |  5 +-
 src/pages/Entry/Card/EntryBuysImport.vue      |  7 +-
 src/pages/Entry/Card/EntrySummary.vue         |  6 +-
 src/pages/Entry/EntryLatestBuys.vue           |  8 +--
 src/pages/Entry/EntryList.vue                 |  2 +-
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |  2 +-
 .../InvoiceOutNegativeBasesFilter.vue         |  6 +-
 src/pages/Item/Card/ItemSummary.vue           |  4 +-
 src/pages/Item/ItemRequest.vue                |  2 +-
 src/pages/Order/Card/OrderSummary.vue         |  6 +-
 .../Shelving/Card/ShelvingDescriptor.vue      |  2 +-
 src/pages/Shelving/Card/ShelvingForm.vue      |  2 +-
 src/pages/Shelving/Card/ShelvingSummary.vue   |  2 +-
 .../Supplier/Card/SupplierConsumption.vue     |  6 +-
 src/pages/Supplier/Card/SupplierSummary.vue   |  2 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  4 +-
 src/pages/Ticket/Card/TicketSummary.vue       | 17 ++---
 src/pages/Travel/Card/TravelBasicData.vue     |  7 +-
 src/pages/Travel/Card/TravelSummary.vue       |  2 +-
 src/pages/Travel/Card/TravelThermographs.vue  |  2 +-
 .../Travel/Card/TravelThermographsForm.vue    |  4 +-
 src/pages/Travel/TravelList.vue               |  2 +-
 src/pages/Wagon/WagonCreate.vue               |  6 +-
 src/pages/Wagon/WagonList.vue                 |  2 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |  2 +-
 src/pages/Worker/Card/WorkerFormation.vue     |  2 +-
 src/pages/Worker/Card/WorkerMedical.vue       |  4 +-
 src/pages/Worker/Card/WorkerSummary.vue       |  4 +-
 35 files changed, 61 insertions(+), 219 deletions(-)

diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index c84772d9b..841a55bba 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -70,7 +70,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('entry.basicData.shipped'),
+        label: t('globals.shipped'),
         name: 'shipped',
         field: 'shipped',
         align: 'left',
@@ -170,7 +170,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseInFk"
                 />
                 <VnInputDate
-                    :label="t('entry.basicData.shipped')"
+                    :label="t('globals.shipped')"
                     v-model="travelFilterParams.shipped"
                 />
                 <VnInputDate
diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
index 920b7f137..d2b40d7d6 100644
--- a/src/components/common/VnDms.vue
+++ b/src/components/common/VnDms.vue
@@ -158,7 +158,7 @@ function addDefaultData(data) {
                 />
                 <QFile
                     ref="inputFileRef"
-                    :label="t('entry.buys.file')"
+                    :label="t('globals.file')"
                     v-model="dms.files"
                     :multiple="false"
                     :accept="allowedContentTypes"
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b73395df2..f4d258585 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -300,8 +300,6 @@ globals:
         salesPersonFk: Sales person
         warehouseFk: Warehouse
         provinceFk: Province
-        from: From
-        To: To
         stateFk: State
         departmentFk: Department
         email: Email
@@ -328,8 +326,7 @@ login:
     loginError: Invalid username or password
     fieldRequired: This field is required
     twoFactorRequired: Two-factor verification required
-twoFactor:
-    code: Code
+twoFactorRequired:
     validate: Validate
     insert: Enter the verification code
     explanation: >-
@@ -357,7 +354,6 @@ entry:
         ordered: Ordered
         tableVisibleColumns:
             id: Id
-            reference: Reference
             created: Creation
             supplierFk: Supplier
             isBooked: Booked
@@ -372,7 +368,6 @@ entry:
         commission: Commission
         currency: Currency
         company: Company
-        reference: Reference
         invoiceNumber: Invoice number
         ordered: Ordered
         confirmed: Confirmed
@@ -388,10 +383,8 @@ entry:
         travelWarehouseIn: Warehouse In
         travelReceived: Received
         buys: Buys
-        quantity: Quantity
         stickers: Stickers
         package: Package
-        weight: Weight
         packing: Packing
         grouping: Grouping
         buyingValue: Buying value
@@ -401,7 +394,6 @@ entry:
     basicData:
         supplier: Supplier
         travel: Travel
-        reference: Reference
         invoiceNumber: Invoice number
         company: Company
         currency: Currency
@@ -415,13 +407,11 @@ entry:
         agency: Agency
         warehouseOut: Warehouse Out
         warehouseIn: Warehouse In
-        shipped: Shipped
         landed: Landed
         id: ID
     buys:
         groupingPrice: Grouping price
         packingPrice: Packing price
-        reference: Reference
         observations: Observations
         item: Item
         size: Size
@@ -429,7 +419,6 @@ entry:
         grouping: Grouping
         buyingValue: Buying value
         packagingFk: Box
-        file: File
         name: Name
         producer: Producer
         type: Type
@@ -448,7 +437,6 @@ entry:
             itemFk: Item ID
             packing: Packing
             grouping: Grouping
-            quantity: Quantity
             size: Size
             tags: Tags
             type: Type
@@ -461,14 +449,12 @@ entry:
             buyingValue: Buying value
             freightValue: Freight value
             comissionValue: Commission value
-            description: Description
             packageValue: Package value
             isIgnored: Is ignored
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
-            weight: Weight
             packagingFk: Package
             packingOut: Package out
             landing: Landing
@@ -476,17 +462,10 @@ entry:
             isRaid: Raid
 ticket:
     pageTitles:
-        tickets: Tickets
         list: List
-        ticketCreate: New ticket
         summary: Summary
-        basicData: Basic Data
-        boxing: Boxing
-        sms: Sms
-        notes: Notes
         sale: Sale
         dms: File management
-        volume: Volume
         observation: Notes
         ticketAdvance: Advance tickets
         futureTickets: Future tickets
@@ -495,17 +474,13 @@ ticket:
     list:
         nickname: Nickname
         state: State
-        shipped: Shipped
         landed: Landed
-        salesPerson: Sales person
         total: Total
     card:
         ticketId: Ticket ID
         state: State
         customerId: Customer ID
-        salesPerson: Sales person
         agency: Agency
-        shipped: Shipped
         warehouse: Warehouse
         customerCard: Customer card
         alias: Alias
@@ -521,7 +496,6 @@ ticket:
         notFound: No videos available
     summary:
         state: State
-        salesPerson: Sales person
         agency: Agency
         zone: Zone
         warehouse: Warehouse
@@ -543,7 +517,6 @@ ticket:
         item: Item
         visible: Visible
         available: Available
-        quantity: Quantity
         price: Price
         discount: Discount
         packing: Packing
@@ -559,12 +532,10 @@ ticket:
         requester: Requester
         atender: Atender
         request: Request
-        weight: Weight
         goTo: Go to
         summaryAmount: Summary
         purchaseRequest: Purchase request
         service: Service
-        description: Description
         attender: Attender
         ok: Ok
     create:
@@ -584,7 +555,6 @@ invoiceOut:
         company: Company
         dued: Due date
         shortDued: Due date
-        amount: Amount
     card:
         issued: Issued
         client: Client
@@ -604,7 +574,6 @@ invoiceOut:
         tickets: Tickets
         ticketId: Ticket id
         nickname: Alias
-        shipped: Shipped
         totalWithVat: Amount
     globalInvoices:
         errors:
@@ -625,13 +594,10 @@ invoiceOut:
             percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
             pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
     negativeBases:
-        from: From
-        to: To
         company: Company
         country: Country
         clientId: Client Id
         client: Client
-        amount: Amount
         base: Base
         ticketId: Ticket Id
         active: Active
@@ -646,13 +612,11 @@ shelving:
         priority: Priority
         newShelving: New Shelving
     summary:
-        code: Code
         parking: Parking
         priority: Priority
         worker: Worker
         recyclable: Recyclable
     basicData:
-        code: Code
         parking: Parking
         priority: Priority
         recyclable: Recyclable
@@ -694,7 +658,6 @@ order:
         phone: Phone
         createdFrom: Created From
         address: Address
-        notes: Notes
         subtotal: Subtotal
         total: Total
         vat: VAT
@@ -702,18 +665,14 @@ order:
         alias: Alias
         items: Items
         orderTicketList: Order Ticket List
-        details: Details
         item: Item
-        quantity: Quantity
         price: Price
         amount: Amount
 department:
     pageTitles:
-        basicData: Basic data
         department: Department
         summary: Summary
     name: Name
-    code: Code
     chat: Chat
     bossDepartment: Boss Department
     email: Email
@@ -728,20 +687,16 @@ 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
-        balance: Balance
         medical: Medical
     list:
         name: Name
@@ -754,7 +709,6 @@ worker:
         newWorker: New worker
     card:
         workerId: Worker ID
-        user: User
         name: Name
         email: Email
         phone: Phone
@@ -762,9 +716,7 @@ worker:
         active: Active
         warehouse: Warehouse
         agency: Agency
-        salesPerson: Sales person
     summary:
-        basicData: Basic data
         boss: Boss
         phoneExtension: Phone extension
         entPhone: Enterprise phone
@@ -820,16 +772,13 @@ worker:
             endDate: End date
             center: Training center
             invoice: Invoice
-            amount: Amount
             remark: Remark
             hasDiploma: Has diploma
     medical:
         tableVisibleColumns:
-            date: Date
             time: Hour
             center: Formation Center
             invoice: Invoice
-            amount: Amount
             isFit: Fit
             remark: Observations
     imageNotFound: Image not found
@@ -865,7 +814,6 @@ wagon:
         removeItem: Wagon removed successfully
     create:
         plate: Plate
-        volume: Volume
         type: Type
         label: Label
     warnings:
@@ -898,7 +846,6 @@ supplier:
             country: Country
     summary:
         responsible: Responsible
-        notes: Notes
         verified: Verified
         isActive: Is active
         billingData: Billing data
@@ -978,15 +925,12 @@ supplier:
         addRow: Add row
     consumption:
         entry: Entry
-        date: Date
-        reference: Reference
 travel:
     travelList:
         tableVisibleColumns:
             id: Id
             ref: Reference
             agency: Agency
-            shipped: Shipped
             landed: Landed
             shipHour: Shipment Hour
             landHour: Landing Hour
@@ -1017,29 +961,23 @@ travel:
         landedFrom: Landed from
         landedTo: Landed to
         continent: Continent out
-        totalEntries: Total entries
     basicData:
-        reference: Reference
         agency: Agency
-        shipped: Shipped
         landed: Landed
         warehouseOut: Warehouse Out
         warehouseIn: Warehouse In
         delivered: Delivered
         received: Received
     thermographs:
-        code: Code
         temperature: Temperature
         state: State
         destination: Destination
         created: Created
         thermograph: Thermograph
-        reference: Reference
         type: Type
         company: Company
         warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
-        file: File
 item:
     descriptor:
         item: Item
@@ -1056,7 +994,6 @@ item:
         id: Identifier
         grouping: Grouping
         packing: Packing
-        description: Description
         stems: Stems
         category: Category
         typeName: Type
@@ -1087,7 +1024,6 @@ item:
         origin: Origin
     buyRequest:
         ticketId: 'Ticket ID'
-        shipped: 'Shipped'
         requester: 'Requester'
         requested: 'Requested'
         price: 'Price'
@@ -1097,9 +1033,7 @@ item:
         concept: 'Concept'
         state: 'State'
     summary:
-        basicData: 'Basic data'
         otherData: 'Other data'
-        description: 'Description'
         tax: 'Tax'
         tags: 'Tags'
         botanical: 'Botanical'
@@ -1143,7 +1077,6 @@ components:
         salesPersonFk: Buyer
         supplierFk: Supplier
         from: From
-        to: To
         active: Is active
         visible: Is visible
         floramondo: Is floramondo
@@ -1151,7 +1084,6 @@ components:
     userPanel:
         copyToken: Token copied to clipboard
         settings: Settings
-        logOut: Log Out
         localWarehouse: Local warehouse
         localBank: Local bank
         localCompany: Local company
@@ -1159,7 +1091,6 @@ components:
         userCompany: User company
     smartCard:
         downloadFile: Download file
-        clone: Clone
         openCard: View
         openSummary: Summary
     cardDescriptor:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 2552c9549..a8d582c30 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -304,8 +304,6 @@ globals:
         salesPersonFk: Comercial
         warehouseFk: Almacén
         provinceFk: Provincia
-        from: Desde
-        To: Hasta
         stateFk: Estado
         departmentFk: Departamento
         email: Correo
@@ -333,7 +331,6 @@ login:
     fieldRequired: Este campo es obligatorio
     twoFactorRequired: Verificación de doble factor requerida
 twoFactor:
-    code: Código
     validate: Validar
     insert: Introduce el código de verificación
     explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
@@ -359,7 +356,6 @@ entry:
         ordered: Pedida
         tableVisibleColumns:
             id: Id
-            reference: Referencia
             created: Creación
             supplierFk: Proveedor
             isBooked: Asentado
@@ -374,7 +370,6 @@ entry:
         commission: Comisión
         currency: Moneda
         company: Empresa
-        reference: Referencia
         invoiceNumber: Núm. factura
         ordered: Pedida
         confirmed: Confirmada
@@ -390,10 +385,8 @@ entry:
         travelWarehouseIn: Alm. entrada
         travelReceived: Recibida
         buys: Compras
-        quantity: Cantidad
         stickers: Etiquetas
         package: Embalaje
-        weight: Peso
         packing: Packing
         grouping: Grouping
         buyingValue: Coste
@@ -403,7 +396,6 @@ entry:
     basicData:
         supplier: Proveedor
         travel: Envío
-        reference: Referencia
         invoiceNumber: Núm. factura
         company: Empresa
         currency: Moneda
@@ -417,13 +409,11 @@ entry:
         agency: Agencia
         warehouseOut: Alm. salida
         warehouseIn: Alm. entrada
-        shipped: F. envío
         landed: F. entrega
         id: ID
     buys:
         groupingPrice: Precio grouping
         packingPrice: Precio packing
-        reference: Referencia
         observations: Observaciónes
         item: Artículo
         size: Medida
@@ -431,7 +421,6 @@ entry:
         grouping: Grouping
         buyingValue: Coste
         packagingFk: Embalaje
-        file: Fichero
         name: Nombre
         producer: Productor
         type: Tipo
@@ -450,7 +439,6 @@ entry:
             itemFk: Id Artículo
             packing: packing
             grouping: Grouping
-            quantity: Cantidad
             size: Medida
             tags: Etiquetas
             type: Tipo
@@ -463,14 +451,12 @@ entry:
             buyingValue: Coste
             freightValue: Porte
             comissionValue: Comisión
-            description: Descripción
             packageValue: Embalaje
             isIgnored: Ignorado
             price2: Grouping
             price3: Packing
             minPrice: Min
             ektFk: Ekt
-            weight: Peso
             packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
@@ -478,17 +464,9 @@ entry:
             isRaid: Redada
 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
         dms: Gestión documental
-        volume: Volumen
         observation: Notas
         ticketAdvance: Adelantar tickets
         futureTickets: Tickets a futuro
@@ -500,21 +478,16 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-        packages: Embalajes
     list:
         nickname: Alias
         state: Estado
-        shipped: Enviado
         landed: Entregado
-        salesPerson: Comercial
         total: Total
     card:
         ticketId: ID ticket
         state: Estado
         customerId: ID cliente
-        salesPerson: Comercial
         agency: Agencia
-        shipped: Enviado
         warehouse: Almacén
         customerCard: Ficha del cliente
         alias: Alias
@@ -530,7 +503,6 @@ ticket:
         notFound: No hay vídeos disponibles
     summary:
         state: Estado
-        salesPerson: Comercial
         agency: Agencia
         zone: Zona
         warehouse: Almacén
@@ -552,7 +524,6 @@ ticket:
         item: Artículo
         visible: Visible
         available: Disponible
-        quantity: Cantidad
         price: Precio
         discount: Descuento
         packing: Encajado
@@ -568,12 +539,10 @@ ticket:
         requester: Solicitante
         atender: Comprador
         request: Petición de compra
-        weight: Peso
         goTo: Ir a
         summaryAmount: Resumen
         purchaseRequest: Petición de compra
         service: Servicio
-        description: Descripción
         attender: Consignatario
     create:
         client: Cliente
@@ -592,7 +561,6 @@ invoiceOut:
         company: Empresa
         dued: Fecha vencimineto
         shortDued: F. vencimiento
-        amount: Importe
     card:
         issued: Fecha emisión
         client: Cliente
@@ -613,7 +581,6 @@ invoiceOut:
         tickets: Tickets
         ticketId: Id ticket
         nickname: Alias
-        shipped: F. envío
         totalWithVat: Importe
     globalInvoices:
         errors:
@@ -638,7 +605,6 @@ invoiceOut:
         country: País
         clientId: Id cliente
         client: Cliente
-        amount: Importe
         base: Base
         ticketId: Id ticket
         active: Activo
@@ -675,7 +641,6 @@ order:
         phone: Teléfono
         createdFrom: Creado desde
         address: Dirección
-        notes: Notas
         subtotal: Subtotal
         total: Total
         vat: IVA
@@ -683,9 +648,7 @@ order:
         alias: Alias
         items: Items
         orderTicketList: Tickets del pedido
-        details: Detalles
         item: Item
-        quantity: Cantidad
         price: Precio
         amount: Monto
 shelving:
@@ -694,13 +657,11 @@ shelving:
         priority: Prioridad
         newShelving: Nuevo Carro
     summary:
-        code: Código
         parking: Parking
         priority: Prioridad
         worker: Trabajador
         recyclable: Reciclable
     basicData:
-        code: Código
         parking: Parking
         priority: Prioridad
         recyclable: Reciclable
@@ -715,11 +676,9 @@ parking:
         label: Buscar parking...
 department:
     pageTitles:
-        basicData: Basic data
         department: Departamentos
         summary: Resumen
     name: Nombre
-    code: Código
     chat: Chat
     bossDepartment: Jefe de departamento
     email: Email
@@ -734,20 +693,16 @@ 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
-        balance: Balance
         formation: Formación
         medical: Mutua
     list:
@@ -761,7 +716,6 @@ worker:
         newWorker: Nuevo trabajador
     card:
         workerId: ID Trabajador
-        user: Usuario
         name: Nombre
         email: Correo personal
         phone: Teléfono
@@ -769,9 +723,7 @@ worker:
         active: Activo
         warehouse: Almacén
         agency: Empresa
-        salesPerson: Comercial
     summary:
-        basicData: Datos básicos
         boss: Jefe
         phoneExtension: Extensión de teléfono
         entPhone: Teléfono de empresa
@@ -818,16 +770,13 @@ worker:
             endDate: Fecha Fin
             center: Centro Formación
             invoice: Factura
-            amount: Importe
             remark: Bonficado
             hasDiploma: Diploma
     medical:
         tableVisibleColumns:
-            date: Fecha
             time: Hora
             center: Centro de Formación
             invoice: Factura
-            amount: Importe
             isFit: Apto
             remark: Observaciones
     imageNotFound: No se ha encontrado la imagen
@@ -863,7 +812,6 @@ wagon:
         removeItem: Vagón borrado correctamente
     create:
         plate: Matrícula
-        volume: Volumen
         type: Tipo
         label: Etiqueta
     warnings:
@@ -895,7 +843,6 @@ supplier:
             country: País
     summary:
         responsible: Responsable
-        notes: Notas
         verified: Verificado
         isActive: Está activo
         billingData: Forma de pago
@@ -975,15 +922,12 @@ supplier:
         addRow: Añadir fila
     consumption:
         entry: Entrada
-        date: Fecha
-        reference: Referencia
 travel:
     travelList:
         tableVisibleColumns:
             id: Id
             ref: Referencia
             agency: Agencia
-            shipped: F.envío
             shipHour: Hora de envío
             landHour: Hora de llegada
             landed: F.entrega
@@ -1014,29 +958,23 @@ travel:
         landedFrom: Llegada desde
         landedTo: Llegada hasta
         continent: Cont. Salida
-        totalEntries: Ent. totales
     basicData:
-        reference: Referencia
         agency: Agencia
-        shipped: F. Envío
         landed: F. entrega
         warehouseOut: Alm. salida
         warehouseIn: Alm. entrada
         delivered: Enviada
         received: Recibida
     thermographs:
-        code: Código
         temperature: Temperatura
         state: Estado
         destination: Destino
         created: Fecha creación
         thermograph: Termógrafo
-        reference: Referencia
         type: Tipo
         company: Empresa
         warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
-        file: Fichero
 item:
     descriptor:
         item: Artículo
@@ -1053,7 +991,6 @@ item:
         id: Identificador
         grouping: Grouping
         packing: Packing
-        description: Descripción
         stems: Tallos
         category: Reino
         typeName: Tipo
@@ -1083,9 +1020,7 @@ item:
         intrastat: Intrastat
         origin: Origen
     summary:
-        basicData: 'Datos básicos'
         otherData: 'Otros datos'
-        description: 'Descripción'
         tax: 'IVA'
         tags: 'Etiquetas'
         botanical: 'Botánico'
@@ -1114,7 +1049,6 @@ item:
         specie: 'Specie'
     buyRequest:
         ticketId: 'ID Ticket'
-        shipped: 'F. envío'
         requester: 'Solicitante'
         requested: 'Solicitado'
         price: 'Precio'
@@ -1146,7 +1080,6 @@ components:
     userPanel:
         copyToken: Token copiado al portapapeles
         settings: Configuración
-        logOut: Cerrar sesión
         localWarehouse: Almacén local
         localBank: Banco local
         localCompany: Empresa local
@@ -1154,7 +1087,6 @@ components:
         userCompany: Empresa del usuario
     smartCard:
         downloadFile: Descargar archivo
-        clone: Clonar
         openCard: Ficha
         openSummary: Detalles
         viewSummary: Vista previa
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 141bb4159..384881792 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -28,8 +28,8 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.code"
-                    :label="t('department.code')"
-                    :rules="validate('department.code')"
+                    :label="t('globals.code')"
+                    :rules="validate('globals.code')"
                     clearable
                 />
             </VnRow>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index ecbb39ed0..05a9e073e 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -50,11 +50,7 @@ onMounted(async () => {
                             :value="department.name"
                             dash
                         />
-                        <VnLv
-                            :label="t('department.code')"
-                            :value="department.code"
-                            dash
-                        />
+                        <VnLv :label="t('globals.code')" :value="department.code" dash />
                         <VnLv
                             :label="t('department.chat')"
                             :value="department.chatName"
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index b81b1db22..2a00bfd74 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -108,10 +108,7 @@ const onFilterTravelSelected = (formData, id) => {
                 </VnSelectDialog>
             </VnRow>
             <VnRow>
-                <VnInput
-                    v-model="data.reference"
-                    :label="t('entry.basicData.reference')"
-                />
+                <VnInput v-model="data.reference" :label="t('globals.reference')" />
             </VnRow>
             <VnRow>
                 <VnInput
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index ff89faada..35972b85a 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -5,7 +5,6 @@ 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';
@@ -163,7 +162,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('entry.summary.quantity'),
+            label: t('globals.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -187,7 +186,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('entry.summary.weight'),
+            label: t('globals.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8431e1096..36ca3b797 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -200,7 +200,7 @@ const redirectToBuysView = () => {
             <VnRow>
                 <QFile
                     ref="inputFileRef"
-                    :label="t('entry.buys.file')"
+                    :label="t('globals.file')"
                     v-model="importData.file"
                     :multiple="false"
                     accept=".json"
@@ -220,10 +220,7 @@ const redirectToBuysView = () => {
             </VnRow>
             <div v-if="importData.file">
                 <VnRow>
-                    <VnInput
-                        :label="t('entry.buys.reference')"
-                        v-model="importData.ref"
-                    />
+                    <VnInput :label="t('globals.reference')" v-model="importData.ref" />
                 </VnRow>
                 <VnRow>
                     <VnInput
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 58a5c2e1b..0ed2e8a67 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -83,7 +83,7 @@ const tableColumnComponents = {
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('entry.summary.quantity'),
+            label: t('globals.quantity'),
             field: 'quantity',
             name: 'quantity',
             align: 'left',
@@ -101,7 +101,7 @@ const entriesTableColumns = computed(() => {
             align: 'left',
         },
         {
-            label: t('entry.summary.weight'),
+            label: t('globals.weight'),
             field: 'weight',
             name: 'weight',
             align: 'left',
@@ -190,7 +190,7 @@ const fetchEntryBuys = async () => {
                     :value="entry.currency?.name"
                 />
                 <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
-                <VnLv :label="t('entry.summary.reference')" :value="entry.reference" />
+                <VnLv :label="t('globals.reference')" :value="entry.reference" />
                 <VnLv
                     :label="t('entry.summary.invoiceNumber')"
                     :value="entry.invoiceNumber"
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 61c430b23..756948182 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -47,12 +47,12 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.quantity'),
+        label: t('globals.quantity'),
         name: 'quantity',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.description'),
+        label: t('globals.description'),
         name: 'description',
     },
     {
@@ -82,7 +82,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.weightByPiece'),
+        label: t('globals.weightByPiece'),
         name: 'weightByPiece',
     },
     {
@@ -147,7 +147,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.weight'),
+        label: t('globals.weight'),
         name: 'weight',
     },
     {
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 6f7ff1935..e44e3891e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -50,7 +50,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('entry.list.tableVisibleColumns.reference'),
+        label: t('globals.reference'),
         name: 'reference',
         isTitle: true,
         component: 'input',
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index e9d5a2f1f..83b1bf8a4 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -86,7 +86,7 @@ const ticketsColumns = ref([
     },
     {
         name: 'landed',
-        label: t('invoiceOut.summary.shipped'),
+        label: t('globals.shipped'),
         field: (row) => row.shipped,
         format: (value) => toDate(value),
         sortable: true,
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 94eab2aab..cf4c27e65 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -33,7 +33,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputDate
                         v-model="params.from"
-                        :label="t('invoiceOut.negativeBases.from')"
+                        :label="t('globals.from')"
                         is-outlined
                     />
                 </QItemSection>
@@ -42,7 +42,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputDate
                         v-model="params.to"
-                        :label="t('invoiceOut.negativeBases.to')"
+                        :label="t('globals.to')"
                         is-outlined
                     />
                 </QItemSection>
@@ -88,7 +88,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInputNumber
                         v-model="params.amount"
-                        :label="t('invoiceOut.negativeBases.amount')"
+                        :label="t('globals.amount')"
                         is-outlined
                     />
                 </QItemSection>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 7b6015c30..dd2c0649b 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -55,7 +55,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.basicData')"
+                    :text="t('globals.summary.basicData')"
                 />
                 <VnLv :label="t('item.summary.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
@@ -126,7 +126,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
             <QCard class="vn-one" v-if="item.description">
                 <VnTitle
                     :url="getUrl(entityId, 'basic-data')"
-                    :text="t('item.summary.description')"
+                    :text="t('globals.description')"
                 />
                 <p v-text="item.description" />
             </QCard>
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 8a41bbe04..7dd961a35 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -47,7 +47,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('item.buyRequest.shipped'),
+        label: t('globals.shipped'),
         field: 'shipped',
         name: 'shipped',
         align: 'left',
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 60358f744..ceacbc75b 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -35,7 +35,7 @@ const detailsColumns = ref([
     },
     {
         name: 'quantity',
-        label: t('order.summary.quantity'),
+        label: t('globals.quantity'),
         field: (row) => row?.quantity,
     },
     {
@@ -161,13 +161,13 @@ const detailsColumns = ref([
                     </VnLv>
                 </QCard>
                 <QCard>
-                    <VnTitle :text="t('order.summary.details')" />
+                    <VnTitle :text="t('globals.details')" />
                     <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
                                 <QTh auto-width>{{ t('order.summary.item') }}</QTh>
                                 <QTh>{{ t('globals.description') }}</QTh>
-                                <QTh auto-width>{{ t('order.summary.quantity') }}</QTh>
+                                <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                                 <QTh auto-width>{{ t('order.summary.price') }}</QTh>
                                 <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
                             </QTr>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 6beca6d88..30e807d20 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -53,7 +53,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
         @on-fetch="setData"
     >
         <template #body="{ entity }">
-            <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
+            <VnLv :label="t('globals.code')" :value="entity.code" />
             <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
             <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
                 <template #value>
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index dc0234c22..f69d427b0 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -58,7 +58,7 @@ const onSave = (shelving, newShelving) => {
             <VnRow>
                 <VnInput
                     v-model="data.code"
-                    :label="t('shelving.basicData.code')"
+                    :label="t('globals.code')"
                     :rules="validate('Shelving.code')"
                 />
                 <VnSelect
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index 94175b0c1..a196b1992 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -54,7 +54,7 @@ const filter = {
                         {{ t('globals.pageTitles.basicData') }}
                         <QIcon name="open_in_new" />
                     </RouterLink>
-                    <VnLv :label="t('shelving.summary.code')" :value="entity.code" />
+                    <VnLv :label="t('globals.code')" :value="entity.code" />
                     <VnLv
                         :label="t('shelving.summary.parking')"
                         :value="entity.parking?.code"
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 8fa6a1e5c..fe1cec260 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -190,13 +190,11 @@ onMounted(async () => {
                         <span>{{ row.id }}</span>
                     </QTd>
                     <QTd no-hover>
-                        <span class="label">{{ t('supplier.consumption.date') }}: </span>
+                        <span class="label">{{ t('globals.date') }}: </span>
                         <span>{{ toDate(row.shipped) }}</span></QTd
                     >
                     <QTd colspan="6" no-hover>
-                        <span class="label"
-                            >{{ t('supplier.consumption.reference') }}:
-                        </span>
+                        <span class="label">{{ t('globals.reference') }}: </span>
                         <span>{{ row.invoiceNumber }}</span>
                     </QTd>
                 </QTr>
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 5791db1eb..6ffb95344 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -60,7 +60,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('supplier.summary.notes')" class="q-mb-xs">
+                <VnLv :label="t('globals.notes')" class="q-mb-xs">
                     <template #value>
                         <span> {{ dashIfEmpty(supplier.note) }} </span>
                     </template>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 70fd9ab1e..af9021e36 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -135,7 +135,7 @@ function ticketFilter(ticket) {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('ticket.summary.salesPerson')">
+            <VnLv :label="t('globals.salesPerson')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -144,7 +144,7 @@ function ticketFilter(ticket) {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('ticket.card.shipped')"
+                :label="t('globals.shipped')"
                 :value="toDateTimeFormat(entity.shipped)"
             />
             <VnLv
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index af96c2724..ac2ae0509 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -142,7 +142,7 @@ function toTicketUrl(section) {
                         </QBadge>
                     </template>
                 </VnLv>
-                <VnLv :label="t('ticket.summary.salesPerson')">
+                <VnLv :label="t('globals.salesPerson')">
                     <template #value>
                         <VnUserLink
                             :name="entity.client?.salesPersonUser?.name"
@@ -200,10 +200,7 @@ function toTicketUrl(section) {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.weight')"
-                    :value="dashIfEmpty(entity.weight)"
-                />
+                <VnLv :label="t('globals.weight')" :value="dashIfEmpty(entity.weight)" />
             </QCard>
             <QCard class="vn-one" style="flex: 2 1">
                 <VnTitle
@@ -313,7 +310,7 @@ function toTicketUrl(section) {
                             <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
@@ -476,7 +473,7 @@ function toTicketUrl(section) {
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                         </QTr>
                     </template>
                     <template #body="props">
@@ -496,7 +493,7 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.services" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.taxClass') }}</QTh>
@@ -524,11 +521,11 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.requests" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.description') }}</QTh>
+                            <QTh auto-width>{{ t('globals.description') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.quantity') }}</QTh>
+                            <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index a3620a6ba..ca9caf82d 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -29,7 +29,7 @@ const agenciesOptions = ref([]);
     >
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
+                <VnInput v-model="data.ref" :label="t('globals.reference')" />
                 <VnSelect
                     :label="t('travel.basicData.agency')"
                     v-model="data.agencyModeFk"
@@ -41,10 +41,7 @@ const agenciesOptions = ref([]);
                 />
             </VnRow>
             <VnRow>
-                <VnInputDate
-                    v-model="data.shipped"
-                    :label="t('travel.basicData.shipped')"
-                />
+                <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
                 <VnInputDate
                     v-model="data.landed"
                     :label="t('travel.basicData.landed')"
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 4be198493..d48ed2847 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -110,7 +110,7 @@ const entriesTableColumns = computed(() => {
 const thermographsTableColumns = computed(() => {
     return [
         {
-            label: t('travel.thermographs.code'),
+            label: t('globals.code'),
             field: 'thermographFk',
             name: 'thermographFk',
             align: 'left',
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index e308243e3..96544a8ca 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -36,7 +36,7 @@ const thermographFilter = {
 const TableColumns = computed(() => {
     return [
         {
-            label: t('travel.thermographs.code'),
+            label: t('globals.code'),
             field: 'thermographFk',
             name: 'thermographFk',
             align: 'left',
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 5e3ecdc3e..b70e93dfc 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -222,7 +222,7 @@ const onThermographCreated = async (data) => {
                 <VnRow>
                     <VnInput
                         v-model="thermographForm.reference"
-                        :label="t('travel.thermographs.reference')"
+                        :label="t('globals.reference')"
                     />
                     <VnSelect
                         :label="t('travel.thermographs.type')"
@@ -279,7 +279,7 @@ const onThermographCreated = async (data) => {
                 <VnRow>
                     <QFile
                         ref="inputFileRef"
-                        :label="t('travel.thermographs.file')"
+                        :label="t('globals.file')"
                         multiple
                         :accept="allowedContentTypes"
                         v-model="thermographForm.files"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index a8c0e69cb..7ea2b3f7a 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -100,7 +100,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'shipped',
-        label: t('travel.travelList.tableVisibleColumns.shipped'),
+        label: t('globals.shipped'),
         component: 'date',
         columnField: {
             component: null,
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index 411c36632..2ec0f4d55 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -111,12 +111,10 @@ function filterType(val, update) {
                     <QInput
                         filled
                         v-model="wagon.volume"
-                        :label="t('wagon.create.volume')"
+                        :label="t('wagon.list.volume')"
                         type="number"
                         min="0"
-                        :rules="[
-                            (val) => !!val || t('wagon.warnings.volumeNotEmpty'),
-                        ]"
+                        :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
                     />
                     <QSelect
                         filled
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 02e3b6d16..61679b933 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -129,7 +129,7 @@ async function remove(row) {
                 <VnInput
                     filled
                     v-model="data.volume"
-                    :label="t('wagon.create.volume')"
+                    :label="t('wagon.list.volume')"
                     type="number"
                     min="0"
                     :rules="[(val) => !!val || t('wagon.warnings.volumeNotEmpty')]"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 1cb42bbfb..491105e09 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -138,7 +138,7 @@ const handlePhotoUpdated = (evt = false) => {
             </div>
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('worker.card.user')" :value="entity.user?.name" />
+            <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
                 :label="t('worker.card.email')"
                 :value="entity.user?.emailUser?.email"
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index c11dd019e..1f5b54c4a 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -77,7 +77,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'amount',
-        label: t('worker.formation.tableVisibleColumns.amount'),
+        label: t('globals.amount'),
         component: 'input',
         field: 'amount',
         create: true,
diff --git a/src/pages/Worker/Card/WorkerMedical.vue b/src/pages/Worker/Card/WorkerMedical.vue
index fab1416c9..bb8c8da58 100644
--- a/src/pages/Worker/Card/WorkerMedical.vue
+++ b/src/pages/Worker/Card/WorkerMedical.vue
@@ -12,7 +12,7 @@ const columns = [
     {
         align: 'left',
         name: 'date',
-        label: t('worker.medical.tableVisibleColumns.date'),
+        label: t('globals.date'),
         create: true,
         component: 'date',
     },
@@ -47,7 +47,7 @@ const columns = [
     {
         align: 'left',
         name: 'amount',
-        label: t('worker.medical.tableVisibleColumns.amount'),
+        label: t('globals.amount'),
         create: true,
         component: 'input',
     },
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index ed34e771d..3f562a77b 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -52,7 +52,7 @@ onBeforeMount(async () => {
         </template>
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
-                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
+                <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
                 <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
                 <VnLv :label="t('worker.list.department')">
                     <template #value>
@@ -91,7 +91,7 @@ onBeforeMount(async () => {
                 </VnLv>
             </QCard>
             <QCard class="vn-one" v-if="advancedSummary">
-                <VnTitle :url="basicDataUrl" :text="t('worker.summary.basicData')" />
+                <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
                     :value="toDate(worker.fiDueDate)"

From 8381a250171c00c8bf832b9efde290bce4fd1ab9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 18 Oct 2024 13:46:34 +0200
Subject: [PATCH 12/89] fix: refs #8036 apply exprBuilder after save filters

---
 src/components/ui/VnFilterPanel.vue |  3 +--
 src/composables/useArrayData.js     | 28 +++++++++++++++++-----------
 2 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..4dececa91 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -37,7 +37,7 @@ const $props = defineProps({
     },
     hiddenTags: {
         type: Array,
-        default: () => ['filter', 'search', 'or', 'and'],
+        default: () => ['filter', 'or', 'and'],
     },
     customTags: {
         type: Array,
@@ -62,7 +62,6 @@ const emit = defineEmits([
     'update:modelValue',
     'refresh',
     'clear',
-    'search',
     'init',
     'remove',
     'setUserParams',
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 30bcac66b..c55e08d74 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -74,18 +74,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             limit: store.limit,
         };
 
-        let exprFilter;
         let userParams = { ...store.userParams };
-        if (store?.exprBuilder) {
-            const where = buildFilter(userParams, (param, value) => {
-                const res = store.exprBuilder(param, value);
-                if (res) delete userParams[param];
-                return res;
-            });
-            exprFilter = where ? { where } : null;
-        }
 
-        Object.assign(filter, store.userFilter, exprFilter);
+        Object.assign(filter, store.userFilter);
+
         let where;
         if (filter?.where || store.filter?.where)
             where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
@@ -98,8 +90,22 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (store.order && store.order.length) params.filter.order = store.order;
         else delete params.filter.order;
 
+        store.currentFilter = JSON.parse(JSON.stringify(params));
+        store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
+
+        let exprFilter;
+        if (store?.exprBuilder) {
+            exprFilter = buildFilter(params, (param, value) => {
+                if (param == 'filter') return;
+                const res = store.exprBuilder(param, value);
+                if (res) delete params[param];
+                return res;
+            });
+        }
+
+        params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
-        store.currentFilter = params;
+
         store.isLoading = true;
         const response = await axios.get(store.url, {
             signal: canceller.signal,

From bfc906a3469077b448df99163690b4d20b0afd3b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 18 Oct 2024 13:48:10 +0200
Subject: [PATCH 13/89] fix: refs #8036 only add where when required

---
 src/composables/useArrayData.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index c55e08d74..6b1d183f2 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -103,7 +103,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
             });
         }
 
-        params.filter.where = { ...params.filter.where, ...exprFilter };
+        if (params.filter.where || exprFilter)
+            params.filter.where = { ...params.filter.where, ...exprFilter };
         params.filter = JSON.stringify(params.filter);
 
         store.isLoading = true;

From e5cd9d4b8f40dae59f976dd8afe0da24b6690ea3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 21 Oct 2024 12:56:09 +0200
Subject: [PATCH 14/89] refactor: refs #7132 global translations files changed

---
 src/components/FilterItemForm.vue             |  14 +-
 src/components/FilterTravelForm.vue           |  16 +-
 src/components/ItemsFilterPanel.vue           |   2 +-
 src/i18n/locale/en.yml                        | 311 +++--------------
 src/i18n/locale/es.yml                        | 314 +++---------------
 .../Department/Card/DepartmentBasicData.vue   |   8 +-
 .../Department/Card/DepartmentSummary.vue     |   6 +-
 src/pages/Entry/Card/EntryBasicData.vue       |  22 +-
 src/pages/Entry/Card/EntryBuys.vue            |   6 +-
 src/pages/Entry/Card/EntryBuysImport.vue      |   8 +-
 src/pages/Entry/Card/EntryDescriptor.vue      |   7 +-
 src/pages/Entry/Card/EntrySummary.vue         |   8 +-
 src/pages/Entry/EntryBuysTableDialog.vue      |   2 +-
 src/pages/Entry/EntryLatestBuys.vue           |  20 +-
 src/pages/Entry/EntryList.vue                 |   2 +-
 .../InvoiceOut/Card/InvoiceOutDescriptor.vue  |   4 +-
 .../InvoiceOut/Card/InvoiceOutSummary.vue     |  16 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |   2 +-
 .../InvoiceOutNegativeBasesFilter.vue         |   6 +-
 src/pages/Item/Card/ItemDescriptor.vue        |   7 +-
 src/pages/Item/Card/ItemDescriptorImage.vue   |   4 +-
 src/pages/Item/Card/ItemSummary.vue           |  10 +-
 src/pages/Item/ItemCreate.vue                 |  13 +-
 src/pages/Item/ItemFixedPrice.vue             |   4 +-
 src/pages/Item/ItemList.vue                   |  14 +-
 src/pages/Item/ItemRequest.vue                |   8 +-
 src/pages/Order/Card/OrderBasicData.vue       |   2 +-
 src/pages/Order/Card/OrderCreateDialog.vue    |   3 +-
 src/pages/Order/Card/OrderDescriptor.vue      |  10 +-
 src/pages/Order/Card/OrderSummary.vue         |  24 +-
 .../Shelving/Card/ShelvingDescriptor.vue      |   4 +-
 src/pages/Shelving/Card/ShelvingForm.vue      |   6 +-
 src/pages/Shelving/Card/ShelvingSummary.vue   |   9 +-
 src/pages/Supplier/Card/SupplierAddresses.vue |   9 +-
 .../Supplier/Card/SupplierAddressesCreate.vue |  20 +-
 src/pages/Supplier/Card/SupplierBasicData.vue |   2 +-
 .../Supplier/Card/SupplierBillingData.vue     |   2 +-
 src/pages/Supplier/Card/SupplierContacts.vue  |  17 +-
 .../Supplier/Card/SupplierDescriptor.vue      |   2 +-
 .../Supplier/Card/SupplierFiscalData.vue      |   8 +-
 src/pages/Supplier/Card/SupplierSummary.vue   |  11 +-
 src/pages/Supplier/SupplierList.vue           |  12 +-
 src/pages/Ticket/Card/TicketBoxing.vue        |   4 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |   8 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  39 +--
 src/pages/Ticket/TicketCreate.vue             |   8 +-
 src/pages/Ticket/TicketCreateDialog.vue       |   8 +-
 src/pages/Ticket/TicketList.vue               |   6 +-
 src/pages/Travel/Card/TravelBasicData.vue     |  15 +-
 src/pages/Travel/Card/TravelDescriptor.vue    |   4 +-
 src/pages/Travel/Card/TravelSummary.vue       |  10 +-
 src/pages/Travel/Card/TravelThermographs.vue  |   4 +-
 .../Travel/Card/TravelThermographsForm.vue    |   8 +-
 src/pages/Travel/ExtraCommunity.vue           |   4 +-
 src/pages/Travel/TravelCreate.vue             |   4 +-
 src/pages/Travel/TravelList.vue               |  10 +-
 src/pages/Wagon/Type/WagonTypeEdit.vue        |   2 +-
 src/pages/Wagon/WagonCreate.vue               |   4 +-
 src/pages/Wagon/WagonList.vue                 |   6 +-
 src/pages/Worker/Card/WorkerDescriptor.vue    |   4 +-
 src/pages/Worker/Card/WorkerSummary.vue       |   6 +-
 src/pages/Worker/WorkerCreate.vue             |  10 +-
 src/pages/Worker/WorkerList.vue               |   8 +-
 63 files changed, 322 insertions(+), 825 deletions(-)

diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 1cf36deeb..d1ceff4ce 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -50,25 +50,25 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('entry.buys.id'),
+        label: t('globals.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('entry.buys.name'),
+        label: t('globals.name'),
         name: 'name',
         field: 'name',
         align: 'left',
     },
     {
-        label: t('entry.buys.size'),
+        label: t('globals.size'),
         name: 'size',
         field: 'size',
         align: 'left',
     },
     {
-        label: t('entry.buys.producer'),
+        label: t('globals.producer'),
         name: 'producerName',
         field: 'producer',
         align: 'left',
@@ -152,10 +152,10 @@ const selectItem = ({ id }) => {
             </span>
             <h1 class="title">{{ t('Filter item') }}</h1>
             <VnRow>
-                <VnInput :label="t('entry.buys.name')" v-model="itemFilterParams.name" />
+                <VnInput :label="t('globals.name')" v-model="itemFilterParams.name" />
                 <VnInput :label="t('entry.buys.size')" v-model="itemFilterParams.size" />
                 <VnSelect
-                    :label="t('entry.buys.producer')"
+                    :label="t('globals.producer')"
                     :options="producersOptions"
                     hide-selected
                     option-label="name"
@@ -163,7 +163,7 @@ const selectItem = ({ id }) => {
                     v-model="itemFilterParams.producerFk"
                 />
                 <VnSelect
-                    :label="t('entry.buys.type')"
+                    :label="t('globals.type')"
                     :options="ItemTypesOptions"
                     hide-selected
                     option-label="name"
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 841a55bba..a471552f2 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -48,13 +48,13 @@ const loading = ref(false);
 
 const tableColumns = computed(() => [
     {
-        label: t('entry.basicData.id'),
+        label: t('globals.id'),
         name: 'id',
         field: 'id',
         align: 'left',
     },
     {
-        label: t('entry.basicData.warehouseOut'),
+        label: t('globals.warehouseOut'),
         name: 'warehouseOutFk',
         field: 'warehouseOutFk',
         align: 'left',
@@ -62,7 +62,7 @@ const tableColumns = computed(() => [
             warehousesOptions.value.find((warehouse) => warehouse.id === val).name,
     },
     {
-        label: t('entry.basicData.warehouseIn'),
+        label: t('globals.warehouseIn'),
         name: 'warehouseInFk',
         field: 'warehouseInFk',
         align: 'left',
@@ -77,7 +77,7 @@ const tableColumns = computed(() => [
         format: (val) => toDate(val),
     },
     {
-        label: t('entry.basicData.landed'),
+        label: t('globals.landed'),
         name: 'landed',
         field: 'landed',
         align: 'left',
@@ -146,7 +146,7 @@ const selectTravel = ({ id }) => {
             <h1 class="title">{{ t('Filter travels') }}</h1>
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.agency')"
+                    :label="t('globals.agency')"
                     :options="agenciesOptions"
                     hide-selected
                     option-label="name"
@@ -154,7 +154,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.agencyModeFk"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.warehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -162,7 +162,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.warehouseOutFk"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.warehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :options="warehousesOptions"
                     hide-selected
                     option-label="name"
@@ -174,7 +174,7 @@ const selectTravel = ({ id }) => {
                     v-model="travelFilterParams.shipped"
                 />
                 <VnInputDate
-                    :label="t('entry.basicData.landed')"
+                    :label="t('globals.landed')"
                     v-model="travelFilterParams.landed"
                 />
             </VnRow>
diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index e89d32da4..938dceb4d 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -248,7 +248,7 @@ const removeTag = (index, params, search) => {
             >
                 <QItemSection class="col">
                     <VnSelect
-                        :label="t('components.itemsFilterPanel.tag')"
+                        :label="t('globals.tag')"
                         v-model="value.selectedTag"
                         :options="tagOptions"
                         option-label="name"
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index f4d258585..aa6e3ba2c 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -59,7 +59,7 @@ globals:
     downloadCSVSuccess: CSV downloaded successfully
     reference: Reference
     agency: Agency
-    wareHouseOut: Warehouse Out
+    warehouseOut: Warehouse Out
     wareHouseIn: Warehouse In
     landed: Landed
     shipped: Shipped
@@ -106,6 +106,26 @@ globals:
     weight: Weight
     error: Ups! Something went wrong
     recalc: Recalculate
+    alias: Alias
+    vat: VAT
+    intrastat: Intrastat
+    tags: Tags
+    size: Size
+    producer: Producer
+    origin: Origin
+    state: State
+    subtotal: Subtotal
+    visible: Visible
+    price: Price
+    client: Client
+    country: Country
+    phone: Phone
+    mobile: Mobile
+    postcode: Postcode
+    street: Street
+    tag: Tag
+    ticketId: Ticket ID
+    confirmed: Confirmed
     pageTitles:
         logIn: Login
         addressEdit: Update address
@@ -295,7 +315,6 @@ globals:
     maxTemperature: Max
     minTemperature: Min
     params:
-        id: ID
         clientFk: Client id
         salesPersonFk: Sales person
         warehouseFk: Warehouse
@@ -346,14 +365,7 @@ resetPassword:
 entry:
     list:
         newEntry: New entry
-        landed: Landed
-        invoiceNumber: Invoice number
-        supplier: Supplier
-        booked: Booked
-        confirmed: Confirmed
-        ordered: Ordered
         tableVisibleColumns:
-            id: Id
             created: Creation
             supplierFk: Supplier
             isBooked: Booked
@@ -362,25 +374,20 @@ entry:
             companyFk: Company
             travelFk: Travel
             isExcludedFromAvailable: Inventory
-            isRaid: Raid
             invoiceAmount: Import
     summary:
         commission: Commission
         currency: Currency
-        company: Company
         invoiceNumber: Invoice number
         ordered: Ordered
-        confirmed: Confirmed
         booked: Booked
         raid: Raid
         excludedFromAvailable: Inventory
         travelReference: Reference
         travelAgency: Agency
         travelShipped: Shipped
-        travelWarehouseOut: Warehouse Out
         travelDelivered: Delivered
         travelLanded: Landed
-        travelWarehouseIn: Warehouse In
         travelReceived: Received
         buys: Buys
         stickers: Stickers
@@ -390,63 +397,29 @@ entry:
         buyingValue: Buying value
         import: Import
         pvp: PVP
-        item: Item
     basicData:
-        supplier: Supplier
         travel: Travel
-        invoiceNumber: Invoice number
-        company: Company
         currency: Currency
         commission: Commission
         observation: Observation
-        ordered: Ordered
-        confirmed: Confirmed
         booked: Booked
         raid: Raid
         excludedFromAvailable: Inventory
-        agency: Agency
-        warehouseOut: Warehouse Out
-        warehouseIn: Warehouse In
-        landed: Landed
-        id: ID
     buys:
-        groupingPrice: Grouping price
-        packingPrice: Packing price
         observations: Observations
-        item: Item
-        size: Size
-        packing: Packing
-        grouping: Grouping
-        buyingValue: Buying value
         packagingFk: Box
-        name: Name
-        producer: Producer
-        type: Type
         color: Color
-        id: ID
         printedStickers: Printed stickers
     notes:
         observationType: Observation type
-    descriptor:
-        agency: Agency
-        landed: Landed
-        warehouseOut: Warehouse Out
     latestBuys:
         tableVisibleColumns:
             image: Picture
             itemFk: Item ID
-            packing: Packing
-            grouping: Grouping
-            size: Size
-            tags: Tags
-            type: Type
-            intrastat: Intrastat
-            origin: Origin
             weightByPiece: Weight/Piece
             isActive: Active
             family: Family
             entryFk: Entry
-            buyingValue: Buying value
             freightValue: Freight value
             comissionValue: Commission value
             packageValue: Package value
@@ -455,7 +428,6 @@ entry:
             price3: Packing
             minPrice: Min
             ektFk: Ekt
-            packagingFk: Package
             packingOut: Package out
             landing: Landing
             isExcludedFromAvailable: Es inventory
@@ -471,60 +443,38 @@ ticket:
         futureTickets: Future tickets
         purchaseRequest: Purchase request
         weeklyTickets: Weekly tickets
-    list:
-        nickname: Nickname
-        state: State
-        landed: Landed
-        total: Total
     card:
-        ticketId: Ticket ID
-        state: State
         customerId: Customer ID
-        agency: Agency
-        warehouse: Warehouse
         customerCard: Customer card
-        alias: Alias
         ticketList: Ticket List
         newOrder: New Order
     boxing:
         expedition: Expedition
-        item: Item
         created: Created
-        worker: Worker
         selectTime: 'Select time:'
         selectVideo: 'Select video:'
         notFound: No videos available
     summary:
-        state: State
-        agency: Agency
         zone: Zone
-        warehouse: Warehouse
         collection: Collection
         route: Route
         invoice: Invoice
         shipped: Shipped
-        landed: Landed
         consigneePhone: Consignee phone
         consigneeMobile: Consignee mobile
         consigneeAddress: Consignee address
         clientPhone: Client phone
         clientMobile: Client mobile
         consignee: Consignee
-        subtotal: Subtotal
-        vat: VAT
         total: Total
         saleLines: Line items
-        item: Item
-        visible: Visible
         available: Available
-        price: Price
         discount: Discount
         packing: Packing
         hasComponentLack: Component lack
         itemShortage: Not visible
         claim: Claim
         reserved: Reserved
-        created: Created
         package: Package
         taxClass: Tax class
         services: Services
@@ -539,41 +489,20 @@ ticket:
         attender: Attender
         ok: Ok
     create:
-        client: Client
         address: Address
-        landed: Landed
-        warehouse: Warehouse
-        agency: Agency
 invoiceOut:
-    list:
-        ref: Reference
-        issued: Issued
-        shortIssued: Issued
-        client: Client
-        created: Created
-        shortCreated: Created
-        company: Company
-        dued: Due date
-        shortDued: Due date
     card:
         issued: Issued
-        client: Client
-        company: Company
         customerCard: Customer card
     summary:
         issued: Issued
-        created: Created
         dued: Due
         booked: Booked
-        company: Company
         taxBreakdown: Tax breakdown
-        type: Type
         taxableBase: Taxable base
         rate: Rate
         fee: Fee
         tickets: Tickets
-        ticketId: Ticket id
-        nickname: Alias
         totalWithVat: Amount
     globalInvoices:
         errors:
@@ -587,19 +516,14 @@ invoiceOut:
             noTicketsToInvoice: There are not tickets to invoice
             criticalInvoiceError: 'Critical invoicing error, process stopped'
         table:
-            client: Client
             addressId: Address id
             streetAddress: Street
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} of {getNAddresses}'
             pdfsNumberText: '{nPdfs} of {totalPdfs} PDFs'
     negativeBases:
-        company: Company
-        country: Country
         clientId: Client Id
-        client: Client
         base: Base
-        ticketId: Ticket Id
         active: Active
         hasToInvoice: Has to Invoice
         verifiedData: Verified Data
@@ -612,13 +536,6 @@ shelving:
         priority: Priority
         newShelving: New Shelving
     summary:
-        parking: Parking
-        priority: Priority
-        worker: Worker
-        recyclable: Recyclable
-    basicData:
-        parking: Parking
-        priority: Priority
         recyclable: Recyclable
 parking:
     pickingOrder: Picking order
@@ -633,49 +550,28 @@ parking:
 order:
     field:
         salesPersonFk: Sales Person
-        clientFk: Client
-        isConfirmed: Confirmed
-        created: Created
-        landed: Landed
-        hour: Hour
-        agency: Agency
-        total: Total
     form:
         clientFk: Client
         addressFk: Address
-        landed: Landed
         agencyModeFk: Agency
     list:
         newOrder: New Order
     summary:
         basket: Basket
-        nickname: Nickname
-        company: Company
-        confirmed: Confirmed
         notConfirmed: Not confirmed
         created: Created
-        landed: Landed
-        phone: Phone
         createdFrom: Created From
         address: Address
-        subtotal: Subtotal
         total: Total
-        vat: VAT
-        state: State
-        alias: Alias
         items: Items
         orderTicketList: Order Ticket List
-        item: Item
-        price: Price
         amount: Amount
 department:
     pageTitles:
         department: Department
         summary: Summary
-    name: Name
     chat: Chat
     bossDepartment: Boss Department
-    email: Email
     selfConsumptionCustomer: Self-consumption customer
     telework: Telework
     notifyOnErrors: Notify on errors
@@ -699,23 +595,9 @@ worker:
         locker: Locker
         medical: Medical
     list:
-        name: Name
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        active: Active
         department: Department
         schedule: Schedule
         newWorker: New worker
-    card:
-        workerId: Worker ID
-        name: Name
-        email: Email
-        phone: Phone
-        mobile: Mobile
-        active: Active
-        warehouse: Warehouse
-        agency: Agency
     summary:
         boss: Boss
         phoneExtension: Phone extension
@@ -748,19 +630,12 @@ worker:
         serialNumber: Serial number
         removePDA: Deallocate PDA
     create:
-        name: Name
         lastName: Last name
         birth: Birth
         fi: Fi
         code: Worker code
-        phone: Phone
-        postcode: Postcode
-        province: Province
-        city: City
-        street: Street
         webUser: Web user
         personalEmail: Personal email
-        company: Company
         boss: Boss
         payMethods: Pay method
         iban: IBAN
@@ -801,7 +676,6 @@ wagon:
         wagonCounter: Trolley counter
         wagonTray: Tray List
     type:
-        name: Name
         submit: Submit
         reset: Reset
         trayColor: Tray color
@@ -809,12 +683,10 @@ wagon:
     list:
         plate: Plate
         volume: Volume
-        type: Type
         remove: Remove
         removeItem: Wagon removed successfully
     create:
         plate: Plate
-        type: Type
         label: Label
     warnings:
         noData: No data available
@@ -831,25 +703,17 @@ wagon:
 supplier:
     list:
         payMethod: Pay method
-        payDeadline: Pay deadline
-        payDay: Pay day
         account: Account
         newSupplier: New supplier
         tableVisibleColumns:
-            id: Id
-            name: Name
             nif: NIF/CIF
-            nickname: Alias
             account: Account
-            payMethod: Pay Method
             payDay: Pay Day
-            country: Country
     summary:
         responsible: Responsible
         verified: Verified
         isActive: Is active
         billingData: Billing data
-        payMethod: Pay method
         payDeadline: Pay deadline
         payDay: Pay day
         account: Account
@@ -862,15 +726,10 @@ supplier:
         fiscalAddress: Fiscal address
         socialName: Social name
         taxNumber: Tax number
-        street: Street
         city: City
-        postCode: Postcode
-        province: Province
-        country: Country
     create:
         supplierName: Supplier name
     basicData:
-        alias: Alias
         workerFk: Responsible
         isSerious: Verified
         isActive: Active
@@ -884,36 +743,18 @@ supplier:
         sageWithholdingFk: Sage withholding
         sageTransactionTypeFk: Sage transaction type
         supplierActivityFk: Supplier activity
-        healthRegister: Health register
-        street: Street
-        postcode: Postcode
-        city: City *
-        provinceFk: Province
-        country: Country
         isTrucker: Trucker
         isVies: Vies
     billingData:
         payMethodFk: Billing data
         payDemFk: Payment deadline
-        payDay: Pay day
     accounts:
         iban: Iban
         bankEntity: Bank entity
         beneficiary: Beneficiary
     contacts:
-        name: Name
-        phone: Phone
-        mobile: Mobile
         email: Email
         observation: Notes
-    addresses:
-        street: Street
-        postcode: Postcode
-        phone: Phone
-        name: Name
-        city: City
-        province: Province
-        mobile: Mobile
     agencyTerms:
         agencyFk: Agency
         minimumM3: Minimum M3
@@ -928,19 +769,13 @@ supplier:
 travel:
     travelList:
         tableVisibleColumns:
-            id: Id
             ref: Reference
-            agency: Agency
-            landed: Landed
             shipHour: Shipment Hour
             landHour: Landing Hour
-            warehouseIn: Warehouse in
-            warehouseOut: Warehouse out
             totalEntries: Total entries
             totalEntriesTooltip: Total entries
             daysOnward: Landed days onwards
     summary:
-        confirmed: Confirmed
         entryId: Entry Id
         freight: Freight
         package: Package
@@ -953,59 +788,28 @@ travel:
         AddEntry: Add entry
         thermographs: Thermographs
         hb: HB
-    variables:
-        search: Id/Reference
-        agencyModeFk: Agency
-        warehouseInFk: ' Warehouse In'
-        warehouseOutFk: Warehouse Out
-        landedFrom: Landed from
-        landedTo: Landed to
-        continent: Continent out
-    basicData:
-        agency: Agency
-        landed: Landed
-        warehouseOut: Warehouse Out
-        warehouseIn: Warehouse In
-        delivered: Delivered
-        received: Received
     thermographs:
         temperature: Temperature
-        state: State
         destination: Destination
-        created: Created
         thermograph: Thermograph
-        type: Type
-        company: Company
-        warehouse: Warehouse
         travelFileDescription: 'Travel id { travelId }'
 item:
     descriptor:
-        item: Item
         buyer: Buyer
         color: Color
         category: Category
-        stems: Stems
-        visible: Visible
         available: Available
         warehouseText: 'Calculated on the warehouse of { warehouseName }'
         itemDiary: Item diary
-        producer: Producer
     list:
         id: Identifier
-        grouping: Grouping
-        packing: Packing
         stems: Stems
         category: Category
         typeName: Type
-        intrastat: Intrastat
         isActive: Active
-        size: Size
-        origin: Origin
         userName: Buyer
         weightByPiece: Weight/Piece
         stemMultiplier: Multiplier
-        producer: Producer
-        landed: Landed
     fixedPrice:
         itemFk: Item ID
         groupingPrice: Grouping price
@@ -1014,71 +818,52 @@ item:
         minPrice: Min price
         started: Started
         ended: Ended
-        warehouse: Warehouse
     create:
-        name: Name
-        tag: Tag
         priority: Priority
-        type: Type
-        intrastat: Intrastat
-        origin: Origin
     buyRequest:
-        ticketId: 'Ticket ID'
-        requester: 'Requester'
-        requested: 'Requested'
-        price: 'Price'
-        attender: 'Atender'
-        item: 'Item'
-        achieved: 'Achieved'
-        concept: 'Concept'
-        state: 'State'
+        requester: Requester
+        requested: Requested
+        attender: Atender
+        achieved: Achieved
+        concept: Concept
     summary:
-        otherData: 'Other data'
-        tax: 'Tax'
-        tags: 'Tags'
-        botanical: 'Botanical'
-        barcode: 'Barcode'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Do photo'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
+        otherData: Other data
+        tax: Tax
+        botanical: Botanical
+        barcode: Barcode
+        completeName: Complete name
+        family: Familiy
+        stems: Stems
+        multiplier: Multiplier
+        buyer: Buyer
+        doPhoto: Do photo
+        intrastatCode: Intrastat code
+        ref: Reference
+        relevance: Relevance
+        weight: Weight (gram)/stem
+        units: Units/box
+        expense: Expense
+        generic: Generic
+        recycledPlastic: Recycled plastic
+        nonRecycledPlastic: Non recycled plastic
+        minSalesQuantity: Min sales quantity
+        genus: Genus
+        specie: Specie
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Type
-        tag: Tag
         value: Value
         # ItemFixedPriceFilter
         buyerFk: Buyer
-        warehouseFk: Warehouse
         started: From
         ended: To
         mine: For me
         hasMinPrice: Minimum price
         # LatestBuysFilter
         salesPersonFk: Buyer
-        supplierFk: Supplier
         from: From
         active: Is active
-        visible: Is visible
         floramondo: Is floramondo
         showBadDates: Show future items
     userPanel:
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index a8d582c30..92507db40 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -58,8 +58,8 @@ globals:
     downloadCSVSuccess: Descarga de CSV exitosa
     reference: Referencia
     agency: Agencia
-    wareHouseOut: Alm. salida
-    wareHouseIn: Alm. entrada
+    warehouseOut: Alm. salida
+    warehouseIn: Alm. entrada
     landed: F. entrega
     shipped: F. envío
     totalEntries: Ent. totales
@@ -108,6 +108,26 @@ globals:
     weight: Peso
     error: ¡Ups! Algo salió mal
     recalc: Recalcular
+    alias: Alias
+    vat: IVA
+    intrastat: Intrastat
+    tags: Etiquetas
+    size: Medida
+    producer: Productor
+    origin: Origen
+    state: Estado
+    subtotal: Subtotal
+    visible: Visible
+    price: Precio
+    client: Cliente
+    country: País
+    phone: Teléfono
+    mobile: Móvil
+    postcode: Código postal
+    street: Dirección
+    tag: Etiqueta
+    ticketId: ID ticket
+    confirmed: Confirmado
     pageTitles:
         logIn: Inicio de sesión
         addressEdit: Modificar consignatario
@@ -299,7 +319,6 @@ globals:
     maxTemperature: Máx
     minTemperature: Mín
     params:
-        id: Id
         clientFk: Id cliente
         salesPersonFk: Comercial
         warehouseFk: Almacén
@@ -348,14 +367,7 @@ resetPassword:
 entry:
     list:
         newEntry: Nueva entrada
-        landed: F. entrega
-        invoiceNumber: Núm. factura
-        supplier: Proveedor
-        booked: Asentado
-        confirmed: Confirmado
-        ordered: Pedida
         tableVisibleColumns:
-            id: Id
             created: Creación
             supplierFk: Proveedor
             isBooked: Asentado
@@ -364,15 +376,12 @@ entry:
             companyFk: Empresa
             travelFk: Envio
             isExcludedFromAvailable: Inventario
-            isRaid: Redada
             invoiceAmount: Importe
     summary:
         commission: Comisión
         currency: Moneda
-        company: Empresa
         invoiceNumber: Núm. factura
         ordered: Pedida
-        confirmed: Confirmada
         booked: Contabilizada
         raid: Redada
         excludedFromAvailable: Inventario
@@ -382,7 +391,6 @@ entry:
         travelWarehouseOut: Alm. salida
         travelDelivered: Enviada
         travelLanded: F. entrega
-        travelWarehouseIn: Alm. entrada
         travelReceived: Recibida
         buys: Compras
         stickers: Etiquetas
@@ -392,63 +400,29 @@ entry:
         buyingValue: Coste
         import: Importe
         pvp: PVP
-        item: Artículo
     basicData:
-        supplier: Proveedor
         travel: Envío
-        invoiceNumber: Núm. factura
-        company: Empresa
         currency: Moneda
         observation: Observación
         commission: Comisión
-        ordered: Pedida
-        confirmed: Confirmado
         booked: Asentado
         raid: Redada
         excludedFromAvailable: Inventario
-        agency: Agencia
-        warehouseOut: Alm. salida
-        warehouseIn: Alm. entrada
-        landed: F. entrega
-        id: ID
     buys:
-        groupingPrice: Precio grouping
-        packingPrice: Precio packing
         observations: Observaciónes
-        item: Artículo
-        size: Medida
-        packing: Packing
-        grouping: Grouping
-        buyingValue: Coste
         packagingFk: Embalaje
-        name: Nombre
-        producer: Productor
-        type: Tipo
         color: Color
-        id: ID
         printedStickers: Etiquetas impresas
     notes:
         observationType: Tipo de observación
-    descriptor:
-        agency: Agencia
-        landed: F. entrega
-        warehouseOut: Alm. salida
     latestBuys:
         tableVisibleColumns:
             image: Foto
             itemFk: Id Artículo
-            packing: packing
-            grouping: Grouping
-            size: Medida
-            tags: Etiquetas
-            type: Tipo
-            intrastat: Intrastat
-            origin: Origen
             weightByPiece: Peso (gramos)/tallo
             isActive: Activo
             family: Familia
             entryFk: Entrada
-            buyingValue: Coste
             freightValue: Porte
             comissionValue: Comisión
             packageValue: Embalaje
@@ -457,7 +431,6 @@ entry:
             price3: Packing
             minPrice: Min
             ektFk: Ekt
-            packagingFk: Embalaje
             packingOut: Embalaje envíos
             landing: Llegada
             isExcludedFromAvailable: Es inventario
@@ -478,60 +451,38 @@ ticket:
         tracking: Estados
         components: Componentes
         pictures: Fotos
-    list:
-        nickname: Alias
-        state: Estado
-        landed: Entregado
-        total: Total
     card:
-        ticketId: ID ticket
-        state: Estado
         customerId: ID cliente
-        agency: Agencia
-        warehouse: Almacén
         customerCard: Ficha del cliente
-        alias: Alias
         ticketList: Listado de tickets
         newOrder: Nuevo pedido
     boxing:
         expedition: Expedición
-        item: Artículo
         created: Creado
-        worker: Trabajador
         selectTime: 'Seleccionar hora:'
         selectVideo: 'Seleccionar vídeo:'
         notFound: No hay vídeos disponibles
     summary:
-        state: Estado
-        agency: Agencia
         zone: Zona
-        warehouse: Almacén
         collection: Colección
         route: Ruta
         invoice: Factura
         shipped: Enviado
-        landed: Entregado
         consigneePhone: Tel. consignatario
         consigneeMobile: Móv. consignatario
         consigneeAddress: Dir. consignatario
         clientPhone: Tel. cliente
         clientMobile: Móv. cliente
         consignee: Consignatario
-        subtotal: Subtotal
-        vat: IVA
         total: Total
         saleLines: Líneas del pedido
-        item: Artículo
-        visible: Visible
         available: Disponible
-        price: Precio
         discount: Descuento
         packing: Encajado
         hasComponentLack: Faltan componentes
         itemShortage: No visible
         claim: Reclamación
         reserved: Reservado
-        created: Fecha creación
         package: Embalaje
         taxClass: Tipo IVA
         services: Servicios
@@ -545,42 +496,21 @@ ticket:
         service: Servicio
         attender: Consignatario
     create:
-        client: Cliente
         address: Dirección
-        landed: F. entrega
-        warehouse: Almacén
-        agency: Agencia
 invoiceOut:
-    list:
-        ref: Referencia
-        issued: Fecha emisión
-        shortIssued: F. emisión
-        client: Cliente
-        created: Fecha creación
-        shortCreated: F. creación
-        company: Empresa
-        dued: Fecha vencimineto
-        shortDued: F. vencimiento
     card:
         issued: Fecha emisión
-        client: Cliente
-        company: Empresa
         customerCard: Ficha del cliente
         ticketList: Listado de tickets
     summary:
         issued: Fecha
-        created: Fecha creación
         dued: Vencimiento
         booked: Contabilizada
-        company: Empresa
         taxBreakdown: Desglose impositivo
-        type: Tipo
         taxableBase: Base imp.
         rate: Tarifa
         fee: Cuota
         tickets: Tickets
-        ticketId: Id ticket
-        nickname: Alias
         totalWithVat: Importe
     globalInvoices:
         errors:
@@ -594,19 +524,14 @@ invoiceOut:
             noTicketsToInvoice: No existen tickets para facturar
             criticalInvoiceError: Error crítico en la facturación proceso detenido
         table:
-            client: Cliente
             addressId: Id dirección
             streetAddress: Dirección fiscal
         statusCard:
             percentageText: '{getPercentage}% {getAddressNumber} de {getNAddresses}'
             pdfsNumberText: '{nPdfs} de {totalPdfs} PDFs'
     negativeBases:
-        company: Empresa
-        country: País
         clientId: Id cliente
-        client: Cliente
         base: Base
-        ticketId: Id ticket
         active: Activo
         hasToInvoice: Facturar
         verifiedData: Datos comprobados
@@ -616,40 +541,21 @@ invoiceOut:
 order:
     field:
         salesPersonFk: Comercial
-        clientFk: Cliente
-        isConfirmed: Confirmada
-        created: Creado
-        landed: F. entrega
-        hour: Hora
-        agency: Agencia
-        total: Total
     form:
         clientFk: Cliente
         addressFk: Dirección
-        landed: F. entrega
         agencyModeFk: Agencia
     list:
         newOrder: Nuevo Pedido
     summary:
         basket: Cesta
-        nickname: Alias
-        company: Empresa
-        confirmed: Confirmada
         notConfirmed: No confirmada
         created: Creado
-        landed: F. entrega
-        phone: Teléfono
         createdFrom: Creado desde
         address: Dirección
-        subtotal: Subtotal
         total: Total
-        vat: IVA
-        state: Estado
-        alias: Alias
         items: Items
         orderTicketList: Tickets del pedido
-        item: Item
-        price: Precio
         amount: Monto
 shelving:
     list:
@@ -657,13 +563,6 @@ shelving:
         priority: Prioridad
         newShelving: Nuevo Carro
     summary:
-        parking: Parking
-        priority: Prioridad
-        worker: Trabajador
-        recyclable: Reciclable
-    basicData:
-        parking: Parking
-        priority: Prioridad
         recyclable: Reciclable
 parking:
     pickingOrder: Orden de recogida
@@ -678,10 +577,8 @@ department:
     pageTitles:
         department: Departamentos
         summary: Resumen
-    name: Nombre
     chat: Chat
     bossDepartment: Jefe de departamento
-    email: Email
     selfConsumptionCustomer: Cliente autoconsumo
     telework: Teletrabaja
     notifyOnErrors: Notificar errores
@@ -706,23 +603,9 @@ worker:
         formation: Formación
         medical: Mutua
     list:
-        name: Nombre
-        email: Email
-        phone: Teléfono
-        mobile: Móvil
-        active: Activo
         department: Departamento
         schedule: Horario
         newWorker: Nuevo trabajador
-    card:
-        workerId: ID Trabajador
-        name: Nombre
-        email: Correo personal
-        phone: Teléfono
-        mobile: Móvil
-        active: Activo
-        warehouse: Almacén
-        agency: Empresa
     summary:
         boss: Jefe
         phoneExtension: Extensión de teléfono
@@ -746,19 +629,12 @@ worker:
         serialNumber: Número de serie
         removePDA: Desasignar PDA
     create:
-        name: Nombre
         lastName: Apellido
         birth: Fecha de nacimiento
         fi: DNI/NIF/NIE
         code: Código de trabajador
-        phone: Teléfono
-        postcode: Código postal
-        province: Provincia
-        city: Población
-        street: Dirección
         webUser: Usuario Web
         personalEmail: Correo personal
-        company: Empresa
         boss: Jefe
         payMethods: Método de pago
         iban: IBAN
@@ -799,7 +675,6 @@ wagon:
         wagonCounter: Contador de carros
         wagonTray: Listado bandejas
     type:
-        name: Nombre
         submit: Guardar
         reset: Deshacer cambios
         trayColor: Color de la bandeja
@@ -807,12 +682,9 @@ wagon:
     list:
         plate: Matrícula
         volume: Volumen
-        type: Tipo
         remove: Borrar
         removeItem: Vagón borrado correctamente
     create:
-        plate: Matrícula
-        type: Tipo
         label: Etiqueta
     warnings:
         noData: Sin datos disponibles
@@ -828,25 +700,16 @@ wagon:
 supplier:
     list:
         payMethod: Método de pago
-        payDeadline: Plazo de pago
-        payDay: Día de pago
         account: Cuenta
         newSupplier: Nuevo proveedor
         tableVisibleColumns:
-            id: Id
-            name: Nombre
             nif: NIF/CIF
-            nickname: Alias
             account: Cuenta
-            payMethod: Método de pago
-            payDay: Dia de pago
-            country: País
     summary:
         responsible: Responsable
         verified: Verificado
         isActive: Está activo
         billingData: Forma de pago
-        payMethod: Método de pago
         payDeadline: Plazo de pago
         payDay: Día de pago
         account: Cuenta
@@ -859,15 +722,11 @@ supplier:
         fiscalAddress: Dirección fiscal
         socialName: Razón social
         taxNumber: NIF/CIF
-        street: Dirección
         city: Población
-        postCode: Código postal
         province: Provincia
-        country: País
     create:
         supplierName: Nombre del proveedor
     basicData:
-        alias: Alias
         workerFk: Responsable
         isSerious: Verificado
         isActive: Activo
@@ -881,36 +740,17 @@ supplier:
         sageWithholdingFk: Retención sage
         sageTransactionTypeFk: Tipo de transacción sage
         supplierActivityFk: Actividad proveedor
-        healthRegister: Pasaporte sanitario
-        street: Calle
-        postcode: Código postal
-        city: Población *
-        provinceFk: Provincia
-        country: País
         isTrucker: Transportista
         isVies: Vies
     billingData:
         payMethodFk: Forma de pago
         payDemFk: Plazo de pago
-        payDay: Día de pago
     accounts:
         iban: Iban
         bankEntity: Entidad bancaria
         beneficiary: Beneficiario
     contacts:
-        name: Nombre
-        phone: Teléfono
-        mobile: Móvil
-        email: Email
         observation: Notas
-    addresses:
-        street: Dirección
-        postcode: Código postal
-        phone: Teléfono
-        name: Nombre
-        city: Población
-        province: Provincia
-        mobile: Móvil
     agencyTerms:
         agencyFk: Agencia
         minimumM3: M3 mínimos
@@ -925,19 +765,13 @@ supplier:
 travel:
     travelList:
         tableVisibleColumns:
-            id: Id
             ref: Referencia
-            agency: Agencia
             shipHour: Hora de envío
             landHour: Hora de llegada
-            landed: F.entrega
-            warehouseIn: Alm.salida
-            warehouseOut: Alm.entrada
             totalEntries: ∑
             totalEntriesTooltip: Entradas totales
             daysOnward: Días de llegada en adelante
     summary:
-        confirmed: Confirmado
         entryId: Id entrada
         freight: Porte
         package: Embalaje
@@ -950,59 +784,28 @@ travel:
         AddEntry: Añadir entrada
         thermographs: Termógrafos
         hb: HB
-    variables:
-        search: Id/Referencia
-        agencyModeFk: Agencia
-        warehouseInFk: Alm. entrada
-        warehouseOutFk: ' Alm. salida'
-        landedFrom: Llegada desde
-        landedTo: Llegada hasta
-        continent: Cont. Salida
-    basicData:
-        agency: Agencia
-        landed: F. entrega
-        warehouseOut: Alm. salida
-        warehouseIn: Alm. entrada
-        delivered: Enviada
-        received: Recibida
     thermographs:
         temperature: Temperatura
-        state: Estado
         destination: Destino
-        created: Fecha creación
         thermograph: Termógrafo
-        type: Tipo
-        company: Empresa
-        warehouse: Almacén
         travelFileDescription: 'Id envío { travelId }'
 item:
     descriptor:
-        item: Artículo
         buyer: Comprador
         color: Color
         category: Categoría
-        stems: Tallos
-        visible: Visible
         available: Disponible
         warehouseText: 'Calculado sobre el almacén de { warehouseName }'
         itemDiary: Registro de compra-venta
-        producer: Productor
     list:
         id: Identificador
-        grouping: Grouping
-        packing: Packing
         stems: Tallos
         category: Reino
         typeName: Tipo
-        intrastat: Intrastat
         isActive: Activo
-        size: Medida
-        origin: Origen
         weightByPiece: Peso (gramos)/tallo
         userName: Comprador
         stemMultiplier: Multiplicador
-        producer: Productor
-        landed: F. entrega
     fixedPrice:
         itemFk: ID Artículo
         groupingPrice: Precio grouping
@@ -1011,70 +814,51 @@ item:
         minPrice: Precio min
         started: Inicio
         ended: Fin
-        warehouse: Almacén
     create:
-        name: Nombre
-        tag: Etiqueta
         priority: Prioridad
-        type: Tipo
-        intrastat: Intrastat
-        origin: Origen
     summary:
-        otherData: 'Otros datos'
-        tax: 'IVA'
-        tags: 'Etiquetas'
-        botanical: 'Botánico'
-        barcode: 'Código de barras'
-        name: 'Nombre'
-        completeName: 'Nombre completo'
-        family: 'Familia'
-        size: 'Medida'
-        origin: 'Origen'
-        stems: 'Tallos'
-        multiplier: 'Multiplicador'
-        buyer: 'Comprador'
-        doPhoto: 'Hacer foto'
-        intrastatCode: 'Código intrastat'
-        intrastat: 'Intrastat'
-        ref: 'Referencia'
-        relevance: 'Relevancia'
-        weight: 'Peso (gramos)/tallo'
-        units: 'Unidades/caja'
-        expense: 'Gasto'
-        generic: 'Genérico'
-        recycledPlastic: 'Plástico reciclado'
-        nonRecycledPlastic: 'Plástico no reciclado'
-        minSalesQuantity: 'Cantidad mínima de venta'
-        genus: 'Genus'
-        specie: 'Specie'
+        otherData: Otros datos
+        tax: IVA
+        botanical: Botánico
+        barcode: Código de barras
+        completeName: Nombre completo
+        family: Familia
+        stems: Tallos
+        multiplier: Multiplicador
+        buyer: Comprador
+        doPhoto: Hacer foto
+        intrastatCode: Código intrastat
+        ref: Referencia
+        relevance: Relevancia
+        weight: Peso (gramos)/tallo
+        units: Unidades/caja
+        expense: Gasto
+        generic: Genérico
+        recycledPlastic: Plástico reciclado
+        nonRecycledPlastic: Plástico no reciclado
+        minSalesQuantity: Cantidad mínima de venta
+        genus: Genus
+        specie: Specie
     buyRequest:
-        ticketId: 'ID Ticket'
-        requester: 'Solicitante'
-        requested: 'Solicitado'
-        price: 'Precio'
-        attender: 'Comprador'
-        item: 'Artículo'
-        achieved: 'Conseguido'
-        concept: 'Concepto'
-        state: 'Estado'
+        requester: Solicitante
+        requested: Solicitado
+        attender: Comprador
+        achieved: Conseguido
+        concept: Concepto
 components:
     topbar: {}
     itemsFilterPanel:
         typeFk: Tipo
-        tag: Etiqueta
         value: Valor
         # ItemFixedPriceFilter
         buyerFk: Comprador
-        warehouseFk: Almacén
         started: Desde
         ended: Hasta
         mine: Para mi
         hasMinPrice: Precio mínimo
         # LatestBuysFilter
         salesPersonFk: Comprador
-        supplierFk: Proveedor
         active: Activo
-        visible: Visible
         floramondo: Floramondo
         showBadDates: Ver items a futuro
     userPanel:
diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
index 384881792..07bccd971 100644
--- a/src/pages/Department/Card/DepartmentBasicData.vue
+++ b/src/pages/Department/Card/DepartmentBasicData.vue
@@ -20,9 +20,9 @@ const { t } = useI18n();
         <template #form="{ data, validate }">
             <VnRow>
                 <VnInput
-                    :label="t('department.name')"
+                    :label="t('globals.name')"
                     v-model="data.name"
-                    :rules="validate('department.name')"
+                    :rules="validate('globals.name')"
                     clearable
                     autofocus
                 />
@@ -42,8 +42,8 @@ const { t } = useI18n();
                 />
                 <VnInput
                     v-model="data.notificationEmail"
-                    :label="t('department.email')"
-                    :rules="validate('department.email')"
+                    :label="t('globals.params.email')"
+                    :rules="validate('globals.params.email')"
                     clearable
                 />
             </VnRow>
diff --git a/src/pages/Department/Card/DepartmentSummary.vue b/src/pages/Department/Card/DepartmentSummary.vue
index 05a9e073e..623eab94a 100644
--- a/src/pages/Department/Card/DepartmentSummary.vue
+++ b/src/pages/Department/Card/DepartmentSummary.vue
@@ -45,11 +45,7 @@ onMounted(async () => {
                 />
                 <div class="full-width row wrap justify-between content-between">
                     <div class="column" style="min-width: 50%">
-                        <VnLv
-                            :label="t('department.name')"
-                            :value="department.name"
-                            dash
-                        />
+                        <VnLv :label="t('globals.name')" :value="department.name" dash />
                         <VnLv :label="t('globals.code')" :value="department.code" dash />
                         <VnLv
                             :label="t('department.chat')"
diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
index 2a00bfd74..64ef60956 100644
--- a/src/pages/Entry/Card/EntryBasicData.vue
+++ b/src/pages/Entry/Card/EntryBasicData.vue
@@ -53,7 +53,7 @@ const onFilterTravelSelected = (formData, id) => {
         <template #form="{ data }">
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.supplier')"
+                    :label="t('globals.supplier')"
                     v-model="data.supplierFk"
                     url="Suppliers"
                     option-value="id"
@@ -113,10 +113,10 @@ const onFilterTravelSelected = (formData, id) => {
             <VnRow>
                 <VnInput
                     v-model="data.invoiceNumber"
-                    :label="t('entry.basicData.invoiceNumber')"
+                    :label="t('entry.summary.invoiceNumber')"
                 />
                 <VnSelect
-                    :label="t('entry.basicData.company')"
+                    :label="t('globals.company')"
                     v-model="data.companyFk"
                     :options="companiesOptions"
                     option-value="id"
@@ -128,14 +128,14 @@ const onFilterTravelSelected = (formData, id) => {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('entry.basicData.currency')"
+                    :label="t('entry.summary.currency')"
                     v-model="data.currencyFk"
                     :options="currenciesOptions"
                     option-value="id"
                     option-label="code"
                 />
                 <QInput
-                    :label="t('entry.basicData.commission')"
+                    :label="t('entry.summary.commission')"
                     v-model="data.commission"
                     type="number"
                     autofocus
@@ -153,17 +153,11 @@ const onFilterTravelSelected = (formData, id) => {
                 />
             </VnRow>
             <VnRow>
-                <QCheckbox
-                    v-model="data.isOrdered"
-                    :label="t('entry.basicData.ordered')"
-                />
-                <QCheckbox
-                    v-model="data.isConfirmed"
-                    :label="t('entry.basicData.confirmed')"
-                />
+                <QCheckbox v-model="data.isOrdered" :label="t('entry.summary.ordered')" />
+                <QCheckbox v-model="data.isConfirmed" :label="t('globals.confirmed')" />
                 <QCheckbox
                     v-model="data.isExcludedFromAvailable"
-                    :label="t('entry.basicData.excludedFromAvailable')"
+                    :label="t('entry.summary.excludedFromAvailable')"
                 />
                 <QCheckbox v-model="data.isRaid" :label="t('entry.basicData.raid')" />
                 <QCheckbox
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 35972b85a..98ce884cf 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -156,7 +156,7 @@ const tableColumnComponents = computed(() => ({
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('entry.summary.item'),
+            label: t('globals.item'),
             field: 'itemFk',
             name: 'item',
             align: 'left',
@@ -211,13 +211,13 @@ const entriesTableColumns = computed(() => {
             format: (value) => toCurrency(value),
         },
         {
-            label: t('entry.buys.groupingPrice'),
+            label: t('item.fixedPrice.groupingPrice'),
             field: 'price2',
             name: 'price2',
             align: 'left',
         },
         {
-            label: t('entry.buys.packingPrice'),
+            label: t('item.fixedPrice.packingPrice'),
             field: 'price3',
             name: 'price3',
             align: 'left',
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 36ca3b797..c03b7756f 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -35,7 +35,7 @@ const packagingsOptions = ref([]);
 
 const columns = computed(() => [
     {
-        label: t('entry.buys.item'),
+        label: t('globals.item'),
         name: 'item',
         field: 'itemFk',
         options: lastItemBuysOptions.value,
@@ -56,19 +56,19 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('entry.buys.packing'),
+        label: t('entry.summary.packing'),
         name: 'packing',
         field: 'packing',
         align: 'left',
     },
     {
-        label: t('entry.buys.grouping'),
+        label: t('entry.summary.grouping'),
         name: 'grouping',
         field: 'grouping',
         align: 'left',
     },
     {
-        label: t('entry.buys.buyingValue'),
+        label: t('entry.summary.buyingValue'),
         name: 'buyingValue',
         field: 'buyingValue',
         align: 'left',
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index b22d6ba53..fa75e820d 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -122,14 +122,11 @@ watch;
             </QItem>
         </template>
         <template #body="{ entity }">
-            <VnLv
-                :label="t('entry.descriptor.agency')"
-                :value="entity.travel?.agency?.name"
-            />
+            <VnLv :label="t('globals.agency')" :value="entity.travel?.agency?.name" />
             <VnLv :label="t('shipped')" :value="toDate(entity.travel?.shipped)" />
             <VnLv :label="t('landed')" :value="toDate(entity.travel?.landed)" />
             <VnLv
-                :label="t('entry.descriptor.warehouseOut')"
+                :label="t('globals.warehouseOut')"
                 :value="entity.travel?.warehouseOut?.name"
             />
         </template>
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 0ed2e8a67..9fe9ae265 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -189,7 +189,7 @@ const fetchEntryBuys = async () => {
                     :label="t('entry.summary.currency')"
                     :value="entry.currency?.name"
                 />
-                <VnLv :label="t('entry.summary.company')" :value="entry.company.code" />
+                <VnLv :label="t('globals.company')" :value="entry.company.code" />
                 <VnLv :label="t('globals.reference')" :value="entry.reference" />
                 <VnLv
                     :label="t('entry.summary.invoiceNumber')"
@@ -218,7 +218,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('shipped')" :value="toDate(entry.travel.shipped)" />
                 <VnLv
-                    :label="t('entry.summary.travelWarehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :value="entry.travel.warehouseOut?.name"
                 />
                 <QCheckbox
@@ -228,7 +228,7 @@ const fetchEntryBuys = async () => {
                 />
                 <VnLv :label="t('landed')" :value="toDate(entry.travel.landed)" />
                 <VnLv
-                    :label="t('entry.summary.travelWarehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :value="entry.travel.warehouseIn?.name"
                 />
                 <QCheckbox
@@ -251,7 +251,7 @@ const fetchEntryBuys = async () => {
                     :disable="true"
                 />
                 <QCheckbox
-                    :label="t('entry.summary.confirmed')"
+                    :label="t('globals.confirmed')"
                     v-model="entry.isConfirmed"
                     :disable="true"
                 />
diff --git a/src/pages/Entry/EntryBuysTableDialog.vue b/src/pages/Entry/EntryBuysTableDialog.vue
index 0f9be6298..960c936ee 100644
--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@@ -35,7 +35,7 @@ const entriesTableColumns = computed(() => [
     {
         align: 'left',
         name: 'item',
-        label: t('entry.summary.item'),
+        label: t('globals.item'),
         field: (row) => row.item.name,
     },
     {
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 756948182..9e1492bb6 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -37,12 +37,12 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packing'),
+        label: t('entry.summary.packing'),
         name: 'packing',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.grouping'),
+        label: t('entry.summary.grouping'),
         name: 'grouping',
     },
     {
@@ -57,27 +57,27 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.size'),
+        label: t('globals.size'),
         name: 'size',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.tags'),
+        label: t('globals.tags'),
         name: 'tags',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.type'),
+        label: t('globals.type'),
         name: 'type',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.intrastat'),
+        label: t('globals.intrastat'),
         name: 'intrastat',
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.origin'),
+        label: t('globals.origin'),
         name: 'origin',
     },
     {
@@ -102,7 +102,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.buyingValue'),
+        label: t('entry.summary.buyingValue'),
         name: 'buyingValue',
     },
     {
@@ -117,7 +117,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packageValue'),
+        label: t('entry.buys.packageValue'),
         name: 'packageValue',
     },
     {
@@ -152,7 +152,7 @@ const columns = [
     },
     {
         align: 'left',
-        label: t('entry.latestBuys.tableVisibleColumns.packagingFk'),
+        label: t('entry.buys.packagingFk'),
         name: 'packagingFk',
     },
     {
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e44e3891e..2bfea2a4d 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -43,7 +43,7 @@ const entryFilter = {
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('entry.list.tableVisibleColumns.id'),
+        label: t('globals.id'),
         name: 'id',
         isTitle: true,
         cardVisible: true,
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
index 5e4be407e..2b60948dd 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptor.vue
@@ -69,7 +69,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         <template #body="{ entity }">
             <VnLv :label="t('invoiceOut.card.issued')" :value="toDate(entity.issued)" />
             <VnLv :label="t('globals.amount')" :value="toCurrency(entity.amount)" />
-            <VnLv v-if="entity.client" :label="t('invoiceOut.card.client')">
+            <VnLv v-if="entity.client" :label="t('globals.client')">
                 <template #value>
                     <span class="link">
                         {{ entity.client.name }}
@@ -79,7 +79,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             </VnLv>
             <VnLv
                 v-if="entity.company"
-                :label="t('invoiceOut.card.company')"
+                :label="t('globals.company')"
                 :value="entity.company.code"
             />
         </template>
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
index 83b1bf8a4..027f08109 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutSummary.vue
@@ -42,7 +42,7 @@ function fetch() {
 const taxColumns = ref([
     {
         name: 'item',
-        label: 'invoiceOut.summary.type',
+        label: 'globals.type',
         field: (row) => row.name,
         sortable: true,
     },
@@ -72,14 +72,14 @@ const taxColumns = ref([
 const ticketsColumns = ref([
     {
         name: 'item',
-        label: t('invoiceOut.summary.ticketId'),
+        label: t('globals.ticketId'),
         field: (row) => row.id,
         sortable: true,
         align: 'left',
     },
     {
         name: 'quantity',
-        label: t('invoiceOut.summary.nickname'),
+        label: t('globals.alias'),
         field: (row) => row.nickname,
         sortable: true,
         align: 'left',
@@ -124,18 +124,12 @@ const ticketsColumns = ref([
                     :label="t('invoiceOut.summary.dued')"
                     :value="toDate(invoiceOut.dued)"
                 />
-                <VnLv
-                    :label="t('invoiceOut.summary.created')"
-                    :value="toDate(invoiceOut.created)"
-                />
+                <VnLv :label="t('globals.created')" :value="toDate(invoiceOut.created)" />
                 <VnLv
                     :label="t('invoiceOut.summary.booked')"
                     :value="toDate(invoiceOut.booked)"
                 />
-                <VnLv
-                    :label="t('invoiceOut.summary.company')"
-                    :value="invoiceOut.company.code"
-                />
+                <VnLv :label="t('globals.company')" :value="invoiceOut.company.code" />
             </QCard>
             <QCard class="vn-three">
                 <VnTitle :text="t('invoiceOut.summary.taxBreakdown')" />
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 5f2eb3c02..7f6bf41d3 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -59,7 +59,7 @@ const columns = computed(() => [
         field: 'clientId',
     },
     {
-        label: t('invoiceOut.globalInvoices.table.client'),
+        label: t('globals.client'),
         field: 'clientName',
         name: 'clientName',
         align: 'left',
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index cf4c27e65..8c8c01e9c 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -51,7 +51,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.company"
-                        :label="t('invoiceOut.negativeBases.company')"
+                        :label="t('globals.company')"
                         is-outlined
                     />
                 </QItemSection>
@@ -60,7 +60,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.country"
-                        :label="t('invoiceOut.negativeBases.country')"
+                        :label="t('globals.country')"
                         is-outlined
                     />
                 </QItemSection>
@@ -79,7 +79,7 @@ const props = defineProps({
                 <QItemSection>
                     <VnInput
                         v-model="params.clientSocialName"
-                        :label="t('invoiceOut.negativeBases.client')"
+                        :label="t('globals.client')"
                         is-outlined
                     />
                 </QItemSection>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index ef844824f..805ba6e11 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -173,10 +173,7 @@ const openCloneDialog = async () => {
                     </span>
                 </template>
             </VnLv>
-            <VnLv
-                :label="t('item.descriptor.producer')"
-                :value="dashIfEmpty(entity.subName)"
-            />
+            <VnLv :label="t('globals.producer')" :value="dashIfEmpty(entity.subName)" />
             <VnLv
                 v-if="entity.value5"
                 :label="t('item.descriptor.color')"
@@ -190,7 +187,7 @@ const openCloneDialog = async () => {
             />
             <VnLv
                 v-if="entity.value7"
-                :label="t('item.descriptor.stems')"
+                :label="t('item.list.stems')"
                 :value="entity.value7"
             />
         </template>
diff --git a/src/pages/Item/Card/ItemDescriptorImage.vue b/src/pages/Item/Card/ItemDescriptorImage.vue
index a4ef22ce3..063c77c65 100644
--- a/src/pages/Item/Card/ItemDescriptorImage.vue
+++ b/src/pages/Item/Card/ItemDescriptorImage.vue
@@ -75,7 +75,7 @@ const handlePhotoUpdated = (evt = false) => {
                             <QIcon name="vn:item" />
                         </div>
                         <div class="text-grey-5" style="opacity: 0.4">
-                            {{ t('item.descriptor.item') }}
+                            {{ t('globals.item') }}
                         </div>
                     </div>
                 </div>
@@ -107,7 +107,7 @@ const handlePhotoUpdated = (evt = false) => {
     >
         <div class="col column items-center">
             <span class="text-uppercase color-vn-white" style="font-size: 11px">
-                {{ t('item.descriptor.visible') }}
+                {{ t('globals.visible') }}
             </span>
             <span class="text-weight-bold text-h5 color-vn-white">{{ visible }}</span>
         </div>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index dd2c0649b..4570b2319 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -57,11 +57,11 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                     :url="getUrl(entityId, 'basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv :label="t('item.summary.name')" :value="item.name" />
+                <VnLv :label="t('globals.name')" :value="item.name" />
                 <VnLv :label="t('item.summary.completeName')" :value="item.longName" />
                 <VnLv :label="t('item.summary.family')" :value="item.itemType.name" />
-                <VnLv :label="t('item.summary.size')" :value="item.size" />
-                <VnLv :label="t('item.summary.origin')" :value="item.origin.name" />
+                <VnLv :label="t('globals.size')" :value="item.size" />
+                <VnLv :label="t('globals.origin')" :value="item.origin.name" />
                 <VnLv :label="t('item.summary.stems')" :value="item.stems" />
                 <VnLv
                     :label="t('item.summary.multiplier')"
@@ -96,7 +96,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                     :value="item.intrastat.id"
                 />
                 <VnLv
-                    :label="t('item.summary.intrastat')"
+                    :label="t('globals.intrastat')"
                     :value="item.intrastat.description"
                 />
                 <VnLv :label="t('item.summary.ref')" :value="item.comment" />
@@ -115,7 +115,7 @@ const getUrl = (id, param) => `#/Item/${id}/${param}`;
                 />
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('item.summary.tags')" />
+                <VnTitle :url="getUrl(entityId, 'tags')" :text="t('globals.tags')" />
                 <VnLv
                     v-for="(tag, index) in tags"
                     :key="index"
diff --git a/src/pages/Item/ItemCreate.vue b/src/pages/Item/ItemCreate.vue
index 6b6234b70..d69153820 100644
--- a/src/pages/Item/ItemCreate.vue
+++ b/src/pages/Item/ItemCreate.vue
@@ -86,12 +86,9 @@ onBeforeMount(async () => {
         >
             <template #form="{ data }">
                 <VnRow>
-                    <VnInput
-                        v-model="data.provisionalName"
-                        :label="t('item.create.name')"
-                    />
+                    <VnInput v-model="data.provisionalName" :label="t('globals.name')" />
                     <VnSelect
-                        :label="t('item.create.tag')"
+                        :label="t('globals.tag')"
                         v-model="data.tag"
                         :options="tagsOptions"
                         option-value="id"
@@ -109,7 +106,7 @@ onBeforeMount(async () => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('item.create.type')"
+                        :label="t('globals.type')"
                         v-model="data.typeFk"
                         :options="itemTypesOptions"
                         option-label="name"
@@ -133,7 +130,7 @@ onBeforeMount(async () => {
                         </template>
                     </VnSelect>
                     <VnSelect
-                        :label="t('item.create.intrastat')"
+                        :label="t('globals.intrastat')"
                         v-model="data.intrastatFk"
                         :options="intrastatsOptions"
                         option-label="description"
@@ -156,7 +153,7 @@ onBeforeMount(async () => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('item.create.origin')"
+                        :label="t('globals.origin')"
                         v-model="data.originFk"
                         :options="originsOptions"
                         option-value="id"
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 7d4d6b896..4205d8344 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -132,7 +132,7 @@ const columns = computed(() => [
     },
 
     {
-        label: t('item.fixedPrice.warehouse'),
+        label: t('globals.warehouse'),
         field: 'warehouseFk',
         name: 'warehouseFk',
         ...defaultColumnAttrs,
@@ -192,7 +192,7 @@ const editTableFieldsOptions = [
     },
     {
         field: 'warehouseFk',
-        label: t('item.fixedPrice.warehouse'),
+        label: t('globals.warehouse'),
         component: 'select',
         attrs: {
             options: [],
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index ae4c9531c..2ad9c92d0 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -114,7 +114,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.grouping'),
+        label: t('entry.summary.grouping'),
         field: 'grouping',
         name: 'grouping',
         align: 'left',
@@ -131,7 +131,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('item.list.packing'),
+        label: t('entry.summary.packing'),
         field: 'packing',
         name: 'packing',
         align: 'left',
@@ -180,7 +180,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.size'),
+        label: t('globals.size'),
         field: 'size',
         name: 'size',
         align: 'left',
@@ -237,7 +237,7 @@ const columns = computed(() => [
     },
 
     {
-        label: t('item.list.intrastat'),
+        label: t('globals.intrastat'),
         field: 'intrastat',
         name: 'intrastat',
         align: 'left',
@@ -256,7 +256,7 @@ const columns = computed(() => [
         },
     },
     {
-        label: t('item.list.origin'),
+        label: t('globals.origin'),
         field: 'origin',
         name: 'origin',
         align: 'left',
@@ -337,7 +337,7 @@ const columns = computed(() => [
         columnFilter: null,
     },
     {
-        label: t('item.list.producer'),
+        label: t('globals.producer'),
         field: 'producer',
         name: 'producer',
         align: 'left',
@@ -354,7 +354,7 @@ const columns = computed(() => [
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('item.list.landed'),
+        label: t('globals.landed'),
         field: 'landed',
         name: 'landed',
         align: 'left',
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 7dd961a35..be378893e 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -40,7 +40,7 @@ watch(
 
 const columns = computed(() => [
     {
-        label: t('item.buyRequest.ticketId'),
+        label: t('globals.ticketId'),
         name: 'id',
         field: 'id',
         align: 'left',
@@ -74,7 +74,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('item.buyRequest.price'),
+        label: t('globals.price'),
         field: 'price',
         name: 'price',
         align: 'left',
@@ -89,7 +89,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('item.buyRequest.item'),
+        label: t('globals.item'),
         field: 'item',
         name: 'item',
         align: 'left',
@@ -110,7 +110,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('item.buyRequest.state'),
+        label: t('globals.state'),
         field: 'state',
         name: 'state',
         align: 'left',
diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
index 4bc9e2e43..dc8d1a429 100644
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ b/src/pages/Order/Card/OrderBasicData.vue
@@ -162,7 +162,7 @@ const onClientChange = async (clientId) => {
                 <VnRow>
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('order.form.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="
                             () => fetchAgencyList(data.landed, data.addressFk)
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index bcc62aa43..b9b232115 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -10,7 +10,6 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
 import { reactive } from 'vue';
-import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
 const state = useState();
@@ -186,7 +185,7 @@ onMounted(async () => {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInputDate
                     placeholder="dd-mm-aaa"
-                    :label="t('order.form.landed')"
+                    :label="t('globals.landed')"
                     v-model="data.landed"
                     @update:model-value="
                         () => fetchAgencyList(data.landed, data.addressId)
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index a035971b0..0bd645e42 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -67,7 +67,7 @@ const setData = (entity) => {
 };
 
 const getConfirmationValue = (isConfirmed) => {
-    return t(isConfirmed ? 'order.summary.confirmed' : 'order.summary.notConfirmed');
+    return t(isConfirmed ? 'globals.confirmed' : 'order.summary.notConfirmed');
 };
 
 const total = ref(null);
@@ -98,7 +98,7 @@ function ticketFilter(order) {
         </template>
         <template #body="{ entity }">
             <VnLv
-                :label="t('order.summary.state')"
+                :label="t('globals.state')"
                 :value="getConfirmationValue(entity.isConfirmed)"
             />
             <VnLv :label="t('order.field.salesPersonFk')">
@@ -109,9 +109,9 @@ function ticketFilter(order) {
                     </span>
                 </template>
             </VnLv>
-            <VnLv :label="t('order.summary.landed')" :value="toDate(entity?.landed)" />
-            <VnLv :label="t('order.field.agency')" :value="entity?.agencyMode?.name" />
-            <VnLv :label="t('order.summary.alias')" :value="entity?.address?.nickname" />
+            <VnLv :label="t('globals.landed')" :value="toDate(entity?.landed)" />
+            <VnLv :label="t('globals.agency')" :value="entity?.agencyMode?.name" />
+            <VnLv :label="t('globals.alias')" :value="entity?.address?.nickname" />
             <VnLv
                 :label="t('order.summary.items')"
                 :value="(entity?.rows?.length || DEFAULT_ITEMS).toString()"
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index ceacbc75b..9e9c371bf 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -24,7 +24,7 @@ const entityId = computed(() => $props.id || route.params.id);
 const detailsColumns = ref([
     {
         name: 'item',
-        label: t('order.summary.item'),
+        label: t('globals.item'),
         field: (row) => row?.item?.id,
         sortable: true,
     },
@@ -40,7 +40,7 @@ const detailsColumns = ref([
     },
     {
         name: 'price',
-        label: t('order.summary.price'),
+        label: t('globals.price'),
         field: (row) => toCurrency(row?.price),
     },
     {
@@ -69,7 +69,7 @@ const detailsColumns = ref([
                         :text="t('globals.pageTitles.basicData')"
                     />
                     <VnLv label="ID" :value="entity.id" />
-                    <VnLv :label="t('order.summary.nickname')" dash>
+                    <VnLv :label="t('globals.alias')" dash>
                         <template #value>
                             <span class="link">
                                 {{ dashIfEmpty(entity?.address?.nickname) }}
@@ -78,11 +78,11 @@ const detailsColumns = ref([
                         </template>
                     </VnLv>
                     <VnLv
-                        :label="t('order.summary.company')"
+                        :label="t('globals.company')"
                         :value="entity?.address?.companyFk"
                     />
                     <VnLv
-                        :label="t('order.summary.confirmed')"
+                        :label="t('globals.confirmed')"
                         :value="Boolean(entity?.isConfirmed)"
                     />
                 </QCard>
@@ -96,14 +96,14 @@ const detailsColumns = ref([
                         :value="toDateHourMinSec(entity?.created)"
                     />
                     <VnLv
-                        :label="t('order.summary.confirmed')"
+                        :label="t('globals.confirmed')"
                         :value="toDateHourMinSec(entity?.confirmed)"
                     />
                     <VnLv
-                        :label="t('order.summary.landed')"
+                        :label="t('globals.landed')"
                         :value="toDateHourMinSec(entity?.landed)"
                     />
-                    <VnLv :label="t('order.summary.phone')">
+                    <VnLv :label="t('globals.phone')">
                         <template #value>
                             {{ dashIfEmpty(entity?.address?.phone) }}
                             <a
@@ -135,7 +135,7 @@ const detailsColumns = ref([
                     <VnTitle :text="t('order.summary.total')" />
                     <VnLv>
                         <template #label>
-                            <span class="text-h6">{{ t('order.summary.subtotal') }}</span>
+                            <span class="text-h6">{{ t('globals.subtotal') }}</span>
                         </template>
                         <template #value>
                             <span class="text-h6">{{
@@ -145,7 +145,7 @@ const detailsColumns = ref([
                     </VnLv>
                     <VnLv>
                         <template #label>
-                            <span class="text-h6">{{ t('order.summary.vat') }}</span>
+                            <span class="text-h6">{{ t('globals.vat') }}</span>
                         </template>
                         <template #value>
                             <span class="text-h6">{{ toCurrency(entity?.VAT) }}</span>
@@ -165,10 +165,10 @@ const detailsColumns = ref([
                     <QTable :columns="detailsColumns" :rows="entity?.rows" flat>
                         <template #header="props">
                             <QTr :props="props">
-                                <QTh auto-width>{{ t('order.summary.item') }}</QTh>
+                                <QTh auto-width>{{ t('globals.item') }}</QTh>
                                 <QTh>{{ t('globals.description') }}</QTh>
                                 <QTh auto-width>{{ t('globals.quantity') }}</QTh>
-                                <QTh auto-width>{{ t('order.summary.price') }}</QTh>
+                                <QTh auto-width>{{ t('globals.price') }}</QTh>
                                 <QTh auto-width>{{ t('order.summary.amount') }}</QTh>
                             </QTr>
                         </template>
diff --git a/src/pages/Shelving/Card/ShelvingDescriptor.vue b/src/pages/Shelving/Card/ShelvingDescriptor.vue
index 30e807d20..b1ff4a8ae 100644
--- a/src/pages/Shelving/Card/ShelvingDescriptor.vue
+++ b/src/pages/Shelving/Card/ShelvingDescriptor.vue
@@ -54,8 +54,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.code, entity
     >
         <template #body="{ entity }">
             <VnLv :label="t('globals.code')" :value="entity.code" />
-            <VnLv :label="t('shelving.summary.parking')" :value="entity.parking?.code" />
-            <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
+            <VnLv :label="t('shelving.list.parking')" :value="entity.parking?.code" />
+            <VnLv v-if="entity.worker" :label="t('globals.worker')">
                 <template #value>
                     <VnUserLink
                         :name="entity.worker?.user?.nickname"
diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
index f69d427b0..3bbd94a0a 100644
--- a/src/pages/Shelving/Card/ShelvingForm.vue
+++ b/src/pages/Shelving/Card/ShelvingForm.vue
@@ -68,7 +68,7 @@ const onSave = (shelving, newShelving) => {
                     option-label="code"
                     :filter-options="['id', 'code']"
                     :fields="['id', 'code']"
-                    :label="t('shelving.basicData.parking')"
+                    :label="t('shelving.list.parking')"
                     :rules="validate('Shelving.parkingFk')"
                 />
             </VnRow>
@@ -76,12 +76,12 @@ const onSave = (shelving, newShelving) => {
                 <VnInput
                     v-model="data.priority"
                     type="number"
-                    :label="t('shelving.basicData.priority')"
+                    :label="t('shelving.list.priority')"
                     :rules="validate('Shelving.priority')"
                 />
                 <QCheckbox
                     v-model="data.isRecyclable"
-                    :label="t('shelving.basicData.recyclable')"
+                    :label="t('shelving.summary.recyclable')"
                     :rules="validate('Shelving.isRecyclable')"
                 />
             </VnRow>
diff --git a/src/pages/Shelving/Card/ShelvingSummary.vue b/src/pages/Shelving/Card/ShelvingSummary.vue
index a196b1992..db7ac34f5 100644
--- a/src/pages/Shelving/Card/ShelvingSummary.vue
+++ b/src/pages/Shelving/Card/ShelvingSummary.vue
@@ -56,14 +56,11 @@ const filter = {
                     </RouterLink>
                     <VnLv :label="t('globals.code')" :value="entity.code" />
                     <VnLv
-                        :label="t('shelving.summary.parking')"
+                        :label="t('shelving.list.parking')"
                         :value="entity.parking?.code"
                     />
-                    <VnLv
-                        :label="t('shelving.summary.priority')"
-                        :value="entity.priority"
-                    />
-                    <VnLv v-if="entity.worker" :label="t('shelving.summary.worker')">
+                    <VnLv :label="t('shelving.list.priority')" :value="entity.priority" />
+                    <VnLv v-if="entity.worker" :label="t('globals.worker')">
                         <template #value>
                             <VnUserLink
                                 :name="entity.worker?.user?.nickname"
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index f46a3be19..f1e95b8de 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -69,16 +69,13 @@ const redirectToUpdateView = (addressData) => {
                         @click="redirectToUpdateView(row)"
                     >
                         <template #list-items>
+                            <VnLv :label="t('globals.street')" :value="row.street" />
                             <VnLv
-                                :label="t('supplier.addresses.street')"
-                                :value="row.street"
-                            />
-                            <VnLv
-                                :label="t('supplier.addresses.postcode')"
+                                :label="t('globals.postcode')"
                                 :value="`${row.postalCode} - ${row.city}, ${row.province.name}`"
                             />
                             <VnLv
-                                :label="t('supplier.addresses.phone')"
+                                :label="t('globals.phone')"
                                 :value="`${row.phone}, ${row.mobile}`"
                             />
                         </template>
diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 0feceb74a..7a078f03b 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -72,14 +72,8 @@ function handleLocation(data, location) {
         >
             <template #form="{ data, validate }">
                 <VnRow>
-                    <VnInput
-                        v-model="data.nickname"
-                        :label="t('supplier.addresses.name')"
-                    />
-                    <VnInput
-                        v-model="data.street"
-                        :label="t('supplier.addresses.street')"
-                    />
+                    <VnInput v-model="data.nickname" :label="t('globals.name')" />
+                    <VnInput v-model="data.street" :label="t('globals.street')" />
                 </VnRow>
                 <VnRow>
                     <VnLocation
@@ -101,14 +95,8 @@ function handleLocation(data, location) {
                     </VnLocation>
                 </VnRow>
                 <VnRow>
-                    <VnInput
-                        v-model="data.phone"
-                        :label="t('supplier.addresses.phone')"
-                    />
-                    <VnInput
-                        v-model="data.mobile"
-                        :label="t('supplier.addresses.mobile')"
-                    />
+                    <VnInput v-model="data.phone" :label="t('globals.phone')" />
+                    <VnInput v-model="data.mobile" :label="t('globals.mobile')" />
                 </VnRow>
             </template>
         </FormModel>
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 52964557d..101007756 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -24,7 +24,7 @@ const workersOptions = ref([]);
             <VnRow>
                 <VnInput
                     v-model="data.nickname"
-                    :label="t('supplier.basicData.alias')"
+                    :label="t('globals.alias')"
                     :rules="validate('supplier.nickname')"
                     clearable
                 />
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 7200bbba6..05c9858d9 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -58,7 +58,7 @@ const formatPayDems = (data) => {
             </VnRow>
             <VnRow>
                 <QInput
-                    :label="t('supplier.billingData.payDay')"
+                    :label="t('supplier.summary.payDay')"
                     type="number"
                     v-model="data.payDay"
                 />
diff --git a/src/pages/Supplier/Card/SupplierContacts.vue b/src/pages/Supplier/Card/SupplierContacts.vue
index 3f2063784..6781c8d34 100644
--- a/src/pages/Supplier/Card/SupplierContacts.vue
+++ b/src/pages/Supplier/Card/SupplierContacts.vue
@@ -44,21 +44,12 @@ const insertRow = () => {
                     <VnRow class="row q-gutter-md">
                         <VnInput
                             input-name-focusable
-                            :label="t('supplier.contacts.name')"
+                            :label="t('globals.name')"
                             v-model="row.name"
                         />
-                        <VnInput
-                            :label="t('supplier.contacts.phone')"
-                            v-model="row.phone"
-                        />
-                        <VnInput
-                            :label="t('supplier.contacts.mobile')"
-                            v-model="row.mobile"
-                        />
-                        <VnInput
-                            :label="t('supplier.contacts.email')"
-                            v-model="row.email"
-                        />
+                        <VnInput :label="t('globals.phone')" v-model="row.phone" />
+                        <VnInput :label="t('globals.mobile')" v-model="row.mobile" />
+                        <VnInput :label="t('globals.params.email')" v-model="row.email" />
                     </VnRow>
                     <VnRow class="row q-gutter-md">
                         <QInput
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5754031b3..0fbe03c99 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -116,7 +116,7 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />
             <VnLv
-                :label="t('supplier.summary.payMethod')"
+                :label="t('supplier.list.payMethod')"
                 :value="entity?.payMethod?.name"
             />
             <VnLv
diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
index 169c4d796..547842960 100644
--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
@@ -147,16 +147,12 @@ function handleLocation(data, location) {
                 />
                 <VnInput
                     v-model="data.healthRegister"
-                    :label="t('supplier.fiscalData.healthRegister')"
+                    :label="t('supplier.summary.healthRegister')"
                     clearable
                 />
             </VnRow>
             <VnRow>
-                <VnInput
-                    v-model="data.street"
-                    :label="t('supplier.fiscalData.street')"
-                    clearable
-                />
+                <VnInput v-model="data.street" :label="t('globals.street')" clearable />
             </VnRow>
             <VnRow>
                 <VnLocation
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 6ffb95344..dbb4c47e1 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -82,7 +82,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                     :text="t('supplier.summary.billingData')"
                 />
                 <VnLv
-                    :label="t('supplier.summary.payMethod')"
+                    :label="t('supplier.list.payMethod')"
                     :value="supplier.payMethod?.name"
                     dash
                 />
@@ -131,19 +131,16 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                 />
                 <VnLv :label="t('supplier.summary.socialName')" :value="supplier.name" />
                 <VnLv :label="t('supplier.summary.taxNumber')" :value="supplier.nif" />
-                <VnLv :label="t('supplier.summary.street')" :value="supplier.street" />
+                <VnLv :label="t('globals.street')" :value="supplier.street" />
                 <VnLv :label="t('supplier.summary.city')" :value="supplier.city" />
-                <VnLv
-                    :label="t('supplier.summary.postCode')"
-                    :value="supplier.postCode"
-                />
+                <VnLv :label="t('globals.postCode')" :value="supplier.postCode" />
                 <VnLv
                     :label="t('supplier.summary.province')"
                     :value="supplier.province?.name"
                     dash
                 />
                 <VnLv
-                    :label="t('supplier.summary.country')"
+                    :label="t('globals.country')"
                     :value="supplier.country?.name"
                     dash
                 />
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ea79947a4..69f826201 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -12,13 +12,13 @@ const tableRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.id'),
+        label: t('globals.id'),
         name: 'id',
         isTitle: true,
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.name'),
+        label: t('globals.name'),
         name: 'socialName',
         create: true,
         columnFilter: {
@@ -35,7 +35,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.nickname'),
+        label: t('globals.alias'),
         name: 'alias',
         columnFilter: {
             name: 'search',
@@ -51,7 +51,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.payMethod'),
+        label: t('supplier.list.payMethod'),
         name: 'payMethod',
         columnFilter: {
             inWhere: true,
@@ -70,7 +70,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.payDay'),
+        label: t('supplier.summary.payDay'),
         name: 'payDay',
         columnFilter: {
             inWhere: true,
@@ -79,7 +79,7 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        label: t('supplier.list.tableVisibleColumns.country'),
+        label: t('globals.country'),
         name: 'country',
         columnFilter: {
             component: 'select',
diff --git a/src/pages/Ticket/Card/TicketBoxing.vue b/src/pages/Ticket/Card/TicketBoxing.vue
index bff95c0e2..1a7287396 100644
--- a/src/pages/Ticket/Card/TicketBoxing.vue
+++ b/src/pages/Ticket/Card/TicketBoxing.vue
@@ -136,13 +136,13 @@ async function getVideoList(expeditionId, timed) {
                         <QItemLabel class="text-h6">#{{ expedition.id }}</QItemLabel>
                     </QItemSection>
                     <QItemSection>
-                        <QItemLabel caption>{{ t('ticket.boxing.created') }}</QItemLabel>
+                        <QItemLabel caption>{{ t('globals.created') }}</QItemLabel>
                         <QItemLabel>
                             {{
                                 date.formatDate(expedition.created, 'YYYY-MM-DD HH:mm:ss')
                             }}
                         </QItemLabel>
-                        <QItemLabel caption>{{ t('ticket.boxing.item') }}</QItemLabel>
+                        <QItemLabel caption>{{ t('globals.item') }}</QItemLabel>
                         <QItemLabel>{{ expedition.packagingItemFk }}</QItemLabel>
                         <QItemLabel caption>{{ t('ticket.boxing.worker') }}</QItemLabel>
                         <QItemLabel>{{ expedition.userName }}</QItemLabel>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index af9021e36..f8ffb43ed 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -125,7 +125,7 @@ function ticketFilter(ticket) {
                     </span>
                 </template>
             </VnLv>
-            <VnLv v-if="entity.ticketState" :label="t('ticket.card.state')">
+            <VnLv v-if="entity.ticketState" :label="t('globals.state')">
                 <template #value>
                     <QBadge
                         text-color="black"
@@ -149,11 +149,11 @@ function ticketFilter(ticket) {
             />
             <VnLv
                 v-if="entity.agencyMode"
-                :label="t('ticket.card.agency')"
+                :label="t('globals.agency')"
                 :value="entity.agencyMode.name"
             />
-            <VnLv :label="t('ticket.card.warehouse')" :value="entity.warehouse?.name" />
-            <VnLv :label="t('ticket.card.alias')" :value="entity.nickname" />
+            <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
+            <VnLv :label="t('globals.alias')" :value="entity.nickname" />
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-xs">
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index ac2ae0509..45769daa5 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -132,7 +132,7 @@ function toTicketUrl(section) {
                     :url="toTicketUrl('basic-data')"
                     :text="t('globals.summary.basicData')"
                 />
-                <VnLv v-if="entity.ticketState" :label="t('ticket.summary.state')">
+                <VnLv v-if="entity.ticketState" :label="t('globals.state')">
                     <template #value>
                         <QBadge
                             text-color="black"
@@ -150,10 +150,7 @@ function toTicketUrl(section) {
                         />
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.agency')"
-                    :value="entity.agencyMode?.name"
-                />
+                <VnLv :label="t('globals.agency')" :value="entity.agencyMode?.name" />
                 <VnLv :label="t('ticket.summary.zone')">
                     <template #value>
                         <span class="link" @click.stop>
@@ -162,10 +159,7 @@ function toTicketUrl(section) {
                         </span>
                     </template>
                 </VnLv>
-                <VnLv
-                    :label="t('ticket.summary.warehouse')"
-                    :value="entity.warehouse?.name"
-                />
+                <VnLv :label="t('globals.warehouse')" :value="entity.warehouse?.name" />
                 <VnLv
                     v-if="ticket?.ticketCollections?.length > 0"
                     :label="t('ticket.summary.collection')"
@@ -211,10 +205,7 @@ function toTicketUrl(section) {
                     :label="t('ticket.summary.shipped')"
                     :value="toDate(entity.shipped)"
                 />
-                <VnLv
-                    :label="t('ticket.summary.landed')"
-                    :value="toDate(entity.landed)"
-                />
+                <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
                 <VnLv :label="t('globals.packages')" :value="entity.packages" />
                 <VnLv :value="entity.address.phone">
                     <template #label>
@@ -281,11 +272,11 @@ function toTicketUrl(section) {
                 <VnTitle :text="t('ticket.summary.summaryAmount')" />
                 <div class="bodyCard">
                     <VnLv
-                        :label="t('ticket.summary.subtotal')"
+                        :label="t('globals.subtotal')"
                         :value="toCurrency(entity.totalWithoutVat)"
                     />
                     <VnLv
-                        :label="t('ticket.summary.vat')"
+                        :label="t('globals.vat')"
                         :value="toCurrency(entity.totalWithVat - entity.totalWithoutVat)"
                     />
                     <VnLv
@@ -307,12 +298,12 @@ function toTicketUrl(section) {
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width></QTh>
-                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.visible') }}</QTh>
+                            <QTh auto-width>{{ t('globals.item') }}</QTh>
+                            <QTh auto-width>{{ t('globals.visible') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.available') }}</QTh>
                             <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.discount') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.packing') }}</QTh>
@@ -364,7 +355,7 @@ function toTicketUrl(section) {
                                     size="xs"
                                 >
                                     <QTooltip>
-                                        {{ t('ticket.summary.visible') }}:
+                                        {{ t('globals.visible') }}:
                                         {{ props.row.visible }}
                                     </QTooltip>
                                 </QIcon>
@@ -471,7 +462,7 @@ function toTicketUrl(section) {
                 <QTable :rows="ticket.packagings" flat style="text-align: center">
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
-                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('globals.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.package') }}</QTh>
                             <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                         </QTr>
@@ -495,7 +486,7 @@ function toTicketUrl(section) {
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('globals.quantity') }}</QTh>
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.taxClass') }}</QTh>
                             <QTh auto-width>{{ t('globals.amount') }}</QTh>
                         </QTr>
@@ -522,12 +513,12 @@ function toTicketUrl(section) {
                     <template #header="props">
                         <QTr class="tr-header" :props="props">
                             <QTh auto-width>{{ t('globals.description') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.created') }}</QTh>
+                            <QTh auto-width>{{ t('globals.created') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.requester') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.attender') }}</QTh>
                             <QTh auto-width>{{ t('globals.quantity') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.price') }}</QTh>
-                            <QTh auto-width>{{ t('ticket.summary.item') }}</QTh>
+                            <QTh auto-width>{{ t('globals.price') }}</QTh>
+                            <QTh auto-width>{{ t('globals.item') }}</QTh>
                             <QTh auto-width>{{ t('ticket.summary.ok') }}</QTh>
                         </QTr>
                     </template>
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3cc486122..1c6a76e6e 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -134,7 +134,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.client')"
+                            :label="t('globals.client')"
                             v-model="data.clientId"
                             :options="clientOptions"
                             option-value="id"
@@ -188,7 +188,7 @@ const redirectToTicketList = (_, { id }) => {
                     <div class="col">
                         <VnInputDate
                             placeholder="dd-mm-aaa"
-                            :label="t('ticket.create.landed')"
+                            :label="t('globals.landed')"
                             v-model="data.landed"
                             @update:model-value="() => fetchAvailableAgencies(data)"
                         />
@@ -197,7 +197,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.warehouse')"
+                            :label="t('globals.warehouse')"
                             v-model="data.warehouseId"
                             :options="warehousesOptions"
                             option-value="id"
@@ -210,7 +210,7 @@ const redirectToTicketList = (_, { id }) => {
                 <VnRow>
                     <div class="col">
                         <VnSelect
-                            :label="t('ticket.create.agency')"
+                            :label="t('globals.agency')"
                             v-model="data.agencyModeId"
                             :options="agenciesOptions"
                             option-value="agencyModeFk"
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 4138884bf..ba25a5744 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -128,7 +128,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.client')"
+                        :label="t('globals.client')"
                         v-model="data.clientId"
                         url="Clients"
                         :fields="['id', 'name', 'defaultAddressFk']"
@@ -184,7 +184,7 @@ const redirectToTicketList = (_, { id }) => {
                 <div class="col">
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('ticket.create.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
@@ -193,7 +193,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="data.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
@@ -206,7 +206,7 @@ const redirectToTicketList = (_, { id }) => {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.agency')"
+                        :label="t('globals.agency')"
                         v-model="data.agencyModeId"
                         :options="agenciesOptions"
                         option-value="agencyModeFk"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ad97e75c1..d50dc5a1b 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -661,7 +661,7 @@ function setReference(data) {
                 <div class="col">
                     <VnInputDate
                         placeholder="dd-mm-aaa"
-                        :label="t('ticket.create.landed')"
+                        :label="t('globals.landed')"
                         v-model="data.landed"
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
@@ -672,7 +672,7 @@ function setReference(data) {
                     <VnSelect
                         url="Warehouses"
                         :sort-by="['name']"
-                        :label="t('ticket.create.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="data.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
@@ -685,7 +685,7 @@ function setReference(data) {
             <VnRow>
                 <div class="col">
                     <VnSelect
-                        :label="t('ticket.create.agency')"
+                        :label="t('globals.agency')"
                         v-model="data.agencyModeId"
                         :options="agenciesOptions"
                         option-value="agencyModeFk"
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index ca9caf82d..a3d776795 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -31,7 +31,7 @@ const agenciesOptions = ref([]);
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
                 <VnSelect
-                    :label="t('travel.basicData.agency')"
+                    :label="t('globals.agency')"
                     v-model="data.agencyModeFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -42,14 +42,11 @@ const agenciesOptions = ref([]);
             </VnRow>
             <VnRow>
                 <VnInputDate v-model="data.shipped" :label="t('globals.shipped')" />
-                <VnInputDate
-                    v-model="data.landed"
-                    :label="t('travel.basicData.landed')"
-                />
+                <VnInputDate v-model="data.landed" :label="t('globals.landed')" />
             </VnRow>
             <VnRow>
                 <VnSelect
-                    :label="t('travel.basicData.warehouseOut')"
+                    :label="t('globals.warehouseOut')"
                     v-model="data.warehouseOutFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -58,7 +55,7 @@ const agenciesOptions = ref([]);
                     hide-selected
                 />
                 <VnSelect
-                    :label="t('travel.basicData.warehouseIn')"
+                    :label="t('globals.warehouseIn')"
                     v-model="data.warehouseInFk"
                     :options="agenciesOptions"
                     option-value="id"
@@ -72,11 +69,11 @@ const agenciesOptions = ref([]);
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    :label="t('travel.basicData.delivered')"
+                    :label="t('travel.summary.delivered')"
                     v-model="data.isDelivered"
                 />
                 <QCheckbox
-                    :label="t('travel.basicData.received')"
+                    :label="t('travel.summary.received')"
                     v-model="data.isReceived"
                 />
             </VnRow>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index bda29903b..ba8d7f947 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -71,8 +71,8 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
             <TravelDescriptorMenuItems :travel="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv :label="t('globals.wareHouseIn')" :value="entity.warehouseIn.name" />
-            <VnLv :label="t('globals.wareHouseOut')" :value="entity.warehouseOut.name" />
+            <VnLv :label="t('globals.warehouseIn')" :value="entity.warehouseIn.name" />
+            <VnLv :label="t('globals.warehouseOut')" :value="entity.warehouseOut.name" />
             <VnLv :label="t('globals.shipped')" :value="toDate(entity.shipped)" />
             <VnLv :label="t('globals.landed')" :value="toDate(entity.landed)" />
             <VnLv :label="t('globals.totalEntries')" :value="entity.totalEntries" />
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index d48ed2847..b8e3c3407 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -33,7 +33,7 @@ const warehouses = ref([]);
 const entriesTableColumns = computed(() => {
     return [
         {
-            label: t('travel.summary.confirmed'),
+            label: t('globals.confirmed'),
             field: 'isConfirmed',
             name: 'isConfirmed',
             align: 'left',
@@ -136,7 +136,7 @@ const thermographsTableColumns = computed(() => {
             format: (val) => (val ? `${val}°` : ''),
         },
         {
-            label: t('travel.thermographs.state'),
+            label: t('globals.state'),
             field: 'result',
             name: 'result',
             align: 'left',
@@ -150,7 +150,7 @@ const thermographsTableColumns = computed(() => {
                 warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
-            label: t('travel.thermographs.created'),
+            label: t('globals.created'),
             field: 'created',
             name: 'created',
             align: 'left',
@@ -265,7 +265,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv :label="t('globals.shipped')" :value="toDate(travel.shipped)" />
                 <VnLv
-                    :label="t('globals.wareHouseOut')"
+                    :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
                 <QCheckbox
@@ -283,7 +283,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 </QCardSection>
                 <VnLv :label="t('globals.landed')" :value="toDate(travel.landed)" />
                 <VnLv
-                    :label="t('globals.wareHouseIn')"
+                    :label="t('globals.warehouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
                 <QCheckbox
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 96544a8ca..0ac8ab5a7 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -62,7 +62,7 @@ const TableColumns = computed(() => {
             format: (val) => (val ? `${val}°` : ''),
         },
         {
-            label: t('travel.thermographs.state'),
+            label: t('globals.state'),
             field: 'result',
             name: 'result',
             align: 'left',
@@ -76,7 +76,7 @@ const TableColumns = computed(() => {
                 warehouses.value.find((warehouse) => warehouse.id === val)?.name,
         },
         {
-            label: t('travel.thermographs.created'),
+            label: t('globals.created'),
             field: 'created',
             name: 'created',
             align: 'left',
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index b70e93dfc..4d7b77edf 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -216,7 +216,7 @@ const onThermographCreated = async (data) => {
                     </VnSelectDialog>
                     <VnInput
                         v-model="thermographForm.state"
-                        :label="t('travel.thermographs.state')"
+                        :label="t('globals.state')"
                     />
                 </VnRow>
                 <VnRow>
@@ -225,7 +225,7 @@ const onThermographCreated = async (data) => {
                         :label="t('globals.reference')"
                     />
                     <VnSelect
-                        :label="t('travel.thermographs.type')"
+                        :label="t('globals.type')"
                         v-model="thermographForm.dmsTypeId"
                         :options="dmsTypesOptions"
                         option-value="id"
@@ -234,14 +234,14 @@ const onThermographCreated = async (data) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('travel.thermographs.company')"
+                        :label="t('globals.company')"
                         v-model="thermographForm.companyId"
                         :options="companiesOptions"
                         option-value="id"
                         option-label="code"
                     />
                     <VnSelect
-                        :label="t('travel.thermographs.warehouse')"
+                        :label="t('globals.warehouse')"
                         v-model="thermographForm.warehouseId"
                         :options="warehousesOptions"
                         option-value="id"
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 4dc7eb052..d45fae5a6 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -220,7 +220,7 @@ const columns = computed(() => [
         sortable: true,
     },
     {
-        label: t('globals.wareHouseOut'),
+        label: t('globals.warehouseOut'),
         field: 'warehouseOutName',
         name: 'warehouseOutName',
         align: 'left',
@@ -237,7 +237,7 @@ const columns = computed(() => [
         format: (value) => toDate(value),
     },
     {
-        label: t('globals.wareHouseIn'),
+        label: t('globals.wareHhuseIn'),
         field: 'warehouseInName',
         name: 'warehouseInName',
         align: 'left',
diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
index 6fb3274e4..72c34aad8 100644
--- a/src/pages/Travel/TravelCreate.vue
+++ b/src/pages/Travel/TravelCreate.vue
@@ -74,7 +74,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('globals.wareHouseOut')"
+                        :label="t('globals.warehouseOut')"
                         v-model="data.warehouseOutFk"
                         :options="warehousesOptions"
                         option-value="id"
@@ -82,7 +82,7 @@ const redirectToTravelBasicData = (_, { id }) => {
                         hide-selected
                     />
                     <VnSelect
-                        :label="t('globals.wareHouseIn')"
+                        :label="t('globals.warehouseIn')"
                         v-model="data.warehouseInFk"
                         :options="warehousesOptions"
                         option-value="id"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 7ea2b3f7a..63d3bf956 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -48,7 +48,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'id',
-        label: t('travel.travelList.tableVisibleColumns.id'),
+        label: t('globals.id'),
         isId: true,
         cardVisible: true,
     },
@@ -66,7 +66,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'agencyModeFk',
-        label: t('travel.travelList.tableVisibleColumns.agency'),
+        label: t('globals.agency'),
         component: 'select',
         attrs: {
             url: 'agencyModes',
@@ -82,7 +82,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseInFk',
-        label: t('travel.travelList.tableVisibleColumns.warehouseIn'),
+        label: t('globals.warehouseIn'),
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -118,7 +118,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'warehouseOutFk',
-        label: t('travel.travelList.tableVisibleColumns.warehouseOut'),
+        label: t('globals.warehouseOut'),
         component: 'select',
         attrs: {
             url: 'warehouses',
@@ -134,7 +134,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'landed',
-        label: t('travel.travelList.tableVisibleColumns.landed'),
+        label: t('globals.landed'),
         component: 'date',
         columnField: {
             component: null,
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index eb8205d72..3de115fc0 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -95,7 +95,7 @@ watch(
                     <VnInput
                         filled
                         v-model="data.name"
-                        :label="t('wagon.type.name')"
+                        :label="t('globals.name')"
                         :rules="[(val) => !!val || t('wagon.warnings.nameNotEmpty')]"
                     />
                     <QCheckbox
diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
index 2ec0f4d55..ac2aab6ce 100644
--- a/src/pages/Wagon/WagonCreate.vue
+++ b/src/pages/Wagon/WagonCreate.vue
@@ -103,7 +103,7 @@ function filterType(val, update) {
                     <VnInput
                         filled
                         v-model="wagon.plate"
-                        :label="t('wagon.create.plate')"
+                        :label="t('wagon.list.plate')"
                         :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
                     />
                 </div>
@@ -127,7 +127,7 @@ function filterType(val, update) {
                         option-value="id"
                         emit-value
                         map-options
-                        :label="t('wagon.create.type')"
+                        :label="t('globals.type')"
                         :options="filteredWagonTypes"
                         :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
                         @filter="filterType"
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 61679b933..893b058ea 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -46,7 +46,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'name',
-        label: t('wagon.list.type'),
+        label: t('globals.type'),
         cardVisible: true,
         format: (row) => row?.type?.name,
     },
@@ -123,7 +123,7 @@ async function remove(row) {
                 <VnInput
                     filled
                     v-model="data.plate"
-                    :label="t('wagon.create.plate')"
+                    :label="t('wagon.list.plate')"
                     :rules="[(val) => !!val || t('wagon.warnings.plateNotEmpty')]"
                 />
                 <VnInput
@@ -146,7 +146,7 @@ async function remove(row) {
                     option-value="id"
                     emit-value
                     map-options
-                    :label="t('wagon.create.type')"
+                    :label="t('globals.type')"
                     :options="filteredWagonTypes"
                     :rules="[(val) => !!val || t('wagon.warnings.typeNotEmpty')]"
                     @filter="filterType"
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 491105e09..8cb688ec8 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -140,7 +140,7 @@ const handlePhotoUpdated = (evt = false) => {
         <template #body="{ entity }">
             <VnLv :label="t('globals.user')" :value="entity.user?.name" />
             <VnLv
-                :label="t('worker.card.email')"
+                :label="t('globals.params.email')"
                 :value="entity.user?.emailUser?.email"
                 copy
             />
@@ -150,7 +150,7 @@ const handlePhotoUpdated = (evt = false) => {
             />
             <VnLv :value="entity.phone">
                 <template #label>
-                    {{ t('worker.card.phone') }}
+                    {{ t('globals.phone') }}
                     <VnLinkPhone :phone-number="entity.phone" />
                 </template>
             </VnLv>
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 3f562a77b..dcb9aa6d5 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -53,7 +53,7 @@ onBeforeMount(async () => {
         <template #body="{ entity: worker }">
             <QCard class="vn-one">
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
-                <VnLv :label="t('worker.card.name')" :value="worker.user?.nickname" />
+                <VnLv :label="t('globals.name')" :value="worker.user?.nickname" />
                 <VnLv :label="t('worker.list.department')">
                     <template #value>
                         <span class="link" v-text="worker.department?.department?.name" />
@@ -119,9 +119,9 @@ onBeforeMount(async () => {
             </QCard>
             <QCard class="vn-one">
                 <VnTitle :text="t('worker.summary.userData')" />
-                <VnLv :label="t('worker.card.name')" :value="worker?.user?.nickname" />
+                <VnLv :label="t('globals.name')" :value="worker?.user?.nickname" />
                 <VnLv
-                    :label="t('worker.list.email')"
+                    :label="t('globals.params.email')"
                     :value="worker.user?.emailUser?.email"
                     copy
                 />
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index b51209879..5676837dd 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -111,7 +111,7 @@ async function autofillBic(worker) {
                 <VnRow>
                     <VnInput
                         v-model="data.firstName"
-                        :label="t('worker.create.name')"
+                        :label="t('globals.name')"
                         :rules="validate('Worker.firstName')"
                         @update:model-value="generateCodeUser(data)"
                     />
@@ -141,7 +141,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('worker.create.company')"
+                        :label="t('globals.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
                         option-value="id"
@@ -150,7 +150,7 @@ async function autofillBic(worker) {
                         :rules="validate('Worker.company')"
                     />
                     <VnSelect
-                        :label="t('worker.create.boss')"
+                        :label="t('worker.summary.boss')"
                         v-model="data.bossFk"
                         url="Workers/search"
                         option-value="id"
@@ -185,7 +185,7 @@ async function autofillBic(worker) {
                     />
                     <VnInput
                         v-model="data.phone"
-                        :label="t('worker.create.phone')"
+                        :label="t('globals.phone')"
                         :rules="validate('Worker.phone')"
                         :disable="formData.isFreelance"
                     />
@@ -201,7 +201,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnInput
-                        :label="t('worker.create.street')"
+                        :label="t('globals.street')"
                         v-model="data.street"
                         :rules="validate('Worker.street')"
                         :disable="formData.isFreelance"
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 7a3f760bc..a2ce43b77 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -233,7 +233,7 @@ async function autofillBic(worker) {
                     <VnInput
                         next
                         v-model="data.firstName"
-                        :label="t('worker.create.name')"
+                        :label="t('globals.name')"
                         @update:model-value="generateCodeUser(data)"
                     />
                     <VnInput
@@ -253,7 +253,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnSelect
-                        :label="t('worker.create.company')"
+                        :label="t('globals.company')"
                         v-model="data.companyFk"
                         :options="companiesOptions"
                         option-value="id"
@@ -261,7 +261,7 @@ async function autofillBic(worker) {
                         hide-selected
                     />
                     <VnSelect
-                        :label="t('worker.create.boss')"
+                        :label="t('worker.summary.boss')"
                         v-model="data.bossFk"
                         url="Workers/search"
                         option-value="id"
@@ -290,7 +290,7 @@ async function autofillBic(worker) {
                     />
                     <VnInput
                         v-model="data.phone"
-                        :label="t('worker.create.phone')"
+                        :label="t('globals.phone')"
                         :disable="data.isFreelance"
                     />
                 </VnRow>

From df3b4e7a186afeaa329055e94be04fb7ef76944d Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 21 Oct 2024 13:07:07 +0200
Subject: [PATCH 15/89] refactor: refs #7132 deleted useless code

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 1fc45f713..98792760b 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -551,7 +551,6 @@ onMounted(async () => {
             style="max-width: 99%"
         >
             <template #header="props">
-                {{ userParams.scopeDays }}
                 <QTr :props="props">
                     <QTh
                         class="horizontal-separator text-uppercase color-vn-label"

From 2a94916bc2a4297c388c15473349bb8b62dc5da1 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 22 Oct 2024 15:04:23 +0200
Subject: [PATCH 16/89] feat: refs #7346 radioButton

---
 src/components/VnTable/VnTable.vue         |   2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue    | 223 ++++++++++++---------
 src/pages/Order/Card/OrderCreateDialog.vue |  38 ----
 3 files changed, 132 insertions(+), 131 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 7127ce2d6..020adca27 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -234,7 +234,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter != false)
+        if ($props.useModel && col.columnFilter)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 1005db67b..9fb2fc5f5 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -12,7 +12,6 @@ import InvoiceOutSummary from './Card/InvoiceOutSummary.vue';
 import { toCurrency, toDate } from 'src/filters/index';
 import { useStateStore } from 'stores/useStateStore';
 import { QBtn } from 'quasar';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
@@ -28,6 +27,7 @@ const hasSelectedCards = computed(() => selectedRows.value.length > 0);
 const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
 const addressOptions = ref([]);
+const selectedOption = ref('ticket');
 
 async function fetchClientAddress(id) {
     const { data } = await axios.get(`Clients/${id}/addresses`);
@@ -214,7 +214,7 @@ watchEffect(selectedRows);
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('Create manual invoice'),
+            title: t('createManualInvoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: {
                 active: true,
@@ -231,103 +231,142 @@ watchEffect(selectedRows);
             selection: 'multiple',
         }"
     >
-        <template #column-clientFk="{ row }">
-            <span class="link" @click.stop>
-                {{ row.clientSocialName }}
-                <CustomerDescriptorProxy :id="row.clientFk" />
-            </span>
-        </template>
         <template #more-create-dialog="{ data }">
             <div class="row q-col-gutter-md">
                 <div class="col-12">
-                    <VnSelect
-                        url="Tickets"
-                        v-model="data.ticketFk"
-                        :label="t('invoiceOutList.tableVisibleColumns.ticket')"
-                        option-label="id"
-                        option-value="id"
-                    >
-                        <template #option="scope">
-                            <QItem v-bind="scope.itemProps">
-                                <QItemSection>
-                                    <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
-                                    <QItemLabel caption>{{
-                                        scope.opt?.nickname
-                                    }}</QItemLabel>
-                                </QItemSection>
-                            </QItem>
-                        </template>
-                    </VnSelect>
-                </div>
-            </div>
-            <div class="row q-col-gutter-md">
-                <div class="col-12">
-                    <span class="q-ml-md q-mt-md">O</span>
-                </div>
-            </div>
-            <div class="row q-col-gutter-md">
-                <div class="col-12">
-                    <VnSelect
-                        url="Clients"
-                        v-model="data.clientFk"
-                        :label="t('invoiceOutModule.customer')"
-                        :options="customerOptions"
-                        option-label="name"
-                        option-value="id"
-                        @update:model-value="fetchClientAddress"
-                    />
-                </div>
-            </div>
-            <div class="row q-col-gutter-md">
-                <div class="col-12">
-                    <VnSelect
-                        v-model="data.addressFk"
-                        :label="t('invoiceOutModule.address')"
-                        :options="addressOptions"
-                        option-value="id"
-                        option-label="nickname"
-                        :disable="!data.clientFk"
-                    />
-                </div>
-            </div>
+                    <div class="q-gutter-sm q-col-gutter-xs">
+                        <div class="row q-m-none">
+                            <div class="col-auto">
+                                <QRadio
+                                    v-model="selectedOption"
+                                    val="ticket"
+                                    label="Ticket"
+                                    class="q-my-none q-mr-md"
+                                />
+                            </div>
+                            <div class="col">
+                                <QInput
+                                    v-if="selectedOption === 'ticket'"
+                                    v-model="data.ticketFk"
+                                    label="Ticket ID"
+                                />
+                            </div>
+                        </div>
 
-            <VnSelect
-                url="InvoiceOutSerials"
-                v-model="data.serial"
-                :label="t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')"
-                :options="invoiceOutSerialsOptions"
-                option-label="description"
-                option-value="code"
-            />
-            <VnInputDate
-                :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
-                v-model="data.maxShipped"
-            />
-            <VnSelect
-                url="TaxAreas"
-                v-model="data.taxArea"
-                :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
-                :options="taxAreasOptions"
-                option-label="code"
-                option-value="code"
-            />
-            <QInput
-                v-model="data.reference"
-                :label="t('invoiceOutList.tableVisibleColumns.ref')"
-            />
+                        <div class="row m-xs">
+                            <div class="col-auto">
+                                <QRadio
+                                    v-model="selectedOption"
+                                    val="cliente"
+                                    label="Cliente"
+                                    class="q-my-none q-mr-md"
+                                />
+                            </div>
+                            <div class="col">
+                                <VnSelect
+                                    v-if="selectedOption === 'cliente'"
+                                    v-model="data.clientFk"
+                                    label="Cliente"
+                                    url="Clients"
+                                    :options="customerOptions"
+                                    option-label="name"
+                                    option-value="id"
+                                    @update:model-value="fetchClientAddress"
+                                />
+                            </div>
+                        </div>
+
+                        <div class="row m-xs">
+                            <div class="col-auto">
+                                <QRadio
+                                    v-model="selectedOption"
+                                    val="consignatario"
+                                    label="Consignatario"
+                                    class="q-my-none q-mr-md"
+                                />
+                            </div>
+                            <div class="col">
+                                <div
+                                    v-if="selectedOption === 'consignatario'"
+                                    class="row q-col-gutter-md"
+                                >
+                                    <div class="col">
+                                        <VnSelect
+                                            v-model="data.clientFk"
+                                            label="Cliente"
+                                            url="Clients"
+                                            :options="customerOptions"
+                                            option-label="name"
+                                            option-value="id"
+                                            @update:model-value="fetchClientAddress"
+                                        />
+                                    </div>
+                                    <div class="col">
+                                        <VnSelect
+                                            v-model="data.addressFk"
+                                            label="Consignatario"
+                                            :options="addressOptions"
+                                            option-label="nickname"
+                                            option-value="id"
+                                            :disable="!data.clientFk"
+                                        />
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+                <div class="q-gutter-md">
+                    <div class="row q-gutter-md">
+                        <VnSelect
+                            url="InvoiceOutSerials"
+                            v-model="data.serial"
+                            :label="
+                                t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')
+                            "
+                            :options="invoiceOutSerialsOptions"
+                            option-label="description"
+                            option-value="code"
+                        />
+                        <VnInputDate
+                            :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
+                            v-model="data.maxShipped"
+                        />
+                    </div>
+                    <div class="row q-gutter-md">
+                        <VnSelect
+                            url="TaxAreas"
+                            v-model="data.taxArea"
+                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                            :options="taxAreasOptions"
+                            option-label="code"
+                            option-value="code"
+                        />
+                        <QInput
+                            v-model="data.reference"
+                            :label="t('invoiceOutList.tableVisibleColumns.ref')"
+                        />
+                    </div>
+                </div>
+            </div>
         </template>
     </VnTable>
 </template>
+
 <i18n>
     en:
-    searchInvoice: Search issued invoice
-    fileDenied: Browser denied file download...
-    fileAllowed: Successful download of CSV file
-    youCanSearchByInvoiceReference: You can search by invoice reference
-    createInvoice: Make invoice Create manual invoice: Create manual invoice
+        searchInvoice: Search issued invoice
+        fileDenied: Browser denied file download...
+        fileAllowed: Successful download of CSV file
+        youCanSearchByInvoiceReference: You can search by invoice reference
+        createInvoice: Make invoice
+        createManualInvoice: Create manual invoice
+
     es:
-    searchInvoice: Buscar factura emitida fileDenied: El navegador denegó la
-    descarga de archivos... fileAllowed: Descarga exitosa de archivo CSV
-    youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-    createInvoice: Crear factura Create manual invoice: Crear factura manual
-</i18n>
+        searchInvoice: Buscar factura emitida
+        fileDenied: El navegador denegó la descarga de archivos...
+        fileAllowed: Descarga exitosa de archivo CSV
+        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+        createInvoice: Crear factura
+        createManualInvoice: Crear factura manual
+    </i18n>
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index b2b031878..0a8b2ff2a 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -9,7 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import { useDialogPluginComponent } from 'quasar';
-import FetchData from 'components/FetchData.vue';
 
 const { t } = useI18n();
 const state = useState();
@@ -58,10 +57,6 @@ const fetchAgencyList = async (landed, addressFk) => {
     }
 };
 
-// const fetchOrderDetails = (order) => {
-//     fetchAddressList(order?.addressFk);
-//     fetchAgencyList(order?.landed, order?.addressFk);
-// };
 const $props = defineProps({
     clientFk: {
         type: Number,
@@ -73,39 +68,6 @@ const initialFormState = reactive({
     addressId: null,
     clientFk: $props.clientFk,
 });
-// const orderMapper = (order) => {
-//     return {
-//         addressId: order.addressFk,
-//         agencyModeId: order.agencyModeFk,
-//         landed: new Date(order.landed).toISOString(),
-//     };
-// };
-// const orderFilter = {
-//     include: [
-//         { relation: 'agencyMode', scope: { fields: ['name'] } },
-//         {
-//             relation: 'address',
-//             scope: { fields: ['nickname'] },
-//         },
-//         { relation: 'rows', scope: { fields: ['id'] } },
-//         {
-//             relation: 'client',
-//             scope: {
-//                 fields: [
-//                     'salesPersonFk',
-//                     'name',
-//                     'isActive',
-//                     'isFreezed',
-//                     'isTaxDataChecked',
-//                 ],
-//                 include: {
-//                     relation: 'salesPersonUser',
-//                     scope: { fields: ['id', 'name'] },
-//                 },
-//             },
-//         },
-//     ],
-// };
 
 const onClientChange = async (clientId = $props.clientFk) => {
     try {

From b69ef48a44ba04dfc7c5012a59c3cf97dcfd2baf Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 23 Oct 2024 12:21:34 +0200
Subject: [PATCH 17/89] refactor: refs #7132 deleted pageTitles repeated

---
 src/i18n/locale/en.yml | 43 ------------------------------------
 src/i18n/locale/es.yml | 49 ------------------------------------------
 2 files changed, 92 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 9049a44a9..d7456ce8f 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -354,9 +354,6 @@ twoFactorRequired:
     explanation: >-
         Please, enter the verification code that we have sent to your email in the
         next 5 minutes
-verifyEmail:
-    pageTitles:
-        verifyEmail: Email verification
 recoverPassword:
     userOrEmail: User or recovery email
     explanation: >-
@@ -436,16 +433,6 @@ entry:
             isExcludedFromAvailable: Es inventory
             isRaid: Raid
 ticket:
-    pageTitles:
-        list: List
-        summary: Summary
-        sale: Sale
-        dms: File management
-        observation: Notes
-        ticketAdvance: Advance tickets
-        futureTickets: Future tickets
-        purchaseRequest: Purchase request
-        weeklyTickets: Weekly tickets
     card:
         customerId: Customer ID
         customerCard: Customer card
@@ -544,8 +531,6 @@ parking:
     sector: Sector
     row: Row
     column: Column
-    pageTitles:
-        parking: Parking
     searchBar:
         info: You can search by parking code
         label: Search parking...
@@ -569,9 +554,6 @@ order:
         orderTicketList: Order Ticket List
         amount: Amount
 department:
-    pageTitles:
-        department: Department
-        summary: Summary
     chat: Chat
     bossDepartment: Boss Department
     selfConsumptionCustomer: Self-consumption customer
@@ -582,21 +564,6 @@ department:
     hasToSendMail: Send check-ins by email
     departmentRemoved: Department removed
 worker:
-    pageTitles:
-        workers: Workers
-        list: List
-        summary: Summary
-        workerCreate: New worker
-        department: Department
-        pda: PDA
-        dms: My documentation
-        pbx: Private Branch Exchange
-        log: Log
-        calendar: Calendar
-        timeControl: Time control
-        locker: Locker
-        medical: Medical
-        operator: Operator
     list:
         department: Department
         schedule: Schedule
@@ -680,16 +647,6 @@ worker:
         isOnReservationMode: Reservation mode
         machine: Machine
 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
-        wagonTray: Tray List
     type:
         submit: Submit
         reset: Reset
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 69f4f6b0c..71f820d8f 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -356,9 +356,6 @@ twoFactor:
     validate: Validar
     insert: Introduce el código de verificación
     explanation: Por favor introduce el código de verificación que te hemos enviado a tu email en los próximos 5 minutos
-verifyEmail:
-    pageTitles:
-        verifyEmail: Verificación de correo
 recoverPassword:
     userOrEmail: Usuario o correo de recuperación
     explanation: >-
@@ -439,21 +436,6 @@ entry:
             isExcludedFromAvailable: Es inventario
             isRaid: Redada
 ticket:
-    pageTitles:
-        list: Listado
-        summary: Resumen
-        dms: Gestión documental
-        observation: Notas
-        ticketAdvance: Adelantar tickets
-        futureTickets: Tickets a futuro
-        expedition: Expedición
-        purchaseRequest: Petición de compra
-        weeklyTickets: Tickets programados
-        saleTracking: Líneas preparadas
-        services: Servicios
-        tracking: Estados
-        components: Componentes
-        pictures: Fotos
     card:
         customerId: ID cliente
         customerCard: Ficha del cliente
@@ -570,15 +552,10 @@ parking:
     pickingOrder: Orden de recogida
     row: Fila
     column: Columna
-    pageTitles:
-        parking: Parking
     searchBar:
         info: Puedes buscar por código de parking
         label: Buscar parking...
 department:
-    pageTitles:
-        department: Departamentos
-        summary: Resumen
     chat: Chat
     bossDepartment: Jefe de departamento
     selfConsumptionCustomer: Cliente autoconsumo
@@ -589,22 +566,6 @@ department:
     hasToSendMail: Enviar fichadas por mail
     departmentRemoved: Departamento eliminado
 worker:
-    pageTitles:
-        workers: Trabajadores
-        list: Listado
-        summary: Resumen
-        workerCreate: Nuevo trabajador
-        department: Departamentos
-        pda: PDA
-        dms: Mi documentación
-        pbx: Centralita
-        log: Historial
-        calendar: Calendario
-        timeControl: Control de horario
-        locker: Taquilla
-        formation: Formación
-        medical: Mutua
-        operator: Operario
     list:
         department: Departamento
         schedule: Horario
@@ -680,16 +641,6 @@ worker:
         machine: Máquina
 
 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
-        wagonTray: Listado bandejas
     type:
         submit: Guardar
         reset: Deshacer cambios

From 1e04ead78027fb3e5b7c6804d50021a62d32bf3b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 24 Oct 2024 15:11:58 +0200
Subject: [PATCH 18/89] perf: refs #8036 currentFilter

---
 src/composables/useArrayData.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 6b1d183f2..4e0cad9c9 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -87,10 +87,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (store.order && store.order.length) params.filter.order = [...store.order];
         else delete params.filter.order;
 
         store.currentFilter = JSON.parse(JSON.stringify(params));
+        delete store.currentFilter.filter.include;
         store.currentFilter.filter = JSON.stringify(store.currentFilter.filter);
 
         let exprFilter;

From bf4bee0f95145b04edf4710eacfba75b5fb2c3ac Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 29 Oct 2024 14:07:34 +0100
Subject: [PATCH 19/89] feat(VnSelect): refs #7136 add scroll

---
 src/components/common/VnSelect.vue    | 50 ++++++++++++++++++---------
 src/pages/Customer/CustomerFilter.vue |  3 +-
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index b0aa648c1..5dc9fc74b 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { ref, toRefs, computed, watch, onMounted, useAttrs } from 'vue';
 import { useI18n } from 'vue-i18n';
-import FetchData from 'src/components/FetchData.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 import { useValidator } from 'src/composables/useValidator';
 const emit = defineEmits(['update:modelValue', 'update:options', 'remove']);
 
@@ -86,7 +86,12 @@ const $props = defineProps({
         type: Boolean,
         default: false,
     },
+    dataKey: {
+        type: String,
+        default: null,
+    },
 });
+
 const { validations } = useValidator();
 const requiredFieldRule = (val) => validations().required($attrs.required, val);
 const $attrs = useAttrs();
@@ -97,14 +102,14 @@ const { optionLabel, optionValue, optionFilter, optionFilterValue, options, mode
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
-const dataRef = ref();
 const lastVal = ref();
 const noOneText = t('globals.noOne');
 const noOneOpt = ref({
     [optionValue.value]: false,
     [optionLabel.value]: noOneText,
 });
-
+const isLoading = ref(false);
+const useURL = computed(() => $props.url);
 const value = computed({
     get() {
         return $props.modelValue;
@@ -114,6 +119,9 @@ const value = computed({
         emit('update:modelValue', value);
     },
 });
+const arrayDataKey =
+    $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
+const arrayData = useArrayData(arrayDataKey, { url: $props.url, searchUrl: false });
 
 watch(options, (newValue) => {
     setOptions(newValue);
@@ -128,7 +136,7 @@ watch(modelValue, async (newValue) => {
 
 onMounted(() => {
     setOptions(options.value);
-    if ($props.url && $props.modelValue && !findKeyInOptions())
+    if (useURL.value && $props.modelValue && !findKeyInOptions())
         fetchFilter($props.modelValue);
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
@@ -166,7 +174,7 @@ function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    if (!$props.url || !dataRef.value) return;
+    if (!$props.url) return;
 
     const { fields, include, sortBy, limit } = $props;
     const key =
@@ -188,8 +196,8 @@ async function fetchFilter(val) {
     const fetchOptions = { where, include, limit };
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
-
-    return dataRef.value.fetch(fetchOptions);
+    arrayData.reset(['skip', 'filter.skip', 'page']);
+    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
 }
 
 async function filterHandler(val, update) {
@@ -229,20 +237,25 @@ function nullishToTrue(value) {
 
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
+async function onScroll({ to, direction, from, index }) {
+    const lastIndex = myOptions.value.length - 1;
+
+    if (from === 0 && index === 0) return;
+    if (!useURL.value && !$props.fetchRef) return;
+    if (direction === 'decrease') return;
+    if (to === lastIndex && arrayData.store.hasMoreData && !isLoading.value) {
+        isLoading.value = true;
+        await arrayData.loadMore();
+        setOptions(arrayData.store.data);
+        vnSelectRef.value.scrollTo(lastIndex);
+        isLoading.value = false;
+    }
+}
+
 defineExpose({ opts: myOptions });
 </script>
 
 <template>
-    <FetchData
-        ref="dataRef"
-        :url="$props.url"
-        @on-fetch="(data) => setOptions(data)"
-        :where="where || { [optionValue]: value }"
-        :limit="limit"
-        :sort-by="sortBy"
-        :fields="fields"
-        :params="params"
-    />
     <QSelect
         v-model="value"
         :options="myOptions"
@@ -261,6 +274,9 @@ defineExpose({ opts: myOptions });
         :rules="mixinRules"
         virtual-scroll-slice-size="options.length"
         hide-bottom-space
+        :input-debounce="useURL ? '300' : '0'"
+        :loading="isLoading"
+        @virtual-scroll="onScroll"
     >
         <template v-if="isClearable" #append>
             <QIcon
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..02e07249a 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -53,7 +53,7 @@ defineProps({
                 <QItemSection>
                     <VnSelect
                         url="Workers/activeWithInheritedRole"
-                        :filter="{ where: { role: 'salesPerson' } }"
+                        :where="{ role: 'salesPerson' }"
                         auto-load
                         :label="t('Salesperson')"
                         v-model="params.salesPersonFk"
@@ -67,7 +67,6 @@ defineProps({
                         dense
                         outlined
                         rounded
-                        :input-debounce="0"
                     />
                 </QItemSection>
             </QItem>

From 4e957ed8a7ef2c09d4e3af99922c510088055f63 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 29 Oct 2024 17:23:45 +0100
Subject: [PATCH 20/89] feat: refs #7346 style radioButton

---
 src/components/common/VnRadio.vue       |   9 +-
 src/components/ui/VnRow.vue             |   8 +-
 src/pages/InvoiceOut/InvoiceOutList.vue | 248 ++++++++++--------------
 3 files changed, 117 insertions(+), 148 deletions(-)

diff --git a/src/components/common/VnRadio.vue b/src/components/common/VnRadio.vue
index 4eeb9dbe9..69b1501a2 100644
--- a/src/components/common/VnRadio.vue
+++ b/src/components/common/VnRadio.vue
@@ -2,5 +2,12 @@
 const model = defineModel({ type: Boolean, required: true });
 </script>
 <template>
-    <QRadio v-model="model" v-bind="$attrs" dense :dark="true" class="q-mr-sm" />
+    <QRadio
+        v-model="model"
+        v-bind="$attrs"
+        dense
+        :dark="true"
+        class="q-mr-sm"
+        size="xs"
+    />
 </template>
diff --git a/src/components/ui/VnRow.vue b/src/components/ui/VnRow.vue
index 16bcfab7d..b57489a98 100644
--- a/src/components/ui/VnRow.vue
+++ b/src/components/ui/VnRow.vue
@@ -1,8 +1,5 @@
-<script setup>
-defineProps({ wrap: { type: Boolean, default: false } });
-</script>
 <template>
-    <div class="vn-row q-gutter-md q-mb-md">
+    <div class="vn-row q-gutter-md">
         <slot />
     </div>
 </template>
@@ -21,6 +18,9 @@ defineProps({ wrap: { type: Boolean, default: false } });
         &:not(.wrap) {
             flex-direction: column;
         }
+        &[fixed] {
+            flex-direction: row;
+        }
     }
 }
 </style>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 9fb2fc5f5..205f67cd4 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -15,6 +15,9 @@ import { QBtn } from 'quasar';
 import axios from 'axios';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
+import VnRow from 'src/components/ui/VnRow.vue';
+import VnRadio from 'src/components/common/VnRadio.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -39,13 +42,9 @@ const columns = computed(() => [
         align: 'center',
         name: 'id',
         label: t('invoiceOutList.tableVisibleColumns.id'),
-        chip: {
-            condition: () => true,
-        },
+        chip: { condition: () => true },
         isId: true,
-        columnFilter: {
-            name: 'search',
-        },
+        columnFilter: { name: 'search' },
     },
     {
         align: 'left',
@@ -53,14 +52,8 @@ const columns = computed(() => [
         label: t('invoiceOutList.tableVisibleColumns.ref'),
         isTitle: true,
         component: 'select',
-        attrs: {
-            url: MODEL,
-            optionLabel: 'ref',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
+        columnField: { component: null },
     },
     {
         align: 'left',
@@ -68,9 +61,7 @@ const columns = computed(() => [
         label: t('invoiceOutList.tableVisibleColumns.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
     },
     {
         align: 'left',
@@ -78,13 +69,8 @@ const columns = computed(() => [
         label: t('invoiceOutModule.customer'),
         cardVisible: true,
         component: 'select',
-        attrs: {
-            url: 'Clients',
-            fields: ['id', 'name'],
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: 'Clients', fields: ['id', 'name'] },
+        columnField: { component: null },
     },
     {
         align: 'left',
@@ -92,14 +78,8 @@ const columns = computed(() => [
         label: t('invoiceOutModule.company'),
         cardVisible: true,
         component: 'select',
-        attrs: {
-            url: 'Companies',
-            optionLabel: 'code',
-            optionValue: 'id',
-        },
-        columnField: {
-            component: null,
-        },
+        attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
+        columnField: { component: null },
     },
     {
         align: 'left',
@@ -113,9 +93,7 @@ const columns = computed(() => [
         name: 'created',
         label: t('invoiceOutList.tableVisibleColumns.created'),
         component: 'date',
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
         format: (row) => toDate(row.created),
     },
     {
@@ -123,9 +101,7 @@ const columns = computed(() => [
         name: 'dued',
         label: t('invoiceOutList.tableVisibleColumns.dueDate'),
         component: 'date',
-        columnField: {
-            component: null,
-        },
+        columnField: { component: null },
         format: (row) => toDate(row.dued),
     },
     {
@@ -216,9 +192,7 @@ watchEffect(selectedRows);
             urlCreate: 'InvoiceOuts/createManualInvoice',
             title: t('createManualInvoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {
-                active: true,
-            },
+            formInitialData: { active: true },
         }"
         :right-search="false"
         v-model:selected="selectedRows"
@@ -232,92 +206,84 @@ watchEffect(selectedRows);
         }"
     >
         <template #more-create-dialog="{ data }">
-            <div class="row q-col-gutter-md">
+            <div class="row q-col-gutter-xs">
                 <div class="col-12">
-                    <div class="q-gutter-sm q-col-gutter-xs">
-                        <div class="row q-m-none">
-                            <div class="col-auto">
-                                <QRadio
-                                    v-model="selectedOption"
-                                    val="ticket"
-                                    label="Ticket"
-                                    class="q-my-none q-mr-md"
-                                />
-                            </div>
-                            <div class="col">
-                                <QInput
-                                    v-if="selectedOption === 'ticket'"
-                                    v-model="data.ticketFk"
-                                    label="Ticket ID"
-                                />
-                            </div>
-                        </div>
-
-                        <div class="row m-xs">
-                            <div class="col-auto">
-                                <QRadio
-                                    v-model="selectedOption"
-                                    val="cliente"
-                                    label="Cliente"
-                                    class="q-my-none q-mr-md"
-                                />
-                            </div>
-                            <div class="col">
-                                <VnSelect
-                                    v-if="selectedOption === 'cliente'"
-                                    v-model="data.clientFk"
-                                    label="Cliente"
-                                    url="Clients"
-                                    :options="customerOptions"
-                                    option-label="name"
-                                    option-value="id"
-                                    @update:model-value="fetchClientAddress"
-                                />
-                            </div>
-                        </div>
-
-                        <div class="row m-xs">
-                            <div class="col-auto">
-                                <QRadio
-                                    v-model="selectedOption"
-                                    val="consignatario"
-                                    label="Consignatario"
-                                    class="q-my-none q-mr-md"
-                                />
-                            </div>
-                            <div class="col">
-                                <div
-                                    v-if="selectedOption === 'consignatario'"
-                                    class="row q-col-gutter-md"
-                                >
-                                    <div class="col">
-                                        <VnSelect
-                                            v-model="data.clientFk"
-                                            label="Cliente"
-                                            url="Clients"
-                                            :options="customerOptions"
-                                            option-label="name"
-                                            option-value="id"
-                                            @update:model-value="fetchClientAddress"
-                                        />
-                                    </div>
-                                    <div class="col">
-                                        <VnSelect
-                                            v-model="data.addressFk"
-                                            label="Consignatario"
-                                            :options="addressOptions"
-                                            option-label="nickname"
-                                            option-value="id"
-                                            :disable="!data.clientFk"
-                                        />
-                                    </div>
+                    <div class="q-col-gutter-xs">
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="ticket"
+                                label="Ticket"
+                                class="q-my-none q-mr-md"
+                            />
+                            <VnInput
+                                :disable="selectedOption !== 'ticket'"
+                                v-model="data.ticketFk"
+                                label="Ticket ID"
+                                style="flex: 1"
+                            />
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="cliente"
+                                label="Cliente"
+                                class="q-my-none q-mr-md"
+                            />
+                            <VnSelect
+                                :disable="selectedOption !== 'cliente'"
+                                v-model="data.clientFk"
+                                label="Cliente"
+                                url="Clients"
+                                :options="customerOptions"
+                                option-label="name"
+                                option-value="id"
+                                @update:model-value="fetchClientAddress"
+                                style="flex: 1"
+                            />
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="consignatario"
+                                label="Consignatario"
+                                class="q-my-none q-mr-md"
+                            />
+                            <div
+                                :disable="selectedOption !== 'consignatario'"
+                                class="row q-col-gutter-xs q-ml-none"
+                            >
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.clientFk"
+                                        label="Cliente"
+                                        url="Clients"
+                                        :options="customerOptions"
+                                        option-label="name"
+                                        option-value="id"
+                                        @update:model-value="fetchClientAddress"
+                                        :disable="selectedOption !== 'consignatario'"
+                                    />
+                                </div>
+                                <div class="col">
+                                    <VnSelect
+                                        v-model="data.addressFk"
+                                        label="Consignatario"
+                                        :options="addressOptions"
+                                        option-label="nickname"
+                                        option-value="id"
+                                        :disable="
+                                            !data.clientFk ||
+                                            selectedOption !== 'consignatario'
+                                        "
+                                    />
                                 </div>
                             </div>
-                        </div>
+                        </VnRow>
                     </div>
                 </div>
-                <div class="q-gutter-md">
-                    <div class="row q-gutter-md">
+                <div class="full-width">
+                    <VnRow class="row q-col-gutter-xs">
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
@@ -332,8 +298,8 @@ watchEffect(selectedRows);
                             :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
                             v-model="data.maxShipped"
                         />
-                    </div>
-                    <div class="row q-gutter-md">
+                    </VnRow>
+                    <VnRow class="row q-col-gutter-xs">
                         <VnSelect
                             url="TaxAreas"
                             v-model="data.taxArea"
@@ -342,31 +308,27 @@ watchEffect(selectedRows);
                             option-label="code"
                             option-value="code"
                         />
-                        <QInput
+                        <VnInput
                             v-model="data.reference"
                             :label="t('invoiceOutList.tableVisibleColumns.ref')"
                         />
-                    </div>
+                    </VnRow>
                 </div>
             </div>
         </template>
     </VnTable>
 </template>
 
-<i18n>
-    en:
-        searchInvoice: Search issued invoice
-        fileDenied: Browser denied file download...
-        fileAllowed: Successful download of CSV file
-        youCanSearchByInvoiceReference: You can search by invoice reference
-        createInvoice: Make invoice
-        createManualInvoice: Create manual invoice
-
-    es:
-        searchInvoice: Buscar factura emitida
-        fileDenied: El navegador denegó la descarga de archivos...
-        fileAllowed: Descarga exitosa de archivo CSV
-        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-        createInvoice: Crear factura
-        createManualInvoice: Crear factura manual
-    </i18n>
+<style lang="scss" scoped>
+#formModel .vn-row {
+    min-height: 45px;
+}
+#formModel .vn-row .q-radio {
+    align-self: flex-end;
+    flex: 0.3;
+}
+#formModel .vn-row > .q-input,
+#formModel .vn-row > .q-select {
+    flex: 0.75;
+}
+</style>

From a467c44b91ec3c80d45cfa5dc68a9e7479dcf144 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 8 Nov 2024 11:51:13 +0100
Subject: [PATCH 21/89] feat: refs #6818 saysimple integration

---
 src/components/ui/VnLinkPhone.vue           | 19 ++++++++++++++++---
 src/pages/Customer/Card/CustomerSummary.vue |  7 ++++++-
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 3ce0b7aa6..490dd838e 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,16 +1,29 @@
 <script setup>
-defineProps({ phoneNumber: { type: [String, Number], default: null } });
+import { useAttrs } from 'vue';
+const props = defineProps({
+    phoneNumber: { type: [String, Number], default: null },
+    channel: { type: Number, default: 1320 },
+});
+
+const config = {
+    sip: { icon: 'phone_in_talk', href: `sip:${props.phoneNumber}` },
+    'say-simple': {
+        icon: 'help', // 'whatsapp',
+        href: `https://verdnatura.saysimple.io/start-conversation?customerIdentity=%2B${props.phoneNumber}&channelId=${props.channel}`,
+    },
+};
+const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 </script>
 <template>
     <QBtn
         v-if="phoneNumber"
         flat
         round
-        icon="phone"
+        :icon="config[type].icon"
         size="sm"
         color="primary"
         padding="none"
-        :href="`sip:${phoneNumber}`"
+        :href="config[type].href"
         @click.stop
     />
 </template>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 8e41119ef..4cc6057e8 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -95,6 +95,11 @@ const sumRisk = ({ clientRisks }) => {
                     <template #label>
                         {{ t('customer.summary.mobile') }}
                         <VnLinkPhone :phone-number="entity.mobile" />
+                        <VnLinkPhone
+                            say-simple
+                            :phone-number="entity.mobile"
+                            :channel="entity.country?.saySimpleCountry?.channel"
+                        />
                     </template>
                 </VnLv>
                 <VnLv :value="entity.email" copy
@@ -142,7 +147,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.country"
                     :label="t('customer.summary.country')"
-                    :value="entity.country.country"
+                    :value="entity.country.name"
                 />
                 <VnLv :label="t('customer.summary.street')" :value="entity.street" />
             </QCard>

From 3bae121ed74f6078ed2ccf8769443646487baf5d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 8 Nov 2024 13:04:40 +0100
Subject: [PATCH 22/89] fix: refs #6818 use right icon

---
 src/components/ui/VnLinkPhone.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 490dd838e..a69cb4509 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -6,7 +6,7 @@ const props = defineProps({
 });
 
 const config = {
-    sip: { icon: 'phone_in_talk', href: `sip:${props.phoneNumber}` },
+    sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'help', // 'whatsapp',
         href: `https://verdnatura.saysimple.io/start-conversation?customerIdentity=%2B${props.phoneNumber}&channelId=${props.channel}`,

From 7fb3e71688f874ab6ca76c24bedc139ed890dc08 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 8 Nov 2024 17:41:27 +0100
Subject: [PATCH 23/89] feat: refs #6818 fetch url & default channel

---
 src/components/ui/VnLinkPhone.vue | 36 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index a69cb4509..a7b2d9b77 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -1,18 +1,38 @@
 <script setup>
-import { useAttrs } from 'vue';
+import { reactive, useAttrs, onBeforeMount, capitalize } from 'vue';
+import axios from 'axios';
 const props = defineProps({
     phoneNumber: { type: [String, Number], default: null },
-    channel: { type: Number, default: 1320 },
+    channel: { type: Number, default: null },
 });
 
-const config = {
+const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
         icon: 'help', // 'whatsapp',
-        href: `https://verdnatura.saysimple.io/start-conversation?customerIdentity=%2B${props.phoneNumber}&channelId=${props.channel}`,
+        href: null,
     },
-};
+});
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
+
+onBeforeMount(async () => {
+    let url;
+    let channel = props.channel;
+    if (type === 'say-simple')
+        url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
+    if (!props.channel)
+        channel = (
+            await axios.get('SaySimpleCountries/findOne', {
+                params: {
+                    filter: { fields: ['channel'], where: { countryFk: 0 } },
+                },
+            })
+        ).data?.channel;
+
+    config[
+        'say-simple'
+    ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+});
 </script>
 <template>
     <QBtn
@@ -25,5 +45,9 @@ const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
         padding="none"
         :href="config[type].href"
         @click.stop
-    />
+    >
+        <QTooltip>
+            {{ capitalize(type).replace('-', '') }}
+        </QTooltip>
+    </QBtn>
 </template>

From 76e35cc758f52b06a88fdfaa73a66d8e2e980719 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 12 Nov 2024 07:28:51 +0100
Subject: [PATCH 24/89] feat: refs #7346 address ordered

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 172 +++++++++++++++++++-----
 1 file changed, 139 insertions(+), 33 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 205f67cd4..728ba9442 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -31,17 +31,24 @@ const MODEL = 'InvoiceOuts';
 const { openReport } = usePrintService();
 const addressOptions = ref([]);
 const selectedOption = ref('ticket');
-
 async function fetchClientAddress(id) {
-    const { data } = await axios.get(`Clients/${id}/addresses`);
+    const { data } = await axios.get(
+        `Clients/${id}/addresses?filter[order]=isActive DESC`
+    );
     addressOptions.value = data;
 }
 
+const exprBuilder = (_, value) => {
+    return {
+        or: [{ code: value }, { description: { like: `%${value}%` } }],
+    };
+};
+
 const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
-        label: t('invoiceOutList.tableVisibleColumns.id'),
+        label: t('invoice id'),
         chip: { condition: () => true },
         isId: true,
         columnFilter: { name: 'search' },
@@ -49,7 +56,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'ref',
-        label: t('invoiceOutList.tableVisibleColumns.ref'),
+        label: t('invoiceOut.list.ref'),
         isTitle: true,
         component: 'select',
         attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
@@ -57,8 +64,8 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'Issued',
-        label: t('invoiceOutList.tableVisibleColumns.issued'),
+        name: 'issued',
+        label: t('invoiceOut.list.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
         columnField: { component: null },
@@ -66,7 +73,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'clientFk',
-        label: t('invoiceOutModule.customer'),
+        label: t('invoiceOut.list.client'),
         cardVisible: true,
         component: 'select',
         attrs: { url: 'Clients', fields: ['id', 'name'] },
@@ -75,7 +82,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'companyCode',
-        label: t('invoiceOutModule.company'),
+        label: t('invoiceOut.list.company'),
         cardVisible: true,
         component: 'select',
         attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
@@ -84,14 +91,14 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'amount',
-        label: t('invoiceOutModule.amount'),
+        label: t('invoiceOut.list.amount'),
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
     {
         align: 'left',
         name: 'created',
-        label: t('invoiceOutList.tableVisibleColumns.created'),
+        label: t('invoiceOut.list.created'),
         component: 'date',
         columnField: { component: null },
         format: (row) => toDate(row.created),
@@ -99,7 +106,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'dued',
-        label: t('invoiceOutList.tableVisibleColumns.dueDate'),
+        label: t('invoiceOut.list.dued'),
         component: 'date',
         columnField: { component: null },
         format: (row) => toDate(row.dued),
@@ -109,12 +116,12 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('components.smartCard.viewSummary'),
+                title: t('view summary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('DownloadPdf'),
+                title: t('download pdf'),
                 icon: 'vn:ticket',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
@@ -163,8 +170,8 @@ watchEffect(selectedRows);
 
 <template>
     <VnSearchbar
-        :info="t('youCanSearchByInvoiceReference')"
-        :label="t('searchInvoice')"
+        :info="t('you can search by invoice reference')"
+        :label="t('search invoice')"
         data-key="invoiceOut"
     />
     <RightMenu>
@@ -180,7 +187,7 @@ watchEffect(selectedRows);
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
             >
-                <QTooltip>{{ t('globals.downloadPdf') }}</QTooltip>
+                <QTooltip>{{ t('download pdf') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -190,7 +197,7 @@ watchEffect(selectedRows);
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('createManualInvoice'),
+            title: t('create manual invoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: { active: true },
         }"
@@ -240,7 +247,21 @@ watchEffect(selectedRows);
                                 option-value="id"
                                 @update:model-value="fetchClientAddress"
                                 style="flex: 1"
-                            />
+                            >
+                                <template #option="scope">
+                                    <QItem
+                                        v-bind="scope.itemProps"
+                                        @click="selectedClient(scope.opt)"
+                                    >
+                                        <QItemSection>
+                                            <QItemLabel>
+                                                #{{ scope.opt?.id }} -
+                                                {{ scope.opt?.name }}
+                                            </QItemLabel>
+                                        </QItemSection>
+                                    </QItem>
+                                </template>
+                            </VnSelect>
                         </VnRow>
                         <VnRow fixed>
                             <VnRadio
@@ -263,7 +284,21 @@ watchEffect(selectedRows);
                                         option-value="id"
                                         @update:model-value="fetchClientAddress"
                                         :disable="selectedOption !== 'consignatario'"
-                                    />
+                                    >
+                                        <template #option="scope">
+                                            <QItem
+                                                v-bind="scope.itemProps"
+                                                @click="selectedClient(scope.opt)"
+                                            >
+                                                <QItemSection>
+                                                    <QItemLabel>
+                                                        #{{ scope.opt?.id }} -
+                                                        {{ scope.opt?.name }}
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
                                 </div>
                                 <div class="col">
                                     <VnSelect
@@ -276,7 +311,52 @@ watchEffect(selectedRows);
                                             !data.clientFk ||
                                             selectedOption !== 'consignatario'
                                         "
-                                    />
+                                    >
+                                        <template #option="scope">
+                                            <QItem v-bind="scope.itemProps">
+                                                <QItemSection>
+                                                    <QItemLabel
+                                                        :class="{
+                                                            'color-vn-label':
+                                                                !scope.opt?.isActive,
+                                                        }"
+                                                    >
+                                                        {{
+                                                            `${
+                                                                !scope.opt?.isActive
+                                                                    ? t(
+                                                                          'basicData.inactive'
+                                                                      )
+                                                                    : ''
+                                                            } `
+                                                        }}
+                                                        <span>
+                                                            {{
+                                                                scope.opt?.nickname
+                                                            }}</span
+                                                        >
+                                                        <span
+                                                            v-if="
+                                                                scope.opt?.province ||
+                                                                scope.opt?.city ||
+                                                                scope.opt?.street
+                                                            "
+                                                            >, {{ scope.opt?.street }},
+                                                            {{ scope.opt?.city }},
+                                                            {{
+                                                                scope.opt?.province?.name
+                                                            }}
+                                                            -
+                                                            {{
+                                                                scope.opt?.agencyMode
+                                                                    ?.name
+                                                            }}</span
+                                                        >
+                                                    </QItemLabel>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelect>
                                 </div>
                             </div>
                         </VnRow>
@@ -287,31 +367,36 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="
-                                t('invoiceOutList.tableVisibleColumns.invoiceOutSerial')
-                            "
+                            :label="t('invoice serial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"
-                        />
-                        <VnInputDate
-                            :label="t('invoiceOutList.tableVisibleColumns.dueDate')"
-                            v-model="data.maxShipped"
-                        />
+                            option-filter
+                            :expr-builder="exprBuilder"
+                        >
+                            <template #option="scope">
+                                <QItem v-bind="scope.itemProps">
+                                    <QItemSection>
+                                        <QItemLabel>
+                                            {{ scope.opt?.code }} -
+                                            {{ scope.opt?.description }}
+                                        </QItemLabel>
+                                    </QItemSection>
+                                </QItem>
+                            </template>
+                        </VnSelect>
+                        <VnInputDate :label="t('due date')" v-model="data.maxShipped" />
                     </VnRow>
                     <VnRow class="row q-col-gutter-xs">
                         <VnSelect
                             url="TaxAreas"
                             v-model="data.taxArea"
-                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
+                            :label="t('tax area')"
                             :options="taxAreasOptions"
                             option-label="code"
                             option-value="code"
                         />
-                        <VnInput
-                            v-model="data.reference"
-                            :label="t('invoiceOutList.tableVisibleColumns.ref')"
-                        />
+                        <VnInput v-model="data.reference" :label="t('reference')" />
                     </VnRow>
                 </div>
             </div>
@@ -332,3 +417,24 @@ watchEffect(selectedRows);
     flex: 0.75;
 }
 </style>
+<i18n>
+    en:
+        invoice id: Invoice ID
+        view summary: View Summary
+        download pdf: Download PDF
+        you can search by invoice reference: You can search by invoice reference
+        search invoice: Search Invoice
+        create manual invoice: Create Manual Invoice
+        invoice serial: Invoice Serial
+        tax area: Tax Area
+
+    es:
+        invoice id: ID de factura
+        view summary: Ver resumen
+        download pdf: Descargar PDF
+        you can search by invoice reference: Puedes buscar por referencia de la factura
+        search invoice: Buscar factura
+        create manual invoice: Crear factura manual
+        invoice serial: Serie de factura
+        tax area: Área fiscal
+</i18n>

From 8e4931516a25008a2703c62a5685a19798d95f5b Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 12 Nov 2024 07:42:55 +0100
Subject: [PATCH 25/89] feat: refs #7346 traducciones en cammelCase

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 61 ++++++++++++++-----------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 728ba9442..9c4b9753c 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -48,7 +48,7 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
-        label: t('invoice id'),
+        label: t('invoiceId'),
         chip: { condition: () => true },
         isId: true,
         columnFilter: { name: 'search' },
@@ -116,12 +116,12 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('view summary'),
+                title: t('viewSummary'),
                 icon: 'preview',
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('download pdf'),
+                title: t('downloadPdf'),
                 icon: 'vn:ticket',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
@@ -170,8 +170,8 @@ watchEffect(selectedRows);
 
 <template>
     <VnSearchbar
-        :info="t('you can search by invoice reference')"
-        :label="t('search invoice')"
+        :info="t('youCanSearchByInvoiceReference')"
+        :label="t('searchInvoice')"
         data-key="invoiceOut"
     />
     <RightMenu>
@@ -187,7 +187,7 @@ watchEffect(selectedRows);
                 @click="downloadPdf()"
                 :disable="!hasSelectedCards"
             >
-                <QTooltip>{{ t('download pdf') }}</QTooltip>
+                <QTooltip>{{ t('downloadPdf') }}</QTooltip>
             </QBtn>
         </template>
     </VnSubToolbar>
@@ -197,7 +197,7 @@ watchEffect(selectedRows);
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
-            title: t('create manual invoice'),
+            title: t('createManualInvoice'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
             formInitialData: { active: true },
         }"
@@ -367,7 +367,7 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="t('invoice serial')"
+                            :label="t('invoiceSerial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"
@@ -385,13 +385,13 @@ watchEffect(selectedRows);
                                 </QItem>
                             </template>
                         </VnSelect>
-                        <VnInputDate :label="t('due date')" v-model="data.maxShipped" />
+                        <VnInputDate :label="t('dueDate')" v-model="data.maxShipped" />
                     </VnRow>
                     <VnRow class="row q-col-gutter-xs">
                         <VnSelect
                             url="TaxAreas"
                             v-model="data.taxArea"
-                            :label="t('tax area')"
+                            :label="t('taxArea')"
                             :options="taxAreasOptions"
                             option-label="code"
                             option-value="code"
@@ -417,24 +417,33 @@ watchEffect(selectedRows);
     flex: 0.75;
 }
 </style>
+
 <i18n>
     en:
-        invoice id: Invoice ID
-        view summary: View Summary
-        download pdf: Download PDF
-        you can search by invoice reference: You can search by invoice reference
-        search invoice: Search Invoice
-        create manual invoice: Create Manual Invoice
-        invoice serial: Invoice Serial
-        tax area: Tax Area
+        invoiceId: Invoice ID
+        viewSummary: View Summary
+        downloadPdf: Download PDF
+        youCanSearchByInvoiceReference: You can search by invoice reference
+        searchInvoice: Search Invoice
+        createManualInvoice: Create Manual Invoice
+        invoiceSerial: Invoice Serial
+        taxArea: Tax Area
+        dueDate: Due Date
+        reference: Reference
+        basicData:
+            inactive: Inactive
 
     es:
-        invoice id: ID de factura
-        view summary: Ver resumen
-        download pdf: Descargar PDF
-        you can search by invoice reference: Puedes buscar por referencia de la factura
-        search invoice: Buscar factura
-        create manual invoice: Crear factura manual
-        invoice serial: Serie de factura
-        tax area: Área fiscal
+        invoiceId: ID de factura
+        viewSummary: Ver resumen
+        downloadPdf: Descargar PDF
+        youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
+        searchInvoice: Buscar factura
+        createManualInvoice: Crear factura manual
+        invoiceSerial: Serie de factura
+        taxArea: Área fiscal
+        dueDate: Fecha de vencimiento
+        reference: Referencia
+        basicData:
+            inactive: Inactivo
 </i18n>

From 40ecd6e3584a94627b714c9dd474975cc3d3187e Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Tue, 12 Nov 2024 08:28:02 +0100
Subject: [PATCH 26/89] refactor: refs #7950 Created cmr model

---
 src/pages/Route/Cmr/CmrList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index ede271960..b3eaf3b48 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -116,7 +116,7 @@ function getApiUrl() {
     return new URL(window.location).origin;
 }
 function getCmrUrl(value) {
-    return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
+    return `${getApiUrl()}/api/Cmrs/${value}/print?access_token=${token}`;
 }
 function downloadPdfs() {
     if (!selectedRows.value.length) {
@@ -129,7 +129,7 @@ function downloadPdfs() {
     let cmrs = [];
     for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
-    return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
+    return window.open(`${getApiUrl()}/api/Cmrs/downloadZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
@@ -149,7 +149,7 @@ function downloadPdfs() {
     <VnTable
         ref="tableRef"
         data-key="CmrList"
-        url="Routes/cmrs"
+        url="Cmrs/filter"
         :columns="columns"
         :right-search="true"
         default-mode="table"

From 700701f0554c7b06985f31e9dcecc8ad51056de0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 10:10:26 +0100
Subject: [PATCH 27/89] refactor: refs #6818 channel logic

---
 src/components/ui/VnLinkPhone.vue | 34 +++++++++++++++++--------------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index a7b2d9b77..3b3153ac3 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -9,29 +9,33 @@ const props = defineProps({
 const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
-        icon: 'help', // 'whatsapp',
+        icon: 'help', // 'whatsapp icon #6818',
         href: null,
+        channel: props.channel,
     },
 });
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 
 onBeforeMount(async () => {
     let url;
-    let channel = props.channel;
-    if (type === 'say-simple')
-        url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
-    if (!props.channel)
-        channel = (
-            await axios.get('SaySimpleCountries/findOne', {
-                params: {
-                    filter: { fields: ['channel'], where: { countryFk: 0 } },
-                },
-            })
-        ).data?.channel;
+    let { channel } = config[type];
+    if (type === 'sip') return;
 
-    config[
-        'say-simple'
-    ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+    if (type === 'say-simple') {
+        url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
+        if (!channel)
+            channel = (
+                await axios.get('SaySimpleCountries/findOne', {
+                    params: {
+                        filter: { fields: ['channel'], where: { countryFk: 0 } },
+                    },
+                })
+            ).data?.channel;
+
+        config[
+            type
+        ].href = `${url}?customerIdentity=%2B${props.phoneNumber}&channelId=${channel}`;
+    }
 });
 </script>
 <template>

From 81b35aa75b03bab9c35effc1a09056945d86304d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 10:11:26 +0100
Subject: [PATCH 28/89] chore: refs #6818 add spaces

---
 src/components/ui/VnLinkPhone.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 3b3153ac3..51694b8eb 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -19,9 +19,9 @@ const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 onBeforeMount(async () => {
     let url;
     let { channel } = config[type];
-    if (type === 'sip') return;
 
-    if (type === 'say-simple') {
+    if (type === 'sip') return;
+    else if (type === 'say-simple') {
         url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
         if (!channel)
             channel = (

From 83be57a0c4dc88180c52fb08e71de9071c305d83 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 15:01:17 +0100
Subject: [PATCH 29/89] chore: refs #6818 drop useless code & comment

---
 src/components/ui/VnLinkPhone.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 51694b8eb..11339859e 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -9,7 +9,7 @@ const props = defineProps({
 const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
-        icon: 'help', // 'whatsapp icon #6818',
+        icon: 'help',
         href: null,
         channel: props.channel,
     },
@@ -20,8 +20,7 @@ onBeforeMount(async () => {
     let url;
     let { channel } = config[type];
 
-    if (type === 'sip') return;
-    else if (type === 'say-simple') {
+    if (type === 'say-simple') {
         url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
         if (!channel)
             channel = (

From 5c59ae8217b6b20592d98d8321e9ca2a08bd3b60 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 09:12:51 +0100
Subject: [PATCH 30/89] fix: refs #7404 some filter issues

---
 src/pages/Entry/EntryStockBought.vue       |  3 ++-
 src/pages/Entry/EntryStockBoughtDetail.vue |  2 +-
 src/pages/Entry/EntryStockBoughtFilter.vue | 11 +++++++++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/pages/Entry/EntryStockBought.vue b/src/pages/Entry/EntryStockBought.vue
index 7ae6901d3..3f0cd2d99 100644
--- a/src/pages/Entry/EntryStockBought.vue
+++ b/src/pages/Entry/EntryStockBought.vue
@@ -99,7 +99,7 @@ const travelDialogRef = ref(false);
 const tableRef = ref();
 const travel = ref(null);
 const userParams = ref({
-    dated: Date.vnNew(),
+    dated: Date.vnNew().toJSON(),
 });
 
 const filter = ref({
@@ -219,6 +219,7 @@ function round(value) {
                 data-key="StockBoughts"
                 url="StockBoughts/getStockBought"
                 save-url="StockBoughts/crud"
+                search-url="StockBoughts"
                 order="reserve DESC"
                 :right-search="false"
                 :is-editable="true"
diff --git a/src/pages/Entry/EntryStockBoughtDetail.vue b/src/pages/Entry/EntryStockBoughtDetail.vue
index 0fd775ee6..812171825 100644
--- a/src/pages/Entry/EntryStockBoughtDetail.vue
+++ b/src/pages/Entry/EntryStockBoughtDetail.vue
@@ -18,7 +18,7 @@ const $props = defineProps({
         required: true,
     },
 });
-const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&date=${$props.dated}`;
+const customUrl = `StockBoughts/getStockBoughtDetail?workerFk=${$props.workerFk}&dated=${$props.dated}`;
 const columns = [
     {
         align: 'left',
diff --git a/src/pages/Entry/EntryStockBoughtFilter.vue b/src/pages/Entry/EntryStockBoughtFilter.vue
index 7694cfe6c..e59332064 100644
--- a/src/pages/Entry/EntryStockBoughtFilter.vue
+++ b/src/pages/Entry/EntryStockBoughtFilter.vue
@@ -27,7 +27,7 @@ onMounted(async () => {
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
-        search-url="table"
+        search-url="StockBoughts"
         @set-user-params="setUserParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -36,12 +36,19 @@ onMounted(async () => {
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem class="q-my-sm">
                 <QItemSection>
                     <VnInputDate
                         id="date"
                         v-model="params.dated"
+                        @update:model-value="
+                            (value) => {
+                                params.dated = value;
+                                setUserParams(params);
+                                searchFn();
+                            }
+                        "
                         :label="t('Date')"
                         is-outlined
                     />

From 81927c5af54cb25b99452064b421fe88c3d5b598 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 09:58:41 +0100
Subject: [PATCH 31/89] fix: zoneFilter

---
 src/pages/Zone/ZoneFilterPanel.vue | 2 +-
 src/pages/Zone/ZoneList.vue        | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 25c55d75c..24a401925 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,7 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="agencies" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData url="agencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index d160ea6b5..b01f8b7e7 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -73,6 +73,7 @@ const columns = computed(() => [
             inWhere: true,
             attrs: {
                 url: 'AgencyModes',
+                fields: ['id', 'name'],
             },
         },
         columnField: {

From 8eb76cd0fc06693a0f17a696427599ed46483c21 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 10:00:04 +0100
Subject: [PATCH 32/89] fix: url name

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

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 24a401925..5e2bad5f2 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,7 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="agencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 178753ddcc575460df7082322bde3a474e7658c0 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 10:11:14 +0100
Subject: [PATCH 33/89] fix: add scope fields on filter

---
 src/pages/Zone/ZoneFilterPanel.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 5e2bad5f2..98bfd35ed 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -22,7 +22,12 @@ const agencies = ref([]);
 </script>
 
 <template>
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
+    <FetchData
+        url="AgencyModes"
+        :filter="{ fields: ['id', 'name'] }"
+        @on-fetch="(data) => (agencies = data)"
+        auto-load
+    />
     <VnFilterPanel
         :data-key="props.dataKey"
         :search-button="true"

From 9291c4dd6acc5d12217f8d4d65688d37afc6edc6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Nov 2024 11:50:08 +0100
Subject: [PATCH 34/89] feat: refs #6818 add icon

---
 src/components/ui/VnLinkPhone.vue           | 2 +-
 src/pages/Customer/Card/CustomerSummary.vue | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 11339859e..3b63889e1 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -9,7 +9,7 @@ const props = defineProps({
 const config = reactive({
     sip: { icon: 'phone', href: `sip:${props.phoneNumber}` },
     'say-simple': {
-        icon: 'help',
+        icon: 'vn:saysimple',
         href: null,
         channel: props.channel,
     },
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 4cc6057e8..555d490d7 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -99,6 +99,7 @@ const sumRisk = ({ clientRisks }) => {
                             say-simple
                             :phone-number="entity.mobile"
                             :channel="entity.country?.saySimpleCountry?.channel"
+                            class="q-ml-xs"
                         />
                     </template>
                 </VnLv>

From b68868e1039be4019b63618073a19906aaafb03d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Nov 2024 12:11:15 +0100
Subject: [PATCH 35/89] feat: add city name

---
 src/pages/Zone/ZoneDeliveryPanel.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 7667f60dc..5e03e9cdf 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -105,11 +105,14 @@ watch(
                 <template #option="{ itemProps, opt }">
                     <QItem v-bind="itemProps">
                         <QItemSection v-if="opt.code">
-                            <QItemLabel>{{ opt.code }}</QItemLabel>
-                            <QItemLabel caption
-                                >{{ opt.town?.province?.name }},
-                                {{ opt.town?.province?.country?.name }}</QItemLabel
-                            >
+                            <QItemLabel>
+                                {{ `${opt.code}, ${opt.town?.name}` }}
+                            </QItemLabel>
+                            <QItemLabel caption>
+                                {{
+                                    `${opt.town?.province?.name}, ${opt.town?.province?.country?.name}`
+                                }}
+                            </QItemLabel>
                         </QItemSection>
                     </QItem>
                 </template>

From 1c5a02fe52891c3b3e166728a47b7cf1fab45d47 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 13:17:15 +0100
Subject: [PATCH 36/89] fix: customer last tickets

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 9d23ba9f3..814586f0a 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -185,6 +185,7 @@ const getItemPackagingType = (ticketSales) => {
         class="full-width"
         :disable-infinite-scroll="true"
         redirect="ticket"
+        :row-click="false"
     >
         <template #column-nickname="{ row }">
             <span class="link">

From 244c23be1d0e04883f2b5a4fe6c534836618bcac Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 13 Nov 2024 13:40:19 +0100
Subject: [PATCH 37/89] fix: allow decimal numbers when creating a purchase
 request

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

diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index d0af9efd0..6e89fc468 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -271,6 +271,7 @@ onMounted(() => (stateStore.rightDrawer = false));
                 :label="t('purchaseRequest.price')"
                 type="number"
                 min="0"
+                step="any"
             />
         </template>
     </VnTable>

From ddfea42c62075a83a269d0e7b667795ad18fd9e2 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Wed, 13 Nov 2024 13:51:37 +0100
Subject: [PATCH 38/89] fix: add click stop on descriptorProxis

---
 src/pages/Customer/components/CustomerSummaryTable.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/components/CustomerSummaryTable.vue b/src/pages/Customer/components/CustomerSummaryTable.vue
index 814586f0a..f7f2e177e 100644
--- a/src/pages/Customer/components/CustomerSummaryTable.vue
+++ b/src/pages/Customer/components/CustomerSummaryTable.vue
@@ -185,17 +185,16 @@ const getItemPackagingType = (ticketSales) => {
         class="full-width"
         :disable-infinite-scroll="true"
         redirect="ticket"
-        :row-click="false"
     >
         <template #column-nickname="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.nickname }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
         </template>
 
         <template #column-routeFk="{ row }">
-            <span class="link">
+            <span class="link" @click.stop>
                 {{ row.routeFk }}
                 <RouteDescriptorProxy :id="row.routeFk" />
             </span>
@@ -212,7 +211,7 @@ const getItemPackagingType = (ticketSales) => {
             <span v-else> {{ toCurrency(row.totalWithVat) }}</span>
         </template>
         <template #column-state="{ row }">
-            <span v-if="row.invoiceOut">
+            <span v-if="row.invoiceOut" @click.stop>
                 <span :class="{ link: row.invoiceOut.ref }">
                     {{ row.invoiceOut.ref }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOut.id" />

From c2b6b816a42a90df7d9d0bd8c675bcc853430a59 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 14 Nov 2024 08:04:06 +0100
Subject: [PATCH 39/89] fix: refs #7283 Account image resolution

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

diff --git a/src/pages/Account/Card/AccountDescriptor.vue b/src/pages/Account/Card/AccountDescriptor.vue
index 4571ee8ab..3156f8e1e 100644
--- a/src/pages/Account/Card/AccountDescriptor.vue
+++ b/src/pages/Account/Card/AccountDescriptor.vue
@@ -54,7 +54,7 @@ const hasAccount = ref(false);
         </template>
         <template #before>
             <!-- falla id :id="entityId.value" collection="user" size="160x160" -->
-            <VnImg :id="entityId" collection="user" resolution="160x160" class="photo">
+            <VnImg :id="entityId" collection="user" resolution="520x520" class="photo">
                 <template #error>
                     <div
                         class="absolute-full picture text-center q-pa-md flex flex-center"

From ef415d080adcd580d92634778bb8a135c9af0b38 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 08:19:19 +0100
Subject: [PATCH 40/89] feat: refs #7308 #7308 remove warnings related to
 useSession

---
 src/boot/quasar.js            | 2 ++
 src/composables/useSession.js | 8 ++++++--
 src/router/index.js           | 8 +++++---
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index 01fe68d8b..1cc2e82cf 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -1,6 +1,7 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import keyShortcut from './keyShortcut';
+import { setupAxios } from 'src/boot/axios';
 import useNotify from 'src/composables/useNotify.js';
 import { CanceledError } from 'axios';
 
@@ -48,4 +49,5 @@ export default boot(({ app }) => {
 
         notify(message ?? 'globals.error', 'negative', 'error');
     };
+    setupAxios();
 });
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 633a30bb0..5097a1fee 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -8,9 +8,13 @@ import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
-
+let router;
+export default {
+    setup() {
+        router = useRouter();
+    },
+};
 export function useSession() {
-    const router = useRouter();
     const { notify } = useNotify();
     let isCheckingToken = false;
     let intervalId = null;
diff --git a/src/router/index.js b/src/router/index.js
index 18541c0b2..5ed8ad9ed 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,8 +14,8 @@ import { useUserConfig } from 'src/composables/useUserConfig';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
 
-const state = useState();
-const session = useSession();
+let state, session;
+
 const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
@@ -43,8 +43,10 @@ const Router = createRouter({
  * with the Router instance.
  */
 export { Router };
-export default route(function (/* { store, ssrContext } */) {
+export default route((/* { store, ssrContext } */) => {
     Router.beforeEach(async (to, from, next) => {
+        state = useState();
+        session = useSession();
         const { isLoggedIn } = session;
         const outLayout = Router.options.routes[0].children.map((r) => r.name);
         if (!isLoggedIn() && !outLayout.includes(to.name)) {

From 590d495dbddfeb6b252e2967c259394ef80f6b2a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 08:19:41 +0100
Subject: [PATCH 41/89] test: refs #7308 #7308 axios.spec.js

---
 src/boot/axios.js                        | 19 +++++---
 test/vitest/__tests__/boot/axios.spec.js | 62 ++++++++++++++++++------
 2 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index aee38e887..5da26a404 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -4,9 +4,8 @@ import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
-const session = useSession();
-const { notify } = useNotify();
-const stateQuery = useStateQueryStore();
+let session, notify, stateQuery;
+
 const baseUrl = '/api/';
 
 axios.defaults.baseURL = baseUrl;
@@ -51,9 +50,15 @@ const onResponseError = (error) => {
     return Promise.reject(error);
 };
 
-axios.interceptors.request.use(onRequest, onRequestError);
-axios.interceptors.response.use(onResponse, onResponseError);
-axiosNoError.interceptors.request.use(onRequest);
-axiosNoError.interceptors.response.use(onResponse);
+export function setupAxios() {
+    session = useSession();
+    notify = useNotify().notify;
+    stateQuery = useStateQueryStore();
+
+    axios.interceptors.request.use(onRequest, onRequestError);
+    axios.interceptors.response.use(onResponse, onResponseError);
+    axiosNoError.interceptors.request.use(onRequest);
+    axiosNoError.interceptors.response.use(onResponse);
+}
 
 export { onRequest, onResponseError, axiosNoError };
diff --git a/test/vitest/__tests__/boot/axios.spec.js b/test/vitest/__tests__/boot/axios.spec.js
index 19d396ec5..dc321a658 100644
--- a/test/vitest/__tests__/boot/axios.spec.js
+++ b/test/vitest/__tests__/boot/axios.spec.js
@@ -1,23 +1,53 @@
-import { Notify } from 'quasar';
-import { onRequest, onResponseError } from 'src/boot/axios';
-import { describe, expect, it, vi } from 'vitest';
+import { describe, it, expect, beforeEach, vi } from 'vitest';
+import { setupAxios, onRequest, onResponseError } from 'src/boot/axios';
+import { useSession } from 'src/composables/useSession';
+import useNotify from 'src/composables/useNotify';
+import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
-vi.mock('src/composables/useSession', () => ({
-    useSession: () => ({
-        getToken: () => 'DEFAULT_TOKEN',
-        isLoggedIn: () => vi.fn(),
-        destroy: () => vi.fn(),
-    }),
-}));
+vi.mock('src/composables/useSession');
+vi.mock('src/composables/useNotify');
+vi.mock('src/stores/useStateQueryStore');
 
-vi.mock('src/stores/useStateQueryStore', () => ({
-    useStateQueryStore: () => ({
-        add: () => vi.fn(),
-        remove: () => vi.fn(),
-    }),
-}));
+// vi.mock('src/composables/useSession', () => ({
+//     useSession: () => ({
+//         getToken: () => 'DEFAULT_TOKEN',
+//         isLoggedIn: () => vi.fn(),
+//         destroy: () => vi.fn(),
+//     }),
+// }));
+
+// vi.mock('src/stores/useStateQueryStore', () => ({
+//     useStateQueryStore: () => ({
+//         add: () => vi.fn(),
+//         remove: () => vi.fn(),
+//     }),
+// }));
 
 describe('Axios boot', () => {
+    let sessionMock, notifyMock, stateQueryMock;
+
+    beforeEach(() => {
+        sessionMock = {
+            getToken: vi.fn().mockReturnValue('DEFAULT_TOKEN'),
+            isLoggedIn: vi.fn().mockReturnValue(true),
+            destroy: vi.fn(),
+        };
+
+        notifyMock = {
+            notify: vi.fn(),
+        };
+
+        stateQueryMock = {
+            add: vi.fn(),
+            remove: vi.fn(),
+        };
+
+        useSession.mockReturnValue(sessionMock);
+        useNotify.mockReturnValue(notifyMock);
+        useStateQueryStore.mockReturnValue(stateQueryMock);
+
+        setupAxios();
+    });
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };

From b0bb09e9a66f619fee6621f633577f76566e4440 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 09:03:18 +0100
Subject: [PATCH 42/89] perf: refs #7308 #7308 remove comments

---
 test/vitest/__tests__/boot/axios.spec.js | 15 ---------------
 1 file changed, 15 deletions(-)

diff --git a/test/vitest/__tests__/boot/axios.spec.js b/test/vitest/__tests__/boot/axios.spec.js
index dc321a658..3c59dbc48 100644
--- a/test/vitest/__tests__/boot/axios.spec.js
+++ b/test/vitest/__tests__/boot/axios.spec.js
@@ -8,21 +8,6 @@ vi.mock('src/composables/useSession');
 vi.mock('src/composables/useNotify');
 vi.mock('src/stores/useStateQueryStore');
 
-// vi.mock('src/composables/useSession', () => ({
-//     useSession: () => ({
-//         getToken: () => 'DEFAULT_TOKEN',
-//         isLoggedIn: () => vi.fn(),
-//         destroy: () => vi.fn(),
-//     }),
-// }));
-
-// vi.mock('src/stores/useStateQueryStore', () => ({
-//     useStateQueryStore: () => ({
-//         add: () => vi.fn(),
-//         remove: () => vi.fn(),
-//     }),
-// }));
-
 describe('Axios boot', () => {
     let sessionMock, notifyMock, stateQueryMock;
 

From 94c7ee3ae3afa39043c8e058695043c4a756a47f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:36:42 +0100
Subject: [PATCH 43/89] fix: arrayData store shared

---
 src/components/CrudModel.vue                   | 2 +-
 src/components/VnTable/VnFilter.vue            | 2 +-
 src/components/VnTable/VnOrder.vue             | 2 +-
 src/components/ui/VnFilterPanel.vue            | 2 +-
 src/components/ui/VnPaginate.vue               | 9 ++++++---
 src/components/ui/VnSearchbar.vue              | 2 +-
 src/composables/useArrayData.js                | 2 +-
 src/pages/Account/AccountList.vue              | 6 +++---
 src/pages/Account/Role/AccountRoles.vue        | 4 ++--
 src/pages/Account/Role/Card/RoleCard.vue       | 2 +-
 src/pages/Claim/ClaimFilter.vue                | 2 +-
 src/pages/Customer/CustomerFilter.vue          | 2 +-
 src/pages/Customer/CustomerList.vue            | 6 +++---
 src/pages/InvoiceIn/InvoiceInList.vue          | 2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue        | 6 +++---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 1 -
 src/pages/Ticket/TicketFilter.vue              | 2 +-
 src/pages/Ticket/TicketList.vue                | 6 +++---
 src/pages/Travel/TravelFilter.vue              | 2 +-
 src/pages/Worker/Card/WorkerCard.vue           | 1 +
 src/pages/Worker/WorkerList.vue                | 6 +++---
 src/pages/Zone/Card/ZoneSearchbar.vue          | 2 +-
 src/pages/Zone/ZoneFilterPanel.vue             | 1 -
 src/pages/Zone/ZoneList.vue                    | 4 ++--
 src/stores/useArrayDataStore.js                | 2 +-
 25 files changed, 40 insertions(+), 38 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..0de5d3aa2 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -77,7 +77,7 @@ const isLoading = ref(false);
 const hasChanges = ref(false);
 const originalData = ref();
 const vnPaginateRef = ref();
-const formData = ref();
+const formData = ref([]);
 const saveButtonRef = ref(null);
 const watchChanges = ref();
 const formUrl = computed(() => $props.url);
diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..86802ee92 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -25,7 +25,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
 });
 
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 7fdd23b78..8ffdfe2bc 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -17,7 +17,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     vertical: {
         type: Boolean,
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 43d634ad9..1ed1194ea 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -49,7 +49,7 @@ const $props = defineProps({
     },
     searchUrl: {
         type: String,
-        default: 'params',
+        default: 'table',
     },
     redirect: {
         type: Boolean,
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 80c607214..f5519eb01 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -44,7 +44,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
@@ -100,7 +100,7 @@ const arrayData = useArrayData(props.dataKey, {
 const store = arrayData.store;
 
 onMounted(async () => {
-    if (props.autoLoad) await fetch();
+    if (props.autoLoad && !store.data?.length) await fetch();
     mounted.value = true;
 });
 
@@ -115,7 +115,10 @@ watch(
 
 watch(
     () => store.data,
-    (data) => emit('onChange', data)
+    (data) => {
+        emit('onChange', data);
+    },
+    { immediate: true }
 );
 
 watch(
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..da2d370fe 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -45,7 +45,7 @@ const props = defineProps({
     },
     limit: {
         type: Number,
-        default: 10,
+        default: 20,
     },
     userParams: {
         type: Object,
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 30bcac66b..7fa494349 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -269,7 +269,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
                 const pushUrl = { path: to };
                 if (to.endsWith('/list') || to.endsWith('/'))
                     pushUrl.query = newUrl.query;
-                destroy();
+                else destroy();
                 return router.push(pushUrl);
             }
         }
diff --git a/src/pages/Account/AccountList.vue b/src/pages/Account/AccountList.vue
index 72c445fa9..9e750e1cb 100644
--- a/src/pages/Account/AccountList.vue
+++ b/src/pages/Account/AccountList.vue
@@ -104,7 +104,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="AccountUsers"
+        data-key="AccountList"
         :expr-builder="exprBuilder"
         :label="t('account.search')"
         :info="t('account.searchInfo')"
@@ -112,12 +112,12 @@ const exprBuilder = (param, value) => {
     />
     <RightMenu>
         <template #right-panel>
-            <AccountFilter data-key="AccountUsers" />
+            <AccountFilter data-key="AccountList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="AccountUsers"
+        data-key="AccountList"
         url="VnUsers/preview"
         :filter="filter"
         order="id DESC"
diff --git a/src/pages/Account/Role/AccountRoles.vue b/src/pages/Account/Role/AccountRoles.vue
index ea175d913..1f3c9ee5a 100644
--- a/src/pages/Account/Role/AccountRoles.vue
+++ b/src/pages/Account/Role/AccountRoles.vue
@@ -82,14 +82,14 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Roles"
+        data-key="AccountRolesList"
         :expr-builder="exprBuilder"
         :label="t('role.searchRoles')"
         :info="t('role.searchInfo')"
     />
     <VnTable
         ref="tableRef"
-        data-key="Roles"
+        data-key="AccountRolesList"
         :url="`VnRoles`"
         :create="{
             urlCreate: 'VnRoles',
diff --git a/src/pages/Account/Role/Card/RoleCard.vue b/src/pages/Account/Role/Card/RoleCard.vue
index 35f9a1f27..a2d5710f4 100644
--- a/src/pages/Account/Role/Card/RoleCard.vue
+++ b/src/pages/Account/Role/Card/RoleCard.vue
@@ -9,7 +9,7 @@ const { t } = useI18n();
     <VnCard
         data-key="Role"
         :descriptor="RoleDescriptor"
-        search-data-key="AccountRoles"
+        search-data-key="AccountRolesList"
         :searchbar-props="{
             url: 'VnRoles',
             label: t('role.searchRoles'),
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index dc25fe4a0..f7e2ffbf6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..479d3e7ab 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -14,7 +14,7 @@ defineProps({
 </script>
 
 <template>
-    <VnFilterPanel :data-key="dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..55065cdcc 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -395,16 +395,16 @@ function handleLocation(data, location) {
     <VnSearchbar
         :info="t('You can search by customer id or name')"
         :label="t('Search customer')"
-        data-key="Customer"
+        data-key="CustomerList"
     />
     <RightMenu>
         <template #right-panel>
-            <CustomerFilter data-key="Customer" />
+            <CustomerFilter data-key="CustomerList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Customer"
+        data-key="CustomerList"
         url="Clients/filter"
         :create="{
             urlCreate: 'Clients/createWithUser',
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index 265f95b0e..c77113d2b 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -122,7 +122,7 @@ const cols = computed(() => [
         :columns="cols"
         :right-search="false"
         :disable-option="{ card: true }"
-        :auto-load="!!$route.query.params"
+        :auto-load="!!$route.query.table"
     >
         <template #column-supplierFk="{ row }">
             <span class="link" @click.stop>
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 91477e1a4..f1b4902f2 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -182,11 +182,11 @@ watchEffect(selectedRows);
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
         :label="t('searchInvoice')"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
     />
     <RightMenu>
         <template #right-panel>
-            <InvoiceOutFilter data-key="invoiceOut" />
+            <InvoiceOutFilter data-key="invoiceOutList" />
         </template>
     </RightMenu>
     <VnSubToolbar>
@@ -203,7 +203,7 @@ watchEffect(selectedRows);
     </VnSubToolbar>
     <VnTable
         ref="tableRef"
-        data-key="invoiceOut"
+        data-key="invoiceOutList"
         :url="`${MODEL}/filter`"
         :create="{
             urlCreate: 'InvoiceOuts/createManualInvoice',
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 834fced87..bf4a1efb4 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -348,7 +348,6 @@ async function hasDocuware() {
 }
 
 async function uploadDocuware(force) {
-    console.log('force: ', force);
     if (!force)
         return quasar
             .dialog({
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 7f72f9862..6f1cac83b 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -47,7 +47,7 @@ const getGroupedStates = (data) => {
     />
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencies = data)" auto-load />
     <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..1c1fa78d4 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -455,18 +455,18 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c91146257..1ac83b9e0 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -24,7 +24,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="warehouses" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Worker/Card/WorkerCard.vue b/src/pages/Worker/Card/WorkerCard.vue
index 5f9fa0f8e..e17ea6503 100644
--- a/src/pages/Worker/Card/WorkerCard.vue
+++ b/src/pages/Worker/Card/WorkerCard.vue
@@ -14,6 +14,7 @@ import WorkerFilter from '../WorkerFilter.vue';
             url: 'Workers/filter',
             label: 'Search worker',
             info: 'You can search by worker id or name',
+            order: 'id DESC',
         }"
         :redirect-on-error="true"
     />
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 7a3f760bc..022cecdc6 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -169,7 +169,7 @@ async function autofillBic(worker) {
 </script>
 <template>
     <VnSearchbar
-        data-key="Worker"
+        data-key="WorkerList"
         :label="t('Search worker')"
         :info="t('You can search by worker id or name')"
     />
@@ -191,13 +191,13 @@ async function autofillBic(worker) {
     />
     <RightMenu>
         <template #right-panel>
-            <WorkerFilter data-key="Worker" />
+            <WorkerFilter data-key="WorkerList" />
         </template>
     </RightMenu>
     <VnTable
         v-if="defaultPayMethod"
         ref="tableRef"
-        data-key="Worker"
+        data-key="WorkerList"
         url="Workers/filter"
         :create="{
             urlCreate: 'Workers/new',
diff --git a/src/pages/Zone/Card/ZoneSearchbar.vue b/src/pages/Zone/Card/ZoneSearchbar.vue
index 06168eb62..f7a59e97f 100644
--- a/src/pages/Zone/Card/ZoneSearchbar.vue
+++ b/src/pages/Zone/Card/ZoneSearchbar.vue
@@ -26,7 +26,7 @@ const exprBuilder = (param, value) => {
 
 <template>
     <VnSearchbar
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :filter="{
             include: { relation: 'agencyMode', scope: { fields: ['name'] } },
diff --git a/src/pages/Zone/ZoneFilterPanel.vue b/src/pages/Zone/ZoneFilterPanel.vue
index 98bfd35ed..1213f7515 100644
--- a/src/pages/Zone/ZoneFilterPanel.vue
+++ b/src/pages/Zone/ZoneFilterPanel.vue
@@ -32,7 +32,6 @@ const agencies = ref([]);
         :data-key="props.dataKey"
         :search-button="true"
         :hidden-tags="['search']"
-        search-url="table"
     >
         <template #tags="{ tag }">
             <div class="q-gutter-x-xs">
diff --git a/src/pages/Zone/ZoneList.vue b/src/pages/Zone/ZoneList.vue
index b01f8b7e7..158d985d2 100644
--- a/src/pages/Zone/ZoneList.vue
+++ b/src/pages/Zone/ZoneList.vue
@@ -139,12 +139,12 @@ onMounted(() => (stateStore.rightDrawer = true));
     <ZoneSearchbar />
     <RightMenu>
         <template #right-panel>
-            <ZoneFilterPanel data-key="Zones" />
+            <ZoneFilterPanel data-key="ZonesList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Zones"
+        data-key="ZonesList"
         url="Zones"
         :create="{
             urlCreate: 'Zones',
diff --git a/src/stores/useArrayDataStore.js b/src/stores/useArrayDataStore.js
index ea029bc12..6a0e7dfa8 100644
--- a/src/stores/useArrayDataStore.js
+++ b/src/stores/useArrayDataStore.js
@@ -8,7 +8,7 @@ export const useArrayDataStore = defineStore('arrayDataStore', () => {
         userFilter: {},
         userParams: {},
         url: '',
-        limit: 10,
+        limit: 20,
         skip: 0,
         order: '',
         isLoading: false,

From 139861f6cf9414434ef8e7ee5a555ce24fe12540 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:38:02 +0100
Subject: [PATCH 44/89] test: fix limit

---
 test/vitest/__tests__/composables/useArrayData.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/test/vitest/__tests__/composables/useArrayData.spec.js
index 21323395b..d4c5d0949 100644
--- a/test/vitest/__tests__/composables/useArrayData.spec.js
+++ b/test/vitest/__tests__/composables/useArrayData.spec.js
@@ -5,7 +5,7 @@ import { useRouter } from 'vue-router';
 import * as vueRouter from 'vue-router';
 
 describe('useArrayData', () => {
-    const filter = '{"limit":10,"skip":0}';
+    const filter = '{"limit":20,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');

From c0ddc2c5b409823843df6d599e01e3335bb5e00e Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Thu, 14 Nov 2024 10:47:14 +0100
Subject: [PATCH 45/89] fix: refs #7346 traslations

---
 src/components/VnTable/VnTable.vue      |   2 +-
 src/pages/InvoiceOut/InvoiceOutList.vue | 107 +++++++++++-------------
 2 files changed, 52 insertions(+), 57 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 445923157..65f716142 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -235,7 +235,7 @@ function splitColumns(columns) {
         if (col.create) splittedColumns.value.create.push(col);
         if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
-        if ($props.useModel && col.columnFilter)
+        if ($props.useModel && col.columnFilter !== false)
             col.columnFilter = { inWhere: true, ...col.columnFilter };
         splittedColumns.value.columns.push(col);
     }
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 9c4b9753c..a22a4c167 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -18,6 +18,7 @@ import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnRow from 'src/components/ui/VnRow.vue';
 import VnRadio from 'src/components/common/VnRadio.vue';
 import VnInput from 'src/components/common/VnInput.vue';
+import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -48,7 +49,7 @@ const columns = computed(() => [
     {
         align: 'center',
         name: 'id',
-        label: t('invoiceId'),
+        label: t('invoiceOutList.tableVisibleColumns.id'),
         chip: { condition: () => true },
         isId: true,
         columnFilter: { name: 'search' },
@@ -56,7 +57,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'ref',
-        label: t('invoiceOut.list.ref'),
+        label: t('globals.reference'),
         isTitle: true,
         component: 'select',
         attrs: { url: MODEL, optionLabel: 'ref', optionValue: 'id' },
@@ -65,7 +66,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'issued',
-        label: t('invoiceOut.list.issued'),
+        label: t('invoiceOut.summary.issued'),
         component: 'date',
         format: (row) => toDate(row.issued),
         columnField: { component: null },
@@ -73,7 +74,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'clientFk',
-        label: t('invoiceOut.list.client'),
+        label: t('globals.client'),
         cardVisible: true,
         component: 'select',
         attrs: { url: 'Clients', fields: ['id', 'name'] },
@@ -82,7 +83,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'companyCode',
-        label: t('invoiceOut.list.company'),
+        label: t('globals.company'),
         cardVisible: true,
         component: 'select',
         attrs: { url: 'Companies', optionLabel: 'code', optionValue: 'id' },
@@ -91,14 +92,14 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'amount',
-        label: t('invoiceOut.list.amount'),
+        label: t('globals.amount'),
         cardVisible: true,
         format: (row) => toCurrency(row.amount),
     },
     {
         align: 'left',
         name: 'created',
-        label: t('invoiceOut.list.created'),
+        label: t('globals.created'),
         component: 'date',
         columnField: { component: null },
         format: (row) => toDate(row.created),
@@ -106,7 +107,7 @@ const columns = computed(() => [
     {
         align: 'left',
         name: 'dued',
-        label: t('invoiceOut.list.dued'),
+        label: t('invoiceOut.summary.dued'),
         component: 'date',
         columnField: { component: null },
         format: (row) => toDate(row.dued),
@@ -116,13 +117,14 @@ const columns = computed(() => [
         name: 'tableActions',
         actions: [
             {
-                title: t('viewSummary'),
+                title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
+                isPrimary: true,
                 action: (row) => viewSummary(row.id, InvoiceOutSummary),
             },
             {
-                title: t('downloadPdf'),
-                icon: 'vn:ticket',
+                title: t('globals.downloadPdf'),
+                icon: 'cloud_download',
                 isPrimary: true,
                 action: (row) => openPdf(row.id),
             },
@@ -171,7 +173,7 @@ watchEffect(selectedRows);
 <template>
     <VnSearchbar
         :info="t('youCanSearchByInvoiceReference')"
-        :label="t('searchInvoice')"
+        :label="t('Search invoice')"
         data-key="invoiceOut"
     />
     <RightMenu>
@@ -212,6 +214,12 @@ watchEffect(selectedRows);
             selection: 'multiple',
         }"
     >
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.clientSocialName }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
         <template #more-create-dialog="{ data }">
             <div class="row q-col-gutter-xs">
                 <div class="col-12">
@@ -220,13 +228,13 @@ watchEffect(selectedRows);
                             <VnRadio
                                 v-model="selectedOption"
                                 val="ticket"
-                                label="Ticket"
+                                :label="t('globals.ticket')"
                                 class="q-my-none q-mr-md"
                             />
                             <VnInput
                                 :disable="selectedOption !== 'ticket'"
                                 v-model="data.ticketFk"
-                                label="Ticket ID"
+                                :label="t('globals.ticket')"
                                 style="flex: 1"
                             />
                         </VnRow>
@@ -234,13 +242,13 @@ watchEffect(selectedRows);
                             <VnRadio
                                 v-model="selectedOption"
                                 val="cliente"
-                                label="Cliente"
+                                :label="t('globals.client')"
                                 class="q-my-none q-mr-md"
                             />
                             <VnSelect
                                 :disable="selectedOption !== 'cliente'"
                                 v-model="data.clientFk"
-                                label="Cliente"
+                                :label="t('globals.client')"
                                 url="Clients"
                                 :options="customerOptions"
                                 option-label="name"
@@ -267,17 +275,14 @@ watchEffect(selectedRows);
                             <VnRadio
                                 v-model="selectedOption"
                                 val="consignatario"
-                                label="Consignatario"
+                                :label="t('ticket.summary.consignee')"
                                 class="q-my-none q-mr-md"
                             />
-                            <div
-                                :disable="selectedOption !== 'consignatario'"
-                                class="row q-col-gutter-xs q-ml-none"
-                            >
+                            <div class="row q-col-gutter-xs q-ml-none">
                                 <div class="col">
                                     <VnSelect
                                         v-model="data.clientFk"
-                                        label="Cliente"
+                                        :label="t('globals.client')"
                                         url="Clients"
                                         :options="customerOptions"
                                         option-label="name"
@@ -303,7 +308,7 @@ watchEffect(selectedRows);
                                 <div class="col">
                                     <VnSelect
                                         v-model="data.addressFk"
-                                        label="Consignatario"
+                                        :label="t('ticket.summary.consignee')"
                                         :options="addressOptions"
                                         option-label="nickname"
                                         option-value="id"
@@ -324,9 +329,7 @@ watchEffect(selectedRows);
                                                         {{
                                                             `${
                                                                 !scope.opt?.isActive
-                                                                    ? t(
-                                                                          'basicData.inactive'
-                                                                      )
+                                                                    ? t('inactive')
                                                                     : ''
                                                             } `
                                                         }}
@@ -367,7 +370,7 @@ watchEffect(selectedRows);
                         <VnSelect
                             url="InvoiceOutSerials"
                             v-model="data.serial"
-                            :label="t('invoiceSerial')"
+                            :label="t('invoiceIn.serial')"
                             :options="invoiceOutSerialsOptions"
                             option-label="description"
                             option-value="code"
@@ -385,18 +388,24 @@ watchEffect(selectedRows);
                                 </QItem>
                             </template>
                         </VnSelect>
-                        <VnInputDate :label="t('dueDate')" v-model="data.maxShipped" />
+                        <VnInputDate
+                            :label="t('invoiceOut.summary.dued')"
+                            v-model="data.maxShipped"
+                        />
                     </VnRow>
                     <VnRow class="row q-col-gutter-xs">
                         <VnSelect
                             url="TaxAreas"
                             v-model="data.taxArea"
-                            :label="t('taxArea')"
+                            :label="t('invoiceOutList.tableVisibleColumns.taxArea')"
                             :options="taxAreasOptions"
                             option-label="code"
                             option-value="code"
                         />
-                        <VnInput v-model="data.reference" :label="t('reference')" />
+                        <VnInput
+                            v-model="data.reference"
+                            :label="t('globals.reference')"
+                        />
                     </VnRow>
                 </div>
             </div>
@@ -407,43 +416,29 @@ watchEffect(selectedRows);
 <style lang="scss" scoped>
 #formModel .vn-row {
     min-height: 45px;
-}
-#formModel .vn-row .q-radio {
-    align-self: flex-end;
-    flex: 0.3;
-}
-#formModel .vn-row > .q-input,
-#formModel .vn-row > .q-select {
-    flex: 0.75;
+
+    .q-radio {
+        align-self: flex-end;
+        flex: 0.3;
+    }
+
+    > .q-input,
+    > .q-select {
+        flex: 0.75;
+    }
 }
 </style>
 
 <i18n>
     en:
         invoiceId: Invoice ID
-        viewSummary: View Summary
-        downloadPdf: Download PDF
         youCanSearchByInvoiceReference: You can search by invoice reference
-        searchInvoice: Search Invoice
         createManualInvoice: Create Manual Invoice
-        invoiceSerial: Invoice Serial
-        taxArea: Tax Area
-        dueDate: Due Date
-        reference: Reference
-        basicData:
-            inactive: Inactive
+        inactive: (Inactive)
 
     es:
         invoiceId: ID de factura
-        viewSummary: Ver resumen
-        downloadPdf: Descargar PDF
         youCanSearchByInvoiceReference: Puedes buscar por referencia de la factura
-        searchInvoice: Buscar factura
         createManualInvoice: Crear factura manual
-        invoiceSerial: Serie de factura
-        taxArea: Área fiscal
-        dueDate: Fecha de vencimiento
-        reference: Referencia
-        basicData:
-            inactive: Inactivo
+        inactive: (Inactivo)
 </i18n>

From 2bcd7061cb00f7450f005d18e774dc5ffbedc0a0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 09:50:00 +0000
Subject: [PATCH 46/89] revert e57a253c6f649382da187d1129449d265fb26d3b

revert Merge pull request '#7308 Remove console warnings' (!928) from 7308-warning_inject into dev

Reviewed-on: https://gitea.verdnatura.es/verdnatura/salix-front/pulls/928
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
---
 src/boot/axios.js                        | 19 ++++-----
 src/boot/quasar.js                       |  2 -
 src/composables/useSession.js            |  8 +---
 src/router/index.js                      |  8 ++--
 test/vitest/__tests__/boot/axios.spec.js | 49 ++++++++----------------
 5 files changed, 29 insertions(+), 57 deletions(-)

diff --git a/src/boot/axios.js b/src/boot/axios.js
index 5da26a404..aee38e887 100644
--- a/src/boot/axios.js
+++ b/src/boot/axios.js
@@ -4,8 +4,9 @@ import { Router } from 'src/router';
 import useNotify from 'src/composables/useNotify.js';
 import { useStateQueryStore } from 'src/stores/useStateQueryStore';
 
-let session, notify, stateQuery;
-
+const session = useSession();
+const { notify } = useNotify();
+const stateQuery = useStateQueryStore();
 const baseUrl = '/api/';
 
 axios.defaults.baseURL = baseUrl;
@@ -50,15 +51,9 @@ const onResponseError = (error) => {
     return Promise.reject(error);
 };
 
-export function setupAxios() {
-    session = useSession();
-    notify = useNotify().notify;
-    stateQuery = useStateQueryStore();
-
-    axios.interceptors.request.use(onRequest, onRequestError);
-    axios.interceptors.response.use(onResponse, onResponseError);
-    axiosNoError.interceptors.request.use(onRequest);
-    axiosNoError.interceptors.response.use(onResponse);
-}
+axios.interceptors.request.use(onRequest, onRequestError);
+axios.interceptors.response.use(onResponse, onResponseError);
+axiosNoError.interceptors.request.use(onRequest);
+axiosNoError.interceptors.response.use(onResponse);
 
 export { onRequest, onResponseError, axiosNoError };
diff --git a/src/boot/quasar.js b/src/boot/quasar.js
index 1cc2e82cf..01fe68d8b 100644
--- a/src/boot/quasar.js
+++ b/src/boot/quasar.js
@@ -1,7 +1,6 @@
 import { boot } from 'quasar/wrappers';
 import qFormMixin from './qformMixin';
 import keyShortcut from './keyShortcut';
-import { setupAxios } from 'src/boot/axios';
 import useNotify from 'src/composables/useNotify.js';
 import { CanceledError } from 'axios';
 
@@ -49,5 +48,4 @@ export default boot(({ app }) => {
 
         notify(message ?? 'globals.error', 'negative', 'error');
     };
-    setupAxios();
 });
diff --git a/src/composables/useSession.js b/src/composables/useSession.js
index 5097a1fee..633a30bb0 100644
--- a/src/composables/useSession.js
+++ b/src/composables/useSession.js
@@ -8,13 +8,9 @@ import useNotify from './useNotify';
 import { useTokenConfig } from './useTokenConfig';
 const TOKEN_MULTIMEDIA = 'tokenMultimedia';
 const TOKEN = 'token';
-let router;
-export default {
-    setup() {
-        router = useRouter();
-    },
-};
+
 export function useSession() {
+    const router = useRouter();
     const { notify } = useNotify();
     let isCheckingToken = false;
     let intervalId = null;
diff --git a/src/router/index.js b/src/router/index.js
index 5ed8ad9ed..18541c0b2 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -14,8 +14,8 @@ import { useUserConfig } from 'src/composables/useUserConfig';
 import { useTokenConfig } from 'src/composables/useTokenConfig';
 import { useAcl } from 'src/composables/useAcl';
 
-let state, session;
-
+const state = useState();
+const session = useSession();
 const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
@@ -43,10 +43,8 @@ const Router = createRouter({
  * with the Router instance.
  */
 export { Router };
-export default route((/* { store, ssrContext } */) => {
+export default route(function (/* { store, ssrContext } */) {
     Router.beforeEach(async (to, from, next) => {
-        state = useState();
-        session = useSession();
         const { isLoggedIn } = session;
         const outLayout = Router.options.routes[0].children.map((r) => r.name);
         if (!isLoggedIn() && !outLayout.includes(to.name)) {
diff --git a/test/vitest/__tests__/boot/axios.spec.js b/test/vitest/__tests__/boot/axios.spec.js
index 3c59dbc48..19d396ec5 100644
--- a/test/vitest/__tests__/boot/axios.spec.js
+++ b/test/vitest/__tests__/boot/axios.spec.js
@@ -1,38 +1,23 @@
-import { describe, it, expect, beforeEach, vi } from 'vitest';
-import { setupAxios, onRequest, onResponseError } from 'src/boot/axios';
-import { useSession } from 'src/composables/useSession';
-import useNotify from 'src/composables/useNotify';
-import { useStateQueryStore } from 'src/stores/useStateQueryStore';
+import { Notify } from 'quasar';
+import { onRequest, onResponseError } from 'src/boot/axios';
+import { describe, expect, it, vi } from 'vitest';
 
-vi.mock('src/composables/useSession');
-vi.mock('src/composables/useNotify');
-vi.mock('src/stores/useStateQueryStore');
+vi.mock('src/composables/useSession', () => ({
+    useSession: () => ({
+        getToken: () => 'DEFAULT_TOKEN',
+        isLoggedIn: () => vi.fn(),
+        destroy: () => vi.fn(),
+    }),
+}));
+
+vi.mock('src/stores/useStateQueryStore', () => ({
+    useStateQueryStore: () => ({
+        add: () => vi.fn(),
+        remove: () => vi.fn(),
+    }),
+}));
 
 describe('Axios boot', () => {
-    let sessionMock, notifyMock, stateQueryMock;
-
-    beforeEach(() => {
-        sessionMock = {
-            getToken: vi.fn().mockReturnValue('DEFAULT_TOKEN'),
-            isLoggedIn: vi.fn().mockReturnValue(true),
-            destroy: vi.fn(),
-        };
-
-        notifyMock = {
-            notify: vi.fn(),
-        };
-
-        stateQueryMock = {
-            add: vi.fn(),
-            remove: vi.fn(),
-        };
-
-        useSession.mockReturnValue(sessionMock);
-        useNotify.mockReturnValue(notifyMock);
-        useStateQueryStore.mockReturnValue(stateQueryMock);
-
-        setupAxios();
-    });
     describe('onRequest()', async () => {
         it('should set the "Authorization" property on the headers', async () => {
             const config = { headers: {} };

From c4a4f7fcd632bbc99d9a46c4ff546f6e64a2c7f1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 11:20:16 +0100
Subject: [PATCH 47/89] refactor: refs #6818 change channel source

---
 src/components/ui/VnLinkPhone.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/ui/VnLinkPhone.vue b/src/components/ui/VnLinkPhone.vue
index 3b63889e1..4c045968f 100644
--- a/src/components/ui/VnLinkPhone.vue
+++ b/src/components/ui/VnLinkPhone.vue
@@ -17,19 +17,12 @@ const config = reactive({
 const type = Object.keys(config).find((key) => key in useAttrs()) || 'sip';
 
 onBeforeMount(async () => {
-    let url;
     let { channel } = config[type];
 
     if (type === 'say-simple') {
-        url = (await axios.get('SaySimpleConfigs/findOne')).data.url;
-        if (!channel)
-            channel = (
-                await axios.get('SaySimpleCountries/findOne', {
-                    params: {
-                        filter: { fields: ['channel'], where: { countryFk: 0 } },
-                    },
-                })
-            ).data?.channel;
+        const { url, defaultChannel } = (await axios.get('SaySimpleConfigs/findOne'))
+            .data;
+        if (!channel) channel = defaultChannel;
 
         config[
             type

From aa05b4b0cb89e5fd41a05bb078cd00bd8a232ee6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 11:51:06 +0100
Subject: [PATCH 48/89] perf: refs #7346 #7346 Imrpove interface dialog

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 72 +++++++++----------------
 1 file changed, 24 insertions(+), 48 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 366be3709..696b49bcf 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -215,7 +215,7 @@ watchEffect(selectedRows);
         }"
     >
         <template #column-clientFk="{ row }">
-            <span class="link" @click.stop v->
+            <span class="link" @click.stop>
                 {{ row.clientSocialName }}
                 <CustomerDescriptorProxy :id="row.clientFk" />
             </span>
@@ -231,54 +231,15 @@ watchEffect(selectedRows);
                                 :label="t('globals.ticket')"
                                 class="q-my-none q-mr-md"
                             />
+
                             <VnInput
-                                :disable="selectedOption !== 'ticket'"
+                                v-if="selectedOption === 'ticket'"
                                 v-model="data.ticketFk"
                                 :label="t('globals.ticket')"
                                 style="flex: 1"
                             />
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="cliente"
-                                :label="t('globals.client')"
-                                class="q-my-none q-mr-md"
-                            />
-                            <VnSelect
-                                :disable="selectedOption !== 'cliente'"
-                                v-model="data.clientFk"
-                                :label="t('globals.client')"
-                                url="Clients"
-                                :options="customerOptions"
-                                option-label="name"
-                                option-value="id"
-                                @update:model-value="fetchClientAddress"
-                                style="flex: 1"
-                            >
-                                <template #option="scope">
-                                    <QItem
-                                        v-bind="scope.itemProps"
-                                        @click="selectedClient(scope.opt)"
-                                    >
-                                        <QItemSection>
-                                            <QItemLabel>
-                                                #{{ scope.opt?.id }} -
-                                                {{ scope.opt?.name }}
-                                            </QItemLabel>
-                                        </QItemSection>
-                                    </QItem>
-                                </template>
-                            </VnSelect>
-                        </VnRow>
-                        <VnRow fixed>
-                            <VnRadio
-                                v-model="selectedOption"
-                                val="consignatario"
-                                :label="t('ticket.summary.consignee')"
-                                class="q-my-none q-mr-md"
-                            />
-                            <div class="row q-col-gutter-xs q-ml-none">
+
+                            <div class="row q-col-gutter-xs q-ml-none" v-else>
                                 <div class="col">
                                     <VnSelect
                                         v-model="data.clientFk"
@@ -288,7 +249,6 @@ watchEffect(selectedRows);
                                         option-label="name"
                                         option-value="id"
                                         @update:model-value="fetchClientAddress"
-                                        :disable="selectedOption !== 'consignatario'"
                                     >
                                         <template #option="scope">
                                             <QItem
@@ -312,9 +272,9 @@ watchEffect(selectedRows);
                                         :options="addressOptions"
                                         option-label="nickname"
                                         option-value="id"
-                                        :disable="
-                                            !data.clientFk ||
-                                            selectedOption !== 'consignatario'
+                                        v-if="
+                                            data.clientFk &&
+                                            selectedOption === 'consignatario'
                                         "
                                     >
                                         <template #option="scope">
@@ -363,6 +323,22 @@ watchEffect(selectedRows);
                                 </div>
                             </div>
                         </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="cliente"
+                                :label="t('globals.client')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
+                        <VnRow fixed>
+                            <VnRadio
+                                v-model="selectedOption"
+                                val="consignatario"
+                                :label="t('ticket.summary.consignee')"
+                                class="q-my-none q-mr-md"
+                            />
+                        </VnRow>
                     </div>
                 </div>
                 <div class="full-width">

From 5af494e13c8137999cdf7c76f34289bfe5617348 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 11:54:04 +0100
Subject: [PATCH 49/89] perf: refs #7346 #7346 use v-show instead v-if

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 696b49bcf..9a82da964 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -233,13 +233,16 @@ watchEffect(selectedRows);
                             />
 
                             <VnInput
-                                v-if="selectedOption === 'ticket'"
+                                v-show="selectedOption === 'ticket'"
                                 v-model="data.ticketFk"
                                 :label="t('globals.ticket')"
                                 style="flex: 1"
                             />
 
-                            <div class="row q-col-gutter-xs q-ml-none" v-else>
+                            <div
+                                class="row q-col-gutter-xs q-ml-none"
+                                v-show="selectedOption !== 'ticket'"
+                            >
                                 <div class="col">
                                     <VnSelect
                                         v-model="data.clientFk"

From ecf131ba78847e8eb8c0f02bff45f3e495da9a8b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 12:06:12 +0100
Subject: [PATCH 50/89] feat: move buttons to DescriptorMenu

---
 .../Customer/Card/CustomerDescriptor.vue      | 34 --------------
 .../Customer/Card/CustomerDescriptorMenu.vue  | 44 +++++++++++++++++++
 src/pages/Ticket/TicketList.vue               | 12 ++---
 3 files changed, 51 insertions(+), 39 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 974b05181..e46d2cb29 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -174,23 +174,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'TicketList',
-                        query: {
-                            table: JSON.stringify({
-                                clientFk: entity.id,
-                            }),
-                            createForm: JSON.stringify({ clientId: entity.id }),
-                        },
-                    }"
-                    size="md"
-                    color="primary"
-                    target="_blank"
-                    icon="vn:ticketAdd"
-                >
-                    <QTooltip>{{ t('New ticket') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -202,23 +185,6 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-                <QBtn
-                    :to="{
-                        name: 'OrderList',
-                        query: {
-                            table: JSON.stringify({
-                                clientFk: entity.id,
-                            }),
-                            createForm: JSON.stringify({ clientFk: entity.id }),
-                        },
-                    }"
-                    size="md"
-                    target="_blank"
-                    icon="vn:basketadd"
-                    color="primary"
-                >
-                    <QTooltip>{{ t('New order') }}</QTooltip>
-                </QBtn>
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 7af415820..5ef217a31 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -40,9 +40,53 @@ const sendSms = async (payload) => {
         notify(error.message, 'positive');
     }
 };
+
+const openTicketCreateForm = () => {
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientId: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('ticket', query);
+};
+const openOrderCreateForm = () => {
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientFk: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('order', query);
+};
+
+const openWindow = (type, { createForm, table }) => {
+    window.open(
+        `/#/${type}/list?createForm=${JSON.stringify(createForm)}&table=${JSON.stringify(
+            table
+        )}`,
+        '_blank'
+    );
+};
 </script>
 
 <template>
+    <QItem v-ripple clickable @click="openTicketCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createTicket') }}
+        </QItemSection>
+    </QItem>
+    <QItem v-ripple clickable @click="openOrderCreateForm()">
+        <QItemSection>
+            {{ t('globals.pageTitles.createOrder') }}
+        </QItemSection>
+    </QItem>
     <QItem v-ripple clickable>
         <QItemSection @click="showSmsDialog()">{{ t('Send SMS') }}</QItemSection>
     </QItem>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index a3876a1a6..0685217ac 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -45,6 +45,13 @@ const userParams = {
     from: null,
     to: null,
 };
+
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+    if (!route.query.createForm) return;
+    onClientSelected(JSON.parse(route.query.createForm));
+});
 // Método para inicializar las variables desde la query string
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
@@ -301,11 +308,6 @@ const getDateColor = (date) => {
     if (comparation < 0) return 'bg-success';
 };
 
-onMounted(() => {
-    initializeFromQuery();
-    stateStore.rightDrawer = true;
-});
-
 async function makeInvoice(ticket) {
     const ticketsIds = ticket.map((item) => item.id);
     const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });

From c65f15d0f0e462e2b9e365ceb1c43be6f0b41dde Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 12:18:39 +0100
Subject: [PATCH 51/89] fix(Zone): if route is null

---
 src/composables/useArrayData.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 30bcac66b..8b06363a0 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -247,6 +247,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     function updateStateParams() {
+        if (!route?.path) return;
         const newUrl = { path: route.path, query: { ...(route.query ?? {}) } };
         newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
 

From 55b4c07e80aa32d636d172a8e268109c00d42a2c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 12:33:44 +0100
Subject: [PATCH 52/89] fix(ZoneCard): fix ZoneLocations searchbar

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

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index d61c61abf..80590d561 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -25,7 +25,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :filter-panel="ZoneFilterPanel"
         :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
         :searchbar-props="{
-            url: 'Zones',
+            url: notIsLocations('ZoneList', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
             whereFilter: notIsLocations((value) => {

From 291e97e540b7a16e7fa6587fe233d5e648b2e853 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 12:48:33 +0100
Subject: [PATCH 53/89] feat: #6943 use openURL quasar

---
 src/composables/useOpenURL.js                 |  8 ++++
 .../Customer/Card/CustomerDescriptorMenu.vue  | 40 +++++++------------
 2 files changed, 22 insertions(+), 26 deletions(-)
 create mode 100644 src/composables/useOpenURL.js

diff --git a/src/composables/useOpenURL.js b/src/composables/useOpenURL.js
new file mode 100644
index 000000000..008774c20
--- /dev/null
+++ b/src/composables/useOpenURL.js
@@ -0,0 +1,8 @@
+import { openURL } from 'quasar';
+const defaultWindowFeatures = {
+    noopener: true,
+    noreferrer: true,
+};
+export default function (url, windowFeatures = defaultWindowFeatures, fn = undefined) {
+    openURL(url, fn, windowFeatures);
+}
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 5ef217a31..aeaeaef57 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -6,8 +6,8 @@ import axios from 'axios';
 import { useQuasar } from 'quasar';
 
 import useNotify from 'src/composables/useNotify';
-
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
+import useOpenURL from 'src/composables/useOpenURL';
 
 const $props = defineProps({
     customer: {
@@ -15,7 +15,6 @@ const $props = defineProps({
         required: true,
     },
 });
-
 const { notify } = useNotify();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -41,48 +40,37 @@ const sendSms = async (payload) => {
     }
 };
 
-const openTicketCreateForm = () => {
+const openCreateForm = (type) => {
     const query = {
         table: {
             clientFk: $props.customer.id,
         },
         createForm: {
-            clientId: $props.customer.id,
             addressId: $props.customer.defaultAddressFk,
         },
     };
-    openWindow('ticket', query);
-};
-const openOrderCreateForm = () => {
-    const query = {
-        table: {
-            clientFk: $props.customer.id,
-        },
-        createForm: {
-            clientFk: $props.customer.id,
-            addressId: $props.customer.defaultAddressFk,
-        },
+    const clientFk = {
+        ticket: 'clientId',
+        order: 'clientFk',
     };
-    openWindow('order', query);
-};
+    const key = clientFk[type];
+    if (!key) return;
+    query.createForm[key] = $props.customer.id;
 
-const openWindow = (type, { createForm, table }) => {
-    window.open(
-        `/#/${type}/list?createForm=${JSON.stringify(createForm)}&table=${JSON.stringify(
-            table
-        )}`,
-        '_blank'
-    );
+    const params = Object.entries(query)
+        .map(([key, value]) => `${key}=${JSON.stringify(value)}`)
+        .join('&');
+    useOpenURL(`/#/${type}/list?${params}`);
 };
 </script>
 
 <template>
-    <QItem v-ripple clickable @click="openTicketCreateForm()">
+    <QItem v-ripple clickable @click="openCreateForm('ticket')">
         <QItemSection>
             {{ t('globals.pageTitles.createTicket') }}
         </QItemSection>
     </QItem>
-    <QItem v-ripple clickable @click="openOrderCreateForm()">
+    <QItem v-ripple clickable @click="openCreateForm('order')">
         <QItemSection>
             {{ t('globals.pageTitles.createOrder') }}
         </QItemSection>

From 218d041000ac794fb6c3deccb22fabe9aa0019cd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 12:58:41 +0100
Subject: [PATCH 54/89] fix(ZoneCard): fix ZoneLocations redirections

---
 src/pages/Zone/Card/ZoneCard.vue | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 80590d561..fa9d6c2d0 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -20,10 +20,11 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
 <template>
     <VnCard
         data-key="zone"
-        base-url="Zones"
+        :base-url="notIsLocations('Zones', undefined)"
         :descriptor="ZoneDescriptor"
-        :filter-panel="ZoneFilterPanel"
+        :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
         :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
+        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('ZoneList', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),

From faf307bc16b3ff2d9b31403b25178fcc8215bb7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 12:59:18 +0100
Subject: [PATCH 55/89] fix: #8192 find by thermographFk instead id

---
 .../Travel/Card/TravelThermographsForm.vue    | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index f56ef1eda..3f2db8954 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -133,6 +133,25 @@ const onThermographCreated = async (data) => {
         warehouseId: data.warehouseFk,
     };
 };
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'search':
+            return /^\d+$/.test(value)
+                ? { id: value }
+                : {
+                      or: [
+                          { name: { like: `%${value}%` } },
+                          { nickname: { like: `%${value}%` } },
+                      ],
+                  };
+        case 'name':
+        case 'nickname':
+            return { [param]: { like: `%${value}%` } };
+        case 'roleFk':
+            return { [param]: value };
+    }
+};
 </script>
 <template>
     <FetchData
@@ -205,6 +224,7 @@ const onThermographCreated = async (data) => {
                         }"
                         sort-by="thermographFk ASC"
                         option-label="thermographFk"
+                        option-filter-value="thermographFk"
                         :disable="viewAction === 'edit'"
                         :tooltip="t('New thermograph')"
                         :roles-allowed-to-create="['logistic']"

From 925ff859cc8bda67cf0411559501a7010d260762 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 13:01:56 +0100
Subject: [PATCH 56/89] fix(ZoneCard): fix ZoneLocations redirections

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

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index fa9d6c2d0..1881e9753 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -26,7 +26,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
         :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
-            url: notIsLocations('ZoneList', 'ZoneLocations'),
+            url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
             info: t('list.searchInfo'),
             whereFilter: notIsLocations((value) => {

From aa5eb005fdc1642302465e83098f99fe772044d6 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 13:27:38 +0100
Subject: [PATCH 57/89] feat: #8192 remove expr-builder proposal

---
 .../Travel/Card/TravelThermographsForm.vue    | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index 3f2db8954..cf9376f11 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -133,25 +133,6 @@ const onThermographCreated = async (data) => {
         warehouseId: data.warehouseFk,
     };
 };
-
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'search':
-            return /^\d+$/.test(value)
-                ? { id: value }
-                : {
-                      or: [
-                          { name: { like: `%${value}%` } },
-                          { nickname: { like: `%${value}%` } },
-                      ],
-                  };
-        case 'name':
-        case 'nickname':
-            return { [param]: { like: `%${value}%` } };
-        case 'roleFk':
-            return { [param]: value };
-    }
-};
 </script>
 <template>
     <FetchData

From a929dec2ab1a17cef63234f77591aa5e4c272228 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 13:42:46 +0100
Subject: [PATCH 58/89] fix(ZoneCard): fix ZoneLocations redirections

---
 src/pages/Zone/Card/ZoneCard.vue          | 2 +-
 src/pages/Zone/Card/ZoneLocationsTree.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 1881e9753..8ad25b80f 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -23,7 +23,7 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :base-url="notIsLocations('Zones', undefined)"
         :descriptor="ZoneDescriptor"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
-        :search-data-key="notIsLocations('ZoneList', 'ZoneLocations')"
+        :search-data-key="notIsLocations('ZoneList', undefined)"
         :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('Zones', 'ZoneLocations'),
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 6b3934df7..89231f75e 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -5,6 +5,7 @@ import VnInput from 'src/components/common/VnInput.vue';
 import { useState } from 'src/composables/useState';
 import axios from 'axios';
 import { useArrayData } from 'composables/useArrayData';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 const props = defineProps({
     rootLabel: {
@@ -33,8 +34,10 @@ const state = useState();
 const treeRef = ref();
 const expanded = ref([]);
 
-const arrayData = useArrayData('ZoneLocations', {
-    url: `Zones/${route.params.id}/getLeaves`,
+const datakey = 'ZoneLocations';
+const url = computed(() => `Zones/${route.params.id}/getLeaves`);
+const arrayData = useArrayData(datakey, {
+    url: url.value,
 });
 const { store } = arrayData;
 const storeData = computed(() => store.data);
@@ -193,6 +196,7 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false"/>
     <QTree
         ref="treeRef"
         :nodes="nodes"

From 7224860c5cd5359dd04685e58aefb04c6b7dce55 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 13:51:39 +0100
Subject: [PATCH 59/89] feat: refs #6839 normalize search

---
 src/components/LeftMenu.vue | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 6e0ae5907..b02c0d014 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -34,18 +34,26 @@ const search = ref(null);
 
 const filteredItems = computed(() => {
     if (!search.value) return items.value;
+    const normalizedSearch = normalize(search.value);
     return items.value.filter((item) => {
-        const locale = t(item.title).toLowerCase();
-        return locale.includes(search.value.toLowerCase());
+        const locale = normalize(t(item.title));
+        return locale.includes(normalizedSearch);
     });
 });
 
 const filteredPinnedModules = computed(() => {
     if (!search.value) return pinnedModules.value;
+    const normalizedSearch = search.value
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .toLowerCase();
     const map = new Map();
     for (const [key, pinnedModule] of pinnedModules.value) {
-        const locale = t(pinnedModule.title).toLowerCase();
-        if (locale.includes(search.value.toLowerCase())) map.set(key, pinnedModule);
+        const locale = t(pinnedModule.title)
+            .normalize('NFD')
+            .replace(/[\u0300-\u036f]/g, '')
+            .toLowerCase();
+        if (locale.includes(normalizedSearch)) map.set(key, pinnedModule);
     }
     return map;
 });
@@ -147,6 +155,13 @@ async function togglePinned(item, event) {
 const handleItemExpansion = (itemName) => {
     expansionItemElements[itemName].scrollToLastElement();
 };
+
+function normalize(text) {
+    return text
+        .normalize('NFD')
+        .replace(/[\u0300-\u036f]/g, '')
+        .toLowerCase();
+}
 </script>
 
 <template>

From 045a828bf93f0c322c560902ad8e52bb137aa8f3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 13:59:04 +0100
Subject: [PATCH 60/89] fix(ZoneCard): fix ZoneLocations redirections

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 89231f75e..b0a97b2f6 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -42,16 +42,15 @@ const arrayData = useArrayData(datakey, {
 const { store } = arrayData;
 const storeData = computed(() => store.data);
 
-const nodes = ref([
-    {
-        id: null,
-        name: props.rootLabel,
-        sons: true,
-        tickable: false,
-        noTick: true,
-        children: [{}],
-    },
-]);
+const defaultNode = {
+    id: null,
+    name: props.rootLabel,
+    sons: true,
+    tickable: false,
+    noTick: true,
+    children: [{}],
+};
+const nodes = ref([defaultNode]);
 
 const _tickedNodes = computed({
     get: () => props.tickedNodes,
@@ -131,6 +130,7 @@ function getNodeIds(node) {
 
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
+    if (!nodes.value[0]) nodes.value = [defaultNode];
     nodes.value[0].childs = [...val];
     const fetchedNodeKeys = val.flatMap(getNodeIds);
     state.set('Tree', [...fetchedNodeKeys]);
@@ -196,7 +196,7 @@ onUnmounted(() => {
             <QBtn color="primary" icon="search" dense flat @click="reFetch()" />
         </template>
     </VnInput>
-    <VnSearchbar :data-key="datakey" :url="url" :redirect="false"/>
+    <VnSearchbar :data-key="datakey" :url="url" :redirect="false" />
     <QTree
         ref="treeRef"
         :nodes="nodes"

From 59b40fed45f18c0847c73f102fb409904583c03d Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 15:57:01 +0100
Subject: [PATCH 61/89] feat: refs #7874 improve vn-notes ui

---
 src/components/ui/VnNotes.vue | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index b395b3934..2164f668e 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -65,15 +65,8 @@ onBeforeRouteLeave((to, from, next) => {
         auto-load
         @on-fetch="(data) => (observationTypes = data)"
     />
-    <QCard class="q-pa-xs q-mb-xl full-width" v-if="$props.addNote">
-        <QCardSection horizontal>
-            <VnAvatar :worker-id="currentUser.id" size="md" />
-            <div class="full-width row justify-between q-pa-xs">
-                <VnUserLink :name="t('New note')" :worker-id="currentUser.id" />
-                {{ t('globals.now') }}
-            </div>
-        </QCardSection>
-        <QCardSection class="q-px-xs q-my-none q-py-none">
+    <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
+        <QCardSection class="q-px-xs q-mt-sm q-py-none">
             <VnRow class="full-width">
                 <VnSelect
                     :label="t('Observation type')"
@@ -144,7 +137,7 @@ onBeforeRouteLeave((to, from, next) => {
                         <div class="full-width row justify-between q-pa-xs">
                             <div>
                                 <VnUserLink
-                                    :name="`${note.worker.user.nickname}`"
+                                    :name="`${note.worker.user.name}`"
                                     :worker-id="note.worker.id"
                                 />
                                 <QBadge

From 8e0b098756ecb29e3b0e4c6707dcb8a5588b0f51 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Nov 2024 16:01:09 +0100
Subject: [PATCH 62/89] fix: refs #7874 add title

---
 src/components/ui/VnNotes.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnNotes.vue b/src/components/ui/VnNotes.vue
index 2164f668e..dbcb2f3fe 100644
--- a/src/components/ui/VnNotes.vue
+++ b/src/components/ui/VnNotes.vue
@@ -66,7 +66,10 @@ onBeforeRouteLeave((to, from, next) => {
         @on-fetch="(data) => (observationTypes = data)"
     />
     <QCard class="q-pa-xs q-mb-lg full-width" v-if="$props.addNote">
-        <QCardSection class="q-px-xs q-mt-sm q-py-none">
+        <QCardSection horizontal>
+            {{ t('New note') }}
+        </QCardSection>
+        <QCardSection class="q-px-xs q-my-none q-py-none">
             <VnRow class="full-width">
                 <VnSelect
                     :label="t('Observation type')"

From cb1c0503430d520c7ad8c586fbf86e62e9989979 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 14 Nov 2024 16:18:22 +0100
Subject: [PATCH 63/89] fix: customerFilter sales person input

---
 src/pages/Customer/CustomerFilter.vue | 35 ++++++++++++++++++++++++---
 1 file changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 6c50cc9df..9741ed439 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -11,6 +11,20 @@ defineProps({
         required: true,
     },
 });
+const handleSalesModelValue = (val) => ({
+    or: [
+        { id: val },
+        { name: val },
+        { nickname: { like: '%' + val + '%' } },
+        { code: { like: `${val}%` } },
+    ],
+});
+
+const exprBuilder = (param, value) => {
+    return {
+        and: [{ active: { neq: false } }, handleSalesModelValue(value)],
+    };
+};
 </script>
 
 <template>
@@ -52,14 +66,18 @@ defineProps({
             <QItem class="q-mb-sm">
                 <QItemSection>
                     <VnSelect
-                        url="Workers/activeWithInheritedRole"
-                        :filter="{ where: { role: 'salesPerson' } }"
+                        url="Workers/search"
+                        :params="{
+                            departmentCodes: ['VT'],
+                        }"
                         auto-load
                         :label="t('Salesperson')"
+                        :expr-builder="exprBuilder"
                         v-model="params.salesPersonFk"
                         @update:model-value="searchFn()"
                         option-value="id"
                         option-label="name"
+                        sort-by="nickname ASC"
                         emit-value
                         map-options
                         use-input
@@ -68,7 +86,18 @@ defineProps({
                         outlined
                         rounded
                         :input-debounce="0"
-                    />
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template></VnSelect
+                    >
                 </QItemSection>
             </QItem>
             <QItem class="q-mb-sm">

From 354f2ce0551fef98eea51af0ed0d97ae533df054 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Nov 2024 08:21:29 +0100
Subject: [PATCH 64/89] fix: deleted duplicate VnUsesMana

---
 src/pages/Ticket/Card/TicketSale.vue | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 8b84a0463..0e464d533 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -22,7 +22,6 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import VnUsesMana from 'src/components/ui/VnUsesMana.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -779,9 +778,6 @@ watch(
                         :label="t('ticketSale.discount')"
                         type="number"
                     />
-                    <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
-                        <VnUsesMana :mana-code="manaCode" />
-                    </div>
                 </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>

From f2b132db79f42f39a8b4b644c62767b2470d9879 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Nov 2024 08:50:10 +0100
Subject: [PATCH 65/89] fix(VnPaginate): not start without data

---
 src/components/ui/VnPaginate.vue                     | 1 +
 src/pages/Worker/Card/WorkerNotificationsManager.vue | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index f5519eb01..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -116,6 +116,7 @@ watch(
 watch(
     () => store.data,
     (data) => {
+        if (!mounted.value) return;
         emit('onChange', data);
     },
     { immediate: true }
diff --git a/src/pages/Worker/Card/WorkerNotificationsManager.vue b/src/pages/Worker/Card/WorkerNotificationsManager.vue
index 4ebe9b0dd..7c29f46ce 100644
--- a/src/pages/Worker/Card/WorkerNotificationsManager.vue
+++ b/src/pages/Worker/Card/WorkerNotificationsManager.vue
@@ -69,7 +69,7 @@ function setNotifications(data) {
         :default-reset="false"
         :default-remove="false"
         :default-save="false"
-        @on-fetch="setNotifications"
+        @on-fetch="(data) => data && setNotifications(data)"
         search-url="notifications"
     >
         <template #body>

From d52a0fdc7f611933bfc20bb3a41e838f8e353e4a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 10:23:57 +0000
Subject: [PATCH 66/89] fix: customer Risk icon color

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 43103bd68..5b13f9513 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -37,6 +37,9 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value?.credit ? 'negative' : 'primary';
+});
 </script>
 
 <template>
@@ -123,6 +126,14 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
                 </QIcon>
+                <QIcon
+                    v-if="customer.debt > customer.credit"
+                    name="vn:risk"
+                    size="xs"
+                    :color="debtWarning"
+                >
+                    <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
+                </QIcon>                
                 <QBtn
                     v-if="customer.unpaid"
                     flat

From d3f538e37cfd96917d6494c3334b73ea0c3b4acc Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 10:27:37 +0000
Subject: [PATCH 67/89] perf: previous commit

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5b13f9513..3dca43925 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -113,8 +113,8 @@ const debtWarning = computed(() => {
                 <QIcon
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
-                    size="xs"
-                    color="primary"
+                    size="xs" 
+                    :color="debtWarning"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -125,15 +125,7 @@ const debtWarning = computed(() => {
                     color="primary"
                 >
                     <QTooltip>{{ t('customer.card.notChecked') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="customer.debt > customer.credit"
-                    name="vn:risk"
-                    size="xs"
-                    :color="debtWarning"
-                >
-                    <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
-                </QIcon>                
+                </QIcon>                             
                 <QBtn
                     v-if="customer.unpaid"
                     flat

From 2891e1363a9b71b7c0d263583883c6c715e025ed Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:36:20 +0100
Subject: [PATCH 68/89] feat: #6943 CustomerDescriptor actions

---
 .../Customer/Card/CustomerDescriptor.vue      | 10 ++++-
 .../Customer/Card/CustomerDescriptorMenu.vue  | 42 +++++++++++++------
 2 files changed, 38 insertions(+), 14 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 43103bd68..15683dc48 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -37,6 +37,9 @@ const entityId = computed(() => {
 
 const data = ref(useCardDescription());
 const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
+const debtWarning = computed(() => {
+    return customer.value?.debt > customer.value.credit ? 'negative' : 'primary';
+});
 </script>
 
 <template>
@@ -107,11 +110,12 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
+
                 <QIcon
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
                     size="xs"
-                    color="primary"
+                    :color="debtWarning"
                 >
                     <QTooltip>{{ t('customer.card.hasDebt') }}</QTooltip>
                 </QIcon>
@@ -168,6 +172,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
+
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -179,6 +184,7 @@ const setData = (entity) => (data.value = useCardDescription(entity?.name, entit
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
+
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -215,6 +221,8 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
+    New order: Nuevo pedido
+    New ticket: Nuevo ticket
     Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago
diff --git a/src/pages/Customer/Card/CustomerDescriptorMenu.vue b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
index 178bba7db..5ef217a31 100644
--- a/src/pages/Customer/Card/CustomerDescriptorMenu.vue
+++ b/src/pages/Customer/Card/CustomerDescriptorMenu.vue
@@ -8,9 +8,6 @@ import { useQuasar } from 'quasar';
 import useNotify from 'src/composables/useNotify';
 
 import VnSmsDialog from 'src/components/common/VnSmsDialog.vue';
-import TicketCreateDialog from 'src/pages/Ticket/TicketCreateDialog.vue';
-import OrderCreateDialog from 'src/pages/Order/Card/OrderCreateDialog.vue';
-import { ref } from 'vue';
 
 const $props = defineProps({
     customer: {
@@ -44,13 +41,38 @@ const sendSms = async (payload) => {
     }
 };
 
-const ticketCreateFormDialog = ref(null);
 const openTicketCreateForm = () => {
-    ticketCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientId: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('ticket', query);
 };
-const orderCreateFormDialog = ref(null);
 const openOrderCreateForm = () => {
-    orderCreateFormDialog.value.show();
+    const query = {
+        table: {
+            clientFk: $props.customer.id,
+        },
+        createForm: {
+            clientFk: $props.customer.id,
+            addressId: $props.customer.defaultAddressFk,
+        },
+    };
+    openWindow('order', query);
+};
+
+const openWindow = (type, { createForm, table }) => {
+    window.open(
+        `/#/${type}/list?createForm=${JSON.stringify(createForm)}&table=${JSON.stringify(
+            table
+        )}`,
+        '_blank'
+    );
 };
 </script>
 
@@ -58,17 +80,11 @@ const openOrderCreateForm = () => {
     <QItem v-ripple clickable @click="openTicketCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createTicket') }}
-            <QDialog ref="ticketCreateFormDialog">
-                <TicketCreateDialog />
-            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable @click="openOrderCreateForm()">
         <QItemSection>
             {{ t('globals.pageTitles.createOrder') }}
-            <QDialog ref="orderCreateFormDialog">
-                <OrderCreateDialog :client-fk="customer.id" />
-            </QDialog>
         </QItemSection>
     </QItem>
     <QItem v-ripple clickable>

From 8e52bd0688ab447211d9d2558c5b2337e4a399a8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:37:27 +0100
Subject: [PATCH 69/89] perf: #6943 improve OrderList

---
 src/pages/Order/OrderList.vue | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 6b6b41828..72c9eb7ec 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import { computed, ref } from 'vue';
+import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
@@ -14,7 +14,6 @@ import OrderFilter from './Card/OrderFilter.vue';
 import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from '../Worker/Card/WorkerDescriptorProxy.vue';
 import { toDateTimeFormat } from 'src/filters/date';
-import { onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 
 const { t } = useI18n();
@@ -142,8 +141,13 @@ const columns = computed(() => [
         ],
     },
 ]);
-
-async function fetchClientAddress(id, formData) {
+onMounted(() => {
+    if (!route.query.createForm) return;
+    const clientId = route.query.createForm;
+    const id = JSON.parse(clientId);
+    fetchClientAddress(id.clientFk);
+});
+async function fetchClientAddress(id, formData = {}) {
     const { data } = await axios.get(`Clients/${id}`, {
         params: { filter: { include: { relation: 'addresses' } } },
     });
@@ -170,13 +174,6 @@ const getDateColor = (date) => {
     if (comparation == 0) return 'bg-warning';
     if (comparation < 0) return 'bg-success';
 };
-
-onMounted(() => {
-    if (!route.query.createForm) return;
-    const clientId = route.query.createForm;
-    const id = JSON.parse(clientId);
-    fetchClientAddress(id.clientFk, id);
-});
 </script>
 <template>
     <OrderSearchbar />

From 87ba74bcfc419a3e9722cea5aa473fdecc2b4c47 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:39:43 +0100
Subject: [PATCH 70/89] perf: #6943 Create ticket from client

---
 src/pages/Ticket/Card/TicketSummary.vue |  5 --
 src/pages/Ticket/TicketList.vue         | 69 +++++++++++++++++--------
 2 files changed, 48 insertions(+), 26 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 5fb99b849..61751357c 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -19,7 +19,6 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
 
 const route = useRoute();
@@ -87,10 +86,6 @@ async function changeState(value) {
 function toTicketUrl(section) {
     return '#/ticket/' + entityId.value + '/' + section;
 }
-function isOnTicketCard() {
-    const currentPath = route.path;
-    return currentPath.startsWith('/ticket');
-}
 </script>
 
 <template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..2cad174ae 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -24,6 +24,8 @@ import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
+const router = useRouter();
+
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -40,16 +42,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
     from: null,
     to: null,
 };
-// Método para inicializar las variables desde la query string
+onMounted(() => {
+    initializeFromQuery();
+    stateStore.rightDrawer = true;
+    if (!route.query.createForm) return;
+    onClientSelected(JSON.parse(route.query.createForm));
+});
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
     from.value = query.from || from.toISOString();
     to.value = query.to || to.toISOString();
     Object.assign(userParams, { from, to });
@@ -206,13 +210,19 @@ const columns = computed(() => [
             {
                 title: t('ticketList.summary'),
                 icon: 'preview',
-                isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row, evt) => {
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
             },
         ],
     },
 ]);
-
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
@@ -268,9 +278,8 @@ const fetchAddresses = async (formData) => {
         if (!formData.clientId) return;
 
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id'],
-            where: { isActive: true },
-            order: 'nickname ASC',
+            fields: ['nickname', 'street', 'city', 'id', 'isActive'],
+            order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
         };
         const params = { filter: JSON.stringify(filter) };
         const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -302,11 +311,6 @@ const getDateColor = (date) => {
     if (comparation < 0) return 'bg-success';
 };
 
-onMounted(() => {
-    initializeFromQuery();
-    stateStore.rightDrawer = true;
-});
-
 async function makeInvoice(ticket) {
     const ticketsIds = ticket.map((item) => item.id);
     const { data } = await axios.post(`Tickets/invoiceTicketsAndPdf`, { ticketsIds });
@@ -472,7 +476,7 @@ function setReference(data) {
             urlCreate: 'Tickets/new',
             title: t('ticketList.createTicket'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
         }"
         default-mode="table"
         :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@@ -616,6 +620,7 @@ function setReference(data) {
                     option-value="id"
                     option-label="name"
                     hide-selected
+                    required
                     @update:model-value="(client) => onClientSelected(data)"
                     :sort-by="'id ASC'"
                 >
@@ -635,7 +640,7 @@ function setReference(data) {
             </VnRow>
             <VnRow>
                 <VnSelect
-                    url="Addresses"
+                    required
                     :label="t('ticket.create.address')"
                     v-model="data.addressId"
                     :options="addressesOptions"
@@ -646,7 +651,22 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem v-bind="scope.itemProps">
+                        <QItem
+                            v-bind="scope.itemProps"
+                            :class="{ disabled: !scope.opt.isActive }"
+                        >
+                            <QItemSection style="min-width: min-content" avatar>
+                                <QIcon
+                                    v-if="
+                                        scope.opt.isActive &&
+                                        selectedClient?.defaultAddressFk === scope.opt.id
+                                    "
+                                    size="sm"
+                                    color="grey"
+                                    name="star"
+                                    class="fill-icon"
+                                />
+                            </QItemSection>
                             <QItemSection>
                                 <QItemLabel>
                                     {{ scope.opt.nickname }}
@@ -680,6 +700,7 @@ function setReference(data) {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        required
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
                 </div>
@@ -693,7 +714,6 @@ function setReference(data) {
                         option-value="agencyModeFk"
                         option-label="agencyMode"
                         hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                     />
                 </div>
             </VnRow>
@@ -829,7 +849,14 @@ function setReference(data) {
         </QTooltip>
     </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
     Search ticket: Buscar ticket

From bdd36f6ba17bc7a8ef261a5d0e99abf4d0ddd62e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:44:41 +0100
Subject: [PATCH 71/89] Merge branch 'master' into
 hotfix-customerDescriptor_actions

---
 src/pages/Customer/Card/CustomerDescriptor.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 955383a35..2b7665ba1 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -110,7 +110,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('customer.card.webAccountInactive') }}</QTooltip>
                 </QIcon>
-
                 <QIcon
                     v-if="customer.debt > customer.credit"
                     name="vn:risk"
@@ -172,7 +171,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer ticket list') }}</QTooltip>
                 </QBtn>
-
                 <QBtn
                     :to="{
                         name: 'InvoiceOutList',
@@ -184,7 +182,6 @@ const debtWarning = computed(() => {
                 >
                     <QTooltip>{{ t('Customer invoice out list') }}</QTooltip>
                 </QBtn>
-
                 <QBtn
                     :to="{
                         name: 'AccountSummary',
@@ -221,8 +218,6 @@ es:
     Go to module index: Ir al índice del módulo
     Customer ticket list: Listado de tickets del cliente
     Customer invoice out list: Listado de facturas del cliente
-    New order: Nuevo pedido
-    New ticket: Nuevo ticket
     Go to user: Ir al usuario
     Go to supplier: Ir al proveedor
     Customer unpaid: Cliente impago

From 4d8432feb5ae21be83a110414e741f2713135768 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:46:55 +0100
Subject: [PATCH 72/89] revert: #6943 address star feature

---
 src/pages/Ticket/TicketList.vue | 22 ++++------------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 2cad174ae..d51ec1277 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -278,8 +278,9 @@ const fetchAddresses = async (formData) => {
         if (!formData.clientId) return;
 
         const filter = {
-            fields: ['nickname', 'street', 'city', 'id', 'isActive'],
-            order: ['isDefaultAddress DESC', 'isActive DESC', 'nickname ASC'],
+            fields: ['nickname', 'street', 'city', 'id'],
+            where: { isActive: true },
+            order: 'nickname ASC',
         };
         const params = { filter: JSON.stringify(filter) };
         const { data } = await axios.get(`Clients/${formData.clientId}/addresses`, {
@@ -651,22 +652,7 @@ function setReference(data) {
                     @update:model-value="() => fetchAvailableAgencies(data)"
                 >
                     <template #option="scope">
-                        <QItem
-                            v-bind="scope.itemProps"
-                            :class="{ disabled: !scope.opt.isActive }"
-                        >
-                            <QItemSection style="min-width: min-content" avatar>
-                                <QIcon
-                                    v-if="
-                                        scope.opt.isActive &&
-                                        selectedClient?.defaultAddressFk === scope.opt.id
-                                    "
-                                    size="sm"
-                                    color="grey"
-                                    name="star"
-                                    class="fill-icon"
-                                />
-                            </QItemSection>
+                        <QItem v-bind="scope.itemProps">
                             <QItemSection>
                                 <QItemLabel>
                                     {{ scope.opt.nickname }}

From e64ea2db199c250af6e2cd327b565e69ccfc9fc0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 11:48:19 +0100
Subject: [PATCH 73/89] feat: #6943 CustomerList salesPerson

---
 src/pages/Customer/CustomerList.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 63f5149e8..815ec57fa 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -68,7 +68,6 @@ const columns = computed(() => [
             fields: ['id', 'name'],
             where: { role: 'salesPerson' },
             optionFilter: 'firstName',
-            useLike: false,
         },
         create: false,
         columnField: {
@@ -429,9 +428,10 @@ function handleLocation(data, location) {
                 :params="{
                     departmentCodes: ['VT', 'shopping'],
                 }"
-                :fields="['id', 'nickname']"
+                :fields="['id', 'nickname', 'code']"
                 sort-by="nickname ASC"
-                :use-like="false"
+                option-label="nickname"
+                option-value="id"
                 emit-value
                 auto-load
             >

From eb287696fa9b184809db45a468e8b025572f7026 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Nov 2024 11:49:46 +0100
Subject: [PATCH 74/89] fix: fixed state column in ticket list

---
 src/pages/Item/ItemFixedPriceFilter.vue | 17 +----------------
 src/pages/Ticket/TicketList.vue         | 12 ++++++------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/pages/Item/ItemFixedPriceFilter.vue b/src/pages/Item/ItemFixedPriceFilter.vue
index 84eefaed3..a8f7d0c5f 100644
--- a/src/pages/Item/ItemFixedPriceFilter.vue
+++ b/src/pages/Item/ItemFixedPriceFilter.vue
@@ -17,21 +17,6 @@ const props = defineProps({
 });
 
 const itemTypeWorkersOptions = ref([]);
-const exprBuilder = (param, value) => {
-    switch (param) {
-        case 'name':
-            return { 'i.name': { like: `%${value}%` } };
-        case 'itemFk':
-        case 'warehouseFk':
-        case 'rate2':
-        case 'rate3':
-            param = `fp.${param}`;
-            return { [param]: value };
-        case 'minPrice':
-            param = `i.${param}`;
-            return { [param]: value };
-    }
-};
 </script>
 
 <template>
@@ -66,7 +51,7 @@ const exprBuilder = (param, value) => {
                         url="Warehouses"
                         auto-load
                         :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
-                        :label="t('components.itemsFilterPanel.warehouseFk')"
+                        :label="t('globals.warehouse')"
                         v-model="params.warehouseFk"
                         option-label="name"
                         option-value="id"
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index c8687ed5f..cd5d59651 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -574,17 +574,17 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <span v-if="getColor(row)">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else-if="row.state === 'Entregado'">
+            <span v-if="row.refFk">
                 <span class="link" @click.stop>
                     {{ row.refFk }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
                 </span>
             </span>
+            <span v-else-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>

From 064dbfc4324caf1d967acee6ebbffefef9e8043f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 12:20:50 +0000
Subject: [PATCH 75/89] fix: #6943 Update AddressObservations

---
 .../components/CustomerAddressEdit.vue        | 30 +++++++++++++------
 1 file changed, 21 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
index 1e5387815..0ea8315d6 100644
--- a/src/pages/Customer/components/CustomerAddressEdit.vue
+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
@@ -23,6 +23,7 @@ const incoterms = ref([]);
 const customsAgents = ref([]);
 const observationTypes = ref([]);
 const notes = ref([]);
+let originalNotes = [];
 const deletes = ref([]);
 
 onBeforeMount(() => {
@@ -42,7 +43,8 @@ const getData = async (observations) => {
         });
 
         if (data.length) {
-            notes.value = data
+            originalNotes = data;
+            notes.value = originalNotes
                 .map((observation) => {
                     const type = observationTypes.value.find(
                         (type) => type.id === observation.observationTypeFk
@@ -81,14 +83,24 @@ const deleteNote = (id, index) => {
 };
 
 const onDataSaved = async () => {
-    let payload = {};
-    const creates = notes.value.filter((note) => note.$isNew);
-    if (creates.length) {
-        payload.creates = creates;
-    }
-    if (deletes.value.length) {
-        payload.deletes = deletes.value;
-    }
+    let payload = {
+        creates: notes.value.filter((note) => note.$isNew),
+        deletes: deletes.value,
+        updates: notes.value
+            .filter((note) =>
+                originalNotes.some(
+                    (oNote) =>
+                        oNote.id === note.id &&
+                        (note.description !== oNote.description ||
+                            note.observationTypeFk !== oNote.observationTypeFk)
+                )
+            )
+            .map((note) => ({
+                data: note,
+                where: { id: note.id },
+            })),
+    };
+
     await axios.post('AddressObservations/crud', payload);
     notes.value = [];
     deletes.value = [];

From 54a34e803424f30646af452b7d389bd23d0ca3a8 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 12:33:56 +0000
Subject: [PATCH 76/89] fix: Redirect to catalog when create new order

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

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 72c9eb7ec..db6f104b1 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -191,7 +191,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-                tableRef.redirect(url);
+               tableRef.value.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,

From 59169235218dfb44be2aabb9e99150636f1badb2 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 15 Nov 2024 12:51:25 +0000
Subject: [PATCH 77/89] fix: Redirect to catalog when create new order

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

diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index db6f104b1..52d108595 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -191,7 +191,7 @@ const getDateColor = (date) => {
             urlCreate: 'Orders/new',
             title: t('module.cerateOrder'),
             onDataSaved: (url) => {
-               tableRef.value.redirect(`${url}/catalog`);
+               tableRef.redirect(`${url}/catalog`);
             },
             formInitialData: {
                 active: true,

From 5e5d2f3c42dcc04fb0375353ba70344348e10f6d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Sun, 17 Nov 2024 13:44:44 +0000
Subject: [PATCH 78/89] fix: #7671 apply sort-by itemFk and name

---
 src/pages/Item/ItemFixedPrice.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 7d4d6b896..815c7d519 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -64,8 +64,7 @@ const columns = computed(() => [
     },
     {
         label: t('globals.name'),
-        field: 'name',
-        name: 'description',
+        name: 'name',
         ...defaultColumnAttrs,
         create: true,
         cardVisible: true,
@@ -426,7 +425,7 @@ function handleOnDataSave({ CrudModelRef }) {
             :default-save="false"
             data-key="ItemFixedPrices"
             url="FixedPrices/filter"
-            :order="['description DESC']"
+            :order="['itemFk DESC', 'name DESC']"
             save-url="FixedPrices/crud"
             :user-params="{ warehouseFk: user.warehouseFk }"
             ref="tableRef"
@@ -480,7 +479,7 @@ function handleOnDataSave({ CrudModelRef }) {
                     </template>
                 </VnSelect>
             </template>
-            <template #column-description="{ row }">
+            <template #column-name="{ row }">
                 <span class="link">
                     {{ row.name }}
                 </span>

From 2bc219a09b8b059d0468510b910e1d9b5561b2bb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Nov 2024 06:59:09 +0100
Subject: [PATCH 79/89] refactor: refs #8185 modified LeftMenu to avoid
 duplicates

---
 src/components/LeftMenu.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 6e0ae5907..3bbb5b046 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -22,7 +22,7 @@ const props = defineProps({
         default: 'main',
     },
 });
-
+const initialized = ref(false);
 const items = ref([]);
 const expansionItemElements = reactive({});
 const pinnedModules = computed(() => {
@@ -53,11 +53,13 @@ const filteredPinnedModules = computed(() => {
 onMounted(async () => {
     await navigation.fetchPinned();
     getRoutes();
+    initialized.value = true;
 });
 
 watch(
     () => route.matched,
     () => {
+        if (!initialized.value) return;
         items.value = [];
         getRoutes();
     },

From e230cc61a07c28980be2b7032c84c5539ff86924 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 09:18:06 +0100
Subject: [PATCH 80/89] fix(TicketBasicData): getShipped, getLanded & bad try
 catch

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 137 +++++++-----------
 .../Card/BasicData/TicketBasicDataView.vue    |  87 +++++------
 2 files changed, 88 insertions(+), 136 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f5ce8a0f3..ee5f5b8d4 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -16,12 +16,9 @@ import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-    },
+const formData = defineModel({
+    type: Object,
+    required: true,
 });
 
 const emit = defineEmits(['updateForm']);
@@ -40,7 +37,6 @@ const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
-const formData = ref($props.formData);
 
 watch(
     () => formData.value,
@@ -69,75 +65,44 @@ const zoneWhere = computed(() => {
         : {};
 });
 
-const getLanded = async (params) => {
-    try {
-        const validParams =
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+async function getLanded(params) {
+    getDate(`Agencies/getLanded`, params);
+}
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = data.landed;
-            formData.value.shipped = params.shipped;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+async function getShipped(params) {
+    getDate(`Agencies/getShipped`, params);
+}
+
+async function getDate(query, params) {
+    for (const param in params) {
+        if (!params[param]) return;
     }
-};
 
-const getShipped = async (params) => {
-    try {
-        const validParams =
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+    formData.value.zoneFk = null;
+    zonesOptions.value = [];
+    const { data } = await axios.get(query, { params });
+    if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = params.landed;
-            formData.value.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
+    formData.value.zoneFk = data.zoneFk;
+    if (data.landed) formData.value.landed = data.landed;
+    if (data.shipped) formData.value.shipped = data.shipped;
+}
 
 const onChangeZone = async (zoneId) => {
-    try {
-        formData.value.agencyModeFk = null;
-        const { data } = await axios.get(`Zones/${zoneId}`);
-        formData.value.agencyModeFk = data.agencyModeFk;
-    } catch (error) {
-        console.error(error);
-    }
+    formData.value.agencyModeFk = null;
+    const { data } = await axios.get(`Zones/${zoneId}`);
+    formData.value.agencyModeFk = data.agencyModeFk;
 };
 
 const onChangeAddress = async (addressId) => {
-    try {
-        formData.value.nickname = null;
-        const { data } = await axios.get(`Addresses/${addressId}`);
-        formData.value.nickname = data.nickname;
-    } catch (error) {
-        console.error(error);
-    }
+    formData.value.nickname = null;
+    const { data } = await axios.get(`Addresses/${addressId}`);
+    formData.value.nickname = data.nickname;
 };
 
 const getClientDefaultAddress = async (clientId) => {
-    try {
-        const { data } = await axios.get(`Clients/${clientId}`);
-        if (data) addressId.value = data.defaultAddressFk;
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.get(`Clients/${clientId}`);
+    if (data) addressId.value = data.defaultAddressFk;
 };
 
 const clientAddressesList = async (value) => {
@@ -189,18 +154,26 @@ const clientId = computed({
     },
 });
 
-const landed = computed({
-    get: () => formData.value?.landed,
-    set: (val) => {
-        formData.value.landed = val;
-        getShipped({
-            landed: val,
+function addDateParams(obj) {
+    return {
+        ...obj,
+        ...{
             addressFk: formData.value?.addressFk,
             agencyModeFk: formData.value?.agencyModeFk,
             warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
+        },
+    };
+}
+
+async function setLanded(landed) {
+    if (!landed) return;
+    getShipped(addDateParams({ landed }));
+}
+
+async function setShipped(shipped) {
+    if (!shipped) return;
+    getLanded(addDateParams({ shipped }));
+}
 
 const agencyModeId = computed({
     get: () => formData.value.agencyModeFk,
@@ -248,21 +221,6 @@ const warehouseId = computed({
     },
 });
 
-const shipped = computed({
-    get: () => formData.value?.shipped,
-    set: (val) => {
-        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
-            val.setHours(0, 0, 0, 0);
-        formData.value.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formData.value?.addressFk,
-            agencyModeFk: formData.value?.agencyModeFk,
-            warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
-
 const onFormModelInit = () => {
     if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
@@ -463,18 +421,21 @@ async function getZone(options) {
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shipped')"
+                @update:model-value="setShipped"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                @update:model-value="setShipped"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
                 :rules="validate('basicData.landed')"
+                @update:model-value="setLanded"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
index 92640f898..851593bff 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataView.vue
@@ -70,60 +70,51 @@ const isFormInvalid = () => {
 };
 
 const getPriceDifference = async () => {
-    try {
-        const params = {
-            landed: formData.value.landed,
-            addressId: formData.value.addressFk,
-            agencyModeId: formData.value.agencyModeFk,
-            zoneId: formData.value.zoneFk,
-            warehouseId: formData.value.warehouseFk,
-            shipped: formData.value.shipped,
-        };
-        const { data } = await axios.post(
-            `tickets/${formData.value.id}/priceDifference`,
-            params
-        );
-        formData.value.sale = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const params = {
+        landed: formData.value.landed,
+        addressId: formData.value.addressFk,
+        agencyModeId: formData.value.agencyModeFk,
+        zoneId: formData.value.zoneFk,
+        warehouseId: formData.value.warehouseFk,
+        shipped: formData.value.shipped,
+    };
+    const { data } = await axios.post(
+        `tickets/${formData.value.id}/priceDifference`,
+        params
+    );
+    formData.value.sale = data;
 };
 
 const submit = async () => {
-    try {
-        if (!formData.value.option)
-            return notify(t('basicData.chooseAnOption'), 'negative');
+    if (!formData.value.option) return notify(t('basicData.chooseAnOption'), 'negative');
 
-        const params = {
-            clientFk: formData.value.clientFk,
-            nickname: formData.value.nickname,
-            agencyModeFk: formData.value.agencyModeFk,
-            addressFk: formData.value.addressFk,
-            zoneFk: formData.value.zoneFk,
-            warehouseFk: formData.value.warehouseFk,
-            companyFk: formData.value.companyFk,
-            shipped: formData.value.shipped,
-            landed: formData.value.landed,
-            isDeleted: formData.value.isDeleted,
-            option: formData.value.option,
-            isWithoutNegatives: formData.value.withoutNegatives,
-            withWarningAccept: formData.value.withWarningAccept,
-            keepPrice: false,
-        };
+    const params = {
+        clientFk: formData.value.clientFk,
+        nickname: formData.value.nickname,
+        agencyModeFk: formData.value.agencyModeFk,
+        addressFk: formData.value.addressFk,
+        zoneFk: formData.value.zoneFk,
+        warehouseFk: formData.value.warehouseFk,
+        companyFk: formData.value.companyFk,
+        shipped: formData.value.shipped,
+        landed: formData.value.landed,
+        isDeleted: formData.value.isDeleted,
+        option: formData.value.option,
+        isWithoutNegatives: formData.value.withoutNegatives,
+        withWarningAccept: formData.value.withWarningAccept,
+        keepPrice: false,
+    };
 
-        const { data } = await axios.post(
-            `tickets/${formData.value.id}/componentUpdate`,
-            params
-        );
+    const { data } = await axios.post(
+        `tickets/${formData.value.id}/componentUpdate`,
+        params
+    );
 
-        if (!data) return;
+    if (!data) return;
 
-        const ticketToMove = data.id;
-        notify(t('basicData.unroutedTicket'), 'positive');
-        router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
-    } catch (error) {
-        console.error(error);
-    }
+    const ticketToMove = data.id;
+    notify(t('basicData.unroutedTicket'), 'positive');
+    router.push({ name: 'TicketSummary', params: { id: ticketToMove } });
 };
 
 const submitWithNegatives = async () => {
@@ -167,7 +158,7 @@ onBeforeMount(async () => await getTicketData());
             <TicketBasicDataForm
                 v-if="initialDataLoaded"
                 @update-form="($event) => (formData = $event)"
-                :form-data="formData"
+                v-model="formData"
             />
         </QStep>
         <QStep :name="2" :title="t('basicData.priceDifference')">

From 9ea9239250ba209a644057b4be5102b631f3935d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 10:41:25 +0100
Subject: [PATCH 81/89] fix: customerSummary balanceDue label value

---
 src/pages/Customer/Card/CustomerSummary.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 8b5f0f2c2..62792a5c2 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 
-import { toCurrency, toPercentage, toDate } from 'src/filters';
+import { toCurrency, toPercentage, toDate, dashOrCurrency } from 'src/filters';
 import CardSummary from 'components/ui/CardSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import VnLinkPhone from 'src/components/ui/VnLinkPhone.vue';
@@ -25,16 +25,16 @@ const $props = defineProps({
 const entityId = computed(() => $props.id || route.params.id);
 const customer = computed(() => summary.value.entity);
 const summary = ref();
-
+const defaulterAmount = computed(() => customer.value.defaulters[0]?.amount);
 const balanceDue = computed(() => {
-    return (
-        customer.value &&
-        customer.value.defaulters.length &&
-        customer.value.defaulters[0].amount
-    );
+    const amount = defaulterAmount.value;
+    if (!amount || amount < 0) {
+        return null;
+    }
+    return amount;
 });
 
-const balanceDueWarning = computed(() => (balanceDue.value ? 'negative' : ''));
+const balanceDueWarning = computed(() => (defaulterAmount.value ? 'negative' : ''));
 
 const claimRate = computed(() => {
     return customer.value.claimsRatio?.claimingRate ?? 0;
@@ -281,7 +281,7 @@ const sumRisk = ({ clientRisks }) => {
                 <VnLv
                     v-if="entity.defaulters"
                     :label="t('customer.summary.balanceDue')"
-                    :value="toCurrency(balanceDue)"
+                    :value="dashOrCurrency(balanceDue)()"
                     :class="balanceDueWarning"
                     :info="t('customer.summary.balanceDueInfo')"
                 />

From 09aad5914fb7b9a253d74cb48d43df36f881da27 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 10:49:30 +0100
Subject: [PATCH 82/89] feat(TicketSummary): add ticketDescritporMenu

---
 src/components/ui/CardSummary.vue             |  2 +-
 .../Ticket/Card/TicketDescriptorMenu.vue      | 32 ++++++------
 src/pages/Ticket/Card/TicketSummary.vue       | 49 ++++++++++++-------
 3 files changed, 50 insertions(+), 33 deletions(-)

diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index 11dcbee3b..9bc1cec7b 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -98,7 +98,7 @@ function existSummary(routes) {
                     <slot name="header" :entity="entity" dense>
                         <VnLv :label="`${entity.id} -`" :value="entity.name" />
                     </slot>
-                    <slot name="header-right">
+                    <slot name="header-right" :entity="entity">
                         <span></span>
                     </slot>
                 </div>
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index bf4a1efb4..9ee22dad2 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -1,6 +1,6 @@
 <script setup>
 import axios from 'axios';
-import { ref, toRefs } from 'vue';
+import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
@@ -31,7 +31,7 @@ const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 const ticketSummary = useArrayData('TicketSummary');
 const { ticket } = toRefs(props);
-const ticketId = currentRoute.value.params.id;
+const ticketId = computed(() => props.ticket.id ?? currentRoute.value.params.id);
 const client = ref();
 const showTransferDialog = ref(false);
 const showTurnDialog = ref(false);
@@ -68,7 +68,7 @@ const actions = {
     setWeight: async () => {
         try {
             const invoiceIds = (
-                await axios.post(`Tickets/${ticketId}/setWeight`, {
+                await axios.post(`Tickets/${ticketId.value}/setWeight`, {
                     weight: weight.value,
                 })
             ).data;
@@ -86,7 +86,7 @@ const actions = {
     },
     remove: async () => {
         try {
-            await axios.post(`Tickets/${ticketId}/setDeleted`);
+            await axios.post(`Tickets/${ticketId.value}/setDeleted`);
 
             notify({ message: t('Ticket deleted'), type: 'positive' });
             notify({
@@ -176,14 +176,14 @@ function showSmsDialog(template, customData) {
 }
 
 async function showSmsDialogWithChanges() {
-    const query = `TicketLogs/${ticketId}/getChanges`;
+    const query = `TicketLogs/${ticketId.value}/getChanges`;
     const response = await axios.get(query);
 
     showSmsDialog('orderChanges', { changes: response.data });
 }
 
 async function sendSms(body) {
-    await axios.post(`Tickets/${ticketId}/sendSms`, body);
+    await axios.post(`Tickets/${ticketId.value}/sendSms`, body);
     notify({
         message: 'Notification sent',
         type: 'positive',
@@ -256,7 +256,10 @@ async function transferClient(client) {
         clientFk: client,
     };
 
-    const { data } = await axios.patch(`Tickets/${ticketId}/transferClient`, params);
+    const { data } = await axios.patch(
+        `Tickets/${ticketId.value}/transferClient`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -296,7 +299,10 @@ async function changeShippedHour(time) {
         shipped: time,
     };
 
-    const { data } = await axios.post(`Tickets/${ticketId}/updateEditableTicket`, params);
+    const { data } = await axios.post(
+        `Tickets/${ticketId.value}/updateEditableTicket`,
+        params
+    );
 
     if (data) window.location.reload();
 }
@@ -313,7 +319,7 @@ function openRecalculateDialog() {
 }
 
 async function recalculateComponents() {
-    await axios.post(`Tickets/${ticketId}/recalculateComponents`);
+    await axios.post(`Tickets/${ticketId.value}/recalculateComponents`);
     notify({
         message: t('Data saved'),
         type: 'positive',
@@ -336,11 +342,11 @@ async function handleInvoiceOutData() {
 }
 
 async function docuwareDownload() {
-    await axios.get(`Tickets/${ticketId}/docuwareDownload`);
+    await axios.get(`Tickets/${ticketId.value}/docuwareDownload`);
 }
 
 async function hasDocuware() {
-    const { data } = await axios.post(`Docuwares/${ticketId}/checkFile`, {
+    const { data } = await axios.post(`Docuwares/${ticketId.value}/checkFile`, {
         fileCabinet: 'deliveryNote',
         signed: true,
     });
@@ -374,7 +380,7 @@ async function uploadDocuware(force) {
         :url="
             route.path.startsWith('/ticket')
                 ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket}/isEditable`
+                : `Tickets/${ticket.id}/isEditable`
         "
         auto-load
         @on-fetch="handleFetchData"
@@ -396,8 +402,6 @@ async function uploadDocuware(force) {
                 <VnSelect
                     url="Clients"
                     :fields="['id', 'name']"
-                    option-label="name"
-                    option-value="id"
                     v-model="client"
                     :label="t('Client')"
                     auto-load
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 61751357c..d20fd9c5f 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -20,6 +20,7 @@ import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnToSummary from 'src/components/ui/VnToSummary.vue';
+import TicketDescriptorMenu from './TicketDescriptorMenu.vue';
 
 const route = useRoute();
 const { notify } = useNotify();
@@ -116,24 +117,36 @@ function toTicketUrl(section) {
                 {{ entity.nickname }}
             </div>
         </template>
-        <template #header-right>
-            <QBtnDropdown
-                ref="stateBtnDropdownRef"
-                color="black"
-                text-color="white"
-                :label="t('globals.changeState')"
-                :disable="!isEditable()"
-            >
-                <VnSelect
-                    :options="editableStates"
-                    hide-selected
-                    option-label="name"
-                    option-value="code"
-                    hide-dropdown-icon
-                    focus-on-mount
-                    @update:model-value="changeState"
-                />
-            </QBtnDropdown>
+        <template #header-right="{ entity }">
+            <div>
+                <QBtnDropdown
+                    ref="stateBtnDropdownRef"
+                    color="black"
+                    text-color="white"
+                    :label="t('globals.changeState')"
+                    :disable="!isEditable()"
+                >
+                    <VnSelect
+                        :options="editableStates"
+                        hide-selected
+                        option-label="name"
+                        option-value="code"
+                        hide-dropdown-icon
+                        focus-on-mount
+                        @update:model-value="changeState"
+                    />
+                </QBtnDropdown>
+                <QBtn color="white" dense flat icon="more_vert" round size="md">
+                    <QTooltip>
+                        {{ t('components.cardDescriptor.moreOptions') }}
+                    </QTooltip>
+                    <QMenu>
+                        <QList>
+                            <TicketDescriptorMenu :ticket="entity" />
+                        </QList>
+                    </QMenu>
+                </QBtn>
+            </div>
         </template>
         <template #body="{ entity }">
             <QCard class="vn-one">

From 383f51c1b260cd48550cee10f05777df696c331c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 10:57:26 +0100
Subject: [PATCH 83/89] refactor(TicketDescritporMenu): url isEditable

---
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 9ee22dad2..f1d30b1bd 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -3,7 +3,7 @@ import axios from 'axios';
 import { computed, ref, toRefs } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute, useRouter } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -23,7 +23,6 @@ const props = defineProps({
         required: true,
     },
 });
-const route = useRoute();
 
 const { push, currentRoute } = useRouter();
 const { dialog, notify } = useQuasar();
@@ -377,11 +376,7 @@ async function uploadDocuware(force) {
 </script>
 <template>
     <FetchData
-        :url="
-            route.path.startsWith('/ticket')
-                ? `Tickets/${ticketId}/isEditable`
-                : `Tickets/${ticket.id}/isEditable`
-        "
+        :url="`Tickets/${ticketId}/isEditable`"
         auto-load
         @on-fetch="handleFetchData"
     />

From f52095a2fcb6b7fbd783e09456996f5a927f9a43 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 10:57:49 +0100
Subject: [PATCH 84/89] Merge branch 'test' into solveConflicts_test_to_dev

---
 src/pages/Claim/ClaimFilter.vue               |   2 +-
 .../Card/BasicData/TicketBasicDataForm.vue    | 109 +++++++-----------
 src/pages/Ticket/TicketList.vue               |  59 ++++++----
 3 files changed, 77 insertions(+), 93 deletions(-)

diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index dc25fe4a0..f7e2ffbf6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -23,7 +23,7 @@ defineExpose({ states });
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 8c6d454c0..1fc54f486 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -16,12 +16,9 @@ import { useAcl } from 'src/composables/useAcl';
 import { useValidator } from 'src/composables/useValidator';
 import { toTimeFormat } from 'filters/date.js';
 
-const $props = defineProps({
-    formData: {
-        type: Object,
-        required: true,
-        default: () => ({}),
-    },
+const formData = defineModel({
+    type: Object,
+    required: true,
 });
 
 const emit = defineEmits(['updateForm']);
@@ -40,7 +37,6 @@ const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
 const zoneSelectRef = ref();
-const formData = ref($props.formData);
 
 watch(
     () => formData.value,
@@ -69,47 +65,28 @@ const zoneWhere = computed(() => {
         : {};
 });
 
-const getLanded = async (params) => {
-    try {
-        const validParams =
-            shipped.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+async function getLanded(params) {
+    getDate(`Agencies/getLanded`, params);
+}
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getLanded`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = data.landed;
-            formData.value.shipped = params.shipped;
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
+async function getShipped(params) {
+    getDate(`Agencies/getShipped`, params);
+}
+
+async function getDate(query, params) {
+    for (const param in params) {
+        if (!params[param]) return;
     }
-};
 
-const getShipped = async (params) => {
-    try {
-        const validParams =
-            landed.value && addressId.value && agencyModeId.value && warehouseId.value;
-        if (!validParams) return;
+    formData.value.zoneFk = null;
+    zonesOptions.value = [];
+    const { data } = await axios.get(query, { params });
+    if (!data) return notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
 
-        formData.value.zoneFk = null;
-        zonesOptions.value = [];
-        const { data } = await axios.get(`Agencies/getShipped`, { params });
-        if (data) {
-            formData.value.zoneFk = data.zoneFk;
-            formData.value.landed = params.landed;
-            formData.value.shipped = data.shipped;
-        } else {
-            notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-        }
-    } catch (error) {
-        console.error(error);
-        notify(t('basicData.noDeliveryZoneAvailable'), 'negative');
-    }
-};
+    formData.value.zoneFk = data.zoneFk;
+    if (data.landed) formData.value.landed = data.landed;
+    if (data.shipped) formData.value.shipped = data.shipped;
+}
 
 const onChangeZone = async (zoneId) => {
     formData.value.agencyModeFk = null;
@@ -177,18 +154,26 @@ const clientId = computed({
     },
 });
 
-const landed = computed({
-    get: () => formData.value?.landed,
-    set: (val) => {
-        formData.value.landed = val;
-        getShipped({
-            landed: val,
+function addDateParams(obj) {
+    return {
+        ...obj,
+        ...{
             addressFk: formData.value?.addressFk,
             agencyModeFk: formData.value?.agencyModeFk,
             warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
+        },
+    };
+}
+
+async function setLanded(landed) {
+    if (!landed) return;
+    getShipped(addDateParams({ landed }));
+}
+
+async function setShipped(shipped) {
+    if (!shipped) return;
+    getLanded(addDateParams({ shipped }));
+}
 
 const agencyModeId = computed({
     get: () => formData.value.agencyModeFk,
@@ -236,21 +221,6 @@ const warehouseId = computed({
     },
 });
 
-const shipped = computed({
-    get: () => formData.value?.shipped,
-    set: (val) => {
-        if (new Date(formData.value?.shipped).toDateString() != val.toDateString())
-            val.setHours(0, 0, 0, 0);
-        formData.value.shipped = val;
-        getLanded({
-            shipped: val,
-            addressFk: formData.value?.addressFk,
-            agencyModeFk: formData.value?.agencyModeFk,
-            warehouseFk: formData.value?.warehouseFk,
-        });
-    },
-});
-
 const onFormModelInit = () => {
     if (formData.value?.clientFk) clientAddressesList(formData.value?.clientFk);
 };
@@ -451,18 +421,21 @@ async function getZone(options) {
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('ticketList.shipped')"
+                @update:model-value="setShipped"
             />
             <VnInputTime
                 :label="t('basicData.shippedHour')"
                 v-model="formData.shipped"
                 :required="true"
                 :rules="validate('basicData.shippedHour')"
+                @update:model-value="setShipped"
             />
             <VnInputDate
                 :label="t('basicData.landed')"
                 v-model="formData.landed"
                 :required="true"
                 :rules="validate('basicData.landed')"
+                @update:model-value="setLanded"
             />
         </VnRow>
     </QForm>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 0685217ac..aae6f80a7 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -1,7 +1,7 @@
 <script setup>
 import axios from 'axios';
 import { computed, ref, onMounted } from 'vue';
-import { useRoute } from 'vue-router';
+import { useRoute, useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -18,12 +18,13 @@ import RightMenu from 'src/components/common/RightMenu.vue';
 import TicketFilter from './TicketFilter.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import FetchData from 'src/components/FetchData.vue';
-import CustomerDescriptorProxy from '../Customer/Card/CustomerDescriptorProxy.vue';
-import ZoneDescriptorProxy from '../Zone/Card/ZoneDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
-import InvoiceOutDescriptorProxy from '../InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
 
 const route = useRoute();
+const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 const tableRef = ref();
@@ -40,23 +41,18 @@ from.setDate(from.getDate() - 7);
 const to = Date.vnNew();
 to.setHours(23, 59, 0, 0);
 to.setDate(to.getDate() + 1);
-
 const userParams = {
     from: null,
     to: null,
 };
-
 onMounted(() => {
     initializeFromQuery();
     stateStore.rightDrawer = true;
     if (!route.query.createForm) return;
     onClientSelected(JSON.parse(route.query.createForm));
 });
-// Método para inicializar las variables desde la query string
 const initializeFromQuery = () => {
     const query = route.query.table ? JSON.parse(route.query.table) : {};
-
-    // Asigna los valores a las variables correspondientes
     from.value = query.from || from.toISOString();
     to.value = query.to || to.toISOString();
     Object.assign(userParams, { from, to });
@@ -213,13 +209,19 @@ const columns = computed(() => [
             {
                 title: t('components.smartCard.viewSummary'),
                 icon: 'preview',
-                isPrimary: true,
-                action: (row) => viewSummary(row.id, TicketSummary),
+                action: (row, evt) => {
+                    if (evt && evt.ctrlKey) {
+                        const url = router.resolve({
+                            params: { id: row.id },
+                            name: 'TicketCard',
+                        }).href;
+                        window.open(url, '_blank');
+                    } else viewSummary(row.id, TicketSummary);
+                },
             },
         ],
     },
 ]);
-
 function redirectToLines(id) {
     const url = `#/ticket/${id}/sale`;
     window.open(url, '_blank');
@@ -456,24 +458,24 @@ function setReference(data) {
         auto-load
     />
     <VnSearchbar
-        data-key="Ticket"
+        data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
     />
     <RightMenu>
         <template #right-panel>
-            <TicketFilter data-key="Ticket" />
+            <TicketFilter data-key="TicketList" />
         </template>
     </RightMenu>
     <VnTable
         ref="tableRef"
-        data-key="Ticket"
+        data-key="TicketList"
         url="Tickets/filter"
         :create="{
             urlCreate: 'Tickets/new',
             title: t('ticketList.createTicket'),
             onDataSaved: ({ id }) => tableRef.redirect(id),
-            formInitialData: {},
+            formInitialData: { clientId: null },
         }"
         default-mode="table"
         :order="['shippedDate DESC', 'shippedHour ASC', 'zoneLanding ASC', 'id']"
@@ -575,17 +577,17 @@ function setReference(data) {
             </span>
         </template>
         <template #column-stateFk="{ row }">
-            <span v-if="getColor(row)">
-                <QChip :class="getColor(row)" dense square>
-                    {{ row.state }}
-                </QChip>
-            </span>
-            <span v-else-if="row.state === 'Entregado'">
+            <span v-if="row.refFk">
                 <span class="link" @click.stop>
                     {{ row.refFk }}
                     <InvoiceOutDescriptorProxy :id="row.invoiceOutId" />
                 </span>
             </span>
+            <span v-else-if="getColor(row)">
+                <QChip :class="getColor(row)" dense square>
+                    {{ row.state }}
+                </QChip>
+            </span>
             <span v-else>
                 {{ row.state }}
             </span>
@@ -617,6 +619,7 @@ function setReference(data) {
                     option-value="id"
                     option-label="name"
                     hide-selected
+                    required
                     @update:model-value="(client) => onClientSelected(data)"
                     :sort-by="'id ASC'"
                 >
@@ -643,6 +646,7 @@ function setReference(data) {
                     option-label="nickname"
                     hide-selected
                     map-options
+                    required
                     :disable="!data.clientId"
                     :sort-by="'isActive DESC'"
                     @update:model-value="() => fetchAvailableAgencies(data)"
@@ -693,6 +697,7 @@ function setReference(data) {
                         option-value="id"
                         option-label="name"
                         hide-selected
+                        required
                         @update:model-value="() => fetchAvailableAgencies(data)"
                     />
                 </div>
@@ -706,7 +711,6 @@ function setReference(data) {
                         option-value="agencyModeFk"
                         option-label="agencyMode"
                         hide-selected
-                        :disable="!data.clientId || !data.landed || !data.warehouseId"
                     />
                 </div>
             </VnRow>
@@ -842,7 +846,14 @@ function setReference(data) {
         </QTooltip>
     </QPageSticky>
 </template>
-
+<style scoped>
+.disabled,
+.disabled *,
+[disabled],
+[disabled] * {
+    cursor: pointer !important;
+}
+</style>
 <i18n>
 es:
     Search ticket: Buscar ticket

From 0c0b9ca648426bc8aaa91ad46b5902dd178e70ac Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Nov 2024 12:27:07 +0100
Subject: [PATCH 85/89] fix: changed route.query

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

diff --git a/src/filters/getParamWhere.js b/src/filters/getParamWhere.js
index 22dd69af1..ef00a93ae 100644
--- a/src/filters/getParamWhere.js
+++ b/src/filters/getParamWhere.js
@@ -9,7 +9,7 @@ function parseJSON(str, fallback) {
 }
 export default function (route, param) {
     // catch route query params
-    const params = parseJSON(route?.query?.params, {});
+    const params = parseJSON(route?.query?.table, {});
     // extract and parse filter from params
     const { filter: filterStr = '{}' } = params;
 

From d3993442b677d03155aaec8d39efadd5a69265b1 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 18 Nov 2024 13:26:27 +0100
Subject: [PATCH 86/89] fix: hotfix OrderTickets

---
 src/pages/Order/Card/OrderLines.vue  | 1 +
 src/pages/Ticket/Card/TicketSale.vue | 7 +++++++
 src/pages/Ticket/locale/en.yml       | 1 +
 src/pages/Ticket/locale/es.yml       | 1 +
 4 files changed, 10 insertions(+)

diff --git a/src/pages/Order/Card/OrderLines.vue b/src/pages/Order/Card/OrderLines.vue
index 5aec976fa..c852ab6a1 100644
--- a/src/pages/Order/Card/OrderLines.vue
+++ b/src/pages/Order/Card/OrderLines.vue
@@ -111,6 +111,7 @@ const columns = computed(() => [
         component: 'select',
         attrs: {
             url: 'Items',
+            sortBy: 'name ASC ',
             fields: ['id', 'name', 'subName'],
         },
         columnField: {
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 0e464d533..1b9791529 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -106,6 +106,13 @@ const columns = computed(() => [
         format: (row) => row?.item?.name,
         columnClass: 'expand',
     },
+    {
+        align: 'left',
+        label: t('ticketSale.size'),
+        name: 'size',
+        format: (row) => row?.item?.size,
+        columnClass: 'expand',
+    },
     {
         align: 'left',
         label: t('ticketSale.price'),
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..b3ab0e69b 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -48,6 +48,7 @@ ticketSale:
     shipped: Shipped
     agency: Agency
     address: Address
+    size: Size
 advanceTickets:
     preparation: Preparation
     origin: Origin
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eab38a402..32ff3ba62 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -184,6 +184,7 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+    size: Medida
 ticketComponents:
     item: Artículo
     description: Descripción

From 00fdbfa2e4bd9823a1a6b7641e99317ca18b8885 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 13:41:54 +0100
Subject: [PATCH 87/89] fix(OrderCatalogFilter): hotFix use search-url="params"

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 6de43e86a..4c018bbb1 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -184,6 +184,7 @@ function addOrder(value, field, params) {
         :custom-tags="['tagGroups']"
         @remove="clearFilter"
         :redirect="false"
+        search-url="params"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'categoryFk'">

From 8d997b5a7a0f2030d2dc78c251e079861608cc72 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:48 +0100
Subject: [PATCH 88/89] build: refs #8144 change package version

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index e2e75f253..0ee43ce12 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.44.0",
+    "version": "24.48.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",
@@ -64,4 +64,4 @@
         "vite": "^5.1.4",
         "vitest": "^0.31.1"
     }
-}
+}
\ No newline at end of file

From a14cc29fc4a6cc0d3122134bc18644a39ac2b153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:12:43 +0100
Subject: [PATCH 89/89] build: change package version

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

diff --git a/package.json b/package.json
index 0ee43ce12..04b75a0b0 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.48.0",
+    "version": "24.50.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",