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 001/120] 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 002/120] 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 003/120] 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 004/120] 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 005/120] 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 fb7087d38a09d13eb2706fe39efc24e75501d075 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 15 Oct 2024 10:26:07 +0200
Subject: [PATCH 006/120] fix: refs #7229 download file

---
 src/composables/downloadFile.js | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 12639dcd6..f46697fb1 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -1,11 +1,28 @@
 import { useSession } from 'src/composables/useSession';
 import { getUrl } from './getUrl';
+import axios from 'axios';
+import { exportFile } from 'quasar';
 
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    let appUrl = await getUrl('', 'lilium');
-    appUrl = appUrl.replace('/#/', '');
-    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
+    try {
+        const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+        const response = await axios.get(
+            url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
+            { responseType: 'blob' }
+        );
+
+        const contentDisposition = response.headers['content-disposition'];
+        const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
+        const filename =
+            matches != null && matches[1]
+                ? matches[1].replace(/['"]/g, '')
+                : 'downloaded-file';
+
+        exportFile(filename, response.data);
+    } catch (error) {
+        console.error('Error downloading the file', error);
+    }
 }

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 007/120] 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 008/120] 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 2a94916bc2a4297c388c15473349bb8b62dc5da1 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 22 Oct 2024 15:04:23 +0200
Subject: [PATCH 009/120] 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 1e04ead78027fb3e5b7c6804d50021a62d32bf3b Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 24 Oct 2024 15:11:58 +0200
Subject: [PATCH 010/120] 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 e13090bb3bf4eca3aae47618d9bbc620407c69da Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 25 Oct 2024 07:01:58 +0200
Subject: [PATCH 011/120] feat: refs #8038 added new functionality in VnSelect
 and refactor styles

---
 src/components/VnTable/VnTable.vue |  2 +-
 src/components/common/VnSelect.vue | 23 +++++++++++++++++++++++
 src/css/app.scss                   |  2 +-
 3 files changed, 25 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index b9c6edf50..7a7c341a6 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -379,7 +379,7 @@ function handleScroll() {
                             :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
-                            :vertical="true"
+                            :vertical="false"
                         />
                     </div>
                     <slot
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index b0aa648c1..86ca38468 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -230,6 +230,28 @@ function nullishToTrue(value) {
 const getVal = (val) => ($props.useLike ? { like: `%${val}%` } : val);
 
 defineExpose({ opts: myOptions });
+
+function handleKeyDown(event) {
+    if (event.key === 'Tab') {
+        event.preventDefault();
+
+        const inputValue = vnSelectRef.value?.inputValue;
+
+        if (inputValue) {
+            const matchingOption = myOptions.value.find(
+                (option) =>
+                    option[optionLabel.value].toLowerCase() === inputValue.toLowerCase()
+            );
+
+            if (matchingOption) {
+                emit('update:modelValue', matchingOption[optionValue.value]);
+            } else {
+                emit('update:modelValue', inputValue);
+            }
+            vnSelectRef.value?.hidePopup();
+        }
+    }
+}
 </script>
 
 <template>
@@ -250,6 +272,7 @@ defineExpose({ opts: myOptions });
         :option-value="optionValue"
         v-bind="$attrs"
         @filter="filterHandler"
+        @keydown="handleKeyDown"
         :emit-value="nullishToTrue($attrs['emit-value'])"
         :map-options="nullishToTrue($attrs['map-options'])"
         :use-input="nullishToTrue($attrs['use-input'])"
diff --git a/src/css/app.scss b/src/css/app.scss
index d4c76ad6b..63a9f5c46 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -241,7 +241,7 @@ input::-webkit-inner-spin-button {
     th,
     td {
         padding: 1px 10px 1px 10px;
-        max-width: 100px;
+        max-width: 130px;
         div span {
             overflow: hidden;
             white-space: nowrap;

From 493e51833955b79906b46ca552c7074e0af419c6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 29 Oct 2024 12:15:40 +0100
Subject: [PATCH 012/120] feat: refs #6999 added search when user tabs on a
 filter with value

---
 src/pages/Entry/EntryLatestBuys.vue | 20 +++++++++++++++++++-
 1 file changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 119808176..50a4ccc7f 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -4,6 +4,7 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
 
+import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
@@ -12,6 +13,9 @@ import VnImg from 'src/components/ui/VnImg.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
+const tableRef = ref();
+const arrayData = useArrayData('LatestBuys', { searchUrl: 'Buys/latestBuysFilter' });
+const lastParams = {};
 const columns = [
     {
         align: 'center',
@@ -234,13 +238,26 @@ const columns = [
         format: (row, dashIfEmpty) => dashIfEmpty(toDate(row.landing)),
     },
 ];
-const tableRef = ref();
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
+
+const onTabPressed = async () => {
+    let params = tableRef.value.params;
+
+    if (
+        Object.keys(params).length > 0 &&
+        JSON.stringify(params) !== JSON.stringify(lastParams)
+    ) {
+        Object.assign(lastParams, params);
+
+        await arrayData.addFilter({ filter: { where: params } });
+    }
+    params = {};
+};
 </script>
 
 <template>
@@ -260,6 +277,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
         auto-load
         :right-search="false"
+        @keydown.tab="onTabPressed"
     />
 </template>
 

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 013/120] 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 fc73149dcfe1b2f83d06d3dd5cbaa6c6dc14008e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 11 Nov 2024 14:20:39 +0100
Subject: [PATCH 014/120] feat: refs #8087 refs#8087 Redadas en travel

---
 src/i18n/locale/en.yml                        |  1 +
 src/i18n/locale/es.yml                        |  1 +
 .../Card/BasicData/TicketBasicDataForm.vue    | 45 ++++++++++++++-----
 src/pages/Ticket/locale/en.yml                |  1 +
 src/pages/Ticket/locale/es.yml                |  1 +
 src/pages/Travel/Card/TravelBasicData.vue     |  5 ++-
 src/pages/Travel/Card/TravelDescriptor.vue    |  8 +---
 src/pages/Travel/Card/TravelSummary.vue       | 13 ++++--
 src/pages/Travel/TravelList.vue               |  8 ++--
 9 files changed, 57 insertions(+), 26 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index a6065e451..53d6e2e9e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -1041,6 +1041,7 @@ travel:
         delivered: Delivered
         received: Received
         daysInForward: Days in forward
+        isRaid: Raid
     thermographs:
         code: Code
         temperature: Temperature
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 6f01f7dd1..0e6ee61c8 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -1039,6 +1039,7 @@ travel:
         delivered: Enviada
         received: Recibida
         daysInForward: Días redada
+        isRaid: Redada
     thermographs:
         code: Código
         temperature: Temperatura
diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index f6c20c514..3ac385fbd 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -36,6 +36,7 @@ const canEditZone = useAcl().hasAny([
 const agencyFetchRef = ref();
 const warehousesOptions = ref([]);
 const companiesOptions = ref([]);
+const currenciesOptions = ref([]);
 const agenciesOptions = ref([]);
 const zonesOptions = ref([]);
 const addresses = ref([]);
@@ -289,6 +290,15 @@ async function getZone(options) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
+    <FetchData
+        url="Currencies"
+        :filter="{
+            fields: ['id', 'code'],
+            order: 'code ASC',
+        }"
+        @on-fetch="(data) => (currenciesOptions = data)"
+        auto-load
+    />
     <FetchData
         ref="agencyFetchRef"
         url="AgencyModes/byWarehouse"
@@ -395,17 +405,6 @@ async function getZone(options) {
             />
         </VnRow>
         <VnRow class="row q-gutter-md q-mb-md no-wrap">
-            <VnSelect
-                :label="t('basicData.company')"
-                v-model="formData.companyFk"
-                option-value="id"
-                option-label="code"
-                :options="companiesOptions"
-                hide-selected
-                map-options
-                :required="true"
-                :rules="validate('basicData.company')"
-            />
             <VnSelect
                 :label="t('basicData.agency')"
                 v-model="agencyModeId"
@@ -444,6 +443,30 @@ async function getZone(options) {
                     </QItem>
                 </template>
             </VnSelect>
+            <VnSelect
+                :label="t('basicData.company')"
+                v-model="formData.companyFk"
+                option-value="id"
+                option-label="code"
+                :options="companiesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.company')"
+            />
+        </VnRow>
+        <VnRow class="row q-gutter-md q-mb-md no-wrap">
+            <VnSelect
+                :label="t('basicData.currencyFk')"
+                v-model="formData.currencyFk"
+                option-value="id"
+                option-label="code"
+                :options="currenciesOptions"
+                hide-selected
+                map-options
+                :required="true"
+                :rules="validate('basicData.currencyFk')"
+            />
         </VnRow>
         <VnRow>
             <VnInputDate
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 829ea7a91..a1f426c3c 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -170,6 +170,7 @@ basicData:
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
+    currencyFk: Currency
 purchaseRequest:
     id: Id
     description: Description
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index eab38a402..a13d07566 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -88,6 +88,7 @@ basicData:
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
     chooseAnOption: Elige una opción
     unroutedTicket: El ticket ha sido desenrutado
+    currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
     client: Cliente
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index d6245e655..37af383e2 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -84,6 +84,7 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
+                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.basicData.delivered')"
                     v-model="data.isDelivered"
@@ -99,7 +100,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
 en:
-    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If no days are specified, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 6025ad045..a77d7460e 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -32,6 +32,7 @@ const filter = {
         'warehouseOutFk',
         'cargoSupplierFk',
         'agencyModeFk',
+        'isRaid',
         'daysInForward',
     ],
     include: [
@@ -80,12 +81,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.daysInForward"
-                    name="vn:net"
-                    color="primary"
-                    size="xs"
-                >
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 7dc267671..6c98d18b8 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -268,6 +268,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <QCheckbox
+                    :label="t('travel.basicData.isRaid')"
+                    v-model="travel.isRaid"
+                    :disable="true"
+                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -286,6 +291,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.wareHouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
@@ -303,10 +312,6 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                 <VnLv :label="t('globals.reference')" :value="travel.ref" />
                 <VnLv label="m³" :value="travel.m3" />
                 <VnLv :label="t('globals.totalEntries')" :value="travel.totalEntries" />
-                <VnLv
-                    :label="t('travel.basicData.daysInForward')"
-                    :value="travel?.daysInForward"
-                />
             </QCard>
             <QCard class="full-width">
                 <VnTitle :text="t('travel.summary.entries')" />
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 334640bff..89c7548cd 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -227,12 +227,14 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                            t('globals.raid', {
+                                daysInForward: row.daysInForward,
+                            })
                         }}</QTooltip
-                    >
+                    >{{ console.log(row.daysInForward) }}
                 </QIcon>
             </div>
         </template>

From e9fad1a44e16324768c42c487e094857e467fe11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Mon, 11 Nov 2024 15:00:07 +0100
Subject: [PATCH 015/120] feat: refs #8087 refs#8087 Redadas en travel

---
 src/pages/Travel/Card/TravelBasicData.vue | 4 ++--
 src/pages/Travel/TravelList.vue           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index 37af383e2..f71bcf72c 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -100,7 +100,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si no se especifican días, la fecha no cambiará
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
 en:
-    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If no days are specified, the date will stay the same.
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 89c7548cd..d6dfd0368 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -234,7 +234,7 @@ const columns = computed(() => [
                                 daysInForward: row.daysInForward,
                             })
                         }}</QTooltip
-                    >{{ console.log(row.daysInForward) }}
+                    >
                 </QIcon>
             </div>
         </template>

From 4bfbd1925e01d8945e8a29cbcfa37308da9dd3c8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 11 Nov 2024 15:18:29 -0300
Subject: [PATCH 016/120] test: refs #8162 ticket list e2e tests

---
 src/components/VnTable/VnTable.vue            |  1 +
 src/components/ui/VnSearchbar.vue             |  1 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  2 +-
 src/pages/Ticket/Card/TicketSummary.vue       |  1 +
 src/pages/Ticket/TicketList.vue               |  2 +
 .../integration/ticket/ticketList.spec.js     | 54 +++++++++++++++++++
 test/cypress/support/commands.js              |  4 ++
 7 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/ticket/ticketList.spec.js

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index fd7b0c51a..99a9a6801 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -737,6 +737,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
+            data-testid="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index dc6d4751c..7a72a09ea 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -130,6 +130,7 @@ async function search() {
                 dense
                 standout
                 autofocus
+                data-testid="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 70fd9ab1e..e1f852af0 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -174,7 +174,7 @@ function ticketFilter(ticket) {
                     <QTooltip>{{ t('Client Frozen') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="entity.problem.includes('hasRisk')"
+                    v-if="entity?.problem?.includes('hasRisk')"
                     name="vn:risk"
                     size="xs"
                     color="primary"
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 61751357c..375044ed1 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -99,6 +99,7 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
+        data-testid="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 4317efb83..f5227b43b 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -457,6 +457,7 @@ function setReference(data) {
         data-key="Ticket"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
+        data-testid="ticketListSearchBar"
     />
     <RightMenu>
         <template #right-panel>
@@ -484,6 +485,7 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
+        data-testid="ticketListTable"
     >
         <template #column-statusIcons="{ row }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
new file mode 100644
index 000000000..4bb882356
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -0,0 +1,54 @@
+/// <reference types="cypress" />
+describe('Ticket descriptor', () => {
+    const firstRow = 'tbody > :nth-child(1)';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/list');
+    });
+
+    const searchResults = (search) => {
+        cy.dataCy('vnSearchBar').find('input').focus();
+        if (search) cy.dataCy('vnSearchBar').find('input').type(search);
+        cy.dataCy('vnSearchBar').find('input').type('{enter}');
+        cy.dataCy('ticketListTable').should('exist');
+        cy.get(firstRow).should('exist');
+    };
+
+    it('should search results', () => {
+        cy.dataCy('ticketListTable').should('not.exist');
+        cy.get('.q-field__control').should('exist');
+        searchResults();
+    });
+
+    it('should open ticket sales', () => {
+        searchResults();
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.get(firstRow).find('.q-btn:first').click();
+        cy.get('@windowOpen').should('be.calledWithMatch', /\/ticket\/\d+\/sale/);
+    });
+
+    it('should open ticket summary', () => {
+        searchResults();
+        cy.get(firstRow).find('.q-btn:last').click();
+        cy.dataCy('ticketSummary').should('exist');
+    });
+
+    it('Client list create new client', () => {
+        cy.dataCy('vnTableCreateBtn').should('exist');
+        cy.dataCy('vnTableCreateBtn').click();
+        const data = {
+            Customer: { val: 1, type: 'select' },
+            Warehouse: { val: 'Warehouse One', type: 'select' },
+            Address: { val: 'employee: employeeLane, CENTRAL CITY', type: 'select' },
+            Landed: { val: '01-01-2024', type: 'date' },
+        };
+        cy.fillInForm(data);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.checkNotification('Data created');
+        cy.url().should('match', /\/ticket\/\d+\/summary/);
+    });
+});
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 34aadad1d..91c0b3f05 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -311,3 +311,7 @@ Cypress.Commands.add('checkValueSelectForm', (id, search) => {
 Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
+
+Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-testid') => {
+    return cy.get(`[${attr}="${dataTestId}"]`);
+});

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 017/120] 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 018/120] 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 18593cc3f9d780b005a0e6ac59e01b9b8a4b985e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 12 Nov 2024 16:27:40 +0100
Subject: [PATCH 019/120] feat: refs #8087 refs#8087 Redadas en travel

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

diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index e9179c239..a9c25af43 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })

From 4572817699a53b23bbba17b001a4f492af877534 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 12 Nov 2024 16:37:59 +0100
Subject: [PATCH 020/120] feat: refs #8087 reactive data

---
 src/pages/Travel/Card/TravelBasicData.vue  |  7 +---
 src/pages/Travel/Card/TravelCard.vue       | 29 +----------------
 src/pages/Travel/Card/TravelDescriptor.vue | 38 +++-------------------
 src/pages/Travel/Card/TravelFilter.js      | 29 +++++++++++++++++
 4 files changed, 35 insertions(+), 68 deletions(-)
 create mode 100644 src/pages/Travel/Card/TravelFilter.js

diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index f71bcf72c..8d6b54cc8 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -21,12 +21,7 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FormModel
-        :url="`Travels/${route.params.id}`"
-        :url-update="`Travels/${route.params.id}`"
-        model="Travel"
-        auto-load
-    >
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('travel.basicData.reference')" />
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 44bd9d430..50cecef34 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,34 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index a77d7460e..1f68cb21a 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -7,7 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
-
+import filter from './TravelFilter.js';
 import { toDate } from 'src/filters';
 
 const $props = defineProps({
@@ -21,36 +21,6 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'isRaid',
-        'daysInForward',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -66,15 +36,15 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :title="data.title"
         :subtitle="data.subtitle"
         :filter="filter"
-        data-key="travelData"
+        data-key="Travel"
         @on-fetch="setData"
     >
         <template #menu="{ 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/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
new file mode 100644
index 000000000..f5f4520fd
--- /dev/null
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -0,0 +1,29 @@
+export default {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'isRaid',
+        'daysInForward',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};

From 7f4a73fd56451c83fad6a932270eb968345c2917 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 14 Nov 2024 08:30:55 +0100
Subject: [PATCH 021/120] feat: refs #6999 added tab to search in VnTable
 filter

---
 src/components/VnTable/VnFilter.vue |  5 +++++
 src/pages/Entry/EntryLatestBuys.vue | 18 ------------------
 2 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index 9da0b26a4..c9c81f5a7 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -143,6 +143,10 @@ function alignRow() {
 const showFilter = computed(
     () => $props.column?.columnFilter !== false && $props.column.name != 'tableActions'
 );
+
+const onTabPressed = async () => {
+    if (model.value) enterEvent['keyup.enter']();
+};
 </script>
 <template>
     <div
@@ -157,6 +161,7 @@ const showFilter = computed(
             v-model="model"
             :components="components"
             component-prop="columnFilter"
+            @keydown.tab="onTabPressed"
         />
     </div>
 </template>
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 50a4ccc7f..bc10ac1ca 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters';
 
-import { useArrayData } from 'composables/useArrayData';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import EntryLatestBuysFilter from './EntryLatestBuysFilter.vue';
@@ -14,8 +13,6 @@ import VnImg from 'src/components/ui/VnImg.vue';
 const stateStore = useStateStore();
 const { t } = useI18n();
 const tableRef = ref();
-const arrayData = useArrayData('LatestBuys', { searchUrl: 'Buys/latestBuysFilter' });
-const lastParams = {};
 const columns = [
     {
         align: 'center',
@@ -244,20 +241,6 @@ onMounted(async () => {
 });
 
 onUnmounted(() => (stateStore.rightDrawer = false));
-
-const onTabPressed = async () => {
-    let params = tableRef.value.params;
-
-    if (
-        Object.keys(params).length > 0 &&
-        JSON.stringify(params) !== JSON.stringify(lastParams)
-    ) {
-        Object.assign(lastParams, params);
-
-        await arrayData.addFilter({ filter: { where: params } });
-    }
-    params = {};
-};
 </script>
 
 <template>
@@ -277,7 +260,6 @@ const onTabPressed = async () => {
         :row-click="({ entryFk }) => tableRef.redirect(entryFk)"
         auto-load
         :right-search="false"
-        @keydown.tab="onTabPressed"
     />
 </template>
 

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 022/120] 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 023/120] 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 024/120] 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 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 025/120] 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 026/120] 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 55b4c07e80aa32d636d172a8e268109c00d42a2c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 12:33:44 +0100
Subject: [PATCH 027/120] 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 218d041000ac794fb6c3deccb22fabe9aa0019cd Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 12:58:41 +0100
Subject: [PATCH 028/120] 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 029/120] 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 030/120] 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 031/120] 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 032/120] 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 045a828bf93f0c322c560902ad8e52bb137aa8f3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 13:59:04 +0100
Subject: [PATCH 033/120] 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 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 034/120] 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 035/120] 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 036/120] 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 037/120] 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 038/120] 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 039/120] 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 040/120] 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 041/120] 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 042/120] 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 043/120] 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 044/120] 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 045/120] 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 046/120] 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 047/120] 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 048/120] 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 049/120] 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 d8c1bd5b16ebcd024d299af557347710ec10f0b9 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 17 Nov 2024 15:24:46 -0300
Subject: [PATCH 050/120] test: refs #8162 more tests

---
 src/components/CrudModel.vue                  |  1 +
 src/components/common/VnSmsDialog.vue         |  3 +-
 src/components/ui/VnConfirm.vue               |  1 +
 src/pages/Ticket/Card/TicketDescriptor.vue    |  1 +
 src/pages/Ticket/Card/TicketEditMana.vue      |  1 +
 src/pages/Ticket/Card/TicketNotes.vue         |  4 ++
 src/pages/Ticket/Card/TicketSale.vue          | 16 ++++-
 .../Ticket/Card/TicketSaleMoreActions.vue     | 12 +++-
 .../integration/ticket/ticketList.spec.js     |  2 +-
 .../integration/ticket/ticketNotes.spec.js    | 25 ++++++++
 .../integration/ticket/ticketRequest.spec.js  | 22 +++++++
 .../integration/ticket/ticketSale.spec.js     | 61 +++++++++++++++++++
 12 files changed, 143 insertions(+), 6 deletions(-)
 create mode 100644 test/cypress/integration/ticket/ticketNotes.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketRequest.spec.js
 create mode 100644 test/cypress/integration/ticket/ticketSale.spec.js

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a4cb55a2c..ce20c4f41 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -394,6 +394,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
+                data-testid="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index 064394445..dbe16f57b 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef">
+    <QDialog ref="dialogRef" data-testid="vnSmsDialog">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,6 +161,7 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
+                    data-testid="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 0b1913383..767e2ca5a 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -104,6 +104,7 @@ function cancel() {
                     unelevated
                     autofocus
                     data-cy="VnConfirm_confirm"
+                    data-testid="vnConfirmConfirmBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index e1f852af0..2584d1a55 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -130,6 +130,7 @@ function ticketFilter(ticket) {
                     <QBadge
                         text-color="black"
                         :color="entity.ticketState.state.classColor"
+                        data-testid="ticketDescriptorStateBadge"
                     >
                         {{ entity.ticketState.state.name }}
                     </QBadge>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index 3d5b04a41..fd385087b 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -75,6 +75,7 @@ const cancel = () => {
                     dense
                     style="width: 50%"
                     @click="save()"
+                    data-testid="saveManaBtn"
                 >
                     {{ t('globals.save') }}
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index b5302d15f..edbaa2d2c 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -86,12 +86,14 @@ async function handleSave() {
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
+                            data-testid="ticketNotesObservationType"
                         />
                         <VnInput
                             :label="t('ticketNotes.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
+                            data-testid="ticketNotesDescription"
                         />
                         <QIcon
                             name="delete"
@@ -99,6 +101,7 @@ async function handleSave() {
                             class="cursor-pointer"
                             color="primary"
                             @click="handleDelete(row)"
+                            data-testid="ticketNotesRemoveNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
@@ -113,6 +116,7 @@ async function handleSave() {
                             class="fill-icon-on-hover q-ml-md"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
+                            data-testid="ticketNotesAddNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7529d4908..92227d90f 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -577,6 +577,7 @@ watch(
                     color="primary"
                     :disable="!isTicketEditable || ticketState === 'OK'"
                     @click="changeTicketState('OK')"
+                    data-testid="ticketSaleOkStateBtn"
                 >
                     <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
                 </QBtn>
@@ -585,6 +586,7 @@ watch(
                     color="primary"
                     :label="t('ticketSale.state')"
                     :disable="!isTicketEditable"
+                    data-testid="ticketSaleStateDropdown"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -594,6 +596,7 @@ watch(
                         hide-dropdown-icon
                         focus-on-mount
                         @update:model-value="changeTicketState"
+                        data-testid="ticketSaleStateSelect"
                     />
                 </QBtnDropdown>
                 <TicketSaleMoreActions
@@ -833,7 +836,7 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
-                <TicketEditManaProxy
+                <!-- <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
@@ -848,7 +851,7 @@ watch(
                     <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
                         <VnUsesMana :mana-code="manaCode" />
                     </div>
-                </TicketEditManaProxy>
+                </TicketEditManaProxy> -->
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>
@@ -858,7 +861,14 @@ watch(
     </VnTable>
 
     <QPageSticky :offset="[20, 20]" style="z-index: 2">
-        <QBtn @click="newOrderFromTicket()" color="primary" fab icon="add" shortcut="+" />
+        <QBtn
+            @click="newOrderFromTicket()"
+            color="primary"
+            fab
+            icon="add"
+            shortcut="+"
+            data-testid="ticketSaleAddToBasketBtn"
+        />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
         </QTooltip>
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 16b84ab5e..7da28deb8 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -179,6 +179,7 @@ const createRefund = async (withWarehouse) => {
         color="primary"
         :label="t('ticketSale.more')"
         :disable="disable"
+        data-testid="ticketSaleMoreActionsDropdown"
     >
         <template #label>
             <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -190,6 +191,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="showSmsDialog('productNotAvailable')"
+                data-testid="sendShortageSMSItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@@ -201,12 +203,18 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="calculateSalePrice()"
+                data-testid="recalculatePriceItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem clickable v-ripple @click="emit('getMana')">
+            <QItem
+                clickable
+                v-ripple
+                @click="emit('getMana')"
+                data-testid="updateDiscountItem"
+            >
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
                 </QItemSection>
@@ -215,6 +223,7 @@ const createRefund = async (withWarehouse) => {
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
+                        data-testid="ticketSaleDiscountInput"
                     />
                 </TicketEditManaProxy>
             </QItem>
@@ -224,6 +233,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="createClaim()"
+                data-testid="createClaimItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 4bb882356..0713eb43e 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -1,5 +1,5 @@
 /// <reference types="cypress" />
-describe('Ticket descriptor', () => {
+describe('TicketList', () => {
     const firstRow = 'tbody > :nth-child(1)';
 
     beforeEach(() => {
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
new file mode 100644
index 000000000..f8fb530ef
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -0,0 +1,25 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/observation');
+    });
+
+    it('Creates and deletes a note', () => {
+        cy.dataCy('ticketNotesAddNoteBtn').should('exist');
+        cy.dataCy('ticketNotesAddNoteBtn').click();
+        cy.dataCy('ticketNotesObservationType').should('exist');
+        cy.selectOption('[data-testid="ticketNotesObservationType"]:last', 'Weight');
+        cy.dataCy('ticketNotesDescription').should('exist');
+        cy.get('[data-testid="ticketNotesDescription"]:last').type(
+            'This is a note description'
+        );
+        cy.dataCy('crudModelDefaultSaveBtn').click();
+        cy.checkNotification('Data saved');
+        cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
+        cy.dataCy('ticketNotesRemoveNoteBtn').click();
+        cy.dataCy('vnConfirmConfirmBtn').click();
+        cy.checkNotification('Data saved');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketRequest.spec.js b/test/cypress/integration/ticket/ticketRequest.spec.js
new file mode 100644
index 000000000..b9dc509ef
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketRequest.spec.js
@@ -0,0 +1,22 @@
+/// <reference types="cypress" />
+describe('TicketRequest', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/request');
+    });
+
+    it('Creates a new request', () => {
+        cy.dataCy('vnTableCreateBtn').should('exist');
+        cy.dataCy('vnTableCreateBtn').click();
+        const data = {
+            Description: { val: 'Purchase description' },
+            Atender: { val: 'buyerNick', type: 'select' },
+            Quantity: { val: 2 },
+            Price: { val: 123 },
+        };
+        cy.fillInForm(data);
+        cy.get('.q-mt-lg > .q-btn--standard').click();
+        cy.checkNotification('Data created');
+    });
+});
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
new file mode 100644
index 000000000..b3c3edd8b
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -0,0 +1,61 @@
+/// <reference types="cypress" />
+
+describe('TicketSale', () => {
+    beforeEach(() => {
+        cy.login('developer');
+        cy.viewport(1920, 1080);
+        cy.visit('/#/ticket/31/sale');
+    });
+
+    const firstRow = 'tbody > :nth-child(1)';
+
+    const selectFirstRow = () => {
+        cy.waitForElement(firstRow);
+        cy.get(firstRow).find('.q-checkbox__inner').click();
+    };
+
+    it('it should add item to basket', () => {
+        cy.window().then((win) => {
+            cy.stub(win, 'open').as('windowOpen');
+        });
+        cy.dataCy('ticketSaleAddToBasketBtn').should('exist');
+        cy.dataCy('ticketSaleAddToBasketBtn').click();
+        cy.get('@windowOpen').should('be.calledWithMatch', /\/order\/\d+\/catalog/);
+    });
+
+    it('should send SMS', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="sendShortageSMSItem"]');
+        cy.dataCy('sendShortageSMSItem').should('exist');
+        cy.dataCy('sendShortageSMSItem').click();
+        cy.dataCy('vnSmsDialog').should('exist');
+        cy.dataCy('sendSmsBtn').click();
+        cy.checkNotification('SMS sent');
+    });
+
+    it('should recalculate price when "Recalculate price" is clicked', () => {
+        cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="recalculatePriceItem"]');
+        cy.dataCy('recalculatePriceItem').should('exist');
+        cy.dataCy('recalculatePriceItem').click();
+        cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
+        cy.checkNotification('Data saved');
+    });
+
+    it('should update discount when "Update discount" is clicked', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-testid="updateDiscountItem"]');
+        cy.dataCy('updateDiscountItem').should('exist');
+        cy.dataCy('updateDiscountItem').click();
+        cy.waitForElement('[data-testid="ticketSaleDiscountInput"]');
+        cy.dataCy('ticketSaleDiscountInput').find('input').focus();
+        cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
+        cy.dataCy('saveManaBtn').click();
+        cy.waitForElement('.q-notification__message');
+        cy.checkNotification('Data saved');
+    });
+});

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 051/120] 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 052/120] 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 452ba788c983fcb2e1c34046ce590c9ef85abdfb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Nov 2024 09:46:34 +0100
Subject: [PATCH 053/120] fix: how only the correct path of the search

---
 src/pages/Zone/Card/ZoneLocationsTree.vue | 66 +++++++++++++++++------
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index 6b3934df7..afe3006ea 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -126,33 +126,69 @@ function getNodeIds(node) {
     return ids;
 }
 
+const findNodePath = (node, searchTerm, path = []) => {
+    if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
+        path.push(node.id);
+        return path;
+    }
+    if (node.childs) {
+        for (let child of node.childs) {
+            const resultPath = findNodePath(child, searchTerm, [...path, node.id]);
+            if (resultPath.length > 0) {
+                return resultPath;
+            }
+        }
+    }
+    return [];
+};
+
+const filterNodes = (nodes, searchTerm) => {
+    return nodes
+        .map((node) => {
+            if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
+                if (node.childs) {
+                    node.childs = filterNodes(node.childs, searchTerm);
+                }
+                return node;
+            }
+            if (node.childs) {
+                node.childs = filterNodes(node.childs, searchTerm);
+                if (node.childs.length > 0) {
+                    return node;
+                }
+            }
+            return null;
+        })
+        .filter((node) => node !== null);
+};
+
 watch(storeData, async (val) => {
     // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-    nodes.value[0].childs = [...val];
-    const fetchedNodeKeys = val.flatMap(getNodeIds);
-    state.set('Tree', [...fetchedNodeKeys]);
+    const searchTerm = store.userParams?.search || '';
 
-    if (store.userParams?.search === '') {
-        val.forEach((n) => {
-            formatNodeSelected(n);
-        });
-    } else {
-        for (let n of state.get('Tree')) await fetchNodeLeaves(n);
-        expanded.value = [null, ...fetchedNodeKeys];
-    }
+    const filteredNodes = filterNodes(val, searchTerm);
+    let nodePath = [];
+    filteredNodes.forEach((node) => {
+        nodePath = findNodePath(node, searchTerm);
+    });
+
+    const finalFilteredNodes = filteredNodes.filter((node) => nodePath.includes(node.id));
+    nodes.value[0].childs = [...finalFilteredNodes];
+    const fetchedNodeKeys = finalFilteredNodes.flatMap(getNodeIds);
+    state.set('Tree', [...fetchedNodeKeys]);
+    expanded.value = [null, ...fetchedNodeKeys];
     previousExpandedNodes.value = new Set(expanded.value);
 });
 
 const reFetch = async () => {
     const { data } = await arrayData.fetch({ append: false });
     nodes.value = data;
+    expanded.value = [null];
 };
 
 onMounted(async () => {
-    if (store.userParams?.search && !props.showSearchBar) {
-        await reFetch();
-        return;
-    }
+    store.userParams.search = '';
+
     const stateTree = state.get('Tree');
     const tree = stateTree ? [...state.get('Tree')] : [null];
     const lastStateTree = state.get('TreeState');

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 054/120] 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 055/120] 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 056/120] 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 057/120] 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 058/120] 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 059/120] 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 060/120] 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 73072794eecf0c69d818b122d94b4ed21d83a3db Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 14:41:27 +0100
Subject: [PATCH 061/120] test: refs #8162 #8162 fix TicketList spec

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

diff --git a/test/cypress/integration/ticket/ticketList.spec.js b/test/cypress/integration/ticket/ticketList.spec.js
index 0713eb43e..bbdbcea92 100644
--- a/test/cypress/integration/ticket/ticketList.spec.js
+++ b/test/cypress/integration/ticket/ticketList.spec.js
@@ -43,7 +43,7 @@ describe('TicketList', () => {
         const data = {
             Customer: { val: 1, type: 'select' },
             Warehouse: { val: 'Warehouse One', type: 'select' },
-            Address: { val: 'employee: employeeLane, CENTRAL CITY', type: 'select' },
+            Address: { val: 'employee', type: 'select' },
             Landed: { val: '01-01-2024', type: 'date' },
         };
         cy.fillInForm(data);

From 28bfda869a23f315c9a7d0c52ba717fe3397b781 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 18 Nov 2024 10:47:57 -0300
Subject: [PATCH 062/120] refactor: refs #8162 remove comment

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

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 6ed7f8cbd..93278eb3d 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -836,7 +836,7 @@ watch(
                 <QBtn flat class="link" dense @click="onOpenEditDiscountPopover(row)">
                     {{ toPercentage(row.discount / 100) }}
                 </QBtn>
-                <!-- <TicketEditManaProxy
+                <TicketEditManaProxy
                     :mana="mana"
                     :new-price="getNewPrice"
                     :uses-mana="usesMana"
@@ -851,7 +851,7 @@ watch(
                     <div v-if="usesMana" class="column q-gutter-y-sm q-mt-sm">
                         <VnUsesMana :mana-code="manaCode" />
                     </div>
-                </TicketEditManaProxy> -->
+                </TicketEditManaProxy>
             </template>
             <span v-else>{{ toPercentage(row.discount / 100) }}</span>
         </template>

From c2db7be8cd20311d2ae467dd44127c1676fa9a36 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 15:06:09 +0100
Subject: [PATCH 063/120] fix(orderCatalogFilter): fix searchByTag

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 297 ++++++++------------
 1 file changed, 116 insertions(+), 181 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 4c018bbb1..68764c1a5 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref } from 'vue';
+import { computed, ref, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -9,10 +9,9 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
+// import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
+import { useArrayData } from 'composables/useArrayData';
 
-const { t } = useI18n();
-
-const route = useRoute();
 const props = defineProps({
     dataKey: {
         type: String,
@@ -27,13 +26,19 @@ const props = defineProps({
         required: true,
     },
 });
+
+const { t } = useI18n();
+const route = useRoute();
+
+const arrayData = useArrayData(props.dataKey);
+
+const currentParams = ref({});
 const categoryList = ref(null);
-const selectedCategoryFk = ref(getParamWhere(route, 'categoryFk'));
+const selectedCategoryFk = ref(null);
 const typeList = ref([]);
 const selectedTypeFk = ref(null);
-const selectedTag = ref(null);
-const tagValues = ref([{}]);
-const tagOptions = ref([]);
+const searchByTag = ref(null);
+
 const vnFilterPanelRef = ref();
 const orderByList = ref([
     { id: 'relevancy DESC, name', name: t('params.relevancy'), priority: 999 },
@@ -48,32 +53,24 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-const createValue = (val, done) => {
-    if (val.length > 2) {
-        if (!tagOptions.value.includes(val)) {
-            done(tagOptions.value, 'add-unique');
-        }
-        tagValues.value.push({ value: val });
-    }
-};
-const resetCategory = () => {
+const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
-};
-
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
+    params.categoryFk = null;
+    params.typeFk = null;
+    arrayData.store.userFilter = null;
+    removeTagGroupParam(params, search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
-        resetCategory();
+        resetCategory(params, search);
         params.categoryFk = null;
     } else {
         selectedCategoryFk.value = category?.id;
         params.categoryFk = category?.id;
+        params.typeFk = null;
+        selectedTypeFk.value = null;
         loadTypes(category?.id);
     }
     search();
@@ -86,19 +83,12 @@ const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
     typeList.value = data;
 };
 
-const selectedCategory = computed(() =>
-    (categoryList.value || []).find(
+const selectedCategory = computed(() => {
+    return (categoryList.value || []).find(
         (category) => category?.id === selectedCategoryFk.value
-    )
-);
-function filterFn(val, update) {
-    update(() => {
-        const needle = val.toLowerCase();
-        tagOptions.value = props.tagValue.filter(
-            (v) => v.toLowerCase().indexOf(needle) > -1
-        );
-    });
-}
+    );
+});
+
 const selectedType = computed(() => {
     return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
 });
@@ -114,37 +104,38 @@ function exprBuilder(param, value) {
     }
 }
 
-const applyTagFilter = (params, search) => {
-    if (!tagValues.value?.length) {
+const applyTags = (tagInfo, params, search) => {
+    if (!tagInfo || !tagInfo.values.length) {
         params.tagGroups = null;
         search();
         return;
     }
-    if (!params.tagGroups) {
-        params.tagGroups = [];
-    }
-    params.tagGroups.push(
-        JSON.stringify({
-            values: tagValues.value.filter((obj) => Object.keys(obj).length > 0),
-            tagSelection: {
-                ...selectedTag.value,
-                orgShowField: selectedTag?.value?.name,
-            },
-            tagFk: selectedTag?.value?.tagFk,
-        })
-    );
+
+    if (!params.tagGroups) params.tagGroups = [];
+    params.tagGroups.push(tagInfo);
     search();
-    selectedTag.value = null;
-    tagValues.value = [{}];
 };
 
-const removeTagChip = (selection, params, search) => {
-    if (params.tagGroups) {
-        params.tagGroups = (params.tagGroups || []).filter(
-            (value) => value !== selection
-        );
+async function onSearchByTag(value) {
+    if (!value.target.value) return;
+    if (!currentParams.value?.tagGroups) {
+        currentParams.value.tagGroups = [];
+    }
+
+    currentParams.value.tagGroups.push({
+        values: [{ value: value.target.value }],
+    });
+    searchByTag.value = null;
+}
+
+const removeTagGroupParam = (params, search, valIndex = null) => {
+    if (!valIndex) {
+        params.tagGroups = null;
+        search();
+    } else {
+        params.tagGroups.splice(valIndex, 1);
+        search();
     }
-    search();
 };
 
 const setCategoryList = (data) => {
@@ -171,26 +162,27 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
+
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
 </script>
 
 <template>
-    <FetchData url="ItemCategories" limit="30" auto-load @on-fetch="setCategoryList" />
+    <FetchData url="ItemCategories" auto-load @on-fetch="setCategoryList" />
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
         :hidden-tags="['orderFk', 'orderBy']"
         :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
-        :custom-tags="['tagGroups']"
-        @remove="clearFilter"
+        :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
-        search-url="params"
+        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'categoryFk'">
-                {{ t(selectedCategory?.name || '') }}
-            </strong>
-            <strong v-else-if="tag.label === 'typeFk'">
+            <strong v-if="tag.label === 'typeFk'">
                 {{ t(selectedType?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
@@ -199,25 +191,37 @@ function addOrder(value, field, params) {
             </div>
         </template>
         <template #customTags="{ tags: customTags, params, searchFn }">
-            <template v-for="tag in customTags" :key="tag.label">
-                <template v-if="tag.label === 'tagGroups'">
-                    <VnFilterPanelChip
-                        v-for="chip in tag.value"
-                        :key="chip"
-                        removable
-                        @remove="removeTagChip(chip, params, searchFn)"
-                    >
-                        <strong> {{ JSON.parse(chip).tagSelection?.name }}: </strong>
-                        <span>{{
-                            (JSON.parse(chip).values || [])
-                                .map((item) => item.value)
-                                .join(' | ')
-                        }}</span>
-                    </VnFilterPanelChip>
-                </template>
+            <template v-for="customTag in customTags" :key="customTag.label">
+                <VnFilterPanelChip
+                    v-for="(tag, valIndex) in Array.isArray(customTag.value)
+                        ? customTag.value
+                        : 1"
+                    :key="valIndex"
+                    removable
+                    @remove="
+                        customTag.label === 'categoryFk'
+                            ? resetCategory(params, searchFn)
+                            : removeTagGroupParam(params, searchFn, valIndex)
+                    "
+                >
+                    <strong v-if="customTag.label === 'categoryFk'">
+                        {{ t(selectedCategory?.name || '') }}
+                    </strong>
+                    <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
+                        {{ tag.tagSelection.name }}:
+                    </strong>
+                    <span>
+                        {{
+                            (tag?.values || [])
+                                .map((item) => `"${item.value}"`)
+                                .join(', ')
+                        }}
+                    </span>
+                </VnFilterPanelChip>
             </template>
         </template>
         <template #body="{ params, searchFn }">
+            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -298,91 +302,39 @@ function addOrder(value, field, params) {
                 </QItemSection>
             </QItem>
             <QSeparator />
-            <QItem class="q-mt-md">
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.tag')"
-                        v-model="selectedTag"
-                        :options="props.tags || []"
-                        option-value="id"
-                        option-label="name"
-                        dense
-                        outlined
-                        rounded
-                        :emit-value="false"
-                        use-input
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem
-                v-for="(value, index) in tagValues"
-                :key="value"
-                class="q-mt-md filter-value"
-            >
-                <FetchData
-                    v-if="selectedTag"
-                    :url="`Tags/${selectedTag}/filterValue`"
-                    limit="30"
-                    auto-load
-                    @on-fetch="(data) => (tagOptions = data)"
-                />
-                <VnSelect
-                    v-if="!selectedTag"
-                    :label="t('params.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @filter="filterFn"
-                    @update:model-value="applyTagFilter(params, searchFn)"
-                />
-                <VnSelect
-                    v-else-if="selectedTag === 1"
-                    :label="t('params.value')"
-                    v-model="value.value"
-                    :options="tagOptions || []"
-                    option-value="value"
-                    option-label="value"
-                    dense
-                    outlined
-                    rounded
-                    emit-value
-                    use-input
-                    class="filter-input"
-                    @new-value="createValue"
-                    @update:model-value="applyTagFilter(params, searchFn)"
-                />
+            <QItem class="q-mt-lg q-pa-none">
                 <VnInput
-                    v-else
-                    :label="t('params.value')"
-                    v-model="value.value"
+                    :label="t('components.itemsFilterPanel.value')"
                     dense
                     outlined
                     rounded
-                    class="filter-input"
-                    @keyup.enter="applyTagFilter(params, searchFn)"
-                />
-                <QIcon
-                    name="delete"
-                    class="filter-icon"
-                    @click="(tagValues || []).splice(index, 1)"
-                />
-            </QItem>
-            <QItem class="q-mt-lg">
-                <QBtn
-                    icon="add_circle"
-                    shortcut="+"
-                    flat
-                    class="filter-icon"
-                    @click="tagValues.push({})"
-                />
+                    :is-clearable="false"
+                    v-model="searchByTag"
+                    @keyup.enter="(val) => onSearchByTag(val, params)"
+                >
+                    <template #prepend>
+                        <QIcon name="search" />
+                    </template>
+                    <template #append>
+                        <QBtn
+                            icon="add_circle"
+                            shortcut="+"
+                            flat
+                            color="primary"
+                            size="md"
+                            dense
+                        />
+                        <QPopupProxy>
+                            <!-- <CatalogFilterValueDialog
+                                style="display: inline-block"
+                                :tags="tags"
+                                @apply-tags="
+                                    ($event) => applyTags($event, params, searchFn)
+                                "
+                            /> -->
+                        </QPopupProxy>
+                    </template>
+                </VnInput>
             </QItem>
             <QSeparator />
         </template>
@@ -417,23 +369,6 @@ function addOrder(value, field, params) {
         cursor: pointer;
     }
 }
-
-.filter-icon {
-    font-size: 24px;
-    color: $primary;
-    padding: 0 4px;
-    cursor: pointer;
-}
-
-.filter-input {
-    flex-shrink: 1;
-    min-width: 0;
-}
-
-.filter-value {
-    display: flex;
-    align-items: center;
-}
 </style>
 
 <i18n>

From e119bf5bfc0ab05ecfa700db976812f035b16d82 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:14 +0100
Subject: [PATCH 064/120] feat: refs #8138 add component ticket problems

---
 src/pages/Monitor/Ticket/MonitorTickets.vue | 57 +------------------
 src/pages/Ticket/TicketList.vue             | 62 +--------------------
 2 files changed, 4 insertions(+), 115 deletions(-)

diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 406bf5f29..f08402d69 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -15,6 +15,7 @@ import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
+import TicketProblems from 'src/components/ui/TicketProblems.vue';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
@@ -366,61 +367,7 @@ const openTab = (id) =>
             </QCheckbox>
         </template>
         <template #column-totalProblems="{ row }">
-            <span>
-                <QIcon
-                    v-if="row.isTaxDataChecked === 0"
-                    name="vn:no036"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasTicketRequest"
-                    name="vn:buyrequest"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    name="vn:unavailable"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
-                </QIcon>
-                <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
-                    <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.risk"
-                    name="vn:risk"
-                    :color="row.hasHighRisk ? 'negative' : 'primary'"
-                    size="xs"
-                >
-                    <QTooltip
-                        >{{ $t('salesTicketsTable.risk') }}: {{ row.risk }}</QTooltip
-                    >
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    name="vn:components"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.isTooLittle"
-                    name="vn:isTooLittle"
-                    color="primary"
-                    size="xs"
-                >
-                    <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
-                </QIcon>
-            </span>
+            <TicketProblems :row="row" />
         </template>
         <template #column-id="{ row }">
             <span class="link" @click.stop.prevent>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index aae6f80a7..fdbaec7cb 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -22,6 +22,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
+import TicketProblems from 'src/components/ui/TicketProblems.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -490,66 +491,7 @@ function setReference(data) {
         }"
     >
         <template #column-statusIcons="{ row }">
-            <div class="q-gutter-x-xs">
-                <QIcon
-                    v-if="row.isTaxDataChecked === 0"
-                    color="primary"
-                    name="vn:no036"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('No verified data') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasTicketRequest"
-                    color="primary"
-                    name="vn:buyrequest"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Purchase request') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.itemShortage"
-                    color="primary"
-                    name="vn:unavailable"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Not visible') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon v-if="row.isFreezed" color="primary" name="vn:frozen" size="xs">
-                    <QTooltip>
-                        {{ t('Client frozen') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon v-if="row.risk" color="primary" name="vn:risk" size="xs">
-                    <QTooltip> {{ t('Risk') }}: {{ row.risk }} </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasComponentLack"
-                    color="primary"
-                    name="vn:components"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Component lack') }}
-                    </QTooltip>
-                </QIcon>
-                <QIcon
-                    v-if="row.hasRounding"
-                    color="primary"
-                    name="sync_problem"
-                    size="xs"
-                >
-                    <QTooltip>
-                        {{ t('Rounding') }}
-                    </QTooltip>
-                </QIcon>
-            </div>
+            <TicketProblems :row="row" />
         </template>
         <template #column-salesPersonFk="{ row }">
             <span class="link" @click.stop>

From f999760205d0c2c1311bf4a82f506ae472213483 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:45 +0100
Subject: [PATCH 065/120] fix: refs #8138 sme minor issues

---
 src/components/ui/TicketProblems.vue        | 40 +++++++++++++++++++++
 src/pages/Customer/Card/CustomerSummary.vue |  2 +-
 src/pages/Monitor/Ticket/MonitorTickets.vue | 35 +++++++++---------
 3 files changed, 57 insertions(+), 20 deletions(-)
 create mode 100644 src/components/ui/TicketProblems.vue

diff --git a/src/components/ui/TicketProblems.vue b/src/components/ui/TicketProblems.vue
new file mode 100644
index 000000000..2965396b1
--- /dev/null
+++ b/src/components/ui/TicketProblems.vue
@@ -0,0 +1,40 @@
+<script setup>
+defineProps({ row: { type: Object, required: true } });
+</script>
+<template>
+    <span>
+        <QIcon
+            v-if="row.isTaxDataChecked === 0"
+            name="vn:no036"
+            color="primary"
+            size="xs"
+        >
+            <QTooltip>{{ $t('salesTicketsTable.noVerifiedData') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.hasTicketRequest" name="vn:buyrequest" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.purchaseRequest') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.itemShortage" name="vn:unavailable" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.notVisible') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isFreezed" name="vn:frozen" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.clientFrozen') }}</QTooltip>
+        </QIcon>
+        <QIcon
+            v-if="row.risk"
+            name="vn:risk"
+            :color="row.hasHighRisk ? 'negative' : 'primary'"
+            size="xs"
+        >
+            <QTooltip>
+                {{ $t('salesTicketsTable.risk') }}: {{ row.risk - row.credit }}
+            </QTooltip>
+        </QIcon>
+        <QIcon v-if="row.hasComponentLack" name="vn:components" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.componentLack') }}</QTooltip>
+        </QIcon>
+        <QIcon v-if="row.isTooLittle" name="vn:isTooLittle" color="primary" size="xs">
+            <QTooltip>{{ $t('salesTicketsTable.tooLittle') }}</QTooltip>
+        </QIcon>
+    </span>
+</template>
diff --git a/src/pages/Customer/Card/CustomerSummary.vue b/src/pages/Customer/Card/CustomerSummary.vue
index 95a162670..4fa7b9bdc 100644
--- a/src/pages/Customer/Card/CustomerSummary.vue
+++ b/src/pages/Customer/Card/CustomerSummary.vue
@@ -320,7 +320,7 @@ const sumRisk = ({ clientRisks }) => {
                     :value="entity.recommendedCredit"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-max">
                 <VnTitle :text="t('Latest tickets')" />
                 <CustomerSummaryTable />
             </QCard>
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index f08402d69..4a31418fb 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -24,13 +24,18 @@ const tableRef = ref(null);
 const provinceOpts = ref([]);
 const stateOpts = ref([]);
 const zoneOpts = ref([]);
-const visibleColumns = ref([]);
 const { viewSummary } = useSummaryDialog();
 const from = Date.vnNew();
 from.setHours(0, 0, 0, 0);
 const to = new Date(from.getTime());
 to.setDate(to.getDate() + 1);
 to.setHours(23, 59, 59, 999);
+const stateColors = {
+    notice: 'info',
+    success: 'positive',
+    warning: 'warning',
+    alert: 'negative',
+};
 
 function exprBuilder(param, value) {
     switch (param) {
@@ -225,7 +230,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.goToLines'),
                 icon: 'vn:lines',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => openTab(row.id),
                 isPrimary: true,
                 attrs: {
@@ -236,7 +241,7 @@ const columns = computed(() => [
             {
                 title: t('salesTicketsTable.preview'),
                 icon: 'preview',
-                color: 'priamry',
+                color: 'primary',
                 action: (row) => viewSummary(row.id, TicketSummary),
                 isPrimary: true,
                 attrs: {
@@ -254,10 +259,10 @@ const getBadgeAttrs = (date) => {
     let timeTicket = new Date(date);
     timeTicket.setHours(0, 0, 0, 0);
 
-    let comparation = today - timeTicket;
+    let timeDiff = today - timeTicket;
 
-    if (comparation == 0) return { color: 'warning', 'text-color': 'black' };
-    if (comparation < 0) return { color: 'success', 'text-color': 'black' };
+    if (timeDiff == 0) return { color: 'warning', 'text-color': 'black' };
+    if (timeDiff < 0) return { color: 'success', 'text-color': 'black' };
     return { color: 'transparent', 'text-color': 'white' };
 };
 
@@ -272,13 +277,6 @@ const autoRefreshHandler = (value) => {
     }
 };
 
-const stateColors = {
-    notice: 'info',
-    success: 'positive',
-    warning: 'warning',
-    alert: 'negative',
-};
-
 const totalPriceColor = (ticket) => {
     const total = parseInt(ticket.totalWithVat);
     if (total > 0 && total < 50) return 'warning';
@@ -286,10 +284,10 @@ const totalPriceColor = (ticket) => {
 
 const formatShippedDate = (date) => {
     if (!date) return '-';
-    const split1 = date.split('T');
-    const [year, month, day] = split1[0].split('-');
-    const _date = new Date(year, month - 1, day);
-    return toDateFormat(_date);
+    const dateSplit = date.split('T');
+    const [year, month, day] = dateSplit[0].split('-');
+    const newDate = new Date(year, month - 1, day);
+    return toDateFormat(newDate);
 };
 
 const openTab = (id) =>
@@ -337,7 +335,6 @@ const openTab = (id) =>
         :expr-builder="exprBuilder"
         :offset="50"
         :columns="columns"
-        :visible-columns="visibleColumns"
         :right-search="false"
         default-mode="table"
         auto-load
@@ -422,7 +419,7 @@ const openTab = (id) =>
             </QIcon>
         </template>
         <template #column-zoneFk="{ row }">
-            <div @click.stop.prevent :title="row.zoneName">
+            <div v-if="row.zoneFk" @click.stop.prevent :title="row.zoneName">
                 <span class="link">{{ row.zoneName }}</span>
                 <ZoneDescriptorProxy :id="row.zoneFk" />
             </div>

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 066/120] 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 067/120] 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",

From e7b431e9ec2c9745fb9b980d039d8f721093498c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:32:35 +0100
Subject: [PATCH 068/120] fix(VnPaginate): disable pagination

---
 src/components/ui/VnPaginate.vue     | 2 ++
 src/pages/Item/ItemFixedPrice.vue    | 2 +-
 src/pages/Ticket/Card/TicketSale.vue | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index b058dc642..04a843889 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,6 +141,8 @@ async function fetch(params) {
 }
 
 async function paginate() {
+    if (props.disableInfiniteScroll || !store.hasMoreData) return;
+
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 815c7d519..628af681a 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -440,7 +440,7 @@ function handleOnDataSave({ CrudModelRef }) {
                 selection: 'multiple',
             }"
             :crud-model="{
-                paginate: false,
+                disableInfiniteScroll: true,
             }"
             v-model:selected="rowsSelected"
             :row-click="saveOnRowChange"
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 1b9791529..08cf248ba 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -621,7 +621,7 @@ watch(
         }"
         :create-as-dialog="false"
         :crud-model="{
-            paginate: false,
+            disableInfiniteScroll: true,
         }"
         :default-remove="false"
         :default-reset="false"

From 5d58bb0c139d7dd108c75736cd24325c8115a447 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 09:47:59 +0100
Subject: [PATCH 069/120] fix(VnPaginate): disable pagination

---
 src/components/VnTable/VnTable.vue | 2 ++
 src/components/ui/VnPaginate.vue   | 2 --
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 908157610..da6c89cbb 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -325,6 +325,8 @@ function handleOnDataSaved(_) {
 }
 
 function handleScroll() {
+    if ($props.crudModel.disableInfiniteScroll) return;
+
     const tMiddle = tableRef.value.$el.querySelector('.q-table__middle');
     const { scrollHeight, scrollTop, clientHeight } = tMiddle;
     const isAtBottom = Math.abs(scrollHeight - scrollTop - clientHeight) <= 40;
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 04a843889..b058dc642 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -141,8 +141,6 @@ async function fetch(params) {
 }
 
 async function paginate() {
-    if (props.disableInfiniteScroll || !store.hasMoreData) return;
-
     const { page, rowsPerPage, sortBy, descending } = pagination.value;
 
     if (!props.url) return;

From 8c20b8736bf2b28f837f2e4c3c615f5c626c1153 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Tue, 19 Nov 2024 11:10:37 +0100
Subject: [PATCH 070/120] feat: refs #8087 refs#8087 Redadas en travel

---
 src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index 3ac385fbd..13f8bcee9 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -446,11 +446,8 @@ async function getZone(options) {
             <VnSelect
                 :label="t('basicData.company')"
                 v-model="formData.companyFk"
-                option-value="id"
                 option-label="code"
                 :options="companiesOptions"
-                hide-selected
-                map-options
                 :required="true"
                 :rules="validate('basicData.company')"
             />

From 38ccf464b761e4724c5688a6e01af39a16c07d59 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:52:00 +0100
Subject: [PATCH 071/120] fix: refs #7323 locale #7396

---
 src/i18n/locale/en.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index ae7007c32..531b3bc14 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -583,15 +583,15 @@ worker:
         role: Role
         sipExtension: Extension
         locker: Locker
-        fiDueDate: Fecha de caducidad del DNI
-        sex: Sexo
-        seniority: Antigüedad
+        fiDueDate: FI due date
+        sex: Sex
+        seniority: Seniority
         fi: DNI/NIE/NIF
-        birth: Fecha de nacimiento
-        isFreelance: Autónomo
+        birth: Birth
+        isFreelance: Freelance
         isSsDiscounted: Bonificación SS
-        hasMachineryAuthorized: Autorizado para llevar maquinaria
-        isDisable: Trabajador desactivado
+        hasMachineryAuthorized: Machinery authorized
+        isDisable: Disable
     notificationsManager:
         activeNotifications: Active notifications
         availableNotifications: Available notifications

From 1faab668b16baceb6ebec80c9075b1e38ff12acd Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 11:53:33 +0100
Subject: [PATCH 072/120] fix: refs #7323 show advanced fields

---
 src/i18n/locale/es.yml                  | 6 +++---
 src/pages/Worker/Card/WorkerSummary.vue | 8 ++++----
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index eb0978ddd..9bfa43c49 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -579,9 +579,9 @@ worker:
         newWorker: Nuevo trabajador
     summary:
         boss: Jefe
-        phoneExtension: Extensión de teléfono
-        entPhone: Teléfono de empresa
-        personalPhone: Teléfono personal
+        phoneExtension: Ext. de teléfono
+        entPhone: Tel. de empresa
+        personalPhone: Tel. personal
         noBoss: Sin jefe
         userData: Datos de usuario
         userId: ID del usuario
diff --git a/src/pages/Worker/Card/WorkerSummary.vue b/src/pages/Worker/Card/WorkerSummary.vue
index 93866b79f..496f1ca16 100644
--- a/src/pages/Worker/Card/WorkerSummary.vue
+++ b/src/pages/Worker/Card/WorkerSummary.vue
@@ -75,10 +75,10 @@ onBeforeMount(async () => {
                         <VnLinkPhone :phone-number="worker.phone" />
                     </template>
                 </VnLv>
-                <VnLv :value="worker.client?.phone">
+                <VnLv :value="advancedSummary?.client?.phone">
                     <template #label>
                         {{ t('worker.summary.personalPhone') }}
-                        <VnLinkPhone :phone-number="worker.client?.phone" />
+                        <VnLinkPhone :phone-number="advancedSummary?.client?.phone" />
                     </template>
                 </VnLv>
             </QCard>
@@ -86,12 +86,12 @@ onBeforeMount(async () => {
                 <VnTitle :url="basicDataUrl" :text="t('globals.summary.basicData')" />
                 <VnLv
                     :label="t('worker.summary.fiDueDate')"
-                    :value="toDate(worker.fiDueDate)"
+                    :value="toDate(advancedSummary.fiDueDate)"
                 />
                 <VnLv :label="t('worker.summary.sex')" :value="worker.sex" />
                 <VnLv
                     :label="t('worker.summary.seniority')"
-                    :value="toDate(worker.seniority)"
+                    :value="toDate(advancedSummary.seniority)"
                 />
                 <VnLv :label="t('worker.summary.fi')" :value="advancedSummary.fi" />
                 <VnLv

From 8a1db719e3c3c68eccad2218a9a47c966d050a1f Mon Sep 17 00:00:00 2001
From: robert <robert@verdnatura.es>
Date: Tue, 19 Nov 2024 11:58:16 +0100
Subject: [PATCH 073/120] fix(Supplier): change isSerious to isReal

---
 src/i18n/locale/en.yml                         | 2 +-
 src/i18n/locale/es.yml                         | 2 +-
 src/pages/Supplier/Card/SupplierBasicData.vue  | 4 ++--
 src/pages/Supplier/Card/SupplierDescriptor.vue | 4 ++--
 src/pages/Supplier/Card/SupplierSummary.vue    | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index aa8df17e2..070125540 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -940,7 +940,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsible
-        isSerious: Verified
+        isReal: Verified
         isActive: Active
         isPayMethodChecked: PayMethod checked
         note: Notes
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index 575e2c6c7..54728c5b6 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -938,7 +938,7 @@ supplier:
     basicData:
         alias: Alias
         workerFk: Responsable
-        isSerious: Verificado
+        isReal: Verificado
         isActive: Activo
         isPayMethodChecked: Método de pago validado
         note: Notas
diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 52964557d..c1a107d3a 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -61,8 +61,8 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow>
                 <QCheckbox
-                    v-model="data.isSerious"
-                    :label="t('supplier.basicData.isSerious')"
+                    v-model="data.isReal"
+                    :label="t('supplier.basicData.isReal')"
                 />
                 <QCheckbox
                     v-model="data.isActive"
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5754031b3..9845cd08a 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -38,7 +38,7 @@ const filter = {
         'payDemFk',
         'payDay',
         'isActive',
-        'isSerious',
+        'isReal',
         'isTrucker',
         'account',
     ],
@@ -137,7 +137,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
                 </QIcon>
                 <QIcon
-                    v-if="!supplier.isSerious"
+                    v-if="!supplier.isReal"
                     name="vn:supplierfalse"
                     color="primary"
                     size="xs"
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 5791db1eb..a1d1631d4 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -67,7 +67,7 @@ const getUrl = (section) => `#/supplier/${entityId.value}/${section}`;
                 </VnLv>
                 <QCheckbox
                     :label="t('supplier.summary.verified')"
-                    v-model="supplier.isSerious"
+                    v-model="supplier.isReal"
                     :disable="true"
                 />
                 <QCheckbox

From 98017df57d17239edaef1987d0e2e8397da77ce7 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 19 Nov 2024 12:25:15 +0100
Subject: [PATCH 074/120] fix: refs #8038 solve conflicts

---
 src/components/common/VnSelect.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index aeed07653..396b26f65 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -138,8 +138,6 @@ onMounted(() => {
     if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
 });
 
-defineExpose({ opts: myOptions });
-
 const arrayDataKey =
     $props.dataKey ?? ($props.url?.length > 0 ? $props.url : $attrs.name ?? $attrs.label);
 

From 5515f55bf69d3f2121410d28bdf5f35c4f9557b0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 12:51:05 +0100
Subject: [PATCH 075/120] test: fix e2e

---
 .../integration/client/clientList.spec.js     | 31 ++++++++++++++-----
 .../vnComponent/vnLocation.spec.js            |  6 ++--
 test/cypress/support/commands.js              |  6 ++--
 3 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 93e53b9f6..b87ddff3b 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -6,7 +6,11 @@ describe('Client list', () => {
         cy.visit('/#/customer/list', {
             timeout: 5000,
             onBeforeLoad(win) {
-                cy.stub(win, 'open');
+                cy.stub(win, 'open')
+                    .callsFake((url) => {
+                        return win.open.wrappedMethod.call(win, url, '_self');
+                    })
+                    .as('Open');
             },
         });
     });
@@ -44,20 +48,31 @@ describe('Client list', () => {
         });
     });
 
-    it('Client founded create ticket', () => {
+    it.only('Client founded create ticket', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.clickButtonsDescriptor(2);
+        cy.openActionDescriptor('Create ticket');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form');
-        cy.checkValueForm(1, search);
+        cy.waitForElement('.q-form', { timeout: 5000 });
+        cy.checkValueSelectForm(1, 1110);
+        cy.checkValueSelectForm(2, search);
+        // cy.get('@Open').should('have.been.calledOnceWithExactly', [
+        //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
+        //     '_blank',
+        //     'noopener,noreferrer',
+        // ]);
     });
-    it('Client founded create order', () => {
+    it.only('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
-        cy.clickButtonsDescriptor(4);
+        cy.openActionDescriptor('New order');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form');
+        cy.waitForElement('.q-form', { timeout: 5000 });
+        cy.checkValueForm(1, 1110);
         cy.checkValueForm(2, search);
+        // cy.get('@Open').should(
+        //     'have.been.calledOnceWithExactly',
+        //     '"/#/order/list?table={"clientFk":1110}&createForm={"addressId":10,"clientFk":1110}", "_blank", "noopener,noreferrer"'
+        // );
     });
 });
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 924b16adc..29e1f868f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -15,10 +15,10 @@ describe('VnLocation', () => {
             cy.domContentLoad();
             cy.get(createLocationButton).click();
         });
-        it('should filter provinces based on selected country', () => {
+        it.only('shoul d filter provinces based on selected country', () => {
             // Select a country
             cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
+                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
                 'Ecuador'
             );
             // Verify that provinces are filtered
@@ -32,7 +32,7 @@ describe('VnLocation', () => {
             ).should('have.length', 1);
         });
 
-        it('should filter towns based on selected province', () => {
+        it.only('should filter towns based on selected province', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 34aadad1d..b92bbe269 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -295,16 +295,16 @@ Cypress.Commands.add('checkNotification', (text) => {
                 throw new Error(`Notification not found: "${text}"`);
         });
 });
-
+// :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id}) > .q-field__inner>.q-field__control> .q-field__control-container>.q-field__native >.q-field__input`
+        `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 
 Cypress.Commands.add('checkValueSelectForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container>.q-field__native>.q-field__input`
+        `.grid-create > :nth-child(${id}) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 

From 65100fcf256f9c19494088c9c2b3d48422c8970b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 13:45:44 +0100
Subject: [PATCH 076/120] test: fix e2e

---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 29e1f868f..0ee453aa0 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -15,7 +15,7 @@ describe('VnLocation', () => {
             cy.domContentLoad();
             cy.get(createLocationButton).click();
         });
-        it.only('shoul d filter provinces based on selected country', () => {
+        it('should filter provinces based on selected country', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
@@ -32,7 +32,7 @@ describe('VnLocation', () => {
             ).should('have.length', 1);
         });
 
-        it.only('should filter towns based on selected province', () => {
+        it('should filter towns based on selected province', () => {
             // Select a country
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,

From 3824f5d124d8083634f67b93ec4696f7763baccc Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Tue, 19 Nov 2024 13:51:19 +0100
Subject: [PATCH 077/120] fix: refs #8138 move component from ui folder

---
 src/components/{ui => }/TicketProblems.vue  | 0
 src/pages/Monitor/Ticket/MonitorTickets.vue | 2 +-
 src/pages/Ticket/TicketList.vue             | 2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/components/{ui => }/TicketProblems.vue (100%)

diff --git a/src/components/ui/TicketProblems.vue b/src/components/TicketProblems.vue
similarity index 100%
rename from src/components/ui/TicketProblems.vue
rename to src/components/TicketProblems.vue
diff --git a/src/pages/Monitor/Ticket/MonitorTickets.vue b/src/pages/Monitor/Ticket/MonitorTickets.vue
index 4a31418fb..e6bf242ac 100644
--- a/src/pages/Monitor/Ticket/MonitorTickets.vue
+++ b/src/pages/Monitor/Ticket/MonitorTickets.vue
@@ -15,7 +15,7 @@ import { toCurrency, dateRange, dashIfEmpty } from 'src/filters';
 import RightMenu from 'src/components/common/RightMenu.vue';
 import MonitorTicketSearchbar from './MonitorTicketSearchbar.vue';
 import MonitorTicketFilter from './MonitorTicketFilter.vue';
-import TicketProblems from 'src/components/ui/TicketProblems.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const DEFAULT_AUTO_REFRESH = 2 * 60 * 1000; // 2min in ms
 const { t } = useI18n();
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index fdbaec7cb..7e95f3a1d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -22,7 +22,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import ZoneDescriptorProxy from 'src/pages/Zone/Card/ZoneDescriptorProxy.vue';
 import { toTimeFormat } from 'src/filters/date';
 import InvoiceOutDescriptorProxy from 'src/pages/InvoiceOut/Card/InvoiceOutDescriptorProxy.vue';
-import TicketProblems from 'src/components/ui/TicketProblems.vue';
+import TicketProblems from 'src/components/TicketProblems.vue';
 
 const route = useRoute();
 const router = useRouter();

From f43e974bbc595758ab316156b8e9f68d340b70f3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 19 Nov 2024 14:14:50 +0100
Subject: [PATCH 078/120] fix: worker test e2e

---
 src/pages/Worker/WorkerList.vue  | 2 +-
 test/cypress/support/commands.js | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index 022cecdc6..71df273c1 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -306,7 +306,7 @@ async function autofillBic(worker) {
                 </VnRow>
                 <VnRow>
                     <VnInput
-                        :label="t('worker.create.street')"
+                        :label="t('globals.street')"
                         :model-value="uppercaseStreetModel(data).get()"
                         @update:model-value="uppercaseStreetModel(data).set"
                         :disable="data.isFreelance"
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 8d48dc71a..0e0cd7d07 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -100,7 +100,6 @@ Cypress.Commands.add('fillInForm', (obj, form = '.q-form > .q-card') => {
                     case 'select':
                         cy.wrap(el).type(val);
                         cy.get('.q-menu .q-item').contains(val).click();
-                        cy.get('body').click();
                         break;
                     case 'date':
                         cy.wrap(el).type(val.split('-').join(''));

From 8714980595e0cfa62e24b7a38f0553ad5c2290fa Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 14:28:43 +0100
Subject: [PATCH 079/120] fix(VnSelect):  setOptions when applyFilter

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

diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 227ff9465..f24f054a5 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -202,7 +202,10 @@ async function fetchFilter(val) {
     if (fields) fetchOptions.fields = fields;
     if (sortBy) fetchOptions.order = sortBy;
     arrayData.reset(['skip', 'filter.skip', 'page']);
-    return (await arrayData.applyFilter({ filter: fetchOptions }))?.data;
+
+    const { data } = await arrayData.applyFilter({ filter: fetchOptions });
+    setOptions(data);
+    return data;
 }
 
 async function filterHandler(val, update) {

From 5f7fd91272c4a870de82ef8c42ef50166d7ad1e7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 14:41:07 +0100
Subject: [PATCH 080/120] feat: add /reports in gitignore

---
 test/cypress/.gitignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/cypress/.gitignore b/test/cypress/.gitignore
index 3f91dd465..8d940320e 100644
--- a/test/cypress/.gitignore
+++ b/test/cypress/.gitignore
@@ -1,2 +1,2 @@
-videos/*
-screenshots/*
\ No newline at end of file
+reports/*
+screenshots/*

From e54eb50265741bfd5e424e59c626df201d9dd1e3 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 15:35:57 +0100
Subject: [PATCH 081/120] fix: refs #8166 show zone error

---
 src/pages/Ticket/TicketAdvance.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index 8de602b37..c247a20bc 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -213,10 +213,7 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
             warehouseFk: ticket.futureWarehouseFk,
         });
 
-        if (!newLanded) {
-            notify(t('advanceTickets.noDeliveryZone'), 'negative');
-            return;
-        }
+        if (!newLanded) throw new Error(t('advanceTickets.noDeliveryZone'));
 
         ticket.landed = newLanded.landed;
         ticket.zoneFk = newLanded.zoneFk;
@@ -299,10 +296,10 @@ const splitTickets = async () => {
                 const { query, params } = await requestComponentUpdate(ticket, true);
                 await axios.post(query, params);
                 progressAdd(ticket.futureId);
-            } catch (error) {
+            } catch (e) {
                 splitErrors.value.push({
                     id: ticket.futureId,
-                    reason: error.response?.data?.error?.message,
+                    reason: e.message || e.response?.data?.error?.message,
                 });
                 progressAdd(ticket.futureId);
             }

From 73b7fa7704eff4dbd3b95bca8d37294eafb19efc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 15:43:55 +0100
Subject: [PATCH 082/120] feat: refs #8166 show notification

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

diff --git a/src/pages/Ticket/TicketAdvance.vue b/src/pages/Ticket/TicketAdvance.vue
index c247a20bc..71e3926ac 100644
--- a/src/pages/Ticket/TicketAdvance.vue
+++ b/src/pages/Ticket/TicketAdvance.vue
@@ -213,7 +213,10 @@ const requestComponentUpdate = async (ticket, isWithoutNegatives) => {
             warehouseFk: ticket.futureWarehouseFk,
         });
 
-        if (!newLanded) throw new Error(t('advanceTickets.noDeliveryZone'));
+        if (!newLanded) {
+            notify(t('advanceTickets.noDeliveryZone'), 'negative');
+            throw new Error(t('advanceTickets.noDeliveryZone'));
+        }
 
         ticket.landed = newLanded.landed;
         ticket.zoneFk = newLanded.zoneFk;

From 9665a3407f4d218105c21a531382fc3ffaa7e491 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 19 Nov 2024 15:54:38 +0100
Subject: [PATCH 083/120] fix: refs #7229 remove catch

---
 src/composables/downloadFile.js | 28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index f46697fb1..ef1a1093e 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -7,22 +7,18 @@ const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
-    try {
-        const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
-        const response = await axios.get(
-            url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
-            { responseType: 'blob' }
-        );
+    const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
+    const response = await axios.get(
+        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
+        { responseType: 'blob' }
+    );
 
-        const contentDisposition = response.headers['content-disposition'];
-        const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
-        const filename =
-            matches != null && matches[1]
-                ? matches[1].replace(/['"]/g, '')
-                : 'downloaded-file';
+    const contentDisposition = response.headers['content-disposition'];
+    const matches = /filename[^;=\n]*=((['"]).*?\2|[^;\n]*)/.exec(contentDisposition);
+    const filename =
+        matches != null && matches[1]
+            ? matches[1].replace(/['"]/g, '')
+            : 'downloaded-file';
 
-        exportFile(filename, response.data);
-    } catch (error) {
-        console.error('Error downloading the file', error);
-    }
+    exportFile(filename, response.data);
 }

From b4ee19bcde76c9d44568b7742aeab673fdf61b50 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 19 Nov 2024 15:56:27 +0100
Subject: [PATCH 084/120] test: #8162 fix clientList spec

---
 .../integration/client/clientList.spec.js     | 18 +++++-----
 .../vnComponent/vnLocation.spec.js            | 35 ++++++-------------
 2 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index b87ddff3b..b3ac9d3df 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it('Client list create new client', () => {
+    it.only('Client list create new client', () => {
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
         const data = {
             Name: { val: 'Name 1' },
@@ -24,9 +24,9 @@ describe('Client list', () => {
             'Web user': { val: 'user_test_1' },
             Street: { val: 'C/ STREET 1' },
             Email: { val: 'user.test@1.com' },
-            'Business type': { val: 'Otros', type: 'select' },
-            'Sales person': { val: 'salesboss', type: 'select' },
+            'Sales person': { val: 'employee', type: 'select' },
             Location: { val: '46000, Valencia(Province one), España', type: 'select' },
+            'Business type': { val: 'Otros', type: 'select' },
         };
         cy.fillInForm(data);
 
@@ -48,13 +48,13 @@ describe('Client list', () => {
         });
     });
 
-    it.only('Client founded create ticket', () => {
+    it('Client founded create ticket', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
         cy.openActionDescriptor('Create ticket');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form', { timeout: 5000 });
-        cy.checkValueSelectForm(1, 1110);
+        cy.waitForElement('.q-form');
+        cy.checkValueSelectForm(1, search);
         cy.checkValueSelectForm(2, search);
         // cy.get('@Open').should('have.been.calledOnceWithExactly', [
         //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
@@ -62,13 +62,13 @@ describe('Client list', () => {
         //     'noopener,noreferrer',
         // ]);
     });
-    it.only('Client founded create order', () => {
+    it('Client founded create order', () => {
         const search = 'Jessica Jones';
         cy.searchByLabel('Name', search);
         cy.openActionDescriptor('New order');
         cy.waitForElement('#formModel');
-        cy.waitForElement('.q-form', { timeout: 5000 });
-        cy.checkValueForm(1, 1110);
+        cy.waitForElement('.q-form');
+        cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
         // cy.get('@Open').should(
         //     'have.been.calledOnceWithExactly',
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 0ee453aa0..70c88b26f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -7,6 +7,9 @@ describe('VnLocation', () => {
         prefix: '.q-dialog__inner > .column > #formModel > .q-card',
         sufix: ' .q-field__inner > .q-field__control',
     };
+    const countrySelector = `${createForm.prefix} > :nth-child(5) > :nth-child(3) > ${createForm.sufix}`;
+    const provinceSelector = `${createForm.prefix} > :nth-child(5) > :nth-child(2) > ${createForm.sufix}`;
+    const citySelector = `${createForm.prefix} > :nth-child(4) > :nth-child(2) > ${createForm.sufix}`;
     describe('CreateFormDialog ', () => {
         beforeEach(() => {
             cy.viewport(1280, 720);
@@ -17,45 +20,29 @@ describe('VnLocation', () => {
         });
         it('should filter provinces based on selected country', () => {
             // Select a country
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
-                'Ecuador'
-            );
+            cy.selectOption(countrySelector, 'Ecuador');
             // Verify that provinces are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(countrySelector).should('have.length', 1);
 
             // Verify that towns are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
             // Select a country
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`,
-                'Ecuador'
-            );
+            cy.selectOption(countrySelector, 'Ecuador');
             // Verify that provinces are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(provinceSelector).should('have.length', 1);
 
             // Verify that towns are filtered
-            cy.get(
-                `${createForm.prefix} > :nth-child(4) > .q-field:nth-child(3)> ${createForm.sufix}`
-            ).should('have.length', 1);
+            cy.get(citySelector).should('have.length', 1);
         });
         it('should pass selected country', () => {
             // Select a country
             const country = 'Ecuador';
             const province = 'Province five';
-            cy.selectOption(
-                `${createForm.prefix} > :nth-child(5) > .q-field:nth-child(5)> ${createForm.sufix}`,
-                country
-            );
+
+            cy.selectOption(countrySelector, country);
             cy.selectOption(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix}`,
                 province

From fef7dd9ac1d4d9c659cfa113004d60c128ff12bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 07:41:39 +0100
Subject: [PATCH 085/120] =?UTF-8?q?fix(MonitorOrders):=20translation=20sen?=
 =?UTF-8?q?dDate=20=E2=86=92=20landed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Monitor/MonitorOrders.vue | 2 +-
 src/pages/Monitor/locale/en.yml     | 1 -
 src/pages/Monitor/locale/es.yml     | 1 -
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index fac601735..17f72f188 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -27,7 +27,7 @@ function exprBuilder(param, value) {
 
 const columns = computed(() => [
     {
-        label: t('salesOrdersTable.dateSend'),
+        label: t('globals.landed'),
         name: 'dateSend',
         field: 'dateSend',
         align: 'left',
diff --git a/src/pages/Monitor/locale/en.yml b/src/pages/Monitor/locale/en.yml
index b8082f02a..e905d2521 100644
--- a/src/pages/Monitor/locale/en.yml
+++ b/src/pages/Monitor/locale/en.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Client
 salesOrdersTable:
     delete: Delete
-    dateSend: Send date
     dateMake: Make date
     client: Client
     salesPerson: Salesperson
diff --git a/src/pages/Monitor/locale/es.yml b/src/pages/Monitor/locale/es.yml
index 4ee5b90a9..a19145300 100644
--- a/src/pages/Monitor/locale/es.yml
+++ b/src/pages/Monitor/locale/es.yml
@@ -11,7 +11,6 @@ salesClientsTable:
     client: Cliente
 salesOrdersTable:
     delete: Eliminar
-    dateSend: Fecha de envío
     dateMake: Fecha de realización
     client: Cliente
     salesPerson: Comercial

From 67a5800a6668af882d976182272706176776dc98 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 07:57:45 +0100
Subject: [PATCH 086/120] fix: logout spec

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

diff --git a/test/cypress/integration/outLogin/logout.spec.js b/test/cypress/integration/outLogin/logout.spec.js
index d6c33a65b..bcdacec78 100644
--- a/test/cypress/integration/outLogin/logout.spec.js
+++ b/test/cypress/integration/outLogin/logout.spec.js
@@ -28,7 +28,7 @@ describe('Logout', () => {
         });
 
         it('when token not exists', () => {
-            cy.get('.q-list > [href="#/item"]').click();
+            cy.get('.q-list').first().should('be.visible').click();
             cy.checkNotification('Authorization Required');
         });
     });

From 3ba8402dfde616ec0a2a7430ad78acfccf62d755 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 08:01:50 +0100
Subject: [PATCH 087/120] fix: vnSearchbar spec

---
 test/cypress/integration/vnComponent/vnSearchBar.spec.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/cypress/integration/vnComponent/vnSearchBar.spec.js b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
index 580199bc3..b8621118c 100644
--- a/test/cypress/integration/vnComponent/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnComponent/vnSearchBar.spec.js
@@ -5,6 +5,7 @@ describe('VnSearchBar', () => {
     const idGap = '.q-item > .q-item__label';
     const vnTableRow = '.q-virtual-scroll__content';
     beforeEach(() => {
+        cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('#/customer/list');
     });

From 2806c94fdbb5c75529751441393c9499a3c5d28a Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:22:50 +0100
Subject: [PATCH 088/120] fix: fix create bankEntity

---
 src/components/CreateBankEntityForm.vue      | 15 ++++++---------
 src/pages/Supplier/Card/SupplierAccounts.vue |  1 -
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index a42be6ef8..5211d6e9d 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -9,8 +9,6 @@ import VnRow from 'components/ui/VnRow.vue';
 import FormModelPopup from './FormModelPopup.vue';
 import { useState } from 'src/composables/useState';
 
-defineProps({ showEntityField: { type: Boolean, default: true } });
-
 const emit = defineEmits(['onDataSaved']);
 const { t } = useI18n();
 const bicInputRef = ref(null);
@@ -22,13 +20,8 @@ const bankEntityFormData = reactive({
     name: null,
     bic: null,
     countryFk: customer.value?.countryFk,
-    id: null,
 });
 
-const countriesFilter = {
-    fields: ['id', 'name', 'code'],
-};
-
 const countriesOptions = ref([]);
 
 const onDataSaved = (...args) => {
@@ -44,7 +37,6 @@ onMounted(async () => {
 <template>
     <FetchData
         url="Countries"
-        :filter="countriesFilter"
         auto-load
         @on-fetch="(data) => (countriesOptions = data)"
     />
@@ -85,7 +77,12 @@ onMounted(async () => {
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>
-                <div v-if="showEntityField" class="col">
+                <div
+                    v-if="
+                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                    "
+                    class="col"
+                >
                     <VnInput
                         :label="t('id')"
                         v-model="data.id"
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index bc009d3ad..08bebb67e 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -126,7 +126,6 @@ const setWireTransfer = async () => {
                                     (_, requestResponse) =>
                                         onBankEntityCreated(requestResponse, row)
                                 "
-                                :show-entity-field="false"
                             />
                         </template>
                         <template #option="scope">

From 1fb927488a2df2a312cb06dee4f9880ef014db7e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:33 +0100
Subject: [PATCH 089/120] test: #8162 fix clientList spec

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

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index b3ac9d3df..37983cc70 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -15,7 +15,7 @@ describe('Client list', () => {
         });
     });
 
-    it.only('Client list create new client', () => {
+    it('Client list create new client', () => {
         cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
         const data = {
             Name: { val: 'Name 1' },

From 32fdc836f9923df5308586c5eae3b6f557ebcc73 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:38 +0100
Subject: [PATCH 090/120] fix(OrderCatalogFilter): fix field value

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 159 ++++++++++++++++++
 src/pages/Order/Card/OrderCatalogFilter.vue   |  17 +-
 2 files changed, 167 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Order/Card/CatalogFilterValueDialog.vue

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
new file mode 100644
index 000000000..120e2fb72
--- /dev/null
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -0,0 +1,159 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import axios from 'axios';
+import VnSelect from 'components/common/VnSelect.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+
+const props = defineProps({
+    tags: {
+        type: Array,
+        default: () => [],
+    },
+});
+
+const emit = defineEmits(['applyTags']);
+const { t } = useI18n();
+
+const tagValues = ref([{}]);
+const tagOptions = ref([]);
+const selectedTag = ref(null);
+
+const applyTags = () => {
+    if (tagValues.value.some((tag) => !tag.value)) return;
+    const tagInfo = {
+        values: [...tagValues.value],
+        tagFk: selectedTag?.value?.id,
+        tagSelection: {
+            name: selectedTag?.value?.name,
+        },
+    };
+    emit('applyTags', tagInfo);
+};
+
+const removeTagGroupParam = (valIndex = null) => {
+    if (!valIndex) {
+        tagValues.value = [{}];
+    } else {
+        (tagValues.value || []).splice(valIndex, 1);
+    }
+};
+
+const getSelectedTagValues = async (tag) => {
+    if (!tag?.id) return;
+    const filter = {
+        fields: ['value'],
+        order: 'value ASC',
+        limit: 30,
+    };
+
+    const url = `Tags/${tag?.id}/filterValue`;
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(url, {
+        params,
+    });
+    tagOptions.value = data;
+};
+</script>
+
+<template>
+    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+        <QCard class="q-pa-sm column q-pa-lg">
+            <QBtn
+                round
+                color="primary"
+                style="position: absolute; z-index: 1; right: 0; top: 0"
+                icon="search"
+                type="submit"
+            >
+            </QBtn>
+
+            <VnSelect
+                :label="t('params.tag')"
+                v-model="selectedTag"
+                :options="props.tags"
+                option-value="id"
+                option-label="name"
+                dense
+                outlined
+                class="q-mb-md"
+                rounded
+                :emit-value="false"
+                use-input
+                @update:model-value="($event) => getSelectedTagValues($event)"
+            />
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                :disabled="!selectedTag || !tagValues[0].value"
+                @click="tagValues.unshift({})"
+            />
+            <div
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="filter-value column align-left"
+            >
+                <div class="col row q-mb-md">
+                    <VnSelect
+                        v-if="!selectedTag?.isFree && tagOptions"
+                        :label="t('components.itemsFilterPanel.value')"
+                        v-model="value.value"
+                        :options="tagOptions || []"
+                        option-value="value"
+                        option-label="value"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        use-input
+                        :disable="!value || !selectedTag"
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <VnInput
+                        v-else
+                        v-model="value.value"
+                        :label="t('components.itemsFilterPanel.value')"
+                        :disable="!value"
+                        is-outlined
+                        :is-clearable="false"
+                        class="col"
+                    />
+                    <QBtn
+                        icon="delete"
+                        size="md"
+                        outlined
+                        dense
+                        rounded
+                        flat
+                        class="filter-icon col-2"
+                        :disabled="!value.value"
+                        @click="removeTagGroupParam(index)"
+                    />
+                </div>
+            </div>
+        </QCard>
+    </QForm>
+</template>
+
+<style scoped lang="scss">
+.filter-icon {
+    font-size: 24px;
+    color: $primary;
+    padding: 0 4px;
+    cursor: pointer;
+}
+</style>
+
+<i18n>
+en:
+    params:
+        tag: Tag
+es:
+    params:
+        tag: Etiqueta
+</i18n>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 68764c1a5..381a0516a 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -9,7 +9,7 @@ import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import getParamWhere from 'src/filters/getParamWhere';
-// import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
+import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 import { useArrayData } from 'composables/useArrayData';
 
 const props = defineProps({
@@ -128,12 +128,12 @@ async function onSearchByTag(value) {
     searchByTag.value = null;
 }
 
-const removeTagGroupParam = (params, search, valIndex = null) => {
-    if (!valIndex) {
-        params.tagGroups = null;
+const removeTagGroupParam = (search, valIndex) => {
+    if (!valIndex && valIndex !== 0) {
+        currentParams.value.tagGroups = null;
         search();
     } else {
-        params.tagGroups.splice(valIndex, 1);
+        currentParams.value.tagGroups.splice(valIndex, 1);
         search();
     }
 };
@@ -201,7 +201,7 @@ onMounted(() => {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(params, searchFn, valIndex)
+                            : removeTagGroupParam(searchFn, valIndex)
                     "
                 >
                     <strong v-if="customTag.label === 'categoryFk'">
@@ -221,7 +221,6 @@ onMounted(() => {
             </template>
         </template>
         <template #body="{ params, searchFn }">
-            {{ params }}
             <QItem class="category-filter q-mt-md">
                 <div
                     v-for="category in categoryList"
@@ -325,13 +324,13 @@ onMounted(() => {
                             dense
                         />
                         <QPopupProxy>
-                            <!-- <CatalogFilterValueDialog
+                            <CatalogFilterValueDialog
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
                                     ($event) => applyTags($event, params, searchFn)
                                 "
-                            /> -->
+                            />
                         </QPopupProxy>
                     </template>
                 </VnInput>

From e10ee5e6c77d4dceff48d9eaf0e97a7694461adb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:26:40 +0100
Subject: [PATCH 091/120] test: #8162 fix vnLocation spec

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

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70c88b26f..70a943688 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -107,7 +107,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
-        it('Create postCode', () => {
+        it.only('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
             cy.get(createLocationButton).click();

From 226f604f9d1f27b2a9bc9b6bc92cd1a72ee12c50 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 09:37:47 +0100
Subject: [PATCH 092/120] test: #8162 fix vnLocation spec

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

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70a943688..70c88b26f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -107,7 +107,7 @@ describe('VnLocation', () => {
             cy.get(inputLocation).should('have.value', postCodeLabel);
         });
 
-        it.only('Create postCode', () => {
+        it('Create postCode', () => {
             const postCode = '1234475';
             const province = 'Valencia';
             cy.get(createLocationButton).click();

From c59baf9cf507c12df101318a99c569f1ff503d14 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:52:11 +0100
Subject: [PATCH 093/120] fix: fix code

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 5211d6e9d..cbd645056 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -79,7 +79,8 @@ onMounted(async () => {
                 </div>
                 <div
                     v-if="
-                        countriesOptions.find((c) => c.id === data.countryFk).code == 'ES'
+                        countriesOptions.find((c) => c.id === data.countryFk)?.code ==
+                        'ES'
                     "
                     class="col"
                 >

From 131cd2de8c52d9d3c28ec8cd1088618e71fea8ef Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Nov 2024 09:53:52 +0100
Subject: [PATCH 094/120] fix: options

---
 src/components/CreateBankEntityForm.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index cbd645056..2da3aa994 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -16,6 +16,10 @@ const state = useState();
 
 const customer = computed(() => state.get('customer'));
 
+const countriesFilter = {
+    fields: ['id', 'name', 'code'],
+};
+
 const bankEntityFormData = reactive({
     name: null,
     bic: null,
@@ -46,6 +50,7 @@ onMounted(async () => {
         :title="t('title')"
         :subtitle="t('subtitle')"
         :form-initial-data="bankEntityFormData"
+        :filter="countriesFilter"
         @on-data-saved="onDataSaved"
     >
         <template #form-inputs="{ data, validate }">

From 9da04881841c5fc269f7fdeab4ed8f7f91790f0b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:03:23 +0100
Subject: [PATCH 095/120] feat: remove comments

---
 test/cypress/integration/client/clientList.spec.js  |  9 ---------
 .../integration/vnComponent/vnLocation.spec.js      | 13 -------------
 test/cypress/support/commands.js                    |  2 +-
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/test/cypress/integration/client/clientList.spec.js b/test/cypress/integration/client/clientList.spec.js
index 37983cc70..431ac0548 100644
--- a/test/cypress/integration/client/clientList.spec.js
+++ b/test/cypress/integration/client/clientList.spec.js
@@ -56,11 +56,6 @@ describe('Client list', () => {
         cy.waitForElement('.q-form');
         cy.checkValueSelectForm(1, search);
         cy.checkValueSelectForm(2, search);
-        // cy.get('@Open').should('have.been.calledOnceWithExactly', [
-        //     '/#/ticket/list?table={"clientFk":1110}&createForm={"addressId":10,"clientId":1110}',
-        //     '_blank',
-        //     'noopener,noreferrer',
-        // ]);
     });
     it('Client founded create order', () => {
         const search = 'Jessica Jones';
@@ -70,9 +65,5 @@ describe('Client list', () => {
         cy.waitForElement('.q-form');
         cy.checkValueForm(1, search);
         cy.checkValueForm(2, search);
-        // cy.get('@Open').should(
-        //     'have.been.calledOnceWithExactly',
-        //     '"/#/order/list?table={"clientFk":1110}&createForm={"addressId":10,"clientFk":1110}", "_blank", "noopener,noreferrer"'
-        // );
     });
 });
diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index 70c88b26f..ef08af679 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -19,26 +19,17 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
         });
         it('should filter provinces based on selected country', () => {
-            // Select a country
             cy.selectOption(countrySelector, 'Ecuador');
-            // Verify that provinces are filtered
             cy.get(countrySelector).should('have.length', 1);
-
-            // Verify that towns are filtered
             cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
-            // Select a country
             cy.selectOption(countrySelector, 'Ecuador');
-            // Verify that provinces are filtered
             cy.get(provinceSelector).should('have.length', 1);
-
-            // Verify that towns are filtered
             cy.get(citySelector).should('have.length', 1);
         });
         it('should pass selected country', () => {
-            // Select a country
             const country = 'Ecuador';
             const province = 'Province five';
 
@@ -67,13 +58,11 @@ describe('VnLocation', () => {
             cy.get(locationOptions).should('have.length.at.least', 5);
         });
         it('input filter location as "al"', function () {
-            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('al');
             cy.get(locationOptions).should('have.length.at.least', 4);
         });
         it('input filter location as "ecuador"', function () {
-            // cy.get(inputLocation).click();
             cy.get(inputLocation).clear();
             cy.get(inputLocation).type('ecuador');
             cy.get(locationOptions).should('have.length.at.least', 1);
@@ -129,7 +118,6 @@ describe('VnLocation', () => {
             const province = 'Saskatchew';
             cy.get(createLocationButton).click();
             cy.get(dialogInputs).eq(0).type(postCode);
-            // city create button
             cy.get(
                 `${createForm.prefix} > :nth-child(4) > .q-select > ${createForm.sufix} > :nth-child(2) > .q-icon`
             ).click();
@@ -138,7 +126,6 @@ describe('VnLocation', () => {
             cy.get('#q-portal--dialog--3 .q-btn--standard').click();
             cy.get('#q-portal--dialog--1 .q-btn--standard').click();
             cy.waitForElement('.q-form');
-
             checkVnLocation(postCode, province);
         });
 
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index d4b2486e7..add41db57 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -294,7 +294,7 @@ Cypress.Commands.add('checkNotification', (text) => {
                 throw new Error(`Notification not found: "${text}"`);
         });
 });
-// :nth-child(2) > .q-field > .q-field__inner > .q-field__control > .q-field__control-container
+
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
         `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`

From deb6467af8ed5072dc714cc459ca036b3803302e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:05:10 +0100
Subject: [PATCH 096/120] feat: remove comments

---
 test/cypress/support/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index add41db57..1765b9043 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -297,7 +297,7 @@ Cypress.Commands.add('checkNotification', (text) => {
 
 Cypress.Commands.add('checkValueForm', (id, search) => {
     cy.get(
-        `.grid-create > :nth-child(${id})  > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
+        `.grid-create > :nth-child(${id}) > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > .q-field__input`
     ).should('have.value', search);
 });
 

From d6aedad38e49ee64b2a6b2f49a107b3b5975a67d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 10:07:03 +0100
Subject: [PATCH 097/120] perf: use const in VnLocation

---
 test/cypress/integration/vnComponent/vnLocation.spec.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/cypress/integration/vnComponent/vnLocation.spec.js b/test/cypress/integration/vnComponent/vnLocation.spec.js
index ef08af679..aeb938c6f 100644
--- a/test/cypress/integration/vnComponent/vnLocation.spec.js
+++ b/test/cypress/integration/vnComponent/vnLocation.spec.js
@@ -19,13 +19,15 @@ describe('VnLocation', () => {
             cy.get(createLocationButton).click();
         });
         it('should filter provinces based on selected country', () => {
-            cy.selectOption(countrySelector, 'Ecuador');
+            const country = 'Ecuador';
+            cy.selectOption(countrySelector, country);
             cy.get(countrySelector).should('have.length', 1);
             cy.get(citySelector).should('have.length', 1);
         });
 
         it('should filter towns based on selected province', () => {
-            cy.selectOption(countrySelector, 'Ecuador');
+            const country = 'Ecuador';
+            cy.selectOption(countrySelector, country);
             cy.get(provinceSelector).should('have.length', 1);
             cy.get(citySelector).should('have.length', 1);
         });

From 2a1cc494990e9589d82e88ee7faeabd64f507be4 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 20 Nov 2024 13:15:40 +0100
Subject: [PATCH 098/120] fix: ticketDescriptor

---
 src/components/common/VnInput.vue              | 8 +++++++-
 src/pages/Ticket/Card/TicketDescriptorMenu.vue | 8 ++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnInput.vue b/src/components/common/VnInput.vue
index 1246eedcd..a74044136 100644
--- a/src/components/common/VnInput.vue
+++ b/src/components/common/VnInput.vue
@@ -99,7 +99,13 @@ const mixinRules = [
                 <QIcon
                     name="close"
                     size="xs"
-                    v-if="hover && value && !$attrs.disabled && $props.clearable"
+                    v-if="
+                        hover &&
+                        value &&
+                        !$attrs.disabled &&
+                        !$attrs.readonly &&
+                        $props.clearable
+                    "
                     @click="
                         () => {
                             value = null;
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index f1d30b1bd..b8e64cb79 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -239,7 +239,7 @@ function makeInvoiceDialog() {
 }
 async function makeInvoice() {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
     };
     await axios.post(`Tickets/invoiceTicketsAndPdf`, params);
 
@@ -265,7 +265,7 @@ async function transferClient(client) {
 
 async function addTurn(day) {
     const params = {
-        ticketFk: parseInt(ticketId),
+        ticketFk: parseInt(ticketId.value),
         weekDay: day,
         agencyModeFk: ticket.value.agencyModeFk,
     };
@@ -280,7 +280,7 @@ async function addTurn(day) {
 
 async function createRefund(withWarehouse) {
     const params = {
-        ticketsIds: [parseInt(ticketId)],
+        ticketsIds: [parseInt(ticketId.value)],
         withWarehouse: withWarehouse,
         negative: true,
     };
@@ -368,7 +368,7 @@ async function uploadDocuware(force) {
 
     const { data } = await axios.post(`Docuwares/upload`, {
         fileCabinet: 'deliveryNote',
-        ticketIds: [parseInt(ticketId)],
+        ticketIds: [parseInt(ticketId.value)],
     });
 
     if (data) notify({ message: t('PDF sent!'), type: 'positive' });

From abd79283ff907b0896acee009115ea38af3967b5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 20 Nov 2024 13:38:22 +0100
Subject: [PATCH 099/120] fix(CatalogFilterValueDialog): from dev and fix

---
 .../Order/Card/CatalogFilterValueDialog.vue   | 38 ++++++-------
 src/pages/Order/Card/OrderCatalog.vue         | 56 ++++++++++++++++---
 src/pages/Order/Card/OrderCatalogFilter.vue   | 23 +++++---
 3 files changed, 79 insertions(+), 38 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 120e2fb72..2cc6c74d3 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -59,15 +59,6 @@ const getSelectedTagValues = async (tag) => {
 <template>
     <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
-            <QBtn
-                round
-                color="primary"
-                style="position: absolute; z-index: 1; right: 0; top: 0"
-                icon="search"
-                type="submit"
-            >
-            </QBtn>
-
             <VnSelect
                 :label="t('params.tag')"
                 v-model="selectedTag"
@@ -82,16 +73,6 @@ const getSelectedTagValues = async (tag) => {
                 use-input
                 @update:model-value="($event) => getSelectedTagValues($event)"
             />
-            <QBtn
-                icon="add_circle"
-                shortcut="+"
-                flat
-                class="filter-icon q-mb-md"
-                size="md"
-                dense
-                :disabled="!selectedTag || !tagValues[0].value"
-                @click="tagValues.unshift({})"
-            />
             <div
                 v-for="(value, index) in tagValues"
                 :key="value"
@@ -120,7 +101,6 @@ const getSelectedTagValues = async (tag) => {
                         :label="t('components.itemsFilterPanel.value')"
                         :disable="!value"
                         is-outlined
-                        :is-clearable="false"
                         class="col"
                     />
                     <QBtn
@@ -131,11 +111,25 @@ const getSelectedTagValues = async (tag) => {
                         rounded
                         flat
                         class="filter-icon col-2"
-                        :disabled="!value.value"
-                        @click="removeTagGroupParam(index)"
+                        @click="tagValues.splice(index, 1)"
                     />
                 </div>
             </div>
+            <QBtn
+                icon="add_circle"
+                shortcut="+"
+                flat
+                class="filter-icon q-mb-md"
+                size="md"
+                dense
+                @click="tagValues.push({})"
+            />
+            <QBtn
+                color="primary"
+                icon="search"
+                type="submit"
+                :label="$t('globals.search')"
+            />
         </QCard>
     </QForm>
 </template>
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b13e8661d..a266fc3d4 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,30 +1,57 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import CatalogItem from 'components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import getParamWhere from 'src/filters/getParamWhere';
+import { useArrayData } from 'composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
+const arrayData = useArrayData('OrderCatalogList');
+const store = arrayData.store;
+const showFilter = ref(null);
 const tags = ref([]);
 
+let catalogParams = {
+    orderFk: route.params.id,
+    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
+};
+
+onBeforeMount(() => {
+    const whereParams = getParamWhere(route);
+    if (whereParams) {
+        const formattedWhereParams = {};
+        if (whereParams.and) {
+            whereParams.and.forEach((item) => {
+                Object.assign(formattedWhereParams, item);
+            });
+        } else {
+            Object.assign(formattedWhereParams, whereParams);
+        }
+
+        catalogParams = {
+            ...catalogParams,
+            ...formattedWhereParams,
+        };
+    } else {
+        showFilter.value = true;
+    }
+});
+
 onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
 });
-onUnmounted(() => (stateStore.rightDrawer = false));
 
-const catalogParams = {
-    orderFk: route.params.id,
-    orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
-};
+onUnmounted(() => (stateStore.rightDrawer = false));
 
 async function checkOrderConfirmation() {
     const response = await axios.get(`Orders/${route.params.id}`);
@@ -34,6 +61,7 @@ async function checkOrderConfirmation() {
 }
 
 function extractTags(items) {
+    if (!items || !items.length) return;
     const resultTags = [];
     (items || []).forEach((item) => {
         (item.tags || []).forEach((tag) => {
@@ -61,6 +89,15 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
+const autoLoad = computed(() => !!catalogParams.categoryFk);
+
+watch(
+    () => store.data,
+    (val) => {
+        extractTags(val);
+    },
+    { immediate: true }
+);
 </script>
 
 <template>
@@ -74,11 +111,12 @@ function extractValueTags(items) {
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea class="fit text-grey-8">
+        <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
                 data-key="OrderCatalogList"
                 :tag-value="tagValue"
                 :tags="tags"
+                :initial-catalog-params="catalogParams"
             />
         </QScrollArea>
     </QDrawer>
@@ -89,8 +127,9 @@ function extractValueTags(items) {
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
-                @on-fetch="extractTags"
+                @on-fetch="showFilter = true"
                 :update-router="false"
+                :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
                     <div class="catalog-list">
@@ -102,6 +141,7 @@ function extractValueTags(items) {
                             :key="row.id"
                             :item="row"
                             is-catalog
+                            class="fill-icon"
                         />
                     </div>
                 </template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 381a0516a..8d5f2c1ca 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -59,20 +59,20 @@ const resetCategory = (params, search) => {
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    removeTagGroupParam(params, search);
+    removeTagGroupParam(search);
 };
 
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
         params.categoryFk = null;
-    } else {
-        selectedCategoryFk.value = category?.id;
-        params.categoryFk = category?.id;
-        params.typeFk = null;
-        selectedTypeFk.value = null;
-        loadTypes(category?.id);
+        return;
     }
+    selectedCategoryFk.value = category?.id;
+    params.categoryFk = category?.id;
+    params.typeFk = null;
+    selectedTypeFk.value = null;
+    loadTypes(category?.id);
     search();
 };
 
@@ -155,6 +155,12 @@ const getCategoryClass = (category, params) => {
     }
 };
 
+const clearFilter = (key) => {
+    if (key === 'categoryFk') {
+        resetCategory();
+    }
+};
+
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -179,6 +185,7 @@ onMounted(() => {
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
+        @remove="clearFilter"
         v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
@@ -328,7 +335,7 @@ onMounted(() => {
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, params, searchFn)
+                                    ($event) => applyTags($event, currentParams, searchFn)
                                 "
                             />
                         </QPopupProxy>

From ad93e16896018423e72454f1ee8b8bd6feb01f9c Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Nov 2024 13:50:35 +0100
Subject: [PATCH 100/120] fix: refs #7229 url

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

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index ef1a1093e..4588265a2 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -9,7 +9,7 @@ const token = getTokenMultimedia();
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
     const response = await axios.get(
-        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
+        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
         { responseType: 'blob' }
     );
 

From 16133faca7308c22ae896731cfbebe5be8bea9b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Wed, 20 Nov 2024 14:29:53 +0100
Subject: [PATCH 101/120] feat: refs #8087 refs#8087 Redadas en travel

---
 .../Card/BasicData/TicketBasicDataForm.vue    | 30 -------------------
 src/pages/Ticket/locale/en.yml                |  1 -
 src/pages/Ticket/locale/es.yml                |  1 -
 3 files changed, 32 deletions(-)

diff --git a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
index cf10b9e21..0c53552fe 100644
--- a/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
+++ b/src/pages/Ticket/Card/BasicData/TicketBasicDataForm.vue
@@ -260,15 +260,6 @@ async function getZone(options) {
         @on-fetch="(data) => (companiesOptions = data)"
         auto-load
     />
-    <FetchData
-        url="Currencies"
-        :filter="{
-            fields: ['id', 'code'],
-            order: 'code ASC',
-        }"
-        @on-fetch="(data) => (currenciesOptions = data)"
-        auto-load
-    />
     <FetchData
         ref="agencyFetchRef"
         url="AgencyModes/byWarehouse"
@@ -424,27 +415,6 @@ async function getZone(options) {
                     </QItem>
                 </template>
             </VnSelect>
-            <VnSelect
-                :label="t('basicData.company')"
-                v-model="formData.companyFk"
-                option-label="code"
-                :options="companiesOptions"
-                :required="true"
-                :rules="validate('basicData.company')"
-            />
-        </VnRow>
-        <VnRow class="row q-gutter-md q-mb-md no-wrap">
-            <VnSelect
-                :label="t('basicData.currencyFk')"
-                v-model="formData.currencyFk"
-                option-value="id"
-                option-label="code"
-                :options="currenciesOptions"
-                hide-selected
-                map-options
-                :required="true"
-                :rules="validate('basicData.currencyFk')"
-            />
         </VnRow>
         <VnRow>
             <VnInputDate
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 797179c4b..41c393a42 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -135,7 +135,6 @@ basicData:
     negativesConfirmMessage: Negatives are going to be generated, are you sure you want to advance all the lines?
     chooseAnOption: Choose an option
     unroutedTicket: The ticket has been unrouted
-    currencyFk: Currency
 purchaseRequest:
     requester: Requester
     atender: Atender
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 2b0bb516b..a851480c1 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -67,7 +67,6 @@ basicData:
     negativesConfirmMessage: Se van a generar negativos, ¿seguro que quieres adelantar todas las líneas?
     chooseAnOption: Elige una opción
     unroutedTicket: El ticket ha sido desenrutado
-    currencyFk: Moneda
 weeklyTickets:
     id: ID Ticket
     shipment: Salida

From bc173d9f6a1478acecbe3b21de214ada7a5d7de1 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Wed, 20 Nov 2024 15:35:37 +0100
Subject: [PATCH 102/120] fix: removed selectedClient

---
 src/pages/InvoiceOut/InvoiceOutList.vue | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 9facb35dc..d39e487ea 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -254,10 +254,7 @@ watchEffect(selectedRows);
                                         @update:model-value="fetchClientAddress"
                                     >
                                         <template #option="scope">
-                                            <QItem
-                                                v-bind="scope.itemProps"
-                                                @click="selectedClient(scope.opt)"
-                                            >
+                                            <QItem v-bind="scope.itemProps">
                                                 <QItemSection>
                                                     <QItemLabel>
                                                         #{{ scope.opt?.id }} -
@@ -296,18 +293,17 @@ watchEffect(selectedRows);
                                                                     : ''
                                                             } `
                                                         }}
-                                                        <span>
-                                                            {{
-                                                                scope.opt?.nickname
-                                                            }}</span
-                                                        >
+                                                        <span>{{
+                                                            scope.opt?.nickname
+                                                        }}</span>
                                                         <span
                                                             v-if="
                                                                 scope.opt?.province ||
                                                                 scope.opt?.city ||
                                                                 scope.opt?.street
                                                             "
-                                                            >, {{ scope.opt?.street }},
+                                                        >
+                                                            , {{ scope.opt?.street }},
                                                             {{ scope.opt?.city }},
                                                             {{
                                                                 scope.opt?.province?.name
@@ -316,8 +312,8 @@ watchEffect(selectedRows);
                                                             {{
                                                                 scope.opt?.agencyMode
                                                                     ?.name
-                                                            }}</span
-                                                        >
+                                                            }}
+                                                        </span>
                                                     </QItemLabel>
                                                 </QItemSection>
                                             </QItem>

From 43f94ede6410b4e8ce4de1a1ec0ffa1cf79a8cbb Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Nov 2024 16:43:59 +0100
Subject: [PATCH 103/120] fix: refs #7229 url + test

---
 src/composables/downloadFile.js               |  2 +-
 .../composables/downloadFile.spec.js          | 33 ++++++++++++-------
 2 files changed, 23 insertions(+), 12 deletions(-)

diff --git a/src/composables/downloadFile.js b/src/composables/downloadFile.js
index 4588265a2..ef1a1093e 100644
--- a/src/composables/downloadFile.js
+++ b/src/composables/downloadFile.js
@@ -9,7 +9,7 @@ const token = getTokenMultimedia();
 export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     const appUrl = (await getUrl('', 'lilium')).replace('/#/', '');
     const response = await axios.get(
-        url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`,
+        url ?? `${appUrl}/${model}/${id}${urlPath}?access_token=${token}`,
         { responseType: 'blob' }
     );
 
diff --git a/test/vitest/__tests__/composables/downloadFile.spec.js b/test/vitest/__tests__/composables/downloadFile.spec.js
index f611479bf..8d480fcef 100644
--- a/test/vitest/__tests__/composables/downloadFile.spec.js
+++ b/test/vitest/__tests__/composables/downloadFile.spec.js
@@ -1,25 +1,36 @@
-import { vi, describe, expect, it } from 'vitest';
+import { vi, describe, expect, it, beforeAll, afterAll } from 'vitest';
 import { axios } from 'app/test/vitest/helper';
 import { downloadFile } from 'src/composables/downloadFile';
 import { useSession } from 'src/composables/useSession';
-
 const session = useSession();
 const token = session.getToken();
 
 describe('downloadFile', () => {
+    const baseUrl = 'http://localhost:9000';
+    let defaulCreateObjectURL;
+
+    beforeAll(() => {
+        defaulCreateObjectURL = window.URL.createObjectURL;
+        window.URL.createObjectURL = vi.fn(() => 'blob:http://localhost:9000/blob-id');
+    });
+
+    afterAll(() => (window.URL.createObjectURL = defaulCreateObjectURL));
+
     it('should open a new window to download the file', async () => {
-        const url = 'http://localhost:9000';
-
-        vi.spyOn(axios, 'get').mockResolvedValueOnce({ data: url });
-
-        const mockWindowOpen = vi.spyOn(window, 'open');
+        const res = {
+            data: new Blob(['file content'], { type: 'application/octet-stream' }),
+            headers: { 'content-disposition': 'attachment; filename="test-file.txt"' },
+        };
+        vi.spyOn(axios, 'get').mockImplementation((url) => {
+            if (url == 'Urls/getUrl') return Promise.resolve({ data: baseUrl });
+            else if (url.includes('downloadFile')) return Promise.resolve(res);
+        });
 
         await downloadFile(1);
 
-        expect(mockWindowOpen).toHaveBeenCalledWith(
-            `${url}/api/dms/1/downloadFile?access_token=${token}`
+        expect(axios.get).toHaveBeenCalledWith(
+            `${baseUrl}/dms/1/downloadFile?access_token=${token}`,
+            { responseType: 'blob' }
         );
-
-        mockWindowOpen.mockRestore();
     });
 });

From 7039b68bba8d540be53d5f19ff3cdfc24ef508f1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 20 Nov 2024 17:23:40 +0100
Subject: [PATCH 104/120] fix: refs #7874 show name

---
 src/pages/Claim/Card/ClaimNotes.vue   | 2 +-
 src/pages/Worker/Card/WorkerNotes.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index a4d11e9f6..134ee33ab 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -25,7 +25,7 @@ const claimFilter = computed(() => {
                 include: {
                     relation: 'user',
                     scope: {
-                        fields: ['id', 'nickname'],
+                        fields: ['id', 'nickname', 'name'],
                     },
                 },
             },
diff --git a/src/pages/Worker/Card/WorkerNotes.vue b/src/pages/Worker/Card/WorkerNotes.vue
index c15b1dfab..4f123206b 100644
--- a/src/pages/Worker/Card/WorkerNotes.vue
+++ b/src/pages/Worker/Card/WorkerNotes.vue
@@ -15,7 +15,7 @@ const filter = {
             include: {
                 relation: 'user',
                 scope: {
-                    fields: ['id', 'nickname'],
+                    fields: ['id', 'nickname', 'name'],
                 },
             },
         },

From 3b5d385d22646f18809955bc91bbba2780194f75 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 20 Nov 2024 22:43:04 +0100
Subject: [PATCH 105/120] fix: use id instead description to open
 InvoiceOutDescriptor

---
 src/pages/Claim/Card/ClaimLinesImport.vue   | 2 +-
 src/pages/Customer/Card/CustomerBalance.vue | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index 539d11a7f..d39262a86 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -130,7 +130,7 @@ function cancel() {
                 <template #body-cell-description="{ row, value }">
                     <QTd auto-width align="right" class="link">
                         {{ value }}
-                        <ItemDescriptorProxy :id="row.itemFk"></ItemDescriptorProxy>
+                        <ItemDescriptorProxy :id="row.itemFk" />
                     </QTd>
                 </template>
             </QTable>
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index f6fc3eed2..712be5e09 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -256,10 +256,10 @@ const showBalancePdf = ({ id }) => {
             {{ toCurrency(balances[rowIndex]?.balance) }}
         </template>
         <template #column-description="{ row }">
-            <div class="link" v-if="row.isInvoice">
+            <span class="link" v-if="row.isInvoice" @click.stop>
                 {{ t('bill', { ref: row.description }) }}
-                <InvoiceOutDescriptorProxy :id="row.description" />
-            </div>
+                <InvoiceOutDescriptorProxy :id="row.id" />
+            </span>
             <span v-else class="q-pa-xs dotted rounded-borders" :title="row.description">
                 {{ row.description }}
             </span>

From 8e411125bfbc3d2fe4541b2e977d656d35427567 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 20 Nov 2024 18:58:08 -0300
Subject: [PATCH 106/120] test: refs #8162 more tests and change data-testid
 for data-cy

---
 src/components/CrudModel.vue                  |  2 +-
 src/components/VnTable/VnTable.vue            |  2 +-
 src/components/common/VnSmsDialog.vue         |  4 +-
 src/components/ui/VnConfirm.vue               |  1 -
 src/components/ui/VnSearchbar.vue             |  2 +-
 src/pages/Claim/Card/ClaimDescriptorMenu.vue  |  2 +-
 src/pages/Ticket/Card/TicketDescriptor.vue    |  2 +-
 src/pages/Ticket/Card/TicketEditMana.vue      |  2 +-
 src/pages/Ticket/Card/TicketNotes.vue         |  8 +-
 src/pages/Ticket/Card/TicketSale.vue          | 17 ++--
 .../Ticket/Card/TicketSaleMoreActions.vue     | 30 ++++---
 src/pages/Ticket/Card/TicketSummary.vue       |  2 +-
 src/pages/Ticket/Card/TicketTransfer.vue      |  2 +-
 src/pages/Ticket/Card/TicketTransferForm.vue  |  3 +
 src/pages/Ticket/TicketList.vue               |  4 +-
 .../integration/ticket/ticketNotes.spec.js    |  6 +-
 .../integration/ticket/ticketSale.spec.js     | 78 ++++++++++++++++++-
 test/cypress/support/commands.js              |  2 +-
 18 files changed, 130 insertions(+), 39 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index ee7caecc4..5eba97dc8 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -394,7 +394,7 @@ watch(formUrl, async () => {
                 @click="onSubmit"
                 :disable="!hasChanges"
                 :title="t('globals.save')"
-                data-testid="crudModelDefaultSaveBtn"
+                data-cy="crudModelDefaultSaveBtn"
             />
             <slot name="moreAfterActions" />
         </QBtnGroup>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 99a9a6801..1213f61c5 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -737,7 +737,7 @@ function handleSelection({ evt, added, rows: selectedRows }, rows) {
             fab
             icon="add"
             shortcut="+"
-            data-testid="vnTableCreateBtn"
+            data-cy="vnTableCreateBtn"
         />
         <QTooltip self="top right">
             {{ createForm?.title }}
diff --git a/src/components/common/VnSmsDialog.vue b/src/components/common/VnSmsDialog.vue
index dbe16f57b..8851a33b2 100644
--- a/src/components/common/VnSmsDialog.vue
+++ b/src/components/common/VnSmsDialog.vue
@@ -86,7 +86,7 @@ async function send() {
 </script>
 
 <template>
-    <QDialog ref="dialogRef" data-testid="vnSmsDialog">
+    <QDialog ref="dialogRef" data-cy="vnSmsDialog">
         <QCard class="q-pa-sm">
             <QCardSection class="row items-center q-pb-none">
                 <span class="text-h6 text-grey">
@@ -161,7 +161,7 @@ async function send() {
                     :loading="isLoading"
                     color="primary"
                     unelevated
-                    data-testid="sendSmsBtn"
+                    data-cy="sendSmsBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnConfirm.vue b/src/components/ui/VnConfirm.vue
index 767e2ca5a..0b1913383 100644
--- a/src/components/ui/VnConfirm.vue
+++ b/src/components/ui/VnConfirm.vue
@@ -104,7 +104,6 @@ function cancel() {
                     unelevated
                     autofocus
                     data-cy="VnConfirm_confirm"
-                    data-testid="vnConfirmConfirmBtn"
                 />
             </QCardActions>
         </QCard>
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 56397d63b..ccf87c6d6 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -130,7 +130,7 @@ async function search() {
                 dense
                 standout
                 autofocus
-                data-testid="vnSearchBar"
+                data-cy="vnSearchBar"
             >
                 <template #prepend>
                     <QIcon
diff --git a/src/pages/Claim/Card/ClaimDescriptorMenu.vue b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
index d88c3d120..d87091887 100644
--- a/src/pages/Claim/Card/ClaimDescriptorMenu.vue
+++ b/src/pages/Claim/Card/ClaimDescriptorMenu.vue
@@ -100,7 +100,7 @@ async function remove() {
         </QMenu>
     </QItem>
     <QSeparator />
-    <QItem @click="confirmRemove()" v-ripple clickable>
+    <QItem @click="confirmRemove()" v-ripple clickable data-cy="deleteClaim">
         <QItemSection avatar>
             <QIcon name="delete" />
         </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketDescriptor.vue b/src/pages/Ticket/Card/TicketDescriptor.vue
index 9ef30543c..4e77b633f 100644
--- a/src/pages/Ticket/Card/TicketDescriptor.vue
+++ b/src/pages/Ticket/Card/TicketDescriptor.vue
@@ -130,7 +130,7 @@ function ticketFilter(ticket) {
                     <QBadge
                         text-color="black"
                         :color="entity.ticketState.state.classColor"
-                        data-testid="ticketDescriptorStateBadge"
+                        data-cy="ticketDescriptorStateBadge"
                     >
                         {{ entity.ticketState.state.name }}
                     </QBadge>
diff --git a/src/pages/Ticket/Card/TicketEditMana.vue b/src/pages/Ticket/Card/TicketEditMana.vue
index fd385087b..693875712 100644
--- a/src/pages/Ticket/Card/TicketEditMana.vue
+++ b/src/pages/Ticket/Card/TicketEditMana.vue
@@ -75,7 +75,7 @@ const cancel = () => {
                     dense
                     style="width: 50%"
                     @click="save()"
-                    data-testid="saveManaBtn"
+                    data-cy="saveManaBtn"
                 >
                     {{ t('globals.save') }}
                 </QBtn>
diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index 871f36476..55a6188d9 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -86,14 +86,14 @@ async function handleSave() {
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
-                            data-testid="ticketNotesObservationType"
+                            data-cy="ticketNotesObservationType"
                         />
                         <VnInput
                             :label="t('basicData.description')"
                             v-model="row.description"
                             class="col"
                             @keyup.enter="handleSave"
-                            data-testid="ticketNotesDescription"
+                            data-cy="ticketNotesDescription"
                         />
                         <QIcon
                             name="delete"
@@ -101,7 +101,7 @@ async function handleSave() {
                             class="cursor-pointer"
                             color="primary"
                             @click="handleDelete(row)"
-                            data-testid="ticketNotesRemoveNoteBtn"
+                            data-cy="ticketNotesRemoveNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.removeNote') }}
@@ -116,7 +116,7 @@ async function handleSave() {
                             class="fill-icon-on-hover q-ml-md"
                             color="primary"
                             @click="ticketNotesCrudRef.insert()"
-                            data-testid="ticketNotesAddNoteBtn"
+                            data-cy="ticketNotesAddNoteBtn"
                         >
                             <QTooltip>
                                 {{ t('ticketNotes.addNote') }}
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 93278eb3d..0967f60b6 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -577,7 +577,7 @@ watch(
                     color="primary"
                     :disable="!isTicketEditable || ticketState === 'OK'"
                     @click="changeTicketState('OK')"
-                    data-testid="ticketSaleOkStateBtn"
+                    data-cy="ticketSaleOkStateBtn"
                 >
                     <QTooltip>{{ t(`Change ticket state to 'Ok'`) }}</QTooltip>
                 </QBtn>
@@ -586,7 +586,7 @@ watch(
                     color="primary"
                     :label="t('ticketList.state')"
                     :disable="!isTicketEditable"
-                    data-testid="ticketSaleStateDropdown"
+                    data-cy="ticketSaleStateDropdown"
                 >
                     <VnSelect
                         :options="editableStatesOptions"
@@ -596,7 +596,7 @@ watch(
                         hide-dropdown-icon
                         focus-on-mount
                         @update:model-value="changeTicketState"
-                        data-testid="ticketSaleStateSelect"
+                        data-cy="ticketSaleStateSelect"
                     />
                 </QBtnDropdown>
                 <TicketSaleMoreActions
@@ -629,6 +629,7 @@ watch(
                     icon="vn:splitline"
                     :disable="!isTicketEditable || !hasSelectedRows"
                     @click="setTransferParams()"
+                    data-cy="ticketSaleTransferBtn"
                 >
                     <QTooltip>{{ t('Transfer lines') }}</QTooltip>
                     <TicketTransfer
@@ -708,7 +709,13 @@ watch(
                     {{ t('ticketSale.visible') }}: {{ row.visible || 0 }}
                 </QTooltip>
             </QIcon>
-            <QIcon v-if="row.reserved" color="primary" name="vn:reserva" size="xs">
+            <QIcon
+                v-if="row.reserved"
+                color="primary"
+                name="vn:reserva"
+                size="xs"
+                data-cy="ticketSaleReservedIcon"
+            >
                 <QTooltip>
                     {{ t('ticketSale.reserved') }}
                 </QTooltip>
@@ -867,7 +874,7 @@ watch(
             fab
             icon="add"
             shortcut="+"
-            data-testid="ticketSaleAddToBasketBtn"
+            data-cy="ticketSaleAddToBasketBtn"
         />
         <QTooltip class="text-no-wrap">
             {{ t('Add item to basket') }}
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 7da28deb8..2a8e0237f 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -179,7 +179,7 @@ const createRefund = async (withWarehouse) => {
         color="primary"
         :label="t('ticketSale.more')"
         :disable="disable"
-        data-testid="ticketSaleMoreActionsDropdown"
+        data-cy="ticketSaleMoreActionsDropdown"
     >
         <template #label>
             <QTooltip>{{ t('Select lines to see the options') }}</QTooltip>
@@ -191,7 +191,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="showSmsDialog('productNotAvailable')"
-                data-testid="sendShortageSMSItem"
+                data-cy="sendShortageSMSItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Send shortage SMS') }}</QItemLabel>
@@ -203,7 +203,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="calculateSalePrice()"
-                data-testid="recalculatePriceItem"
+                data-cy="recalculatePriceItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Recalculate price') }}</QItemLabel>
@@ -213,7 +213,7 @@ const createRefund = async (withWarehouse) => {
                 clickable
                 v-ripple
                 @click="emit('getMana')"
-                data-testid="updateDiscountItem"
+                data-cy="updateDiscountItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Update discount') }}</QItemLabel>
@@ -223,7 +223,7 @@ const createRefund = async (withWarehouse) => {
                         v-model.number="newDiscount"
                         :label="t('ticketSale.discount')"
                         type="number"
-                        data-testid="ticketSaleDiscountInput"
+                        data-cy="ticketSaleDiscountInput"
                     />
                 </TicketEditManaProxy>
             </QItem>
@@ -233,7 +233,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="createClaim()"
-                data-testid="createClaimItem"
+                data-cy="createClaimItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Add claim') }}</QItemLabel>
@@ -245,6 +245,7 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(true)"
+                data-cy="markAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Mark as reserved') }}</QItemLabel>
@@ -256,12 +257,13 @@ const createRefund = async (withWarehouse) => {
                 v-close-popup
                 v-ripple
                 @click="setReserved(false)"
+                data-cy="unmarkAsReservedItem"
             >
                 <QItemSection>
                     <QItemLabel>{{ t('Unmark as reserved') }}</QItemLabel>
                 </QItemSection>
             </QItem>
-            <QItem clickable v-ripple>
+            <QItem clickable v-ripple data-cy="ticketSaleRefundItem">
                 <QItemSection>
                     <QItemLabel>{{ t('Refund') }}</QItemLabel>
                 </QItemSection>
@@ -270,12 +272,22 @@ const createRefund = async (withWarehouse) => {
                 </QItemSection>
                 <QMenu anchor="top end" self="top start" auto-close bordered>
                     <QList>
-                        <QItem v-ripple clickable @click="createRefund(true)">
+                        <QItem
+                            v-ripple
+                            clickable
+                            @click="createRefund(true)"
+                            data-cy="ticketSaleRefundWithWarehouse"
+                        >
                             <QItemSection>
                                 {{ t('with warehouse') }}
                             </QItemSection>
                         </QItem>
-                        <QItem v-ripple clickable @click="createRefund(false)">
+                        <QItem
+                            v-ripple
+                            clickable
+                            @click="createRefund(false)"
+                            data-cy="ticketSaleRefundWithoutWarehouse"
+                        >
                             <QItemSection>
                                 {{ t('without warehouse') }}
                             </QItemSection>
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index b3ee9ad37..650e28e8f 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -100,7 +100,7 @@ function toTicketUrl(section) {
         ref="summaryRef"
         :url="`Tickets/${entityId}/summary`"
         data-key="TicketSummary"
-        data-testid="ticketSummary"
+        data-cy="ticketSummary"
     >
         <template #header-left>
             <VnToSummary
diff --git a/src/pages/Ticket/Card/TicketTransfer.vue b/src/pages/Ticket/Card/TicketTransfer.vue
index d7aff3ef7..005d74a0e 100644
--- a/src/pages/Ticket/Card/TicketTransfer.vue
+++ b/src/pages/Ticket/Card/TicketTransfer.vue
@@ -91,7 +91,7 @@ onMounted(() => (_transfer.value = $props.transfer));
 </script>
 
 <template>
-    <QPopupProxy ref="QPopupProxyRef">
+    <QPopupProxy ref="QPopupProxyRef" data-cy="ticketTransferPopup">
         <QCard class="q-px-md" style="display: flex; width: 80vw">
             <QTable
                 :rows="transfer.sales"
diff --git a/src/pages/Ticket/Card/TicketTransferForm.vue b/src/pages/Ticket/Card/TicketTransferForm.vue
index d07a9d2e7..ece3a3b97 100644
--- a/src/pages/Ticket/Card/TicketTransferForm.vue
+++ b/src/pages/Ticket/Card/TicketTransferForm.vue
@@ -57,6 +57,7 @@ defineExpose({ transferSales });
             v-model.number="_transfer.ticketId"
             :label="t('Transfer to ticket')"
             :clearable="false"
+            data-cy="ticketTransferDestinationTicketInput"
         >
             <template #append>
                 <QBtn
@@ -64,6 +65,7 @@ defineExpose({ transferSales });
                     color="primary"
                     @click="transferSales(_transfer.ticketId)"
                     style="width: 30px"
+                    data-cy="ticketTransferTransferBtn"
                 />
             </template>
         </VnInput>
@@ -72,6 +74,7 @@ defineExpose({ transferSales });
             color="primary"
             class="full-width q-my-lg"
             @click="transferSales()"
+            data-cy="ticketTransferNewTicketBtn"
         />
     </QForm>
 </template>
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 83f0f7c07..9246ac60d 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -461,7 +461,7 @@ function setReference(data) {
         data-key="TicketList"
         :label="t('Search ticket')"
         :info="t('You can search by ticket id or alias')"
-        data-testid="ticketListSearchBar"
+        data-cy="ticketListSearchBar"
     />
     <RightMenu>
         <template #right-panel>
@@ -489,7 +489,7 @@ function setReference(data) {
             'row-key': 'id',
             selection: 'multiple',
         }"
-        data-testid="ticketListTable"
+        data-cy="ticketListTable"
     >
         <template #column-statusIcons="{ row }">
             <div class="q-gutter-x-xs">
diff --git a/test/cypress/integration/ticket/ticketNotes.spec.js b/test/cypress/integration/ticket/ticketNotes.spec.js
index f8fb530ef..ef196c783 100644
--- a/test/cypress/integration/ticket/ticketNotes.spec.js
+++ b/test/cypress/integration/ticket/ticketNotes.spec.js
@@ -10,16 +10,16 @@ describe('TicketRequest', () => {
         cy.dataCy('ticketNotesAddNoteBtn').should('exist');
         cy.dataCy('ticketNotesAddNoteBtn').click();
         cy.dataCy('ticketNotesObservationType').should('exist');
-        cy.selectOption('[data-testid="ticketNotesObservationType"]:last', 'Weight');
+        cy.selectOption('[data-cy="ticketNotesObservationType"]:last', 'Weight');
         cy.dataCy('ticketNotesDescription').should('exist');
-        cy.get('[data-testid="ticketNotesDescription"]:last').type(
+        cy.get('[data-cy="ticketNotesDescription"]:last').type(
             'This is a note description'
         );
         cy.dataCy('crudModelDefaultSaveBtn').click();
         cy.checkNotification('Data saved');
         cy.dataCy('ticketNotesRemoveNoteBtn').should('exist');
         cy.dataCy('ticketNotesRemoveNoteBtn').click();
-        cy.dataCy('vnConfirmConfirmBtn').click();
+        cy.dataCy('VnConfirm_confirm').click();
         cy.checkNotification('Data saved');
     });
 });
diff --git a/test/cypress/integration/ticket/ticketSale.spec.js b/test/cypress/integration/ticket/ticketSale.spec.js
index b3c3edd8b..60f31dbf6 100644
--- a/test/cypress/integration/ticket/ticketSale.spec.js
+++ b/test/cypress/integration/ticket/ticketSale.spec.js
@@ -1,5 +1,7 @@
 /// <reference types="cypress" />
 
+const c = require('croppie');
+
 describe('TicketSale', () => {
     beforeEach(() => {
         cy.login('developer');
@@ -26,7 +28,7 @@ describe('TicketSale', () => {
     it('should send SMS', () => {
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="sendShortageSMSItem"]');
+        cy.waitForElement('[data-cy="sendShortageSMSItem"]');
         cy.dataCy('sendShortageSMSItem').should('exist');
         cy.dataCy('sendShortageSMSItem').click();
         cy.dataCy('vnSmsDialog').should('exist');
@@ -38,7 +40,7 @@ describe('TicketSale', () => {
         cy.intercept('POST', '**/recalculatePrice').as('recalculatePrice');
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="recalculatePriceItem"]');
+        cy.waitForElement('[data-cy="recalculatePriceItem"]');
         cy.dataCy('recalculatePriceItem').should('exist');
         cy.dataCy('recalculatePriceItem').click();
         cy.wait('@recalculatePrice').its('response.statusCode').should('eq', 200);
@@ -48,14 +50,82 @@ describe('TicketSale', () => {
     it('should update discount when "Update discount" is clicked', () => {
         selectFirstRow();
         cy.dataCy('ticketSaleMoreActionsDropdown').click();
-        cy.waitForElement('[data-testid="updateDiscountItem"]');
+        cy.waitForElement('[data-cy="updateDiscountItem"]');
         cy.dataCy('updateDiscountItem').should('exist');
         cy.dataCy('updateDiscountItem').click();
-        cy.waitForElement('[data-testid="ticketSaleDiscountInput"]');
+        cy.waitForElement('[data-cy="ticketSaleDiscountInput"]');
         cy.dataCy('ticketSaleDiscountInput').find('input').focus();
         cy.dataCy('ticketSaleDiscountInput').find('input').type('10');
         cy.dataCy('saveManaBtn').click();
         cy.waitForElement('.q-notification__message');
         cy.checkNotification('Data saved');
     });
+
+    it('adds claim', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('createClaimItem').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.url().should('match', /\/claim\/\d+\/basic-data/);
+        // Delete created claim to avoid cluttering the database
+        cy.dataCy('descriptor-more-opts').click();
+        cy.dataCy('deleteClaim').click();
+        cy.dataCy('VnConfirm_confirm').click();
+        cy.checkNotification('Data deleted');
+    });
+
+    it('marks row as reserved', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-cy="markAsReservedItem"]');
+        cy.dataCy('markAsReservedItem').click();
+        cy.dataCy('ticketSaleReservedIcon').should('exist');
+    });
+
+    it('unmarks row as reserved', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.waitForElement('[data-cy="unmarkAsReservedItem"]');
+        cy.dataCy('unmarkAsReservedItem').click();
+        cy.dataCy('ticketSaleReservedIcon').should('not.exist');
+    });
+
+    it('refunds row with warehouse', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('ticketSaleRefundItem').click();
+        cy.dataCy('ticketSaleRefundWithWarehouse').click();
+        cy.checkNotification('The following refund ticket have been created');
+    });
+
+    it('refunds row without warehouse', () => {
+        selectFirstRow();
+        cy.dataCy('ticketSaleMoreActionsDropdown').click();
+        cy.dataCy('ticketSaleRefundItem').click();
+        cy.dataCy('ticketSaleRefundWithoutWarehouse').click();
+        cy.checkNotification('The following refund ticket have been created');
+    });
+
+    it('transfers ticket', () => {
+        cy.visit('/#/ticket/32/sale');
+        selectFirstRow();
+        cy.dataCy('ticketSaleTransferBtn').click();
+        cy.dataCy('ticketTransferPopup').should('exist');
+        cy.dataCy('ticketTransferNewTicketBtn').click();
+        // existen 3 elementos "tbody" necesito checkear que el segundo elemento tbody tenga una row sola
+        cy.get('tbody').eq(1).find('tr').should('have.length', 1);
+        selectFirstRow();
+        cy.dataCy('ticketSaleTransferBtn').click();
+        cy.dataCy('ticketTransferPopup').should('exist');
+        cy.dataCy('ticketTransferDestinationTicketInput').find('input').focus();
+        cy.dataCy('ticketTransferDestinationTicketInput').find('input').type('32');
+        cy.dataCy('ticketTransferTransferBtn').click();
+        // checkear que la url contenga /ticket/1000002/sale
+        cy.url().should('match', /\/ticket\/32\/sale/);
+    });
+
+    it('should redirect to ticket logs', () => {
+        cy.get(firstRow).find('.q-btn:last').click();
+        cy.url().should('match', /\/ticket\/31\/log/);
+    });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index 91c0b3f05..68fc10b23 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -312,6 +312,6 @@ Cypress.Commands.add('searchByLabel', (label, value) => {
     cy.get(`[label="${label}"] > .q-field > .q-field__inner`).type(`${value}{enter}`);
 });
 
-Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-testid') => {
+Cypress.Commands.add('dataCy', (dataTestId, attr = 'data-cy') => {
     return cy.get(`[${attr}="${dataTestId}"]`);
 });

From c5acde22a32779d84d5c0f13f1021dce002d1ea2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:42:00 +0100
Subject: [PATCH 107/120] chore: requested changes

---
 .../Order/Card/CatalogFilterValueDialog.vue     | 16 ++++------------
 src/pages/Order/Card/OrderCatalog.vue           | 17 +++++++++--------
 src/pages/Order/Card/OrderCatalogFilter.vue     | 14 ++++++--------
 3 files changed, 19 insertions(+), 28 deletions(-)

diff --git a/src/pages/Order/Card/CatalogFilterValueDialog.vue b/src/pages/Order/Card/CatalogFilterValueDialog.vue
index 2cc6c74d3..9593e08c4 100644
--- a/src/pages/Order/Card/CatalogFilterValueDialog.vue
+++ b/src/pages/Order/Card/CatalogFilterValueDialog.vue
@@ -2,7 +2,7 @@
 import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
-import VnSelect from 'components/common/VnSelect.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 
 const props = defineProps({
@@ -31,14 +31,6 @@ const applyTags = () => {
     emit('applyTags', tagInfo);
 };
 
-const removeTagGroupParam = (valIndex = null) => {
-    if (!valIndex) {
-        tagValues.value = [{}];
-    } else {
-        (tagValues.value || []).splice(valIndex, 1);
-    }
-};
-
 const getSelectedTagValues = async (tag) => {
     if (!tag?.id) return;
     const filter = {
@@ -57,7 +49,7 @@ const getSelectedTagValues = async (tag) => {
 </script>
 
 <template>
-    <QForm @submit="applyTags(tagValues)" class="all-pointer-events">
+    <QForm @submit="applyTags()" class="all-pointer-events">
         <QCard class="q-pa-sm column q-pa-lg">
             <VnSelect
                 :label="t('params.tag')"
@@ -71,7 +63,7 @@ const getSelectedTagValues = async (tag) => {
                 rounded
                 :emit-value="false"
                 use-input
-                @update:model-value="($event) => getSelectedTagValues($event)"
+                @update:model-value="getSelectedTagValues"
             />
             <div
                 v-for="(value, index) in tagValues"
@@ -83,7 +75,7 @@ const getSelectedTagValues = async (tag) => {
                         v-if="!selectedTag?.isFree && tagOptions"
                         :label="t('components.itemsFilterPanel.value')"
                         v-model="value.value"
-                        :options="tagOptions || []"
+                        :options="tagOptions"
                         option-value="value"
                         option-label="value"
                         dense
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index a266fc3d4..b65f6bcd1 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -4,18 +4,19 @@ import { useRoute, useRouter } from 'vue-router';
 import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import CatalogItem from 'components/ui/CatalogItem.vue';
-import OrderCatalogFilter from 'pages/Order/Card/OrderCatalogFilter.vue';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import CatalogItem from 'src/components/ui/CatalogItem.vue';
+import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import getParamWhere from 'src/filters/getParamWhere';
-import { useArrayData } from 'composables/useArrayData';
+import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
 const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const arrayData = useArrayData('OrderCatalogList');
+const dataKey = 'OrderCatalogList';
+const arrayData = useArrayData('dataKey');
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);
@@ -102,7 +103,7 @@ watch(
 
 <template>
     <VnSearchbar
-        data-key="OrderCatalogList"
+        :data-key="dataKey"
         :user-params="catalogParams"
         :static-params="['orderFk', 'orderBy']"
         :redirect="false"
@@ -113,7 +114,7 @@ watch(
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea v-if="showFilter" class="fit text-grey-8">
             <OrderCatalogFilter
-                data-key="OrderCatalogList"
+                :data-key="dataKey"
                 :tag-value="tagValue"
                 :tags="tags"
                 :initial-catalog-params="catalogParams"
@@ -123,7 +124,7 @@ watch(
     <QPage class="column items-center q-pa-md">
         <div class="full-width">
             <VnPaginate
-                data-key="OrderCatalogList"
+                :data-key="dataKey"
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 8d5f2c1ca..8aa88da0d 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -53,6 +53,11 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
+onMounted(() => {
+    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
+    selectedTypeFk.value = getParamWhere(route, 'typeFk');
+});
+
 const resetCategory = (params, search) => {
     selectedCategoryFk.value = null;
     typeList.value = null;
@@ -65,7 +70,6 @@ const resetCategory = (params, search) => {
 const selectCategory = (params, category, search) => {
     if (params.categoryFk === category?.id) {
         resetCategory(params, search);
-        params.categoryFk = null;
         return;
     }
     selectedCategoryFk.value = category?.id;
@@ -131,11 +135,10 @@ async function onSearchByTag(value) {
 const removeTagGroupParam = (search, valIndex) => {
     if (!valIndex && valIndex !== 0) {
         currentParams.value.tagGroups = null;
-        search();
     } else {
         currentParams.value.tagGroups.splice(valIndex, 1);
-        search();
     }
+    search();
 };
 
 const setCategoryList = (data) => {
@@ -168,11 +171,6 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
-
-onMounted(() => {
-    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-});
 </script>
 
 <template>

From 44f2ecca286f8a4d20a3352eebf990126031b1bf Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 21 Nov 2024 07:49:10 +0100
Subject: [PATCH 108/120] chore: requested changes

---
 src/components/ui/VnToSummary.vue     | 1 -
 src/pages/Order/Card/OrderCatalog.vue | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/components/ui/VnToSummary.vue b/src/components/ui/VnToSummary.vue
index 1c7d6cf01..305d65e02 100644
--- a/src/components/ui/VnToSummary.vue
+++ b/src/components/ui/VnToSummary.vue
@@ -1,6 +1,5 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { defineProps } from 'vue';
 
 const props = defineProps({
     routeName: {
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index b65f6bcd1..66a1a132d 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -16,7 +16,7 @@ const router = useRouter();
 const stateStore = useStateStore();
 const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
-const arrayData = useArrayData('dataKey');
+const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
 const showFilter = ref(null);
 const tags = ref([]);

From e5434e743613a0595df2af9aac285b5d7a1f6e91 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 21 Nov 2024 09:08:52 +0000
Subject: [PATCH 109/120] warmfix: ItemLastEntries to date

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

diff --git a/src/pages/Item/Card/ItemLastEntries.vue b/src/pages/Item/Card/ItemLastEntries.vue
index 5c0251ea8..22fb9adc7 100644
--- a/src/pages/Item/Card/ItemLastEntries.vue
+++ b/src/pages/Item/Card/ItemLastEntries.vue
@@ -170,7 +170,7 @@ onMounted(async () => {
     from.value = getDate(_from, 'from');
     const _to = Date.vnNew();
     _to.setDate(_to.getDate() + 10);
-    to.value = getDate(Date.vnNew(), 'to');
+    to.value = getDate(_to, 'to');
 
     updateFilter();
 

From 5ff95c2b93c18af2b7cbe2db97d44a256c7c0f45 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 21 Nov 2024 10:10:44 +0100
Subject: [PATCH 110/120] fix: locations tree

---
 src/pages/Zone/Card/ZoneCard.vue          |   1 -
 src/pages/Zone/Card/ZoneLocationsTree.vue | 154 +++++++---------------
 2 files changed, 48 insertions(+), 107 deletions(-)

diff --git a/src/pages/Zone/Card/ZoneCard.vue b/src/pages/Zone/Card/ZoneCard.vue
index 8ad25b80f..a470cd5bd 100644
--- a/src/pages/Zone/Card/ZoneCard.vue
+++ b/src/pages/Zone/Card/ZoneCard.vue
@@ -24,7 +24,6 @@ function notIsLocations(ifIsFalse, ifIsTrue) {
         :descriptor="ZoneDescriptor"
         :filter-panel="notIsLocations(ZoneFilterPanel, undefined)"
         :search-data-key="notIsLocations('ZoneList', undefined)"
-        :custom-url="`Zones/${route.params?.id}/getLeaves`"
         :searchbar-props="{
             url: notIsLocations('Zones', 'ZoneLocations'),
             label: notIsLocations(t('list.searchZone'), t('list.searchLocation')),
diff --git a/src/pages/Zone/Card/ZoneLocationsTree.vue b/src/pages/Zone/Card/ZoneLocationsTree.vue
index c91bf670c..23a37ef7c 100644
--- a/src/pages/Zone/Card/ZoneLocationsTree.vue
+++ b/src/pages/Zone/Card/ZoneLocationsTree.vue
@@ -39,8 +39,7 @@ const url = computed(() => `Zones/${route.params.id}/getLeaves`);
 const arrayData = useArrayData(datakey, {
     url: url.value,
 });
-const { store } = arrayData;
-const storeData = computed(() => store.data);
+const store = arrayData.store;
 
 const defaultNode = {
     id: null,
@@ -66,8 +65,20 @@ const onNodeExpanded = async (nodeKeysArray) => {
     if (!nodeKeysSet.has(null)) return;
 
     const wasExpanded = !previousExpandedNodes.value.has(lastNodeKey);
-    if (wasExpanded) await fetchNodeLeaves(lastNodeKey);
-    else {
+    if (wasExpanded && treeRef.value) {
+        const node = treeRef.value?.getNodeByKey(lastNodeKey);
+        const params = { parentId: node.id };
+        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
+            params,
+        });
+        if (response.data) {
+            node.childs = response.data.map((n) => {
+                if (n.sons > 0) n.childs = [{}];
+                return n;
+            });
+        }
+        await fetchNodeLeaves(lastNodeKey, true);
+    } else {
         const difference = new Set(
             [...previousExpandedNodes.value].filter((x) => !nodeKeysSet.has(x))
         );
@@ -83,41 +94,21 @@ const formatNodeSelected = (node) => {
     if (node.selected === 1) node.selected = true;
     else if (node.selected === 0) node.selected = false;
 
-    if (node.childs && node.childs.length > 0) {
-        expanded.value.push(node.id);
-
-        node.childs.forEach((childNode) => {
-            formatNodeSelected(childNode);
-        });
-    }
-
     if (node.sons > 0 && !node.childs) node.childs = [{}];
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
-    try {
-        const node = treeRef.value?.getNodeByKey(nodeKey);
-        if (!node || node.sons === 0) return;
+    if (!treeRef.value) return;
+    const node = treeRef.value?.getNodeByKey(nodeKey);
+    if (node.selected === 1) node.selected = true;
+    else if (node.selected === 0) node.selected = false;
+    if (!node || node.sons === 0) return;
 
-        const params = { parentId: node.id };
-        const response = await axios.get(`Zones/${route.params.id}/getLeaves`, {
-            params,
-        });
-        if (response.data) {
-            node.childs = response.data.map((n) => {
-                formatNodeSelected(n);
-                return n;
-            });
-        }
-
-        state.set('Tree', node);
-    } catch (err) {
-        console.error('Error fetching department leaves', err);
-        throw new Error();
-    }
+    state.set('Tree', node);
 };
 
 function getNodeIds(node) {
+    if (!node) return [];
     let ids = [];
     if (node.id) ids.push(node.id);
 
@@ -128,59 +119,32 @@ function getNodeIds(node) {
     return ids;
 }
 
-const findNodePath = (node, searchTerm, path = []) => {
-    if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
-        path.push(node.id);
-        return path;
-    }
-    if (node.childs) {
-        for (let child of node.childs) {
-            const resultPath = findNodePath(child, searchTerm, [...path, node.id]);
-            if (resultPath.length > 0) {
-                return resultPath;
+watch(
+    () => store.data,
+    async (val) => {
+        if (!val) return;
+        // // 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]);
+
+        if (!store.userParams?.search) {
+            val.forEach((n) => {
+                formatNodeSelected(n);
+            });
+            store.data = null;
+            expanded.value = [null];
+        } else {
+            for (let n of state.get('Tree')) {
+                await fetchNodeLeaves(n);
             }
+            expanded.value = [null, ...fetchedNodeKeys];
         }
-    }
-    return [];
-};
-
-const filterNodes = (nodes, searchTerm) => {
-    return nodes
-        .map((node) => {
-            if (node.name.toLowerCase().includes(searchTerm.toLowerCase())) {
-                if (node.childs) {
-                    node.childs = filterNodes(node.childs, searchTerm);
-                }
-                return node;
-            }
-            if (node.childs) {
-                node.childs = filterNodes(node.childs, searchTerm);
-                if (node.childs.length > 0) {
-                    return node;
-                }
-            }
-            return null;
-        })
-        .filter((node) => node !== null);
-};
-
-watch(storeData, async (val) => {
-    // Se triggerea cuando se actualiza el store.data, el cual es el resultado del fetch de la searchbar
-    const searchTerm = store.userParams?.search || '';
-
-    const filteredNodes = filterNodes(val, searchTerm);
-    let nodePath = [];
-    filteredNodes.forEach((node) => {
-        nodePath = findNodePath(node, searchTerm);
-    });
-
-    const finalFilteredNodes = filteredNodes.filter((node) => nodePath.includes(node.id));
-    nodes.value[0].childs = [...finalFilteredNodes];
-    const fetchedNodeKeys = finalFilteredNodes.flatMap(getNodeIds);
-    state.set('Tree', [...fetchedNodeKeys]);
-    expanded.value = [null, ...fetchedNodeKeys];
-    previousExpandedNodes.value = new Set(expanded.value);
-});
+        previousExpandedNodes.value = new Set(expanded.value);
+    },
+    { immediate: true }
+);
 
 const reFetch = async () => {
     const { data } = await arrayData.fetch({ append: false });
@@ -189,34 +153,12 @@ const reFetch = async () => {
 };
 
 onMounted(async () => {
-    store.userParams.search = '';
-
-    const stateTree = state.get('Tree');
-    const tree = stateTree ? [...state.get('Tree')] : [null];
-    const lastStateTree = state.get('TreeState');
-    if (tree) {
-        for (let n of tree) {
-            await fetchNodeLeaves(n);
-        }
-
-        if (lastStateTree) {
-            tree.push(lastStateTree);
-            await fetchNodeLeaves(lastStateTree);
-        }
-    }
-
-    setTimeout(() => {
-        if (lastStateTree) {
-            document.getElementById(lastStateTree).scrollIntoView();
-        }
-    }, 1000);
-
-    expanded.value.unshift(null);
-    previousExpandedNodes.value = new Set(expanded.value);
+    if (store.userParams?.search) await arrayData.fetch({});
 });
 
 onUnmounted(() => {
     state.set('Tree', undefined);
+    arrayData.destroy();
 });
 </script>
 

From 837f42d21f84159138251c456d69a34cc2ccfb4f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 21 Nov 2024 10:18:25 +0100
Subject: [PATCH 111/120] fix: provinceName

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

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 166c33e1a..2d06de3d5 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -167,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ item.province.name }}
+                            {{ item?.province?.name }}
                         </div>
                         <div>
                             {{ item.phone }}

From 8a972507a430e05e901e87d6c72f897591dfeb88 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 21 Nov 2024 10:20:42 +0100
Subject: [PATCH 112/120] fix: remove s

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

diff --git a/src/pages/Customer/Card/CustomerAddress.vue b/src/pages/Customer/Card/CustomerAddress.vue
index 2d06de3d5..3ae5fbafb 100644
--- a/src/pages/Customer/Card/CustomerAddress.vue
+++ b/src/pages/Customer/Card/CustomerAddress.vue
@@ -167,7 +167,7 @@ const toCustomerAddressEdit = (addressId) => {
                         <div>{{ item.street }}</div>
                         <div>
                             {{ item.postalCode }} - {{ item.city }},
-                            {{ item?.province?.name }}
+                            {{ item.province?.name }}
                         </div>
                         <div>
                             {{ item.phone }}

From 5268140d8bc229dfa59bd67baabb4f8de35800b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Carlos=20Andr=C3=A9s?= <carlosap@verdnatura.es>
Date: Thu, 21 Nov 2024 15:51:27 +0100
Subject: [PATCH 113/120] feat: refs#8087 Redadas en travel

---
 src/i18n/locale/en.yml                     |  1 +
 src/i18n/locale/es.yml                     |  1 +
 src/pages/Entry/EntryList.vue              |  2 +-
 src/pages/Travel/Card/TravelBasicData.vue  | 12 +++----
 src/pages/Travel/Card/TravelCard.vue       | 29 +---------------
 src/pages/Travel/Card/TravelDescriptor.vue | 39 ++--------------------
 src/pages/Travel/Card/TravelFilter.js      | 29 ++++++++++++++++
 src/pages/Travel/Card/TravelSummary.vue    |  9 +++++
 src/pages/Travel/TravelList.vue            |  6 ++--
 9 files changed, 53 insertions(+), 75 deletions(-)
 create mode 100644 src/pages/Travel/Card/TravelFilter.js

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 60f460b9d..613046f86 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -767,6 +767,7 @@ travel:
         hb: HB
     basicData:
         daysInForward: Days in forward
+        isRaid: Raid
     thermographs:
         temperature: Temperature
         destination: Destination
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index c6ab57dd7..58ddc98ef 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -761,6 +761,7 @@ travel:
         hb: HB
     basicData:
         daysInForward: Días redada
+        isRaid: Redada
     thermographs:
         temperature: Temperatura
         destination: Destino
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 38bf09b53..3487f86c0 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -221,7 +221,7 @@ onMounted(async () => {
                         t('entry.list.tableVisibleColumns.isExcludedFromAvailable')
                     }}</QTooltip>
                 </QIcon>
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: row.daysInForward })
diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
index c3a13907a..faf408989 100644
--- a/src/pages/Travel/Card/TravelBasicData.vue
+++ b/src/pages/Travel/Card/TravelBasicData.vue
@@ -21,12 +21,7 @@ const agenciesOptions = ref([]);
         @on-fetch="(data) => (agenciesOptions = data)"
         auto-load
     />
-    <FormModel
-        :url="`Travels/${route.params.id}`"
-        :url-update="`Travels/${route.params.id}`"
-        model="Travel"
-        auto-load
-    >
+    <FormModel :url-update="`Travels/${route.params.id}`" model="Travel" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.ref" :label="t('globals.reference')" />
@@ -78,6 +73,7 @@ const agenciesOptions = ref([]);
                 </VnInput>
             </VnRow>
             <VnRow>
+                <QCheckbox v-model="data.isRaid" :label="t('travel.basicData.isRaid')" />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="data.isDelivered"
@@ -93,7 +89,7 @@ const agenciesOptions = ref([]);
 
 <i18n>
 es:
-    raidDays: Al rellenarlo, generamos una redada. Indica los días que un travel se moverá automáticamente en el tiempo
+    raidDays: Si se marca "Redada", la fecha de entrega se moverá automáticamente los días indicados (incluido 0). Si se deja vacio, la fecha no cambiará
 en:
-    raidDays: When filling, a raid is generated. Enter the number of days the travel will automatically forward in time
+    raidDays: If "Raid" is checked, the landing date will automatically shift by the specified number of days (including 0). If left empty, the date will stay the same.
 </i18n>
diff --git a/src/pages/Travel/Card/TravelCard.vue b/src/pages/Travel/Card/TravelCard.vue
index 44bd9d430..50cecef34 100644
--- a/src/pages/Travel/Card/TravelCard.vue
+++ b/src/pages/Travel/Card/TravelCard.vue
@@ -1,34 +1,7 @@
 <script setup>
 import VnCard from 'components/common/VnCard.vue';
 import TravelDescriptor from './TravelDescriptor.vue';
-
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
+import filter from './TravelFilter.js';
 </script>
 <template>
     <VnCard
diff --git a/src/pages/Travel/Card/TravelDescriptor.vue b/src/pages/Travel/Card/TravelDescriptor.vue
index 295b47fa0..9d00d371a 100644
--- a/src/pages/Travel/Card/TravelDescriptor.vue
+++ b/src/pages/Travel/Card/TravelDescriptor.vue
@@ -7,6 +7,7 @@ import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import useCardDescription from 'src/composables/useCardDescription';
 import TravelDescriptorMenuItems from './TravelDescriptorMenuItems.vue';
+import filter from './TravelFilter.js';
 
 import { toDate } from 'src/filters';
 
@@ -21,35 +22,6 @@ const $props = defineProps({
 const route = useRoute();
 const { t } = useI18n();
 
-const filter = {
-    fields: [
-        'id',
-        'ref',
-        'shipped',
-        'landed',
-        'totalEntries',
-        'warehouseInFk',
-        'warehouseOutFk',
-        'cargoSupplierFk',
-        'agencyModeFk',
-        'daysInForward',
-    ],
-    include: [
-        {
-            relation: 'warehouseIn',
-            scope: {
-                fields: ['name'],
-            },
-        },
-        {
-            relation: 'warehouseOut',
-            scope: {
-                fields: ['name'],
-            },
-        },
-    ],
-};
-
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -65,7 +37,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         :title="data.title"
         :subtitle="data.subtitle"
         :filter="filter"
-        data-key="travelData"
+        data-key="Travel"
         @on-fetch="setData"
     >
         <template #menu="{ entity }">
@@ -80,12 +52,7 @@ const setData = (entity) => (data.value = useCardDescription(entity.ref, entity.
         </template>
         <template #icons="{ entity }">
             <QCardActions class="q-gutter-x-md">
-                <QIcon
-                    v-if="entity.daysInForward"
-                    name="vn:net"
-                    color="primary"
-                    size="xs"
-                >
+                <QIcon v-if="entity.isRaid" name="vn:net" color="primary" size="xs">
                     <QTooltip>
                         {{
                             t('globals.raid', { daysInForward: entity.daysInForward })
diff --git a/src/pages/Travel/Card/TravelFilter.js b/src/pages/Travel/Card/TravelFilter.js
new file mode 100644
index 000000000..f5f4520fd
--- /dev/null
+++ b/src/pages/Travel/Card/TravelFilter.js
@@ -0,0 +1,29 @@
+export default {
+    fields: [
+        'id',
+        'ref',
+        'shipped',
+        'landed',
+        'totalEntries',
+        'warehouseInFk',
+        'warehouseOutFk',
+        'cargoSupplierFk',
+        'agencyModeFk',
+        'isRaid',
+        'daysInForward',
+    ],
+    include: [
+        {
+            relation: 'warehouseIn',
+            scope: {
+                fields: ['name'],
+            },
+        },
+        {
+            relation: 'warehouseOut',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+};
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index d720abd11..5ed7da996 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -268,6 +268,11 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseOut')"
                     :value="travel.warehouseOut?.name"
                 />
+                <QCheckbox
+                    :label="t('travel.basicData.isRaid')"
+                    v-model="travel.isRaid"
+                    :disable="true"
+                />
                 <QCheckbox
                     :label="t('travel.summary.delivered')"
                     v-model="travel.isDelivered"
@@ -286,6 +291,10 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
                     :label="t('globals.warehouseIn')"
                     :value="travel.warehouseIn?.name"
                 />
+                <VnLv
+                    :label="t('travel.basicData.daysInForward')"
+                    :value="travel?.daysInForward"
+                />
                 <QCheckbox
                     :label="t('travel.summary.received')"
                     v-model="travel.isReceived"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index ee1427cf0..852003a95 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -227,10 +227,12 @@ const columns = computed(() => [
     >
         <template #column-status="{ row }">
             <div class="row">
-                <QIcon v-if="!!row.daysInForward" name="vn:net" color="primary">
+                <QIcon v-if="!!row.isRaid" name="vn:net" color="primary">
                     <QTooltip>
                         {{
-                            t('globals.raid', { daysInForward: row.daysInForward })
+                            t('globals.raid', {
+                                daysInForward: row.daysInForward,
+                            })
                         }}</QTooltip
                     >
                 </QIcon>

From 3b03f0dfee860773ec6db601dcdd77f20915ae0f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 07:43:59 +0100
Subject: [PATCH 114/120] fix(TicketNotes): observationTypes use .description

---
 src/pages/Ticket/Card/TicketNotes.vue | 10 ++--------
 src/pages/Ticket/locale/en.yml        | 10 ----------
 src/pages/Ticket/locale/es.yml        | 12 ------------
 3 files changed, 2 insertions(+), 30 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketNotes.vue b/src/pages/Ticket/Card/TicketNotes.vue
index b5302d15f..ea06cd9f6 100644
--- a/src/pages/Ticket/Card/TicketNotes.vue
+++ b/src/pages/Ticket/Card/TicketNotes.vue
@@ -49,13 +49,7 @@ async function handleSave() {
 
 <template>
     <FetchData
-        @on-fetch="
-            (data) =>
-                (observationTypes = data.map((type) => {
-                    type.label = t(`ticketNotes.observationTypes.${type.description}`);
-                    return type;
-                }))
-        "
+        @on-fetch="(data) => (observationTypes = data)"
         auto-load
         url="ObservationTypes"
     />
@@ -82,7 +76,7 @@ async function handleSave() {
                             :label="t('ticketNotes.observationType')"
                             :options="observationTypes"
                             hide-selected
-                            option-label="label"
+                            option-label="description"
                             option-value="id"
                             v-model="row.observationTypeFk"
                             :disable="!!row.id"
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index b3ab0e69b..5aa1f15d3 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -14,16 +14,6 @@ ticketNotes:
     description: Description
     removeNote: Remove note
     addNote: Add note
-    observationTypes:
-        ItemPicker: Item picker
-        Packager: Packager
-        Delivery: Delivery
-        SalesPerson: Sales person
-        Administrative: Administrative
-        Weight: Weight
-        InvoiceOut: Invoice Out
-        DropOff: Drop Off
-        Sustitución: Sustitution
 ticketSale:
     id: Id
     visible: Visible
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 32ff3ba62..ad0c17d7c 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -29,18 +29,6 @@ ticketNotes:
     description: Descripción
     removeNote: Quitar nota
     addNote: Añadir nota
-    observationTypes:
-        ItemPicker: Sacador
-        Packager: Encajador
-        Delivery: Envío
-        SalesPerson: Comercial
-        Administrative: Administrativa
-        Weight: Peso
-        InvoiceOut: Facturas
-        DropOff: Despacho
-        Sustitución: Sustitución
-        Accepted: Aceptado
-        Denied: Denegado
 purchaseRequest:
     Id: Id
     description: Descripción

From 8cbf40f46584cf4cf952db3d479b9afe55ffb560 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 07:45:49 +0100
Subject: [PATCH 115/120] fix(TicketSummary): observationTypes use .description

---
 src/pages/Ticket/Card/TicketSummary.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index d20fd9c5f..afc894926 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -291,13 +291,8 @@ function toTicketUrl(section) {
                         "
                     >
                         <span class="label" style="margin-right: 4px">
-                            ({{
-                                t(
-                                    `ticketNotes.observationTypes.${item.observationType.description}`
-                                )
-                            }}):
+                            ({{ item.observationType.description }}):
                         </span>
-
                         <span>{{ item.description }}</span>
                     </QItem>
                 </QVirtualScroll>

From bf29be1c5f9d7be76a857d966b0e09fab8ae740e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 08:39:46 +0100
Subject: [PATCH 116/120] fix: remove all try catch(err) (error) console.error

---
 src/components/EditPictureForm.vue            |  34 ++--
 src/components/EditTableCellValueForm.vue     |  24 +--
 src/components/FilterItemForm.vue             |  46 +++--
 src/components/FilterTravelForm.vue           |  42 ++---
 src/components/FormModel.vue                  |   3 -
 src/components/ItemsFilterPanel.vue           |  52 +++--
 src/components/RefundInvoiceForm.vue          |  12 +-
 src/components/TransferInvoiceForm.vue        |  52 +++--
 src/components/VnTable/VnVisibleColumn.vue    |  46 ++---
 src/components/common/TableVisibleColumns.vue | 114 ++++++-----
 src/pages/Account/AccountAccounts.vue         |  16 +-
 src/pages/Account/AccountAcls.vue             |  42 ++---
 src/pages/Account/AccountConnections.vue      |  10 +-
 src/pages/Account/AccountLdap.vue             |  20 +-
 src/pages/Account/AccountSamba.vue            |  20 +-
 .../Account/Alias/Card/AliasDescriptor.vue    |  10 +-
 src/pages/Account/Alias/Card/AliasUsers.vue   |  10 +-
 src/pages/Account/Card/AccountMailAlias.vue   |  20 +-
 .../Account/Card/AccountMailForwarding.vue    |  33 +---
 .../Account/Role/Card/RoleDescriptor.vue      |   8 +-
 src/pages/Account/Role/Card/SubRoles.vue      |  18 +-
 .../components/CustomerSamplesCreate.vue      |  34 ++--
 .../Department/Card/DepartmentDescriptor.vue  |  10 +-
 src/pages/Entry/Card/EntryBuys.vue            |  42 ++---
 src/pages/Entry/Card/EntryBuysImport.vue      |  42 ++---
 src/pages/Entry/Card/EntrySummary.vue         |   5 +-
 src/pages/Entry/EntryWasteRecalc.vue          |   2 -
 .../Card/InvoiceOutDescriptorMenu.vue         |  75 +++-----
 src/pages/InvoiceOut/InvoiceOutList.vue       |  11 +-
 src/pages/Item/Card/ItemDescriptor.vue        |  60 +++---
 src/pages/Item/Card/ItemShelving.vue          |  24 +--
 src/pages/Item/Card/ItemTags.vue              |  26 ++-
 src/pages/Item/Card/ItemTax.vue               |  16 +-
 src/pages/Item/ItemFixedPrice.vue             |  42 ++---
 src/pages/Item/ItemList.vue                   |  20 +-
 src/pages/Item/ItemListFilter.vue             |  26 ++-
 src/pages/Item/ItemRequest.vue                |  47 ++---
 src/pages/Monitor/MonitorOrders.vue           |  14 +-
 src/pages/Order/Card/OrderBasicData.vue       |  54 ++----
 src/pages/Order/Card/OrderCreateDialog.vue    |  54 ++----
 src/pages/Supplier/Card/SupplierAccounts.vue  |  16 +-
 src/pages/Ticket/Card/ExpeditionNewTicket.vue |  32 ++--
 src/pages/Ticket/Card/TicketComponents.vue    |  26 +--
 src/pages/Ticket/Card/TicketExpedition.vue    |  10 +-
 .../Ticket/Card/TicketPurchaseRequest.vue     |  10 +-
 src/pages/Ticket/Card/TicketSale.vue          | 177 +++++++-----------
 .../Ticket/Card/TicketSaleMoreActions.vue     |  22 +--
 src/pages/Ticket/Card/TicketSaleTracking.vue  | 164 ++++++----------
 src/pages/Ticket/Card/TicketService.vue       |  52 +++--
 src/pages/Ticket/Card/TicketSummary.vue       |  22 +--
 src/pages/Ticket/Card/TicketVolume.vue        |  22 +--
 src/pages/Ticket/TicketAdvanceFilter.vue      |  24 +--
 src/pages/Ticket/TicketCreate.vue             |  59 +++---
 src/pages/Ticket/TicketCreateDialog.vue       |  59 +++---
 src/pages/Ticket/TicketFuture.vue             |  38 ++--
 src/pages/Ticket/TicketFutureFilter.vue       |  40 ++--
 src/pages/Ticket/TicketList.vue               |  59 +++---
 src/pages/Ticket/TicketWeekly.vue             |  22 +--
 .../Travel/Card/TravelDescriptorMenuItems.vue |  22 +--
 src/pages/Travel/Card/TravelSummary.vue       |  48 ++---
 src/pages/Travel/Card/TravelThermographs.vue  |  10 +-
 .../Travel/Card/TravelThermographsForm.vue    |  18 +-
 src/pages/Travel/ExtraCommunity.vue           |  20 +-
 src/pages/Wagon/Type/WagonTypeEdit.vue        |  14 +-
 src/pages/Worker/Card/WorkerCalendarItem.vue  |  45 ++---
 src/pages/Worker/Card/WorkerDescriptor.vue    |  12 +-
 src/pages/Worker/Card/WorkerPda.vue           |  13 +-
 src/pages/Worker/Card/WorkerTimeControl.vue   |  90 ++++-----
 src/pages/Worker/Card/WorkerTimeHourChip.vue  |  14 +-
 src/pages/Worker/WorkerDepartmentTree.vue     |  45 ++---
 .../Zone/Card/ZoneEventExclusionForm.vue      |  48 ++---
 .../Zone/Card/ZoneEventInclusionForm.vue      |  57 +++---
 src/pages/Zone/Card/ZoneEventsPanel.vue       |  22 +--
 src/pages/Zone/Card/ZoneLocations.vue         |  10 +-
 src/pages/Zone/Card/ZoneWarehouses.vue        |  16 +-
 src/pages/Zone/ZoneDeliveryPanel.vue          |  18 +-
 76 files changed, 995 insertions(+), 1617 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index cd6107aca..1f158e785 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -156,26 +156,22 @@ const rotateRight = () => {
 };
 
 const onSubmit = () => {
-    try {
-        if (!newPhoto.files && !newPhoto.url) {
-            notify(t('Select an image'), 'negative');
-            return;
-        }
-
-        const options = {
-            type: 'blob',
-        };
-
-        editor.value
-            .result(options)
-            .then((result) => {
-                const file = new File([result], newPhoto.files?.name || '');
-                newPhoto.blob = file;
-            })
-            .then(() => makeRequest());
-    } catch (err) {
-        console.error('Error uploading image');
+    if (!newPhoto.files && !newPhoto.url) {
+        notify(t('Select an image'), 'negative');
+        return;
     }
+
+    const options = {
+        type: 'blob',
+    };
+
+    editor.value
+        .result(options)
+        .then((result) => {
+            const file = new File([result], newPhoto.files?.name || '');
+            newPhoto.blob = file;
+        })
+        .then(() => makeRequest());
 };
 
 const makeRequest = async () => {
diff --git a/src/components/EditTableCellValueForm.vue b/src/components/EditTableCellValueForm.vue
index 14709e884..7755df9ab 100644
--- a/src/components/EditTableCellValueForm.vue
+++ b/src/components/EditTableCellValueForm.vue
@@ -51,21 +51,17 @@ const onDataSaved = () => {
 };
 
 const onSubmit = async () => {
-    try {
-        isLoading.value = true;
-        const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
-        const payload = {
-            field: selectedField.value.field,
-            newValue: newValue.value,
-            lines: rowsToEdit,
-        };
+    isLoading.value = true;
+    const rowsToEdit = $props.rows.map((row) => ({ id: row.id, itemFk: row.itemFk }));
+    const payload = {
+        field: selectedField.value.field,
+        newValue: newValue.value,
+        lines: rowsToEdit,
+    };
 
-        await axios.post($props.editUrl, payload);
-        onDataSaved();
-        isLoading.value = false;
-    } catch (err) {
-        console.error('Error submitting table cell edit');
-    }
+    await axios.post($props.editUrl, payload);
+    onDataSaved();
+    isLoading.value = false;
 };
 
 const closeForm = () => {
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 1cf36deeb..5c3d47415 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -84,34 +84,30 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
-    try {
-        let filter = itemFilter;
-        const params = itemFilterParams;
-        const where = {};
-        for (let key in params) {
-            const value = params[key];
-            if (!value) continue;
+    let filter = itemFilter;
+    const params = itemFilterParams;
+    const where = {};
+    for (let key in params) {
+        const value = params[key];
+        if (!value) continue;
 
-            switch (key) {
-                case 'name':
-                    where[key] = { like: `%${value}%` };
-                    break;
-                case 'producerFk':
-                case 'typeFk':
-                case 'size':
-                case 'inkFk':
-                    where[key] = value;
-            }
+        switch (key) {
+            case 'name':
+                where[key] = { like: `%${value}%` };
+                break;
+            case 'producerFk':
+            case 'typeFk':
+            case 'size':
+            case 'inkFk':
+                where[key] = value;
         }
-        filter.where = where;
-
-        const { data } = await axios.get(props.url, {
-            params: { filter: JSON.stringify(filter) },
-        });
-        tableRows.value = data;
-    } catch (err) {
-        console.error('Error fetching entries items');
     }
+    filter.where = where;
+
+    const { data } = await axios.get(props.url, {
+        params: { filter: JSON.stringify(filter) },
+    });
+    tableRows.value = data;
 };
 
 const closeForm = () => {
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index c84772d9b..6eb44bd01 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -86,32 +86,28 @@ const tableColumns = computed(() => [
 ]);
 
 const onSubmit = async () => {
-    try {
-        let filter = travelFilter;
-        const params = travelFilterParams;
-        const where = {};
-        for (let key in params) {
-            const value = params[key];
-            if (!value) continue;
+    let filter = travelFilter;
+    const params = travelFilterParams;
+    const where = {};
+    for (let key in params) {
+        const value = params[key];
+        if (!value) continue;
 
-            switch (key) {
-                case 'agencyModeFk':
-                case 'warehouseInFk':
-                case 'warehouseOutFk':
-                case 'shipped':
-                case 'landed':
-                    where[key] = value;
-            }
+        switch (key) {
+            case 'agencyModeFk':
+            case 'warehouseInFk':
+            case 'warehouseOutFk':
+            case 'shipped':
+            case 'landed':
+                where[key] = value;
         }
-
-        filter.where = where;
-        const { data } = await axios.get('Travels', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        tableRows.value = data;
-    } catch (err) {
-        console.error('Error fetching travels');
     }
+
+    filter.where = where;
+    const { data } = await axios.get('Travels', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    tableRows.value = data;
 };
 
 const closeForm = () => {
diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 05f947cf3..9ac2d38a5 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -217,9 +217,6 @@ async function save() {
         updateAndEmit('onDataSaved', formData.value, response?.data);
         if ($props.reload) await arrayData.fetch({});
         hasChanges.value = false;
-    } catch (err) {
-        console.error(err);
-        notify('errors.writeRequest', 'negative');
     } finally {
         isLoading.value = false;
     }
diff --git a/src/components/ItemsFilterPanel.vue b/src/components/ItemsFilterPanel.vue
index e89d32da4..5fc5f3d12 100644
--- a/src/components/ItemsFilterPanel.vue
+++ b/src/components/ItemsFilterPanel.vue
@@ -88,20 +88,16 @@ const applyTags = (params, search) => {
 };
 
 const fetchItemTypes = async (id) => {
-    try {
-        const filter = {
-            fields: ['id', 'name', 'categoryFk'],
-            where: { categoryFk: id },
-            include: 'category',
-            order: 'name ASC',
-        };
-        const { data } = await axios.get('ItemTypes', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemTypesOptions.value = data;
-    } catch (err) {
-        console.error('Error fetching item types', err);
-    }
+    const filter = {
+        fields: ['id', 'name', 'categoryFk'],
+        where: { categoryFk: id },
+        include: 'category',
+        order: 'name ASC',
+    };
+    const { data } = await axios.get('ItemTypes', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    itemTypesOptions.value = data;
 };
 
 const getCategoryClass = (category, params) => {
@@ -111,23 +107,19 @@ const getCategoryClass = (category, params) => {
 };
 
 const getSelectedTagValues = async (tag) => {
-    try {
-        if (!tag?.selectedTag?.id) return;
-        tag.value = null;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-            limit: 30,
-        };
+    if (!tag?.selectedTag?.id) return;
+    tag.value = null;
+    const filter = {
+        fields: ['value'],
+        order: 'value ASC',
+        limit: 30,
+    };
 
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-            params,
-        });
-        tag.valueOptions = data;
-    } catch (err) {
-        console.error('Error getting selected tag values');
-    }
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+        params,
+    });
+    tag.valueOptions = data;
 };
 
 const removeTag = (index, params, search) => {
diff --git a/src/components/RefundInvoiceForm.vue b/src/components/RefundInvoiceForm.vue
index 9d9f0cff1..590acede0 100644
--- a/src/components/RefundInvoiceForm.vue
+++ b/src/components/RefundInvoiceForm.vue
@@ -39,14 +39,10 @@ const refund = async () => {
         invoiceCorrectionTypeFk: invoiceParams.invoiceCorrectionTypeFk,
     };
 
-    try {
-        const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
-        notify(t('Refunded invoice'), 'positive');
-        const [id] = data?.refundId || [];
-        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
-    } catch (err) {
-        console.error('Error refunding invoice', err);
-    }
+    const { data } = await axios.post('InvoiceOuts/refundAndInvoice', params);
+    notify(t('Refunded invoice'), 'positive');
+    const [id] = data?.refundId || [];
+    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
 };
 </script>
 
diff --git a/src/components/TransferInvoiceForm.vue b/src/components/TransferInvoiceForm.vue
index f7050cdba..aa71070d6 100644
--- a/src/components/TransferInvoiceForm.vue
+++ b/src/components/TransferInvoiceForm.vue
@@ -49,36 +49,32 @@ const makeInvoice = async () => {
         makeInvoice: checked.value,
     };
 
-    try {
-        if (checked.value && hasToInvoiceByAddress) {
-            const response = await new Promise((resolve) => {
-                quasar
-                    .dialog({
-                        component: VnConfirm,
-                        componentProps: {
-                            title: t('Bill destination client'),
-                            message: t('transferInvoiceInfo'),
-                        },
-                    })
-                    .onOk(() => {
-                        resolve(true);
-                    })
-                    .onCancel(() => {
-                        resolve(false);
-                    });
-            });
-            if (!response) {
-                return;
-            }
+    if (checked.value && hasToInvoiceByAddress) {
+        const response = await new Promise((resolve) => {
+            quasar
+                .dialog({
+                    component: VnConfirm,
+                    componentProps: {
+                        title: t('Bill destination client'),
+                        message: t('transferInvoiceInfo'),
+                    },
+                })
+                .onOk(() => {
+                    resolve(true);
+                })
+                .onCancel(() => {
+                    resolve(false);
+                });
+        });
+        if (!response) {
+            return;
         }
-
-        const { data } = await axios.post('InvoiceOuts/transfer', params);
-        notify(t('Transferred invoice'), 'positive');
-        const id = data?.[0];
-        if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
-    } catch (err) {
-        console.error('Error transfering invoice', err);
     }
+
+    const { data } = await axios.post('InvoiceOuts/transfer', params);
+    notify(t('Transferred invoice'), 'positive');
+    const id = data?.[0];
+    if (id) router.push({ name: 'InvoiceOutSummary', params: { id } });
 };
 </script>
 
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index f5c3458cd..57b1fdf21 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -57,31 +57,27 @@ async function getConfig(url, filter) {
 }
 
 async function fetchViewConfigData() {
-    try {
-        const defaultFilter = {
-            where: { tableCode: $props.tableCode },
-        };
+    const defaultFilter = {
+        where: { tableCode: $props.tableCode },
+    };
 
-        const userConfig = await getConfig('UserConfigViews', {
-            where: {
-                ...defaultFilter.where,
-                ...{ userFk: user.value.id },
-            },
-        });
+    const userConfig = await getConfig('UserConfigViews', {
+        where: {
+            ...defaultFilter.where,
+            ...{ userFk: user.value.id },
+        },
+    });
 
-        if (userConfig) {
-            initialUserConfigViewData.value = userConfig;
-            setUserConfigViewData(userConfig.configuration);
-            return;
-        }
+    if (userConfig) {
+        initialUserConfigViewData.value = userConfig;
+        setUserConfigViewData(userConfig.configuration);
+        return;
+    }
 
-        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
-        if (defaultConfig) {
-            setUserConfigViewData(defaultConfig.columns);
-            return;
-        }
-    } catch (err) {
-        console.error('Error fetching config view data', err);
+    const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+    if (defaultConfig) {
+        setUserConfigViewData(defaultConfig.columns);
+        return;
     }
 }
 
@@ -92,7 +88,6 @@ async function saveConfig() {
     setUserConfigViewData(configuration, true);
     if (!$props.tableCode) return popupProxyRef.value.hide();
 
-    try {
         const params = {};
         // Si existe una view config del usuario hacemos un update si no la creamos
         if (initialUserConfigViewData.value) {
@@ -123,10 +118,7 @@ async function saveConfig() {
         }
         notify('globals.dataSaved', 'positive');
         popupProxyRef.value.hide();
-    } catch (err) {
-        console.error('Error saving user view config', err);
-        notify('errors.writeRequest', 'negative');
-    }
+
 }
 
 onMounted(async () => {
diff --git a/src/components/common/TableVisibleColumns.vue b/src/components/common/TableVisibleColumns.vue
index 9a6c70ef0..ee1e56319 100644
--- a/src/components/common/TableVisibleColumns.vue
+++ b/src/components/common/TableVisibleColumns.vue
@@ -58,79 +58,71 @@ const getConfig = async (url, filter) => {
 };
 
 const fetchViewConfigData = async () => {
-    try {
-        const userConfigFilter = {
-            where: { tableCode: $props.tableCode, userFk: user.value.id },
-        };
-        const userConfig = await getConfig('UserConfigViews', userConfigFilter);
+    const userConfigFilter = {
+        where: { tableCode: $props.tableCode, userFk: user.value.id },
+    };
+    const userConfig = await getConfig('UserConfigViews', userConfigFilter);
 
-        if (userConfig) {
-            initialUserConfigViewData.value = userConfig;
-            setUserConfigViewData(userConfig.configuration);
-            return;
-        }
+    if (userConfig) {
+        initialUserConfigViewData.value = userConfig;
+        setUserConfigViewData(userConfig.configuration);
+        return;
+    }
 
-        const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
-        const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
+    const defaultConfigFilter = { where: { tableCode: $props.tableCode } };
+    const defaultConfig = await getConfig('DefaultViewConfigs', defaultConfigFilter);
 
-        if (defaultConfig) {
-            // Si el backend devuelve una configuración por defecto la usamos
-            setUserConfigViewData(defaultConfig.columns);
-            return;
-        } else {
-            // Si no hay configuración por defecto mostramos todas las columnas
-            const defaultColumns = {};
-            $props.allColumns.forEach((col) => (defaultColumns[col] = true));
-            setUserConfigViewData(defaultColumns);
-        }
-    } catch (err) {
-        console.error('Error fetching config view data', err);
+    if (defaultConfig) {
+        // Si el backend devuelve una configuración por defecto la usamos
+        setUserConfigViewData(defaultConfig.columns);
+        return;
+    } else {
+        // Si no hay configuración por defecto mostramos todas las columnas
+        const defaultColumns = {};
+        $props.allColumns.forEach((col) => (defaultColumns[col] = true));
+        setUserConfigViewData(defaultColumns);
     }
 };
 
 const saveConfig = async () => {
-    try {
-        const params = {};
-        const configuration = {};
+    const params = {};
+    const configuration = {};
 
-        formattedCols.value.forEach((col) => {
-            const { name, active } = col;
-            configuration[name] = active;
-        });
+    formattedCols.value.forEach((col) => {
+        const { name, active } = col;
+        configuration[name] = active;
+    });
 
-        // Si existe una view config del usuario hacemos un update si no la creamos
-        if (initialUserConfigViewData.value) {
-            params.updates = [
-                {
-                    data: {
-                        configuration: configuration,
-                    },
-                    where: {
-                        id: initialUserConfigViewData.value.id,
-                    },
-                },
-            ];
-        } else {
-            params.creates = [
-                {
-                    userFk: user.value.id,
-                    tableCode: $props.tableCode,
-                    tableConfig: $props.tableCode,
+    // Si existe una view config del usuario hacemos un update si no la creamos
+    if (initialUserConfigViewData.value) {
+        params.updates = [
+            {
+                data: {
                     configuration: configuration,
                 },
-            ];
-        }
-
-        const response = await axios.post('UserConfigViews/crud', params);
-        if (response.data && response.data[0]) {
-            initialUserConfigViewData.value = response.data[0];
-        }
-        emitSavedConfig();
-        notify('globals.dataSaved', 'positive');
-        popupProxyRef.value.hide();
-    } catch (err) {
-        console.error('Error saving user view config', err);
+                where: {
+                    id: initialUserConfigViewData.value.id,
+                },
+            },
+        ];
+    } else {
+        params.creates = [
+            {
+                userFk: user.value.id,
+                tableCode: $props.tableCode,
+                tableConfig: $props.tableCode,
+                configuration: configuration,
+            },
+        ];
     }
+
+    const response = await axios.post('UserConfigViews/crud', params);
+    if (response.data && response.data[0]) {
+        initialUserConfigViewData.value = response.data[0];
+    }
+    emitSavedConfig();
+    notify('globals.dataSaved', 'positive');
+    popupProxyRef.value.hide();
 };
 
 const emitSavedConfig = () => {
diff --git a/src/pages/Account/AccountAccounts.vue b/src/pages/Account/AccountAccounts.vue
index 9cc282551..d75f6359f 100644
--- a/src/pages/Account/AccountAccounts.vue
+++ b/src/pages/Account/AccountAccounts.vue
@@ -11,21 +11,13 @@ const { t } = useI18n();
 const { notify } = useNotify();
 
 const onSynchronizeAll = async () => {
-    try {
-        notify(t('Synchronizing in the background'), 'positive');
-        await axios.patch(`Accounts/syncAll`);
-    } catch (error) {
-        console.error('Error synchronizing all accounts', error);
-    }
+    notify(t('Synchronizing in the background'), 'positive');
+    await axios.patch(`Accounts/syncAll`);
 };
 
 const onSynchronizeRoles = async () => {
-    try {
-        await axios.patch(`RoleInherits/sync`);
-        notify(t('Roles synchronized!'), 'positive');
-    } catch (error) {
-        console.error('Error synchronizing roles', error);
-    }
+    await axios.patch(`RoleInherits/sync`);
+    notify(t('Roles synchronized!'), 'positive');
 };
 </script>
 
diff --git a/src/pages/Account/AccountAcls.vue b/src/pages/Account/AccountAcls.vue
index dd93a0cb5..d073fcfd2 100644
--- a/src/pages/Account/AccountAcls.vue
+++ b/src/pages/Account/AccountAcls.vue
@@ -94,29 +94,25 @@ const columns = computed(() => [
     },
 ]);
 const deleteAcl = async ({ id }) => {
-    try {
-        await new Promise((resolve) => {
-            quasar
-                .dialog({
-                    component: VnConfirm,
-                    componentProps: {
-                        title: t('Remove ACL'),
-                        message: t('Do you want to remove this ACL?'),
-                    },
-                })
-                .onOk(() => {
-                    resolve(true);
-                })
-                .onCancel(() => {
-                    resolve(false);
-                });
-        });
-        await axios.delete(`ACLs/${id}`);
-        tableRef.value.reload();
-        notify('ACL removed', 'positive');
-    } catch (error) {
-        console.error('Error deleting Acl: ', error);
-    }
+    await new Promise((resolve) => {
+        quasar
+            .dialog({
+                component: VnConfirm,
+                componentProps: {
+                    title: t('Remove ACL'),
+                    message: t('Do you want to remove this ACL?'),
+                },
+            })
+            .onOk(() => {
+                resolve(true);
+            })
+            .onCancel(() => {
+                resolve(false);
+            });
+    });
+    await axios.delete(`ACLs/${id}`);
+    tableRef.value.reload();
+    notify('ACL removed', 'positive');
 };
 </script>
 
diff --git a/src/pages/Account/AccountConnections.vue b/src/pages/Account/AccountConnections.vue
index 057745831..ba4ed49c8 100644
--- a/src/pages/Account/AccountConnections.vue
+++ b/src/pages/Account/AccountConnections.vue
@@ -34,13 +34,9 @@ const refresh = () => paginateRef.value.fetch();
 const navigate = (id) => router.push({ name: 'AccountSummary', params: { id } });
 
 const killSession = async ({ userId, created }) => {
-    try {
-        await axios.post(`${urlPath}/killSession`, { userId, created });
-        paginateRef.value.fetch();
-        notify(t('Session killed'), 'positive');
-    } catch (error) {
-        console.error('Error killing session', error);
-    }
+    await axios.post(`${urlPath}/killSession`, { userId, created });
+    paginateRef.value.fetch();
+    notify(t('Session killed'), 'positive');
 };
 </script>
 
diff --git a/src/pages/Account/AccountLdap.vue b/src/pages/Account/AccountLdap.vue
index 7b8433e73..2b61c647d 100644
--- a/src/pages/Account/AccountLdap.vue
+++ b/src/pages/Account/AccountLdap.vue
@@ -40,12 +40,8 @@ const formUrlCreate = ref(null);
 const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 const onTestConection = async () => {
-    try {
-        await axios.get(`LdapConfigs/test`);
-        notify(t('LDAP connection established!'), 'positive');
-    } catch (error) {
-        console.error('Error testing connection', error);
-    }
+    await axios.get(`LdapConfigs/test`);
+    notify(t('LDAP connection established!'), 'positive');
 };
 const getInitialLdapConfig = async () => {
     try {
@@ -72,14 +68,10 @@ const getInitialLdapConfig = async () => {
     }
 };
 const deleteMailForward = async () => {
-    try {
-        await axios.delete(URL_UPDATE);
-        initialData.value = { ...DEFAULT_DATA };
-        hasData.value = false;
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error deleting mail forward', err);
-    }
+    await axios.delete(URL_UPDATE);
+    initialData.value = { ...DEFAULT_DATA };
+    hasData.value = false;
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 onMounted(async () => await getInitialLdapConfig());
diff --git a/src/pages/Account/AccountSamba.vue b/src/pages/Account/AccountSamba.vue
index 7af9f4364..73c871922 100644
--- a/src/pages/Account/AccountSamba.vue
+++ b/src/pages/Account/AccountSamba.vue
@@ -46,12 +46,8 @@ const formUrlUpdate = ref(null);
 const formCustomFn = ref(null);
 
 const onTestConection = async () => {
-    try {
-        await axios.get(`SambaConfigs/test`);
-        notify(t('Samba connection established!'), 'positive');
-    } catch (error) {
-        console.error('Error testing connection', error);
-    }
+    await axios.get(`SambaConfigs/test`);
+    notify(t('Samba connection established!'), 'positive');
 };
 
 const getInitialSambaConfig = async () => {
@@ -79,14 +75,10 @@ const getInitialSambaConfig = async () => {
 };
 
 const deleteMailForward = async () => {
-    try {
-        await axios.delete(URL_UPDATE);
-        initialData.value = { ...DEFAULT_DATA };
-        hasData.value = false;
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error deleting mail forward', err);
-    }
+    await axios.delete(URL_UPDATE);
+    initialData.value = { ...DEFAULT_DATA };
+    hasData.value = false;
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 onMounted(async () => await getInitialSambaConfig());
diff --git a/src/pages/Account/Alias/Card/AliasDescriptor.vue b/src/pages/Account/Alias/Card/AliasDescriptor.vue
index 963f84547..dc06ef504 100644
--- a/src/pages/Account/Alias/Card/AliasDescriptor.vue
+++ b/src/pages/Account/Alias/Card/AliasDescriptor.vue
@@ -44,13 +44,9 @@ const removeAlias = () => {
             cancel: true,
         })
         .onOk(async () => {
-            try {
-                await axios.delete(`MailAliases/${entityId.value}`);
-                notify(t('Alias removed'), 'positive');
-                router.push({ name: 'AccountAlias' });
-            } catch (err) {
-                console.error('Error removing alias');
-            }
+            await axios.delete(`MailAliases/${entityId.value}`);
+            notify(t('Alias removed'), 'positive');
+            router.push({ name: 'AccountAlias' });
         });
 };
 </script>
diff --git a/src/pages/Account/Alias/Card/AliasUsers.vue b/src/pages/Account/Alias/Card/AliasUsers.vue
index 4a9c449e4..4aad68f1a 100644
--- a/src/pages/Account/Alias/Card/AliasUsers.vue
+++ b/src/pages/Account/Alias/Card/AliasUsers.vue
@@ -46,13 +46,9 @@ const columns = computed(() => [
 ]);
 
 const deleteAlias = async (row) => {
-    try {
-        await axios.delete(`${urlPath.value}/${row.id}`);
-        notify(t('User removed'), 'positive');
-        fetchAliases();
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.delete(`${urlPath.value}/${row.id}`);
+    notify(t('User removed'), 'positive');
+    fetchAliases();
 };
 
 watch(
diff --git a/src/pages/Account/Card/AccountMailAlias.vue b/src/pages/Account/Card/AccountMailAlias.vue
index 15d03c665..8d3bd3b67 100644
--- a/src/pages/Account/Card/AccountMailAlias.vue
+++ b/src/pages/Account/Card/AccountMailAlias.vue
@@ -61,23 +61,15 @@ const fetchAccountExistence = async () => {
 };
 
 const deleteMailAlias = async (row) => {
-    try {
-        await axios.delete(`${urlPath}/${row.id}`);
-        fetchMailAliases();
-        notify(t('Unsubscribed from alias!'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.delete(`${urlPath}/${row.id}`);
+    fetchMailAliases();
+    notify(t('Unsubscribed from alias!'), 'positive');
 };
 
 const createMailAlias = async (mailAliasFormData) => {
-    try {
-        await axios.post(urlPath, mailAliasFormData);
-        notify(t('Subscribed to alias!'), 'positive');
-        fetchMailAliases();
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.post(urlPath, mailAliasFormData);
+    notify(t('Subscribed to alias!'), 'positive');
+    fetchMailAliases();
 };
 
 const fetchMailAliases = async () => {
diff --git a/src/pages/Account/Card/AccountMailForwarding.vue b/src/pages/Account/Card/AccountMailForwarding.vue
index 24b30f2b3..aa92e5072 100644
--- a/src/pages/Account/Card/AccountMailForwarding.vue
+++ b/src/pages/Account/Card/AccountMailForwarding.vue
@@ -41,35 +41,22 @@ const fetchAccountExistence = async () => {
 };
 
 const fetchMailForwards = async () => {
-    try {
-        const response = await axios.get(`MailForwards/${route.params.id}`);
-        return response.data;
-    } catch (err) {
-        console.error('Error fetching mail forwards', err);
-        return null;
-    }
+    const response = await axios.get(`MailForwards/${route.params.id}`);
+    return response.data;
 };
 
 const deleteMailForward = async () => {
-    try {
-        await axios.delete(`MailForwards/${route.params.id}`);
-        formData.value.forwardTo = null;
-        initialData.value.forwardTo = null;
-        initialData.value.hasData = hasData.value;
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error deleting mail forward', err);
-    }
+    await axios.delete(`MailForwards/${route.params.id}`);
+    formData.value.forwardTo = null;
+    initialData.value.forwardTo = null;
+    initialData.value.hasData = hasData.value;
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 const updateMailForward = async () => {
-    try {
-        await axios.patch('MailForwards', formData.value);
-        initialData.value = { ...formData.value };
-        initialData.value.hasData = hasData.value;
-    } catch (err) {
-        console.error('Error creating mail forward', err);
-    }
+    await axios.patch('MailForwards', formData.value);
+    initialData.value = { ...formData.value };
+    initialData.value.hasData = hasData.value;
 };
 
 const onSubmit = async () => {
diff --git a/src/pages/Account/Role/Card/RoleDescriptor.vue b/src/pages/Account/Role/Card/RoleDescriptor.vue
index e4af3ed13..1ad3b146a 100644
--- a/src/pages/Account/Role/Card/RoleDescriptor.vue
+++ b/src/pages/Account/Role/Card/RoleDescriptor.vue
@@ -32,12 +32,8 @@ const filter = {
     where: { id: entityId },
 };
 const removeRole = async () => {
-    try {
-        await axios.delete(`VnRoles/${entityId.value}`);
-        notify(t('Role removed'), 'positive');
-    } catch (error) {
-        console.error('Error deleting role', error);
-    }
+    await axios.delete(`VnRoles/${entityId.value}`);
+    notify(t('Role removed'), 'positive');
 };
 </script>
 
diff --git a/src/pages/Account/Role/Card/SubRoles.vue b/src/pages/Account/Role/Card/SubRoles.vue
index d17f96dd8..2d119c93a 100644
--- a/src/pages/Account/Role/Card/SubRoles.vue
+++ b/src/pages/Account/Role/Card/SubRoles.vue
@@ -46,29 +46,19 @@ const columns = computed(() => [
 ]);
 
 const deleteSubRole = async (row) => {
-    try {
-        await axios.delete(`${urlPath.value}/${row.id}`);
-        fetchSubRoles();
-        notify(
-            t('Role removed. Changes will take a while to fully propagate.'),
-            'positive'
-        );
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.delete(`${urlPath.value}/${row.id}`);
+    fetchSubRoles();
+    notify(t('Role removed. Changes will take a while to fully propagate.'), 'positive');
 };
 
 const createSubRole = async (subRoleFormData) => {
-    try {
         await axios.post(urlPath.value, subRoleFormData);
         notify(
             t('Role added! Changes will take a while to fully propagate.'),
             'positive'
         );
         fetchSubRoles();
-    } catch (error) {
-        console.error(error);
-    }
+
 };
 
 watch(
diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
index 8c59f28b6..a75dfa1b2 100644
--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
@@ -106,28 +106,24 @@ const setParams = (params) => {
 };
 
 const getPreview = async () => {
-    try {
-        const params = {
-            recipientId: entityId,
-        };
-        const validationMessage = validateMessage();
-        if (validationMessage) return notify(t(validationMessage), 'negative');
+    const params = {
+        recipientId: entityId,
+    };
+    const validationMessage = validateMessage();
+    if (validationMessage) return notify(t(validationMessage), 'negative');
 
-        setParams(params);
+    setParams(params);
 
-        const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
-        const { data } = await axios.get(path, { params });
+    const path = `${sampleType.value.model}/${entityId.value}/${sampleType.value.code}-html`;
+    const { data } = await axios.get(path, { params });
 
-        if (!data) return;
-        quasar.dialog({
-            component: CustomerSamplesPreview,
-            componentProps: {
-                htmlContent: data,
-            },
-        });
-    } catch (err) {
-        notify('Errors getting preview', 'negative');
-    }
+    if (!data) return;
+    quasar.dialog({
+        component: CustomerSamplesPreview,
+        componentProps: {
+            htmlContent: data,
+        },
+    });
 };
 
 const onSubmit = async () => {
diff --git a/src/pages/Department/Card/DepartmentDescriptor.vue b/src/pages/Department/Card/DepartmentDescriptor.vue
index e914f6af6..39b8d54b5 100644
--- a/src/pages/Department/Card/DepartmentDescriptor.vue
+++ b/src/pages/Department/Card/DepartmentDescriptor.vue
@@ -42,13 +42,9 @@ const setData = (entity) => {
 };
 
 const removeDepartment = async () => {
-    try {
-        await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
-        router.push({ name: 'WorkerDepartment' });
-        notify('department.departmentRemoved', 'positive');
-    } catch (err) {
-        console.error('Error removing department');
-    }
+    await axios.post(`/Departments/${entityId.value}/removeChild`, entityId.value);
+    router.push({ name: 'WorkerDepartment' });
+    notify('department.departmentRemoved', 'positive');
 };
 
 const { openConfirmationModal } = useVnConfirm();
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index ff89faada..c59a0e711 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -237,13 +237,9 @@ const copyOriginalRowsData = (rows) => {
 };
 
 const saveChange = async (field, { rowIndex, row }) => {
-    try {
-        if (originalRowDataCopy.value[rowIndex][field] == row[field]) return;
-        await axios.patch(`Buys/${row.id}`, row);
-        originalRowDataCopy.value[rowIndex][field] = row[field];
-    } catch (err) {
-        console.error('Error saving changes', err);
-    }
+    if (originalRowDataCopy.value[rowIndex][field] == row[field]) return;
+    await axios.patch(`Buys/${row.id}`, row);
+    originalRowDataCopy.value[rowIndex][field] = row[field];
 };
 
 const openRemoveDialog = async () => {
@@ -261,15 +257,11 @@ const openRemoveDialog = async () => {
             },
         })
         .onOk(async () => {
-            try {
-                await deleteBuys();
-                const notifyMessage = t(
-                    `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
-                );
-                notify(notifyMessage, 'positive');
-            } catch (err) {
-                console.error('Error deleting buys');
-            }
+            await deleteBuys();
+            const notifyMessage = t(
+                `Buy${rowsSelected.value.length > 1 ? 's' : ''} deleted`
+            );
+            notify(notifyMessage, 'positive');
         });
 };
 
@@ -283,17 +275,13 @@ const importBuys = () => {
 };
 
 const toggleGroupingMode = async (buy, mode) => {
-    try {
-        const groupingMode = mode === 'grouping' ? mode : 'packing';
-        const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
-        const params = {
-            groupingMode: newGroupingMode,
-        };
-        await axios.patch(`Buys/${buy.id}`, params);
-        buy.groupingMode = newGroupingMode;
-    } catch (err) {
-        console.error('Error toggling grouping mode');
-    }
+    const groupingMode = mode === 'grouping' ? mode : 'packing';
+    const newGroupingMode = buy.groupingMode === groupingMode ? null : groupingMode;
+    const params = {
+        groupingMode: newGroupingMode,
+    };
+    await axios.patch(`Buys/${buy.id}`, params);
+    buy.groupingMode = newGroupingMode;
 };
 
 const lockIconType = (groupingMode, mode) => {
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 8431e1096..007231b43 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -123,36 +123,28 @@ const fillData = async (rawData) => {
 };
 
 const fetchBuys = async (buys) => {
-    try {
-        const params = { buys };
-        const { data } = await axios.post(
-            `Entries/${route.params.id}/importBuysPreview`,
-            params
-        );
-        importData.value.buys = data;
-    } catch (err) {
-        console.error('Error fetching buys');
-    }
+    const params = { buys };
+    const { data } = await axios.post(
+        `Entries/${route.params.id}/importBuysPreview`,
+        params
+    );
+    importData.value.buys = data;
 };
 
 const onSubmit = async () => {
-    try {
-        const params = importData.value;
-        const hasAnyEmptyRow = params.buys.some((buy) => {
-            return buy.itemFk === null;
-        });
+    const params = importData.value;
+    const hasAnyEmptyRow = params.buys.some((buy) => {
+        return buy.itemFk === null;
+    });
 
-        if (hasAnyEmptyRow) {
-            notify(t('Some of the imported buys does not have an item'), 'negative');
-            return;
-        }
-
-        await axios.post(`Entries/${route.params.id}/importBuys`, params);
-        notify('globals.dataSaved', 'positive');
-        redirectToBuysView();
-    } catch (err) {
-        console.error('Error importing buys', err);
+    if (hasAnyEmptyRow) {
+        notify(t('Some of the imported buys does not have an item'), 'negative');
+        return;
     }
+
+    await axios.post(`Entries/${route.params.id}/importBuys`, params);
+    notify('globals.dataSaved', 'positive');
+    redirectToBuysView();
 };
 
 const redirectToBuysView = () => {
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index c2f1e6b57..bc333758a 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -147,12 +147,9 @@ async function setEntryData(data) {
 }
 
 const fetchEntryBuys = async () => {
-    try {
         const { data } = await axios.get(`Entries/${entry.value.id}/getBuys`);
         if (data) entryBuys.value = data;
-    } catch (err) {
-        console.error('Error fetching entry buys');
-    }
+
 };
 </script>
 
diff --git a/src/pages/Entry/EntryWasteRecalc.vue b/src/pages/Entry/EntryWasteRecalc.vue
index cd823beb4..6ae200ed7 100644
--- a/src/pages/Entry/EntryWasteRecalc.vue
+++ b/src/pages/Entry/EntryWasteRecalc.vue
@@ -30,8 +30,6 @@ const recalc = async () => {
         isLoading.value = true;
         await axios.post('Applications/waste_addSales/execute-proc', params);
         notify('wasteRecalc.recalcOk', 'positive');
-    } catch (err) {
-        console.error(err);
     } finally {
         isLoading.value = false;
     }
diff --git a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
index 70d38cb93..eb72563e1 100644
--- a/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
+++ b/src/pages/InvoiceOut/Card/InvoiceOutDescriptorMenu.vue
@@ -61,25 +61,18 @@ const showSendInvoiceDialog = (type) => {
 };
 
 const sendEmailInvoice = async ({ address }) => {
-    try {
-        if (!address) notify(`The email can't be empty`, 'negative');
+    if (!address) notify(`The email can't be empty`, 'negative');
 
-        if (invoiceFormType.value === 'pdf') {
-            return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-email`, {
-                recipientId: $props.invoiceOutData.client.id,
-                recipient: address,
-            });
-        } else {
-            return sendEmail(
-                `InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`,
-                {
-                    recipientId: $props.invoiceOutData.client.id,
-                    recipient: address,
-                }
-            );
-        }
-    } catch (err) {
-        console.error('Error sending email', err);
+    if (invoiceFormType.value === 'pdf') {
+        return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-email`, {
+            recipientId: $props.invoiceOutData.client.id,
+            recipient: address,
+        });
+    } else {
+        return sendEmail(`InvoiceOuts/${$props.invoiceOutData.ref}/invoice-csv-email`, {
+            recipientId: $props.invoiceOutData.client.id,
+            recipient: address,
+        });
     }
 };
 
@@ -88,46 +81,30 @@ const redirectToInvoiceOutList = () => {
 };
 
 const deleteInvoice = async () => {
-    try {
-        await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`);
-        notify(t('InvoiceOut deleted'), 'positive');
-    } catch (err) {
-        console.error('Error deleting invoice out', err);
-    }
+    await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/delete`);
+    notify(t('InvoiceOut deleted'), 'positive');
 };
 
 const bookInvoice = async () => {
-    try {
-        await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`);
-        notify(t('InvoiceOut booked'), 'positive');
-    } catch (err) {
-        console.error('Error booking invoice out', err);
-    }
+    await axios.post(`InvoiceOuts/${$props.invoiceOutData.ref}/book`);
+    notify(t('InvoiceOut booked'), 'positive');
 };
 
 const generateInvoicePdf = async () => {
-    try {
-        await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`);
-        notify(t('The invoice PDF document has been regenerated'), 'positive');
-    } catch (err) {
-        console.error('Error generating invoice out pdf', err);
-    }
+    await axios.post(`InvoiceOuts/${$props.invoiceOutData.id}/createPdf`);
+    notify(t('The invoice PDF document has been regenerated'), 'positive');
 };
 
 const refundInvoice = async (withWarehouse) => {
-    try {
-        const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
-        const { data } = await axios.post('InvoiceOuts/refund', params);
-        location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
-        notify(
-            t('refundInvoiceSuccessMessage', {
-                refundTicket: data[0].id,
-            }),
-            'positive'
-        );
-    } catch (err) {
-        console.error('Error generating invoice out pdf', err);
-    }
+    const params = { ref: $props.invoiceOutData.ref, withWarehouse: withWarehouse };
+    const { data } = await axios.post('InvoiceOuts/refund', params);
+    location.href = window.origin + `/#/ticket/${data[0].id}/sale`;
+    notify(
+        t('refundInvoiceSuccessMessage', {
+            refundTicket: data[0].id,
+        }),
+        'positive'
+    );
 };
 
 const showTransferInvoiceForm = async () => {
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index f1b4902f2..092844386 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -143,15 +143,10 @@ onMounted(() => (stateStore.rightDrawer = true));
 onUnmounted(() => (stateStore.rightDrawer = false));
 
 function openPdf(id) {
-    try {
-        openReport(`${MODEL}/${id}/download`);
-    } catch (err) {
-        console.error('Error opening PDF', err);
-    }
+    openReport(`${MODEL}/${id}/download`);
 }
 
 function downloadPdf() {
-    try {
         if (selectedRows.value.size === 0) return;
         const selectedCardsArray = Array.from(selectedRows.value.values());
 
@@ -170,9 +165,7 @@ function downloadPdf() {
 
             openReport(`${MODEL}/downloadZip`, params);
         }
-    } catch (err) {
-        console.error('Error opening PDF');
-    }
+
 }
 
 watchEffect(selectedRows);
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index ef844824f..1e6c5c730 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -58,46 +58,34 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = async (entity) => {
-    try {
-        if (!entity) return;
-        data.value = useCardDescription(entity.name, entity.id);
-        await updateStock();
-    } catch (err) {
-        console.error('Error item');
-    }
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+    await updateStock();
 };
 
 const getItemConfigs = async () => {
-    try {
-        const { data } = await axios.get('ItemConfigs/findOne');
-        if (!data) return;
-        return (warehouseConfig.value = data.warehouseFk);
-    } catch (err) {
-        console.error('Error item');
-    }
+    const { data } = await axios.get('ItemConfigs/findOne');
+    if (!data) return;
+    return (warehouseConfig.value = data.warehouseFk);
 };
 const updateStock = async () => {
-    try {
-        available.value = null;
-        visible.value = null;
+    available.value = null;
+    visible.value = null;
 
-        const params = {
-            warehouseFk: $props.warehouseFk,
-            dated: $props.dated,
-        };
+    const params = {
+        warehouseFk: $props.warehouseFk,
+        dated: $props.dated,
+    };
 
-        await getItemConfigs();
-        if (!params.warehouseFk) {
-            params.warehouseFk = warehouseConfig.value;
-        }
-        const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
-            params,
-        });
-        available.value = data.available;
-        visible.value = data.visible;
-    } catch (err) {
-        console.error('Error updating stock');
+    await getItemConfigs();
+    if (!params.warehouseFk) {
+        params.warehouseFk = warehouseConfig.value;
     }
+    const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
+        params,
+    });
+    available.value = data.available;
+    visible.value = data.visible;
 };
 
 const openRegularizeStockForm = () => {
@@ -105,12 +93,8 @@ const openRegularizeStockForm = () => {
 };
 
 const cloneItem = async () => {
-    try {
-        const { data } = await axios.post(`Items/${entityId.value}/clone`);
-        router.push({ name: 'ItemTags', params: { id: data.id } });
-    } catch (err) {
-        console.error('Error cloning item');
-    }
+    const { data } = await axios.post(`Items/${entityId.value}/clone`);
+    router.push({ name: 'ItemTags', params: { id: data.id } });
 };
 
 const openCloneDialog = async () => {
diff --git a/src/pages/Item/Card/ItemShelving.vue b/src/pages/Item/Card/ItemShelving.vue
index 41cb34c03..27e265e6b 100644
--- a/src/pages/Item/Card/ItemShelving.vue
+++ b/src/pages/Item/Card/ItemShelving.vue
@@ -45,13 +45,9 @@ const arrayData = useArrayData('ItemShelvings', {
 const rows = computed(() => arrayData.store.data || []);
 
 const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ filter: null, params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
+    const paramKey = col.columnFilter?.filterParamKey || col.field;
+    params[paramKey] = col.columnFilter.filterValue;
+    await arrayData.addFilter({ filter: null, params });
 };
 
 const getInputEvents = (col) => {
@@ -173,15 +169,11 @@ const totalLabels = computed(() =>
 );
 
 const removeLines = async () => {
-    try {
-        const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk);
-        await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds });
-        rowsSelected.value = [];
-        notify('shelvings.shelvingsRemoved', 'positive');
-        await arrayData.fetch({ append: false });
-    } catch (err) {
-        console.error('Error removing lines', err);
-    }
+    const itemShelvingIds = rowsSelected.value.map((row) => row.itemShelvingFk);
+    await axios.post('ItemShelvings/deleteItemShelvings', { itemShelvingIds });
+    rowsSelected.value = [];
+    notify('shelvings.shelvingsRemoved', 'positive');
+    await arrayData.fetch({ append: false });
 };
 onMounted(async () => {
     await arrayData.fetch({ append: false });
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
index 6f31d0cf8..bf6232920 100644
--- a/src/pages/Item/Card/ItemTags.vue
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -19,22 +19,18 @@ const tagOptions = ref([]);
 const valueOptionsMap = ref(new Map());
 
 const getSelectedTagValues = async (tag) => {
-    try {
-        if (!tag.tagFk && tag.tag.isFree) return;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-            limit: 30,
-        };
+    if (!tag.tagFk && tag.tag.isFree) return;
+    const filter = {
+        fields: ['value'],
+        order: 'value ASC',
+        limit: 30,
+    };
 
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get(`Tags/${tag.tagFk}/filterValue`, {
-            params,
-        });
-        valueOptionsMap.value.set(tag.tagFk, data);
-    } catch (err) {
-        console.error('Error getting selected tag values');
-    }
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(`Tags/${tag.tagFk}/filterValue`, {
+        params,
+    });
+    valueOptionsMap.value.set(tag.tagFk, data);
 };
 
 const onItemTagsFetched = async (itemTags) => {
diff --git a/src/pages/Item/Card/ItemTax.vue b/src/pages/Item/Card/ItemTax.vue
index 489a2c7b2..44e0b39cd 100644
--- a/src/pages/Item/Card/ItemTax.vue
+++ b/src/pages/Item/Card/ItemTax.vue
@@ -32,17 +32,13 @@ const ItemTaxRef = ref(null);
 const taxesOptions = ref([]);
 
 const submitTaxes = async (data) => {
-    try {
-        let payload = data.map((tax) => ({
-            id: tax.id,
-            taxClassFk: tax.taxClassFk,
-        }));
+    let payload = data.map((tax) => ({
+        id: tax.id,
+        taxClassFk: tax.taxClassFk,
+    }));
 
-        await axios.post(`Items/updateTaxes`, payload);
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error saving taxes', err);
-    }
+    await axios.post(`Items/updateTaxes`, payload);
+    notify(t('globals.dataSaved'), 'positive');
 };
 </script>
 <template>
diff --git a/src/pages/Item/ItemFixedPrice.vue b/src/pages/Item/ItemFixedPrice.vue
index 628af681a..f6a54ed63 100644
--- a/src/pages/Item/ItemFixedPrice.vue
+++ b/src/pages/Item/ItemFixedPrice.vue
@@ -221,24 +221,16 @@ const updateMinPrice = async (value, props) => {
 };
 
 const upsertPrice = async (props, resetMinPrice = false) => {
-    try {
-        const { row } = props;
-        if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
-            if (resetMinPrice) row.hasMinPrice = 0;
-            await upsertFixedPrice(row);
-        }
-    } catch (err) {
-        console.error('Error editing price', err);
+    const { row } = props;
+    if (tableRef.value.CrudModelRef.getChanges().updates.length > 0) {
+        if (resetMinPrice) row.hasMinPrice = 0;
+        await upsertFixedPrice(row);
     }
 };
 
 async function upsertFixedPrice(row) {
-    try {
-        const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
-        return data;
-    } catch (err) {
-        console.error('Error editing price', err);
-    }
+    const { data } = await axios.patch('FixedPrices/upsertFixedPrice', row);
+    return data;
 }
 
 async function saveOnRowChange(row) {
@@ -321,14 +313,10 @@ const onEditCellDataSaved = async () => {
 };
 
 const removeFuturePrice = async () => {
-    try {
-        rowsSelected.value.forEach(({ id }) => {
-            const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
-            removePrice(id, rowIndex);
-        });
-    } catch (err) {
-        console.error('Error removing price', err);
-    }
+    rowsSelected.value.forEach(({ id }) => {
+        const rowIndex = fixedPrices.value.findIndex(({ id }) => id === id);
+        removePrice(id, rowIndex);
+    });
 };
 
 function confirmRemove(item, isFuture) {
@@ -345,13 +333,9 @@ function confirmRemove(item, isFuture) {
 }
 
 const removePrice = async (id) => {
-    try {
-        await axios.delete(`FixedPrices/${id}`);
-        notify(t('globals.dataSaved'), 'positive');
-        tableRef.value.reload({});
-    } catch (err) {
-        console.error('Error removing price', err);
-    }
+    await axios.delete(`FixedPrices/${id}`);
+    notify(t('globals.dataSaved'), 'positive');
+    tableRef.value.reload({});
 };
 const dateStyle = (date) =>
     date
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
index ae4c9531c..c298295b0 100644
--- a/src/pages/Item/ItemList.vue
+++ b/src/pages/Item/ItemList.vue
@@ -73,13 +73,9 @@ const exprBuilder = (param, value) => {
 const params = reactive({ isFloramondo: false, isActive: true });
 
 const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await paginateRef.value.addFilter(null, params);
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
+    const paramKey = col.columnFilter?.filterParamKey || col.field;
+    params[paramKey] = col.columnFilter.filterValue;
+    await paginateRef.value.addFilter(null, params);
 };
 
 const getInputEvents = (col) => {
@@ -379,13 +375,9 @@ const redirectToItemSummary = (id) => {
 };
 
 const cloneItem = async (itemFk) => {
-    try {
-        const { data } = await axios.post(`Items/${itemFk}/clone`);
-        if (!data) return;
-        router.push({ name: 'ItemTags', params: { id: data.id } });
-    } catch (err) {
-        console.error('Error cloning item', err);
-    }
+    const { data } = await axios.post(`Items/${itemFk}/clone`);
+    if (!data) return;
+    router.push({ name: 'ItemTags', params: { id: data.id } });
 };
 
 onMounted(async () => {
diff --git a/src/pages/Item/ItemListFilter.vue b/src/pages/Item/ItemListFilter.vue
index 22dce9c64..c8357ba33 100644
--- a/src/pages/Item/ItemListFilter.vue
+++ b/src/pages/Item/ItemListFilter.vue
@@ -55,22 +55,18 @@ const onCategoryChange = async (categoryFk, search) => {
 };
 
 const getSelectedTagValues = async (tag) => {
-    try {
-        if (!tag?.selectedTag?.id) return;
-        tag.value = null;
-        const filter = {
-            fields: ['value'],
-            order: 'value ASC',
-        };
+    if (!tag?.selectedTag?.id) return;
+    tag.value = null;
+    const filter = {
+        fields: ['value'],
+        order: 'value ASC',
+    };
 
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
-            params,
-        });
-        tag.valueOptions = data;
-    } catch (err) {
-        console.error('Error getting selected tag values');
-    }
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get(`Tags/${tag.selectedTag.id}/filterValue`, {
+        params,
+    });
+    tag.valueOptions = data;
 };
 
 const applyTags = (params, search) => {
diff --git a/src/pages/Item/ItemRequest.vue b/src/pages/Item/ItemRequest.vue
index 82c3b48e0..1328dc470 100644
--- a/src/pages/Item/ItemRequest.vue
+++ b/src/pages/Item/ItemRequest.vue
@@ -125,41 +125,30 @@ const columns = computed(() => [
 ]);
 
 const changeQuantity = async (request) => {
-    try {
-        if (request.saleFk) {
-            const params = {
-                quantity: request.saleQuantity,
-            };
+    if (request.saleFk) {
+        const params = {
+            quantity: request.saleQuantity,
+        };
 
-            await axios.patch(`Sales/${request.saleFk}`, params);
-            notify(t('globals.dataSaved'), 'positive');
-            confirmRequest(request);
-        } else confirmRequest(request);
-    } catch (error) {
-        console.error('Error changing quantity:: ', error);
-    }
+        await axios.patch(`Sales/${request.saleFk}`, params);
+        notify(t('globals.dataSaved'), 'positive');
+        confirmRequest(request);
+    } else confirmRequest(request);
 };
 
 const confirmRequest = async (request) => {
-    try {
-        if (request.itemFk && request.saleQuantity) {
-            const params = {
-                itemFk: request.itemFk,
-                quantity: request.saleQuantity,
-                attenderFk: request.attenderFk,
-            };
+    if (request.itemFk && request.saleQuantity) {
+        const params = {
+            itemFk: request.itemFk,
+            quantity: request.saleQuantity,
+            attenderFk: request.attenderFk,
+        };
 
-            const { data } = await axios.post(
-                `TicketRequests/${request.id}/confirm`,
-                params
-            );
+        const { data } = await axios.post(`TicketRequests/${request.id}/confirm`, params);
 
-            request.itemDescription = data.concept;
-            request.isOk = true;
-            notify(t('globals.dataSaved'), 'positive');
-        }
-    } catch (error) {
-        console.error('Error confirming request:: ', error);
+        request.itemDescription = data.concept;
+        request.isOk = true;
+        notify(t('globals.dataSaved'), 'positive');
     }
 };
 
diff --git a/src/pages/Monitor/MonitorOrders.vue b/src/pages/Monitor/MonitorOrders.vue
index 17f72f188..f9e149d96 100644
--- a/src/pages/Monitor/MonitorOrders.vue
+++ b/src/pages/Monitor/MonitorOrders.vue
@@ -103,15 +103,11 @@ const getBadgeColor = (date) => {
 };
 
 const removeOrders = async () => {
-    try {
-        const selectedIds = selectedRows.value.map((row) => row.id);
-        const params = { deletes: selectedIds };
-        await axios.post('SalesMonitors/deleteOrders', params);
-        selectedRows.value = [];
-        await table.value.reload();
-    } catch (err) {
-        console.error('Error deleting orders', err);
-    }
+    const selectedIds = selectedRows.value.map((row) => row.id);
+    const params = { deletes: selectedIds };
+    await axios.post('SalesMonitors/deleteOrders', params);
+    selectedRows.value = [];
+    await table.value.reload();
 };
 
 const openTab = (id) =>
diff --git a/src/pages/Order/Card/OrderBasicData.vue b/src/pages/Order/Card/OrderBasicData.vue
index 4bc9e2e43..46ecdaa70 100644
--- a/src/pages/Order/Card/OrderBasicData.vue
+++ b/src/pages/Order/Card/OrderBasicData.vue
@@ -22,22 +22,17 @@ const agencyList = ref([]);
 const addressList = ref([]);
 
 const fetchAddressList = async (addressId) => {
-    try {
-        const { data } = await axios.get('addresses', {
-            params: {
-                filter: JSON.stringify({
-                    fields: ['id', 'nickname', 'street', 'city'],
-                    where: { id: addressId },
-                }),
-            },
-        });
-        addressList.value = data;
-        if (addressList.value?.length === 1) {
-            state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
-        }
-    } catch (err) {
-        console.error(`Error fetching addresses`, err);
-        return err.response;
+    const { data } = await axios.get('addresses', {
+        params: {
+            filter: JSON.stringify({
+                fields: ['id', 'nickname', 'street', 'city'],
+                where: { id: addressId },
+            }),
+        },
+    });
+    addressList.value = data;
+    if (addressList.value?.length === 1) {
+        state.get(ORDER_MODEL).addressFk = addressList.value[0].id;
     }
 };
 
@@ -45,18 +40,13 @@ const fetchAgencyList = async (landed, addressFk) => {
     if (!landed || !addressFk) {
         return;
     }
-    try {
-        const { data } = await axios.get('Agencies/landsThatDay', {
-            params: {
-                addressFk,
-                landed: new Date(landed).toISOString(),
-            },
-        });
-        agencyList.value = data;
-    } catch (err) {
-        console.error(`Error fetching agencies`, err);
-        return err.response;
-    }
+    const { data } = await axios.get('Agencies/landsThatDay', {
+        params: {
+            addressFk,
+            landed: new Date(landed).toISOString(),
+        },
+    });
+    agencyList.value = data;
 };
 
 const fetchOrderDetails = (order) => {
@@ -92,12 +82,8 @@ const orderFilter = {
 };
 
 const onClientChange = async (clientId) => {
-    try {
-        const { data } = await axios.get(`Clients/${clientId}`);
-        await fetchAddressList(data.defaultAddressFk);
-    } catch (error) {
-        console.error('Error al cambiar el cliente:', error);
-    }
+    const { data } = await axios.get(`Clients/${clientId}`);
+    await fetchAddressList(data.defaultAddressFk);
 };
 </script>
 
diff --git a/src/pages/Order/Card/OrderCreateDialog.vue b/src/pages/Order/Card/OrderCreateDialog.vue
index bcc62aa43..4fa320c02 100644
--- a/src/pages/Order/Card/OrderCreateDialog.vue
+++ b/src/pages/Order/Card/OrderCreateDialog.vue
@@ -22,22 +22,17 @@ const addressList = ref([]);
 defineEmits(['confirm', ...useDialogPluginComponent.emits]);
 
 const fetchAddressList = async (addressId) => {
-    try {
-        const { data } = await axios.get('addresses', {
-            params: {
-                filter: JSON.stringify({
-                    fields: ['id', 'nickname', 'street', 'city'],
-                    where: { id: addressId },
-                }),
-            },
-        });
-        addressList.value = data;
-        if (addressList.value?.length === 1) {
-            state.get(ORDER_MODEL).addressId = addressList.value[0].id;
-        }
-    } catch (err) {
-        console.error(`Error fetching addresses`, err);
-        return err.response;
+    const { data } = await axios.get('addresses', {
+        params: {
+            filter: JSON.stringify({
+                fields: ['id', 'nickname', 'street', 'city'],
+                where: { id: addressId },
+            }),
+        },
+    });
+    addressList.value = data;
+    if (addressList.value?.length === 1) {
+        state.get(ORDER_MODEL).addressId = addressList.value[0].id;
     }
 };
 
@@ -45,18 +40,13 @@ const fetchAgencyList = async (landed, addressFk) => {
     if (!landed || !addressFk) {
         return;
     }
-    try {
-        const { data } = await axios.get('Agencies/landsThatDay', {
-            params: {
-                addressFk,
-                landed: new Date(landed).toISOString(),
-            },
-        });
-        agencyList.value = data;
-    } catch (err) {
-        console.error(`Error fetching agencies`, err);
-        return err.response;
-    }
+    const { data } = await axios.get('Agencies/landsThatDay', {
+        params: {
+            addressFk,
+            landed: new Date(landed).toISOString(),
+        },
+    });
+    agencyList.value = data;
 };
 
 // const fetchOrderDetails = (order) => {
@@ -109,12 +99,8 @@ const initialFormState = reactive({
 // };
 
 const onClientChange = async (clientId = $props.clientFk) => {
-    try {
-        const { data } = await axios.get(`Clients/${clientId}`);
-        await fetchAddressList(data.defaultAddressFk);
-    } catch (error) {
-        console.error('Error al cambiar el cliente:', error);
-    }
+    const { data } = await axios.get(`Clients/${clientId}`);
+    await fetchAddressList(data.defaultAddressFk);
 };
 
 async function onDataSaved(_, id) {
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 08bebb67e..428ab05c2 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -47,17 +47,13 @@ const onChangesSaved = () => {
 };
 
 const setWireTransfer = async () => {
-    try {
-        const params = {
-            id: route.params.id,
-            payMethodFk: wireTransferFk.value,
-        };
+    const params = {
+        id: route.params.id,
+        payMethodFk: wireTransferFk.value,
+    };
 
-        await axios.patch(`Suppliers/${route.params.id}`, params);
-        notify('globals.dataSaved', 'positive');
-    } catch (err) {
-        console.error('Error setting wire transfer', err);
-    }
+    await axios.patch(`Suppliers/${route.params.id}`, params);
+    notify('globals.dataSaved', 'positive');
 };
 </script>
 <template>
diff --git a/src/pages/Ticket/Card/ExpeditionNewTicket.vue b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
index 9183ae405..c288f6cc2 100644
--- a/src/pages/Ticket/Card/ExpeditionNewTicket.vue
+++ b/src/pages/Ticket/Card/ExpeditionNewTicket.vue
@@ -34,26 +34,20 @@ const newTicketFormData = reactive({});
 const date = new Date();
 
 const createTicket = async () => {
-    try {
-        const expeditionIds = $props.selectedExpeditions.map(
-            (expedition) => expedition.id
-        );
-        const params = {
-            clientId: $props.ticket.clientFk,
-            landed: newTicketFormData.landed,
-            warehouseId: $props.ticket.warehouseFk,
-            addressId: $props.ticket.addressFk,
-            agencyModeId: $props.ticket.agencyModeFk,
-            routeId: newTicketFormData.routeFk,
-            expeditionIds: expeditionIds,
-        };
+    const expeditionIds = $props.selectedExpeditions.map((expedition) => expedition.id);
+    const params = {
+        clientId: $props.ticket.clientFk,
+        landed: newTicketFormData.landed,
+        warehouseId: $props.ticket.warehouseFk,
+        addressId: $props.ticket.addressFk,
+        agencyModeId: $props.ticket.agencyModeFk,
+        routeId: newTicketFormData.routeFk,
+        expeditionIds: expeditionIds,
+    };
 
-        const { data } = await axios.post('Expeditions/moveExpeditions', params);
-        notify(t('globals.dataSaved'), 'positive');
-        router.push({ name: 'TicketSummary', params: { id: data.id } });
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.post('Expeditions/moveExpeditions', params);
+    notify(t('globals.dataSaved'), 'positive');
+    router.push({ name: 'TicketSummary', params: { id: data.id } });
 };
 </script>
 
diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 0bccdaacd..b5b3c430c 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -150,31 +150,19 @@ const getTotal = computed(() => {
 });
 
 const getComponentsSum = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
-        componentsList.value = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.get(`Tickets/${route.params.id}/getComponentsSum`);
+    componentsList.value = data;
 };
 
 const getTheoricalCost = async () => {
-    try {
-        const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
-        theoricalCost.value = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.get(`Tickets/${route.params.id}/freightCost`);
+    theoricalCost.value = data;
 };
 
 const getTicketVolume = async () => {
-    try {
-        if (!ticketData.value) return;
-        const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
-        ticketVolume.value = data[0].volume;
-    } catch (error) {
-        console.error(error);
-    }
+    if (!ticketData.value) return;
+    const { data } = await axios.get(`Tickets/${ticketData.value.id}/getVolume`);
+    ticketVolume.value = data[0].volume;
 };
 
 onMounted(() => {
diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue
index bd63f259c..2c20310ee 100644
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@@ -163,16 +163,13 @@ const showNewTicketDialog = (withRoute = false) => {
 };
 
 const deleteExpedition = async () => {
-    try {
         const expeditionIds = selectedRows.value.map((expedition) => expedition.id);
         const params = { expeditionIds };
         await axios.post('Expeditions/deleteExpeditions', params);
         vnTableRef.value.reload();
         selectedExpeditions.value = [];
         notify(t('expedition.expeditionRemoved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
+
 };
 
 const showLog = async (expedition) => {
@@ -181,7 +178,6 @@ const showLog = async (expedition) => {
 };
 
 const getExpeditionState = async (expedition) => {
-    try {
         const filter = {
             where: { expeditionFk: expedition.id },
             order: ['created DESC'],
@@ -195,9 +191,7 @@ const getExpeditionState = async (expedition) => {
             ...state,
             isScanned: !!state.isScanned,
         }));
-    } catch (error) {
-        console.error(error);
-    }
+
 };
 
 onMounted(async () => {
diff --git a/src/pages/Ticket/Card/TicketPurchaseRequest.vue b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
index 6e89fc468..b1271b25a 100644
--- a/src/pages/Ticket/Card/TicketPurchaseRequest.vue
+++ b/src/pages/Ticket/Card/TicketPurchaseRequest.vue
@@ -172,13 +172,9 @@ const getRequestState = (state) => {
 const isEditable = (isOk) => isOk !== null;
 
 async function removeLine(id) {
-    try {
-        await axios.delete(`TicketRequests/${id}`);
-        notify(t('globals.dataSaved'), 'positive');
-        location.reload();
-    } catch (err) {
-        console.error('Error ', err);
-    }
+    await axios.delete(`TicketRequests/${id}`);
+    notify(t('globals.dataSaved'), 'positive');
+    location.reload();
 }
 
 onMounted(() => (stateStore.rightDrawer = false));
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 08cf248ba..f6baabb5c 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -152,15 +152,11 @@ const columns = computed(() => [
 ]);
 
 const getConfig = async () => {
-    try {
-        let filter = {
-            fields: ['daysForWarningClaim'],
-        };
-        const { data } = await axios.get(`TicketConfigs`, { filter });
-        ticketConfig.value = data;
-    } catch (err) {
-        console.error('Error getting ticket config', err);
-    }
+    let filter = {
+        fields: ['daysForWarningClaim'],
+    };
+    const { data } = await axios.get(`TicketConfigs`, { filter });
+    ticketConfig.value = data;
 };
 
 const onSalesFetched = (salesData) => {
@@ -183,41 +179,33 @@ const resetChanges = async () => {
 };
 
 const updateQuantity = async (sale) => {
-    try {
-        const payload = { quantity: sale.quantity };
-        await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
-        notify('globals.dataSaved', 'positive');
-    } catch (err) {
-        console.error('Error updating quantity', err);
-    }
+    const payload = { quantity: sale.quantity };
+    await axios.post(`Sales/${sale.id}/updateQuantity`, payload);
+    notify('globals.dataSaved', 'positive');
 };
 
 const addSale = async (sale) => {
-    try {
-        const payload = {
-            barcode: sale.itemFk,
-            quantity: sale.quantity,
-        };
+    const payload = {
+        barcode: sale.itemFk,
+        quantity: sale.quantity,
+    };
 
-        const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload);
+    const { data } = await axios.post(`tickets/${route.params.id}/addSale`, payload);
 
-        if (!data) return;
+    if (!data) return;
 
-        const newSale = data;
-        sale.id = newSale.id;
-        sale.image = newSale.item.image;
-        sale.subName = newSale.item.subName;
-        sale.concept = newSale.concept;
-        sale.quantity = newSale.quantity;
-        sale.discount = newSale.discount;
-        sale.price = newSale.price;
-        sale.item = newSale.item;
+    const newSale = data;
+    sale.id = newSale.id;
+    sale.image = newSale.item.image;
+    sale.subName = newSale.item.subName;
+    sale.concept = newSale.concept;
+    sale.quantity = newSale.quantity;
+    sale.discount = newSale.discount;
+    sale.price = newSale.price;
+    sale.item = newSale.item;
 
-        notify('globals.dataSaved', 'positive');
-        window.location.reload();
-    } catch (err) {
-        console.error('Error adding sale', err);
-    }
+    notify('globals.dataSaved', 'positive');
+    window.location.reload();
 };
 
 const changeQuantity = (sale) => {
@@ -232,13 +220,9 @@ const changeQuantity = (sale) => {
 };
 
 const updateConcept = async (sale) => {
-    try {
-        const data = { newConcept: sale.concept };
-        await axios.post(`Sales/${sale.id}/updateConcept`, data);
-        notify('globals.dataSaved', 'positive');
-    } catch (err) {
-        console.error('Error updating concept', err);
-    }
+    const data = { newConcept: sale.concept };
+    await axios.post(`Sales/${sale.id}/updateConcept`, data);
+    notify('globals.dataSaved', 'positive');
 };
 
 const DEFAULT_EDIT = {
@@ -292,18 +276,14 @@ const onOpenEditDiscountPopover = async (sale) => {
 };
 
 const updatePrice = async (sale) => {
-    try {
-        const newPrice = edit.value.price;
-        if (newPrice != null && newPrice != sale.price) {
-            await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
-            sale.price = newPrice;
-            edit.value = { ...DEFAULT_EDIT };
-            notify('globals.dataSaved', 'positive');
-        }
-        await getMana();
-    } catch (err) {
-        console.error('Error updating price', err);
+    const newPrice = edit.value.price;
+    if (newPrice != null && newPrice != sale.price) {
+        await axios.post(`Sales/${sale.id}/updatePrice`, { newPrice });
+        sale.price = newPrice;
+        edit.value = { ...DEFAULT_EDIT };
+        notify('globals.dataSaved', 'positive');
     }
+    await getMana();
 };
 
 const changeDiscount = (sale) => {
@@ -344,15 +324,11 @@ const getNewPrice = computed(() => {
 });
 
 const newOrderFromTicket = async () => {
-    try {
-        const { data } = await axios.post(`Orders/newFromTicket`, {
-            ticketFk: Number(route.params.id),
-        });
-        const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
-        window.open(routeData.href, '_blank');
-    } catch (err) {
-        console.error('Error creating new order', err);
-    }
+    const { data } = await axios.post(`Orders/newFromTicket`, {
+        ticketFk: Number(route.params.id),
+    });
+    const routeData = router.resolve({ name: 'OrderCatalog', params: { id: data } });
+    window.open(routeData.href, '_blank');
 };
 
 const goToLog = (saleId) => {
@@ -367,15 +343,11 @@ const goToLog = (saleId) => {
 };
 
 const changeTicketState = async (val) => {
-    try {
-        stateBtnDropdownRef.value.hide();
-        const params = { ticketFk: route.params.id, code: val };
-        await axios.post('Tickets/state', params);
-        notify('globals.dataSaved', 'positive');
-        await resetChanges();
-    } catch (err) {
-        console.error('Error changing ticket state', err);
-    }
+    stateBtnDropdownRef.value.hide();
+    const params = { ticketFk: route.params.id, code: val };
+    await axios.post('Tickets/state', params);
+    notify('globals.dataSaved', 'positive');
+    await resetChanges();
 };
 
 const removeSelectedSales = () => {
@@ -386,47 +358,34 @@ const removeSelectedSales = () => {
 };
 
 const removeSales = async () => {
-    try {
-        const params = {
-            sales: selectedRows.value.filter((sale) => sale.id),
-            ticketId: store.data.id,
-        };
-        selectedRows.value
-            .filter((sale) => !sale.id)
-            .forEach((sale) =>
-                tableRef.value.CrudModelRef.formData.splice(sale.$index, 1)
-            );
+    const params = {
+        sales: selectedRows.value.filter((sale) => sale.id),
+        ticketId: store.data.id,
+    };
+    selectedRows.value
+        .filter((sale) => !sale.id)
+        .forEach((sale) => tableRef.value.CrudModelRef.formData.splice(sale.$index, 1));
 
-        if (params.sales.length == 0) return;
-        await axios.post('Sales/deleteSales', params);
-        removeSelectedSales();
-        notify('globals.dataSaved', 'positive');
-        window.location.reload();
-    } catch (err) {
-        console.error('Error deleting sales', err);
-    }
+    if (params.sales.length == 0) return;
+    await axios.post('Sales/deleteSales', params);
+    removeSelectedSales();
+    notify('globals.dataSaved', 'positive');
+    window.location.reload();
 };
 
 const setTransferParams = async () => {
-    try {
-        selectedSales.value = selectedValidSales.value;
-        const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
-        transfer.value = {
-            lastActiveTickets: [],
-            sales: checkedSales,
-        };
+    selectedSales.value = selectedValidSales.value;
+    const checkedSales = JSON.parse(JSON.stringify(selectedSales.value));
+    transfer.value = {
+        lastActiveTickets: [],
+        sales: checkedSales,
+    };
 
-        const params = { ticketId: store.data.id };
-        const { data } = await axios.get(
-            `clients/${store.data.clientFk}/lastActiveTickets`,
-            {
-                params,
-            }
-        );
-        transfer.value.lastActiveTickets = data;
-    } catch (err) {
-        console.error('Error setting transfer params', err);
-    }
+    const params = { ticketId: store.data.id };
+    const { data } = await axios.get(`clients/${store.data.clientFk}/lastActiveTickets`, {
+        params,
+    });
+    transfer.value.lastActiveTickets = data;
 };
 
 onMounted(async () => {
diff --git a/src/pages/Ticket/Card/TicketSaleMoreActions.vue b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
index 5625c81c1..87e1d2a48 100644
--- a/src/pages/Ticket/Card/TicketSaleMoreActions.vue
+++ b/src/pages/Ticket/Card/TicketSaleMoreActions.vue
@@ -140,13 +140,9 @@ const createClaim = () => {
 };
 
 const onCreateClaimAccepted = async () => {
-    try {
-        const params = { ticketId: ticket.value.id, sales: props.sales };
-        const { data } = await axios.post(`Claims/createFromSales`, params);
-        push({ name: 'ClaimBasicData', params: { id: data.id } });
-    } catch (error) {
-        console.error('Error creating claim: ', error);
-    }
+    const params = { ticketId: ticket.value.id, sales: props.sales };
+    const { data } = await axios.post(`Claims/createFromSales`, params);
+    push({ name: 'ClaimBasicData', params: { id: data.id } });
 };
 
 const setReserved = async (reserved) => {
@@ -166,14 +162,10 @@ const createRefund = async (withWarehouse) => {
         negative: true,
     };
 
-    try {
-        const { data } = await axios.post('Tickets/cloneAll', params);
-        const [refundTicket] = data;
-        notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
-        push({ name: 'TicketSale', params: { id: refundTicket.id } });
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.post('Tickets/cloneAll', params);
+    const [refundTicket] = data;
+    notify(t('refundTicketCreated', { ticketId: refundTicket.id }), 'positive');
+    push({ name: 'TicketSale', params: { id: refundTicket.id } });
 };
 </script>
 
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index e7830bf37..1083393c4 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -150,18 +150,14 @@ const shelvingsTableColumns = computed(() => [
 ]);
 
 const getSaleTrackings = async (sale) => {
-    try {
-        const filter = {
-            where: { saleFk: sale.saleFk },
-            order: ['itemFk DESC'],
-        };
-        const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
-            params: { filter: JSON.stringify(filter) },
-        });
-        saleTrackings.value = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const filter = {
+        where: { saleFk: sale.saleFk },
+        order: ['itemFk DESC'],
+    };
+    const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+    saleTrackings.value = data;
 };
 
 const showLog = async (sale) => {
@@ -170,17 +166,13 @@ const showLog = async (sale) => {
 };
 
 const getItemShelvingSales = async (sale) => {
-    try {
-        const filter = {
-            where: { saleFk: sale.saleFk },
-        };
-        const { data } = await axios.get(`ItemShelvingSales/filter`, {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemShelvingsSales.value = data;
-    } catch (error) {
-        console.error(error);
-    }
+    const filter = {
+        where: { saleFk: sale.saleFk },
+    };
+    const { data } = await axios.get(`ItemShelvingSales/filter`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+    itemShelvingsSales.value = data;
 };
 
 const showShelving = async (sale) => {
@@ -189,36 +181,28 @@ const showShelving = async (sale) => {
 };
 
 const updateQuantity = async (sale) => {
-    try {
-        if (oldQuantity.value === sale.quantity) return;
-        const params = {
-            quantity: sale.quantity,
-        };
-        await axios.patch(`ItemShelvingSales/${sale.id}`, params);
-        oldQuantity.value = null;
-    } catch (error) {
-        console.error(error);
-    }
+    if (oldQuantity.value === sale.quantity) return;
+    const params = {
+        quantity: sale.quantity,
+    };
+    await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+    oldQuantity.value = null;
 };
 
 const updateParking = async (sale) => {
-    try {
-        const filter = {
-            fields: ['id'],
-            where: {
-                code: sale.shelvingFk,
-            },
-        };
-        const { data } = await axios.get(`Shelvings/findOne`, {
-            params: { filter: JSON.stringify(filter) },
-        });
-        const params = {
-            parkingFk: sale.parkingFk,
-        };
-        await axios.patch(`Shelvings/${data.id}`, params);
-    } catch (error) {
-        console.error(error);
-    }
+    const filter = {
+        fields: ['id'],
+        where: {
+            code: sale.shelvingFk,
+        },
+    };
+    const { data } = await axios.get(`Shelvings/findOne`, {
+        params: { filter: JSON.stringify(filter) },
+    });
+    const params = {
+        parkingFk: sale.parkingFk,
+    };
+    await axios.patch(`Shelvings/${data.id}`, params);
 };
 
 const updateShelving = async (sale) => {
@@ -241,61 +225,41 @@ const updateShelving = async (sale) => {
 };
 
 const saleTrackingNew = async (sale, stateCode, isChecked) => {
-    try {
-        const params = {
-            saleFk: sale.saleFk,
-            isChecked,
-            quantity: sale.quantity,
-            stateCode,
-        };
-        await axios.post(`SaleTrackings/new`, params);
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
+    const params = {
+        saleFk: sale.saleFk,
+        isChecked,
+        quantity: sale.quantity,
+        stateCode,
+    };
+    await axios.post(`SaleTrackings/new`, params);
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 const saleTrackingDel = async ({ saleFk }, stateCode) => {
-    try {
-        const params = {
-            saleFk,
-            stateCodes: [stateCode],
-        };
-        await axios.post(`SaleTrackings/delete`, params);
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
+    const params = {
+        saleFk,
+        stateCodes: [stateCode],
+    };
+    await axios.post(`SaleTrackings/delete`, params);
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 const clickSaleGroupDetail = async (sale) => {
-    try {
-        if (!sale.saleGroupDetailFk) return;
+    if (!sale.saleGroupDetailFk) return;
 
-        await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
-        sale.hasSaleGroupDetail = false;
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
+    sale.hasSaleGroupDetail = false;
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 const clickPreviousSelected = (sale) => {
-    try {
-        qCheckBoxController(sale, 'isPreviousSelected');
-        if (!sale.isPreviousSelected) sale.isPrevious = false;
-    } catch (error) {
-        console.error(error);
-    }
+    qCheckBoxController(sale, 'isPreviousSelected');
+    if (!sale.isPreviousSelected) sale.isPrevious = false;
 };
 
 const clickPrevious = (sale) => {
-    try {
-        qCheckBoxController(sale, 'isPrevious');
-        if (sale.isPrevious) sale.isPreviousSelected = true;
-    } catch (error) {
-        console.error(error);
-    }
+    qCheckBoxController(sale, 'isPrevious');
+    if (sale.isPrevious) sale.isPreviousSelected = true;
 };
 
 const qCheckBoxController = (sale, action) => {
@@ -306,16 +270,12 @@ const qCheckBoxController = (sale, action) => {
         isPreviousSelected: 'PREVIOUS_PREPARATION',
     };
     const stateCode = STATE_CODES[action];
-    try {
-        if (!sale[action]) {
-            saleTrackingNew(sale, stateCode, true);
-            sale[action] = true;
-        } else {
-            saleTrackingDel(sale, stateCode);
-            sale[action] = false;
-        }
-    } catch (error) {
-        console.error(error);
+    if (!sale[action]) {
+        saleTrackingNew(sale, stateCode, true);
+        sale[action] = true;
+    } else {
+        saleTrackingDel(sale, stateCode);
+        sale[action] = false;
     }
 };
 </script>
diff --git a/src/pages/Ticket/Card/TicketService.vue b/src/pages/Ticket/Card/TicketService.vue
index 45a870f7f..47c28a422 100644
--- a/src/pages/Ticket/Card/TicketService.vue
+++ b/src/pages/Ticket/Card/TicketService.vue
@@ -46,40 +46,32 @@ watch(
 onMounted(async () => await getDefaultTaxClass());
 
 const createRefund = async () => {
-    try {
-        if (!selected.value.length) return;
+    if (!selected.value.length) return;
 
-        const params = {
-            servicesIds: selected.value.map((s) => +s.id),
-            withWarehouse: false,
-            negative: true,
-        };
-        const { data } = await axios.post('Sales/clone', params);
-        const [refundTicket] = data;
-        notify(
-            t('service.createRefundSuccess', {
-                ticketId: refundTicket.id,
-            }),
-            'positive'
-        );
-        router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
-    } catch (error) {
-        console.error(error);
-    }
+    const params = {
+        servicesIds: selected.value.map((s) => +s.id),
+        withWarehouse: false,
+        negative: true,
+    };
+    const { data } = await axios.post('Sales/clone', params);
+    const [refundTicket] = data;
+    notify(
+        t('service.createRefundSuccess', {
+            ticketId: refundTicket.id,
+        }),
+        'positive'
+    );
+    router.push({ name: 'TicketSale', params: { id: refundTicket.id } });
 };
 
 const getDefaultTaxClass = async () => {
-    try {
-        let filter = {
-            where: { code: 'G' },
-        };
-        const { data } = await axios.get('TaxClasses/findOne', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        defaultTaxClass.value = data;
-    } catch (error) {
-        console.error(error);
-    }
+    let filter = {
+        where: { code: 'G' },
+    };
+    const { data } = await axios.get('TaxClasses/findOne', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    defaultTaxClass.value = data;
 };
 
 const columns = computed(() => [
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index afc894926..1ff0d6d80 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -69,19 +69,15 @@ function isEditable() {
 }
 
 async function changeState(value) {
-    try {
-        stateBtnDropdownRef.value?.hide();
-        const formData = {
-            ticketFk: entityId.value,
-            code: value,
-        };
-        await axios.post(`Tickets/state`, formData);
-        notify('globals.dataSaved', 'positive');
-        summaryRef.value?.fetch();
-        descriptorData.fetch({});
-    } catch (err) {
-        console.error('Error changing ticket state', err);
-    }
+    stateBtnDropdownRef.value?.hide();
+    const formData = {
+        ticketFk: entityId.value,
+        code: value,
+    };
+    await axios.post(`Tickets/state`, formData);
+    notify('globals.dataSaved', 'positive');
+    summaryRef.value?.fetch();
+    descriptorData.fetch({});
 }
 
 function toTicketUrl(section) {
diff --git a/src/pages/Ticket/Card/TicketVolume.vue b/src/pages/Ticket/Card/TicketVolume.vue
index 2cf7ffc42..edfe489d9 100644
--- a/src/pages/Ticket/Card/TicketVolume.vue
+++ b/src/pages/Ticket/Card/TicketVolume.vue
@@ -75,22 +75,18 @@ const columns = computed(() => [
 ]);
 
 const applyVolumes = async (salesData) => {
-    try {
-        if (!salesData.length) return;
+    if (!salesData.length) return;
 
-        sales.value = salesData;
-        const ticket = sales.value[0].ticketFk;
-        const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
-        const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
+    sales.value = salesData;
+    const ticket = sales.value[0].ticketFk;
+    const { data } = await axios.get(`Tickets/${ticket}/getVolume`);
+    const volumes = new Map(data.saleVolume.map((volume) => [volume.saleFk, volume]));
 
-        sales.value.forEach((sale) => {
-            sale.saleVolume = volumes.get(sale.id);
-        });
+    sales.value.forEach((sale) => {
+        sale.saleVolume = volumes.get(sale.id);
+    });
 
-        packingTypeVolume.value = data.packingTypeVolume;
-    } catch (error) {
-        console.error(error);
-    }
+    packingTypeVolume.value = data.packingTypeVolume;
 };
 
 onMounted(() => (stateStore.rightDrawer = true));
diff --git a/src/pages/Ticket/TicketAdvanceFilter.vue b/src/pages/Ticket/TicketAdvanceFilter.vue
index 1e11afea1..a1d301f35 100644
--- a/src/pages/Ticket/TicketAdvanceFilter.vue
+++ b/src/pages/Ticket/TicketAdvanceFilter.vue
@@ -27,20 +27,16 @@ const warehousesOptions = ref([]);
 const itemPackingTypes = ref([]);
 
 const getItemPackingTypes = async () => {
-    try {
-        const filter = {
-            where: { isActive: true },
-        };
-        const { data } = await axios.get('ItemPackingTypes', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemPackingTypes.value = data.map((ipt) => ({
-            description: t(ipt.description),
-            code: ipt.code,
-        }));
-    } catch (error) {
-        console.error(error);
-    }
+    const filter = {
+        where: { isActive: true },
+    };
+    const { data } = await axios.get('ItemPackingTypes', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    itemPackingTypes.value = data.map((ipt) => ({
+        description: t(ipt.description),
+        code: ipt.code,
+    }));
 };
 
 const getLocale = (val) => {
diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
index 3cc486122..68bfa59b1 100644
--- a/src/pages/Ticket/TicketCreate.vue
+++ b/src/pages/Ticket/TicketCreate.vue
@@ -37,46 +37,37 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
-    try {
-        const filter = {
-            include: {
-                relation: 'defaultAddress',
-                scope: {
-                    fields: ['id', 'agencyModeFk'],
-                },
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
             },
-            where: { id: formData.clientId },
-        };
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('Clients', { params });
-        const [client] = data;
-        selectedClient.value = client;
-    } catch (err) {
-        console.error('Error fetching client');
-    }
+        },
+        where: { id: formData.clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get('Clients', { params });
+    const [client] = data;
+    selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    try {
-        if (!formData.clientId) return;
+    if (!formData.clientId) return;
 
-        const filter = {
-            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`, {
-            params,
-        });
-        addressesOptions.value = data;
+    const filter = {
+        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`, {
+        params,
+    });
+    addressesOptions.value = data;
 
-        const { defaultAddress } = selectedClient.value;
-        formData.addressId = defaultAddress.id;
-    } catch (err) {
-        console.error(`Error fetching addresses`, err);
-        return err.response;
-    }
+    const { defaultAddress } = selectedClient.value;
+    formData.addressId = defaultAddress.id;
 };
 
 const onClientSelected = async (formData) => {
diff --git a/src/pages/Ticket/TicketCreateDialog.vue b/src/pages/Ticket/TicketCreateDialog.vue
index 4138884bf..a45dcec17 100644
--- a/src/pages/Ticket/TicketCreateDialog.vue
+++ b/src/pages/Ticket/TicketCreateDialog.vue
@@ -37,46 +37,37 @@ onBeforeMount(async () => {
 });
 
 const fetchClient = async (formData) => {
-    try {
-        const filter = {
-            include: {
-                relation: 'defaultAddress',
-                scope: {
-                    fields: ['id', 'agencyModeFk'],
-                },
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
             },
-            where: { id: formData.clientId },
-        };
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('Clients', { params });
-        const [client] = data;
-        selectedClient.value = client;
-    } catch (err) {
-        console.error('Error fetching client');
-    }
+        },
+        where: { id: formData.clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get('Clients', { params });
+    const [client] = data;
+    selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    try {
-        if (!formData.clientId) return;
+    if (!formData.clientId) return;
 
-        const filter = {
-            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`, {
-            params,
-        });
-        addressesOptions.value = data;
+    const filter = {
+        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`, {
+        params,
+    });
+    addressesOptions.value = data;
 
-        const { defaultAddress } = selectedClient.value;
-        formData.addressId = defaultAddress.id;
-    } catch (err) {
-        console.error(`Error fetching addresses`, err);
-        return err.response;
-    }
+    const { defaultAddress } = selectedClient.value;
+    formData.addressId = defaultAddress.id;
 };
 
 const onClientSelected = async (formData) => {
diff --git a/src/pages/Ticket/TicketFuture.vue b/src/pages/Ticket/TicketFuture.vue
index 2078d0595..b36a7659f 100644
--- a/src/pages/Ticket/TicketFuture.vue
+++ b/src/pages/Ticket/TicketFuture.vue
@@ -68,13 +68,9 @@ const params = reactive({
 });
 
 const applyColumnFilter = async (col) => {
-    try {
-        const paramKey = col.columnFilter?.filterParamKey || col.field;
-        params[paramKey] = col.columnFilter.filterValue;
-        await arrayData.addFilter({ params });
-    } catch (err) {
-        console.error('Error applying column filter', err);
-    }
+    const paramKey = col.columnFilter?.filterParamKey || col.field;
+    params[paramKey] = col.columnFilter.filterValue;
+    await arrayData.addFilter({ params });
 };
 
 const getInputEvents = (col) => {
@@ -248,23 +244,19 @@ const totalPriceColor = (totalWithVat) =>
     isLessThan50(totalWithVat) ? 'warning' : 'transparent';
 
 const moveTicketsFuture = async () => {
-    try {
-        const ticketsToMove = selectedTickets.value.map((ticket) => ({
-            originId: ticket.id,
-            destinationId: ticket.futureId,
-            originShipped: ticket.shipped,
-            destinationShipped: ticket.futureShipped,
-            workerFk: ticket.workerFk,
-        }));
+    const ticketsToMove = selectedTickets.value.map((ticket) => ({
+        originId: ticket.id,
+        destinationId: ticket.futureId,
+        originShipped: ticket.shipped,
+        destinationShipped: ticket.futureShipped,
+        workerFk: ticket.workerFk,
+    }));
 
-        let params = { tickets: ticketsToMove };
-        await axios.post('Tickets/merge', params);
-        notify(t('futureTickets.moveTicketSuccess'), 'positive');
-        selectedTickets.value = [];
-        arrayData.fetch({ append: false });
-    } catch (error) {
-        console.error('Error moving tickets to future', error);
-    }
+    let params = { tickets: ticketsToMove };
+    await axios.post('Tickets/merge', params);
+    notify(t('futureTickets.moveTicketSuccess'), 'positive');
+    selectedTickets.value = [];
+    arrayData.fetch({ append: false });
 };
 onMounted(async () => {
     await arrayData.fetch({ append: false });
diff --git a/src/pages/Ticket/TicketFutureFilter.vue b/src/pages/Ticket/TicketFutureFilter.vue
index 6345f62b3..ffe967272 100644
--- a/src/pages/Ticket/TicketFutureFilter.vue
+++ b/src/pages/Ticket/TicketFutureFilter.vue
@@ -24,33 +24,25 @@ const itemPackingTypes = ref([]);
 const stateOptions = ref([]);
 
 const getItemPackingTypes = async () => {
-    try {
-        const filter = {
-            where: { isActive: true },
-        };
-        const { data } = await axios.get('ItemPackingTypes', {
-            params: { filter: JSON.stringify(filter) },
-        });
-        itemPackingTypes.value = data.map((ipt) => ({
-            description: t(ipt.description),
-            code: ipt.code,
-        }));
-    } catch (error) {
-        console.error(error);
-    }
+    const filter = {
+        where: { isActive: true },
+    };
+    const { data } = await axios.get('ItemPackingTypes', {
+        params: { filter: JSON.stringify(filter) },
+    });
+    itemPackingTypes.value = data.map((ipt) => ({
+        description: t(ipt.description),
+        code: ipt.code,
+    }));
 };
 
 const getGroupedStates = async () => {
-    try {
-        const { data } = await axios.get('AlertLevels');
-        stateOptions.value = data.map((state) => ({
-            id: state.id,
-            name: t(`futureTickets.${state.code}`),
-            code: state.code,
-        }));
-    } catch (error) {
-        console.error(error);
-    }
+    const { data } = await axios.get('AlertLevels');
+    stateOptions.value = data.map((state) => ({
+        id: state.id,
+        name: t(`futureTickets.${state.code}`),
+        code: state.code,
+    }));
 };
 
 onMounted(async () => {
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index a75312b57..aa666be98 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -254,46 +254,37 @@ const fetchAvailableAgencies = async (formData) => {
 };
 
 const fetchClient = async (formData) => {
-    try {
-        const filter = {
-            include: {
-                relation: 'defaultAddress',
-                scope: {
-                    fields: ['id', 'agencyModeFk'],
-                },
+    const filter = {
+        include: {
+            relation: 'defaultAddress',
+            scope: {
+                fields: ['id', 'agencyModeFk'],
             },
-            where: { id: formData.clientId },
-        };
-        const params = { filter: JSON.stringify(filter) };
-        const { data } = await axios.get('Clients', { params });
-        const [client] = data;
-        selectedClient.value = client;
-    } catch (err) {
-        console.error('Error fetching client');
-    }
+        },
+        where: { id: formData.clientId },
+    };
+    const params = { filter: JSON.stringify(filter) };
+    const { data } = await axios.get('Clients', { params });
+    const [client] = data;
+    selectedClient.value = client;
 };
 
 const fetchAddresses = async (formData) => {
-    try {
-        if (!formData.clientId) return;
+    if (!formData.clientId) return;
 
-        const filter = {
-            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`, {
-            params,
-        });
-        addressesOptions.value = data;
+    const filter = {
+        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`, {
+        params,
+    });
+    addressesOptions.value = data;
 
-        const { defaultAddress } = selectedClient.value;
-        formData.addressId = defaultAddress.id;
-    } catch (err) {
-        console.error(`Error fetching addresses`, err);
-        return err.response;
-    }
+    const { defaultAddress } = selectedClient.value;
+    formData.addressId = defaultAddress.id;
 };
 const getColor = (row) => {
     if (row.alertLevelCode === 'OK') return 'bg-success';
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index d68d18c24..f914e2524 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -153,24 +153,16 @@ const columns = computed(() => [
 ]);
 
 const deleteWeekly = async (ticketFk) => {
-    try {
-        await axios.delete(`TicketWeeklies/${ticketFk}`);
-        notify(t('globals.dataSaved'), 'positive');
-        const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
-        store.data.splice(ticketIndex, 1);
-        location.reload();
-    } catch (err) {
-        console.error('Error deleting weekly', err);
-    }
+    await axios.delete(`TicketWeeklies/${ticketFk}`);
+    notify(t('globals.dataSaved'), 'positive');
+    const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
+    store.data.splice(ticketIndex, 1);
+    location.reload();
 };
 
 const onUpdate = async (ticketFk, field, value) => {
-    try {
-        const params = { ticketFk, [field]: value };
-        await axios.patch('TicketWeeklies', params);
-    } catch (err) {
-        console.error('Error updating weekly', err);
-    }
+    const params = { ticketFk, [field]: value };
+    await axios.patch('TicketWeeklies', params);
 };
 
 onMounted(async () => {
diff --git a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
index 47b6f0aa6..14d824b86 100644
--- a/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
+++ b/src/pages/Travel/Card/TravelDescriptorMenuItems.vue
@@ -32,16 +32,12 @@ const cloneTravel = () => {
 };
 
 const cloneTravelWithEntries = async () => {
-    try {
-        const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
-        notify('globals.dataSaved', 'positive');
-        router.push({ name: 'TravelBasicData', params: { id: data.id } });
-    } catch (err) {
-        console.error('Error cloning travel with entries');
-    }
+    const { data } = await axios.post(`Travels/${$props.travel.id}/cloneWithEntries`);
+    notify('globals.dataSaved', 'positive');
+    router.push({ name: 'TravelBasicData', params: { id: data.id } });
 };
 
-const canDelete = computed(() => useAcl().hasAny('Travel','*','WRITE'));
+const canDelete = computed(() => useAcl().hasAny('Travel', '*', 'WRITE'));
 
 const openDeleteEntryDialog = (id) => {
     quasar
@@ -58,13 +54,9 @@ const openDeleteEntryDialog = (id) => {
 };
 
 const deleteTravel = async (id) => {
-    try {
-        await axios.delete(`Travels/${id}`);
-        router.push({ name: 'TravelList' });
-        notify('globals.dataDeleted', 'positive');
-    } catch (err) {
-        console.error('Error deleting travel');
-    }
+    await axios.delete(`Travels/${id}`);
+    router.push({ name: 'TravelList' });
+    notify('globals.dataDeleted', 'positive');
 };
 </script>
 
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 4be198493..7766968bd 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -193,44 +193,32 @@ const entriesTotalM3 = computed(() =>
 );
 
 const getTravelEntries = async (id) => {
-    try {
-        const { data } = await axios.get(`Travels/${id}/getEntries`);
-        entries.value = data;
-    } catch (err) {
-        console.error('Error fetching travel entries');
-    }
+    const { data } = await axios.get(`Travels/${id}/getEntries`);
+    entries.value = data;
 };
 
 const getTravelThermographs = async (id) => {
-    try {
-        const filter = {
-            include: {
-                relation: 'warehouse',
-                scope: {
-                    fields: ['id', 'name'],
-                },
+    const filter = {
+        include: {
+            relation: 'warehouse',
+            scope: {
+                fields: ['id', 'name'],
             },
-            where: { travelFk: id },
-        };
+        },
+        where: { travelFk: id },
+    };
 
-        const { data } = await axios.get('TravelThermographs', {
-            params: { filter: JSON.parse(JSON.stringify(filter)) },
-        });
-        thermographs.value = data;
-    } catch (err) {
-        console.error('Error fetching travel thermographs');
-    }
+    const { data } = await axios.get('TravelThermographs', {
+        params: { filter: JSON.parse(JSON.stringify(filter)) },
+    });
+    thermographs.value = data;
 };
 
 async function setTravelData(travelData) {
-    try {
-        if (travelData) {
-            travel.value = travelData;
-            await getTravelEntries(travel.value.id);
-            await getTravelThermographs(travel.value.id);
-        }
-    } catch (err) {
-        console.error(`Error setting travel data`, err);
+    if (travelData) {
+        travel.value = travelData;
+        await getTravelEntries(travel.value.id);
+        await getTravelThermographs(travel.value.id);
     }
 }
 
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index e308243e3..a0dcc2286 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -122,13 +122,9 @@ const redirectToThermographForm = (action, id) => {
 };
 
 const removeThermograph = async (id) => {
-    try {
-        await axios.delete(`Travels/deleteThermograph?id=${id}`);
-        await thermographPaginateRef.value.fetch();
-        notify(t('Thermograph removed'), 'positive');
-    } catch (err) {
-        console.error('Error removing termograph');
-    }
+    await axios.delete(`Travels/deleteThermograph?id=${id}`);
+    await thermographPaginateRef.value.fetch();
+    notify(t('Thermograph removed'), 'positive');
 };
 </script>
 
diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
index cf9376f11..758f4f3d1 100644
--- a/src/pages/Travel/Card/TravelThermographsForm.vue
+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
@@ -56,17 +56,13 @@ onBeforeMount(async () => {
 });
 
 const fetchDmsTypes = async () => {
-    try {
-        const params = {
-            filter: {
-                where: { code: 'thermograph' },
-            },
-        };
-        const { data } = await axios.get('DmsTypes/findOne', { params });
-        return data;
-    } catch (err) {
-        console.error('Error fetching Dms Types');
-    }
+    const params = {
+        filter: {
+            where: { code: 'thermograph' },
+        },
+    };
+    const { data } = await axios.get('DmsTypes/findOne', { params });
+    return data;
 };
 
 const setCreateDefaultParams = async () => {
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 4dc7eb052..84a630d83 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -293,20 +293,16 @@ const openReportPdf = () => {
 };
 
 const saveFieldValue = async (val, field, index) => {
-    try {
-        // Evitar la solicitud de guardado si el valor no ha cambiado
-        if (originalRowDataCopy.value[index][field] == val) return;
+    // Evitar la solicitud de guardado si el valor no ha cambiado
+    if (originalRowDataCopy.value[index][field] == val) return;
 
-        const id = rows.value[index].id;
-        const params = { [field]: val };
-        await axios.patch(`Travels/${id}`, params);
-        // Actualizar la copia de los datos originales con el nuevo valor
-        originalRowDataCopy.value[index][field] = val;
+    const id = rows.value[index].id;
+    const params = { [field]: val };
+    await axios.patch(`Travels/${id}`, params);
+    // Actualizar la copia de los datos originales con el nuevo valor
+    originalRowDataCopy.value[index][field] = val;
 
-        await arrayData.fetch({ append: false });
-    } catch (err) {
-        console.error('Error updating travel');
-    }
+    await arrayData.fetch({ append: false });
 };
 
 const stopEventPropagation = (event, col) => {
diff --git a/src/pages/Wagon/Type/WagonTypeEdit.vue b/src/pages/Wagon/Type/WagonTypeEdit.vue
index eb8205d72..7ced6e0ec 100644
--- a/src/pages/Wagon/Type/WagonTypeEdit.vue
+++ b/src/pages/Wagon/Type/WagonTypeEdit.vue
@@ -19,16 +19,10 @@ const createTrayFormDialogRef = ref();
 const selectedEntityId = ref();
 
 async function loadTrays() {
-    try {
-        const res = await axios.get('WagonTypeTrays');
-        const filteredTrays = res.data.filter(
-            (tray) => tray.wagonTypeFk === entityId.value
-        );
-        wagonTrays.value = filteredTrays;
-        return;
-    } catch (err) {
-        console.error('Error loading trays:', err);
-    }
+    const res = await axios.get('WagonTypeTrays');
+    const filteredTrays = res.data.filter((tray) => tray.wagonTypeFk === entityId.value);
+    wagonTrays.value = filteredTrays;
+    return;
 }
 
 async function addTray(newTray) {
diff --git a/src/pages/Worker/Card/WorkerCalendarItem.vue b/src/pages/Worker/Card/WorkerCalendarItem.vue
index 05a013d6b..9d15428f1 100644
--- a/src/pages/Worker/Card/WorkerCalendarItem.vue
+++ b/src/pages/Worker/Card/WorkerCalendarItem.vue
@@ -60,40 +60,29 @@ const updateSelectedDate = (year) => {
 };
 
 const createEvent = async (date) => {
-    try {
-        const params = {
-            dated: date,
-            absenceTypeId: props.absenceType.id,
-            businessFk: props.businessFk,
-        };
+    const params = {
+        dated: date,
+        absenceTypeId: props.absenceType.id,
+        businessFk: props.businessFk,
+    };
 
-        const { data } = await axios.post(
-            `Workers/${route.params.id}/createAbsence`,
-            params
-        );
+    const { data } = await axios.post(`Workers/${route.params.id}/createAbsence`, params);
 
-        if (data) emit('refresh');
-    } catch (error) {
-        console.error('error creating event:: ', error);
-    }
+    if (data) emit('refresh');
 };
 
 const editEvent = async (event) => {
-    try {
-        const absenceType = props.absenceType;
-        const params = {
-            absenceId: event.absenceId,
-            absenceTypeId: absenceType.id,
-        };
-        const { data } = await axios.patch(
-            `Workers/${route.params.id}/updateAbsence`,
-            params
-        );
+    const absenceType = props.absenceType;
+    const params = {
+        absenceId: event.absenceId,
+        absenceTypeId: absenceType.id,
+    };
+    const { data } = await axios.patch(
+        `Workers/${route.params.id}/updateAbsence`,
+        params
+    );
 
-        if (data) emit('refresh');
-    } catch (error) {
-        console.error('error editing event:: ', error);
-    }
+    if (data) emit('refresh');
 };
 
 const deleteEvent = async (event, date) => {
diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index e3eb9ab82..db8a73322 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -39,15 +39,9 @@ const entityId = computed(() => {
 const workerExcluded = ref(false);
 
 const getIsExcluded = async () => {
-    try {
-        const { data } = await axios.get(
-            `WorkerDisableExcludeds/${entityId.value}/exists`
-        );
-        if (!data) return;
-        workerExcluded.value = data.exists;
-    } catch (err) {
-        console.error('Error getting worker excluded: ', err);
-    }
+    const { data } = await axios.get(`WorkerDisableExcludeds/${entityId.value}/exists`);
+    if (!data) return;
+    workerExcluded.value = data.exists;
 };
 
 const handleExcluded = async () => {
diff --git a/src/pages/Worker/Card/WorkerPda.vue b/src/pages/Worker/Card/WorkerPda.vue
index a5e8ae3fa..94f4e0d95 100644
--- a/src/pages/Worker/Card/WorkerPda.vue
+++ b/src/pages/Worker/Card/WorkerPda.vue
@@ -32,14 +32,11 @@ const initialData = computed(() => {
 });
 
 const deallocatePDA = async (deviceProductionFk) => {
-    try {
-        await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
-            pda: deviceProductionFk,
-        });
-        notify(t('PDA deallocated'), 'positive');
-    } catch (err) {
-        console.error('Error deallocating PDA');
-    }
+    await axios.post(`Workers/${route.params.id}/deallocatePDA`, {
+        pda: deviceProductionFk,
+    });
+    notify(t('PDA deallocated'), 'positive');
+
     paginate.value.fetch();
 };
 
diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue
index 39fb536b6..0bba2f891 100644
--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@@ -251,13 +251,9 @@ const addEvents = (data) => {
 };
 
 const fetchHours = async () => {
-    try {
-        await workerHoursRef.value.fetch();
-        await getWorkedHours(startOfWeek.value, endOfWeek.value);
-        await getAbsences();
-    } catch (err) {
-        console.error('Error fetching worker hours');
-    }
+    await workerHoursRef.value.fetch();
+    await getWorkedHours(startOfWeek.value, endOfWeek.value);
+    await getAbsences();
 };
 
 const fetchWeekData = async () => {
@@ -265,25 +261,21 @@ const fetchWeekData = async () => {
         year: selectedDate.value.getFullYear(),
         week: selectedWeekNumber.value,
     };
-    try {
-        const mail = (
-            await axiosNoError.get(`Workers/${route.params.id}/mail`, {
-                params: { filter: { where } },
-            })
-        ).data[0];
+    const mail = (
+        await axiosNoError.get(`Workers/${route.params.id}/mail`, {
+            params: { filter: { where } },
+        })
+    ).data[0];
 
-        if (!mail) state.value = null;
-        else {
-            state.value = mail.state;
-            reason.value = mail.reason;
-        }
-
-        canResend.value = !!(
-            await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
-        ).data.count;
-    } catch (err) {
-        console.error('Error fetching week data');
+    if (!mail) state.value = null;
+    else {
+        state.value = mail.state;
+        reason.value = mail.reason;
     }
+
+    canResend.value = !!(
+        await axiosNoError.get('WorkerTimeControlMails/count', { params: { where } })
+    ).data.count;
 };
 
 const setHours = (data) => {
@@ -357,23 +349,19 @@ const showReasonForm = () => {
 };
 
 const updateWorkerTimeControlMail = async (state, reason) => {
-    try {
-        const params = {
-            year: selectedDate.value.getFullYear(),
-            week: selectedWeekNumber.value,
-            state,
-        };
-        const workerId = Number(route.params.id);
+    const params = {
+        year: selectedDate.value.getFullYear(),
+        week: selectedWeekNumber.value,
+        state,
+    };
+    const workerId = Number(route.params.id);
 
-        if (reason) params.reason = reason;
+    if (reason) params.reason = reason;
 
-        await axios.post(`WorkerTimeControls/${workerId}/updateMailState`, params);
-        await getMailStates(selectedDate.value);
-        await fetchWeekData();
-        notify(t('globals.dataSaved'), 'positive');
-    } catch (err) {
-        console.error('Error updating worker time control mail');
-    }
+    await axios.post(`WorkerTimeControls/${workerId}/updateMailState`, params);
+    await getMailStates(selectedDate.value);
+    await fetchWeekData();
+    notify(t('globals.dataSaved'), 'positive');
 };
 
 const isSatisfied = async () => {
@@ -389,20 +377,16 @@ const isUnsatisfied = async (reason) => {
 };
 
 const resendEmail = async () => {
-    try {
-        const params = {
-            recipient: worker.value?.user?.email,
-            week: selectedWeekNumber.value,
-            year: selectedDate.value.getFullYear(),
-            workerId: Number(route.params.id),
-            state: 'SENDED',
-        };
-        await axios.post('WorkerTimeControls/weekly-hour-record-email', params);
-        await getMailStates(selectedDate.value);
-        notify(t('Email sended'), 'positive');
-    } catch (err) {
-        console.error('Error sending email');
-    }
+    const params = {
+        recipient: worker.value?.user?.email,
+        week: selectedWeekNumber.value,
+        year: selectedDate.value.getFullYear(),
+        workerId: Number(route.params.id),
+        state: 'SENDED',
+    };
+    await axios.post('WorkerTimeControls/weekly-hour-record-email', params);
+    await getMailStates(selectedDate.value);
+    notify(t('Email sended'), 'positive');
 };
 
 onBeforeMount(() => {
diff --git a/src/pages/Worker/Card/WorkerTimeHourChip.vue b/src/pages/Worker/Card/WorkerTimeHourChip.vue
index 795fecef8..5ca04bce0 100644
--- a/src/pages/Worker/Card/WorkerTimeHourChip.vue
+++ b/src/pages/Worker/Card/WorkerTimeHourChip.vue
@@ -50,17 +50,11 @@ const directionIconName = computed(() => {
 });
 
 const deleteHourEntry = async () => {
-    try {
-        const { data } = await axios.post(
-            `WorkerTimeControls/${$props.id}/deleteTimeEntry`
-        );
+    const { data } = await axios.post(`WorkerTimeControls/${$props.id}/deleteTimeEntry`);
 
-        if (!data) return;
-        emit('onHourEntryDeleted');
-        notify('Entry removed', 'positive');
-    } catch (err) {
-        console.error('Error deleting hour entry');
-    }
+    if (!data) return;
+    emit('onHourEntryDeleted');
+    notify('Entry removed', 'positive');
 };
 
 const showWorkerTimeForm = () => emit('showWorkerTimeForm');
diff --git a/src/pages/Worker/WorkerDepartmentTree.vue b/src/pages/Worker/WorkerDepartmentTree.vue
index c73cb59b9..f349b449d 100644
--- a/src/pages/Worker/WorkerDepartmentTree.vue
+++ b/src/pages/Worker/WorkerDepartmentTree.vue
@@ -33,28 +33,23 @@ const onNodeExpanded = (nodeKeysArray) => {
 };
 
 const fetchNodeLeaves = async (nodeKey) => {
-    try {
-        const node = treeRef.value?.getNodeByKey(nodeKey);
+    const node = treeRef.value?.getNodeByKey(nodeKey);
 
-        if (!node || node.sons === 0) return;
+    if (!node || node.sons === 0) return;
 
-        const params = { parentId: node.id };
-        const response = await axios.get('/departments/getLeaves', { params });
-        if (response.data) {
-            node.children = response.data.map((n) => {
-                const hasChildrens = n.sons > 0;
+    const params = { parentId: node.id };
+    const response = await axios.get('/departments/getLeaves', { params });
+    if (response.data) {
+        node.children = response.data.map((n) => {
+            const hasChildrens = n.sons > 0;
 
-                n.children = hasChildrens ? [{}] : null;
-                n.clickable = true;
-                return n;
-            });
-        }
-
-        state.set('Tree', node);
-    } catch (err) {
-        console.error('Error fetching department leaves', err);
-        throw new Error();
+            n.children = hasChildrens ? [{}] : null;
+            n.clickable = true;
+            return n;
+        });
     }
+
+    state.set('Tree', node);
 };
 
 const removeNode = (node) => {
@@ -72,15 +67,11 @@ const removeNode = (node) => {
 };
 
 async function remove(id) {
-    try {
-        await axios.post(`/Departments/${id}/removeChild`, { id });
-        quasar.notify({
-            message: t('department.departmentRemoved'),
-            type: 'positive',
-        });
-    } catch (err) {
-        console.error('Error removing department');
-    }
+    await axios.post(`/Departments/${id}/removeChild`, { id });
+    quasar.notify({
+        message: t('department.departmentRemoved'),
+        type: 'positive',
+    });
 }
 
 const showCreateNodeForm = (nodeId) => {
diff --git a/src/pages/Zone/Card/ZoneEventExclusionForm.vue b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
index 215c12f46..d131519c4 100644
--- a/src/pages/Zone/Card/ZoneEventExclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventExclusionForm.vue
@@ -57,34 +57,24 @@ const excludeType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const exclusionGeoCreate = async () => {
-    try {
-        const params = {
-            zoneFk: parseInt(route.params.id),
-            date: dated.value,
-            geoIds: tickedNodes.value,
-        };
-        await axios.post('Zones/exclusionGeo', params);
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error creating exclusion geo: ', err);
-    }
+    const params = {
+        zoneFk: parseInt(route.params.id),
+        date: dated.value,
+        geoIds: tickedNodes.value,
+    };
+    await axios.post('Zones/exclusionGeo', params);
+    await refetchEvents();
 };
 
 const exclusionCreate = async () => {
-    try {
-        if (isNew.value)
-            await axios.post(`Zones/${route.params.id}/exclusions`, [
-                { dated: dated.value },
-            ]);
-        else
-            await axios.post(`Zones/${route.params.id}/exclusions`, {
-                dated: dated.value,
-            });
+    if (isNew.value)
+        await axios.post(`Zones/${route.params.id}/exclusions`, [{ dated: dated.value }]);
+    else
+        await axios.post(`Zones/${route.params.id}/exclusions`, {
+            dated: dated.value,
+        });
 
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error creating exclusion: ', err);
-    }
+    await refetchEvents();
 };
 
 const onSubmit = async () => {
@@ -93,13 +83,9 @@ const onSubmit = async () => {
 };
 
 const deleteEvent = async () => {
-    try {
-        if (!props.event) return;
-        await axios.delete(`Zones/${route.params.id}/exclusions`);
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error deleting event: ', err);
-    }
+    if (!props.event) return;
+    await axios.delete(`Zones/${route.params.id}/exclusions`);
+    await refetchEvents();
 };
 
 const closeForm = () => emit('closeForm');
diff --git a/src/pages/Zone/Card/ZoneEventInclusionForm.vue b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
index 66e41607f..5e2d2fab6 100644
--- a/src/pages/Zone/Card/ZoneEventInclusionForm.vue
+++ b/src/pages/Zone/Card/ZoneEventInclusionForm.vue
@@ -57,45 +57,34 @@ const inclusionType = computed({
 const arrayData = useArrayData('ZoneEvents');
 
 const createEvent = async () => {
-    try {
-        eventInclusionFormData.value.weekDays = weekdayStore.toSet(
-            eventInclusionFormData.value.wdays
+    eventInclusionFormData.value.weekDays = weekdayStore.toSet(
+        eventInclusionFormData.value.wdays
+    );
+
+    if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
+    else eventInclusionFormData.value.dated = null;
+
+    if (inclusionType.value != 'range') {
+        eventInclusionFormData.value.started = null;
+        eventInclusionFormData.value.ended = null;
+    }
+
+    if (isNew.value)
+        await axios.post(`Zones/${route.params.id}/events`, eventInclusionFormData.value);
+    else
+        await axios.put(
+            `Zones/${route.params.id}/events/${props.event?.id}`,
+            eventInclusionFormData.value
         );
 
-        if (inclusionType.value == 'day') eventInclusionFormData.value.weekDays = '';
-        else eventInclusionFormData.value.dated = null;
-
-        if (inclusionType.value != 'range') {
-            eventInclusionFormData.value.started = null;
-            eventInclusionFormData.value.ended = null;
-        }
-
-        if (isNew.value)
-            await axios.post(
-                `Zones/${route.params.id}/events`,
-                eventInclusionFormData.value
-            );
-        else
-            await axios.put(
-                `Zones/${route.params.id}/events/${props.event?.id}`,
-                eventInclusionFormData.value
-            );
-
-        await refetchEvents();
-        emit('onSubmit');
-    } catch (err) {
-        console.error('Error creating event', err);
-    }
+    await refetchEvents();
+    emit('onSubmit');
 };
 
 const deleteEvent = async () => {
-    try {
-        if (!props.event) return;
-        await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
-        await refetchEvents();
-    } catch (err) {
-        console.error('Error deleting event: ', err);
-    }
+    if (!props.event) return;
+    await axios.delete(`Zones/${route.params.id}/events/${props.event?.id}`);
+    await refetchEvents();
 };
 
 const closeForm = () => {
diff --git a/src/pages/Zone/Card/ZoneEventsPanel.vue b/src/pages/Zone/Card/ZoneEventsPanel.vue
index 2cfa98246..6e1fbb85f 100644
--- a/src/pages/Zone/Card/ZoneEventsPanel.vue
+++ b/src/pages/Zone/Card/ZoneEventsPanel.vue
@@ -57,15 +57,11 @@ const arrayData = useArrayData('ZoneEvents', {
 });
 
 const fetchData = async () => {
-    try {
-        if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
+    if (!params.value.zoneFk || !params.value.started || !params.value.ended) return;
 
-        await arrayData.applyFilter({
-            params: params.value,
-        });
-    } catch (err) {
-        console.error('Error fetching events: ', err);
-    }
+    await arrayData.applyFilter({
+        params: params.value,
+    });
 };
 
 watch(
@@ -87,13 +83,9 @@ const formatWdays = (event) => {
 };
 
 const deleteEvent = async (id) => {
-    try {
-        if (!id) return;
-        await axios.delete(`Zones/${route.params.id}/events/${id}`);
-        await fetchData();
-    } catch (err) {
-        console.error('Error deleting event: ', err);
-    }
+    if (!id) return;
+    await axios.delete(`Zones/${route.params.id}/events/${id}`);
+    await fetchData();
 };
 
 const openInclusionForm = (event) => {
diff --git a/src/pages/Zone/Card/ZoneLocations.vue b/src/pages/Zone/Card/ZoneLocations.vue
index f357e9e5b..59fde394d 100644
--- a/src/pages/Zone/Card/ZoneLocations.vue
+++ b/src/pages/Zone/Card/ZoneLocations.vue
@@ -10,13 +10,9 @@ const { t } = useI18n();
 const route = useRoute();
 
 const onSelected = async (val, node) => {
-    try {
-        if (val === null) val = undefined;
-        const params = { geoId: node.id, isIncluded: val };
-        await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
-    } catch (err) {
-        console.error('Error updating included', err);
-    }
+    if (val === null) val = undefined;
+    const params = { geoId: node.id, isIncluded: val };
+    await axios.post(`Zones/${route.params.id}/toggleIsIncluded`, params);
 };
 </script>
 
diff --git a/src/pages/Zone/Card/ZoneWarehouses.vue b/src/pages/Zone/Card/ZoneWarehouses.vue
index 6b2933224..98e446797 100644
--- a/src/pages/Zone/Card/ZoneWarehouses.vue
+++ b/src/pages/Zone/Card/ZoneWarehouses.vue
@@ -34,21 +34,13 @@ const columns = computed(() => [
 ]);
 
 const deleteWarehouse = async (row) => {
-    try {
-        await axios.delete(`${urlPath.value}/${row.id}`);
-        fetchWarehouses();
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.delete(`${urlPath.value}/${row.id}`);
+    fetchWarehouses();
 };
 
 const createZoneWarehouse = async (ZoneWarehouseFormData) => {
-    try {
-        await axios.post(urlPath.value, ZoneWarehouseFormData);
-        fetchWarehouses();
-    } catch (error) {
-        console.error(error);
-    }
+    await axios.post(urlPath.value, ZoneWarehouseFormData);
+    fetchWarehouses();
 };
 
 watch(
diff --git a/src/pages/Zone/ZoneDeliveryPanel.vue b/src/pages/Zone/ZoneDeliveryPanel.vue
index 5e03e9cdf..0dd16abf4 100644
--- a/src/pages/Zone/ZoneDeliveryPanel.vue
+++ b/src/pages/Zone/ZoneDeliveryPanel.vue
@@ -21,17 +21,13 @@ const arrayData = useArrayData('ZoneDeliveryDays', {
 
 const deliveryMethodsConfig = { pickUp: ['PICKUP'], delivery: ['AGENCY', 'DELIVERY'] };
 const fetchData = async (params) => {
-    try {
-        const { data } = params
-            ? await arrayData.applyFilter({
-                  params,
-              })
-            : await arrayData.fetch({ append: false });
-        if (!data.events || !data.events.length)
-            notify(t('deliveryPanel.noEventsWarning'), 'warning');
-    } catch (err) {
-        console.error('Error fetching events: ', err);
-    }
+    const { data } = params
+        ? await arrayData.applyFilter({
+              params,
+          })
+        : await arrayData.fetch({ append: false });
+    if (!data.events || !data.events.length)
+        notify(t('deliveryPanel.noEventsWarning'), 'warning');
 };
 
 const onSubmit = async () => {

From 522f32aa9a696c4d4fb7dfd8b5c3f215bb373205 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 10:40:49 +0100
Subject: [PATCH 117/120] fix: orderCatalogFilter and fix useArrayData

---
 src/components/ui/VnFilterPanel.vue         |  6 +-
 src/composables/useArrayData.js             | 38 +++++----
 src/pages/Order/Card/OrderCatalog.vue       | 31 +-------
 src/pages/Order/Card/OrderCatalogFilter.vue | 86 ++++++++-------------
 4 files changed, 63 insertions(+), 98 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 1ed1194ea..b9aa5e114 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -57,7 +57,6 @@ const $props = defineProps({
     },
 });
 
-defineExpose({ search, sanitizer });
 const emit = defineEmits([
     'update:modelValue',
     'refresh',
@@ -76,6 +75,9 @@ const arrayData = useArrayData($props.dataKey, {
 const route = useRoute();
 const store = arrayData.store;
 const userParams = ref({});
+
+defineExpose({ search, sanitizer, params: userParams });
+
 onMounted(() => {
     userParams.value = $props.modelValue ?? {};
     emit('init', { params: userParams.value });
@@ -179,7 +181,7 @@ const customTags = computed(() =>
 
 async function remove(key) {
     userParams.value[key] = undefined;
-    search();
+    await search();
     emit('remove', key);
     emit('update:modelValue', userParams.value);
 }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 7fce714fc..b37fa1377 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 ?? {});
@@ -94,12 +86,29 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const params = { filter };
 
         Object.assign(params, userParams);
-        params.filter.skip = store.skip;
-        if (store.order && store.order.length) params.filter.order = store.order;
+        if (params.filter) params.filter.skip = store.skip;
+        if (store?.order && typeof store?.order == 'string') store.order = [store.order];
+        if (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;
+        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;
+            });
+        }
+
+        if (params.filter.where || exprFilter)
+            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,
@@ -249,7 +258,8 @@ 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);
+        if (store?.searchUrl)
+            newUrl.query[store.searchUrl] = JSON.stringify(store.currentFilter);
 
         if (store.navigate) {
             const { customRouteRedirectName, searchText } = store.navigate;
diff --git a/src/pages/Order/Card/OrderCatalog.vue b/src/pages/Order/Card/OrderCatalog.vue
index 66a1a132d..90bce38fd 100644
--- a/src/pages/Order/Card/OrderCatalog.vue
+++ b/src/pages/Order/Card/OrderCatalog.vue
@@ -1,14 +1,13 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute, useRouter } from 'vue-router';
-import { onBeforeMount, onMounted, onUnmounted, ref, computed, watch } from 'vue';
+import { onMounted, onUnmounted, ref, computed, watch } from 'vue';
 import axios from 'axios';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CatalogItem from 'src/components/ui/CatalogItem.vue';
 import OrderCatalogFilter from 'src/pages/Order/Card/OrderCatalogFilter.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import getParamWhere from 'src/filters/getParamWhere';
 import { useArrayData } from 'src/composables/useArrayData';
 
 const route = useRoute();
@@ -18,7 +17,6 @@ const { t } = useI18n();
 const dataKey = 'OrderCatalogList';
 const arrayData = useArrayData(dataKey);
 const store = arrayData.store;
-const showFilter = ref(null);
 const tags = ref([]);
 
 let catalogParams = {
@@ -26,27 +24,6 @@ let catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-onBeforeMount(() => {
-    const whereParams = getParamWhere(route);
-    if (whereParams) {
-        const formattedWhereParams = {};
-        if (whereParams.and) {
-            whereParams.and.forEach((item) => {
-                Object.assign(formattedWhereParams, item);
-            });
-        } else {
-            Object.assign(formattedWhereParams, whereParams);
-        }
-
-        catalogParams = {
-            ...catalogParams,
-            ...formattedWhereParams,
-        };
-    } else {
-        showFilter.value = true;
-    }
-});
-
 onMounted(() => {
     stateStore.rightDrawer = true;
     checkOrderConfirmation();
@@ -90,7 +67,7 @@ function extractValueTags(items) {
     );
     tagValue.value = resultValueTags;
 }
-const autoLoad = computed(() => !!catalogParams.categoryFk);
+const autoLoad = computed(() => !!JSON.parse(route?.query.table ?? '{}')?.categoryFk);
 
 watch(
     () => store.data,
@@ -112,7 +89,7 @@ watch(
         :info="t('You can search items by name or id')"
     />
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
-        <QScrollArea v-if="showFilter" class="fit text-grey-8">
+        <QScrollArea class="fit text-grey-8">
             <OrderCatalogFilter
                 :data-key="dataKey"
                 :tag-value="tagValue"
@@ -128,8 +105,6 @@ watch(
                 url="Orders/CatalogFilter"
                 :limit="50"
                 :user-params="catalogParams"
-                @on-fetch="showFilter = true"
-                :update-router="false"
                 :auto-load="autoLoad"
             >
                 <template #body="{ rows }">
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index 8aa88da0d..eb9faf031 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import axios from 'axios';
@@ -8,7 +8,6 @@ import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnFilterPanelChip from 'components/ui/VnFilterPanelChip.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-import getParamWhere from 'src/filters/getParamWhere';
 import CatalogFilterValueDialog from 'src/pages/Order/Card/CatalogFilterValueDialog.vue';
 import { useArrayData } from 'composables/useArrayData';
 
@@ -32,11 +31,8 @@ const route = useRoute();
 
 const arrayData = useArrayData(props.dataKey);
 
-const currentParams = ref({});
 const categoryList = ref(null);
-const selectedCategoryFk = ref(null);
 const typeList = ref([]);
-const selectedTypeFk = ref(null);
 const searchByTag = ref(null);
 
 const vnFilterPanelRef = ref();
@@ -53,50 +49,32 @@ const orderWayList = ref([
 const orderBySelected = ref('relevancy DESC, name');
 const orderWaySelected = ref('ASC');
 
-onMounted(() => {
-    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-});
-
 const resetCategory = (params, search) => {
-    selectedCategoryFk.value = null;
     typeList.value = null;
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    removeTagGroupParam(search);
+    removeTagGroupParam(params, search);
 };
 
-const selectCategory = (params, category, search) => {
-    if (params.categoryFk === category?.id) {
+const selectCategory = async (params, category, search) => {
+    if (vnFilterPanelRef.value.params.categoryFk === category?.id) {
         resetCategory(params, search);
         return;
     }
-    selectedCategoryFk.value = category?.id;
-    params.categoryFk = category?.id;
     params.typeFk = null;
-    selectedTypeFk.value = null;
-    loadTypes(category?.id);
-    search();
+    params.categoryFk = category.id;
+    await loadTypes(category?.id);
+    await search();
 };
 
-const loadTypes = async (categoryFk = selectedCategoryFk.value) => {
+const loadTypes = async (id) => {
     const { data } = await axios.get(`Orders/${route.params.id}/getItemTypeAvailable`, {
-        params: { itemCategoryId: categoryFk },
+        params: { itemCategoryId: id },
     });
     typeList.value = data;
 };
 
-const selectedCategory = computed(() => {
-    return (categoryList.value || []).find(
-        (category) => category?.id === selectedCategoryFk.value
-    );
-});
-
-const selectedType = computed(() => {
-    return (typeList.value || []).find((type) => type?.id === selectedTypeFk.value);
-});
-
 function exprBuilder(param, value) {
     switch (param) {
         case 'categoryFk':
@@ -122,21 +100,21 @@ const applyTags = (tagInfo, params, search) => {
 
 async function onSearchByTag(value) {
     if (!value.target.value) return;
-    if (!currentParams.value?.tagGroups) {
-        currentParams.value.tagGroups = [];
+    if (!vnFilterPanelRef.value.params?.tagGroups) {
+        vnFilterPanelRef.value.params.tagGroups = [];
     }
 
-    currentParams.value.tagGroups.push({
+    vnFilterPanelRef.value.params.tagGroups.push({
         values: [{ value: value.target.value }],
     });
     searchByTag.value = null;
 }
 
-const removeTagGroupParam = (search, valIndex) => {
+const removeTagGroupParam = (params, search, valIndex) => {
     if (!valIndex && valIndex !== 0) {
-        currentParams.value.tagGroups = null;
+        params.tagGroups = null;
     } else {
-        currentParams.value.tagGroups.splice(valIndex, 1);
+        params.tagGroups.splice(valIndex, 1);
     }
     search();
 };
@@ -149,7 +127,8 @@ const setCategoryList = (data) => {
             icon: `vn:${(category.icon || '').split('-')[1]}`,
         }));
 
-    selectedCategoryFk.value && loadTypes();
+    vnFilterPanelRef.value.params.categoryFk &&
+        loadTypes(vnFilterPanelRef.value.params.categoryFk);
 };
 
 const getCategoryClass = (category, params) => {
@@ -178,24 +157,23 @@ function addOrder(value, field, params) {
     <VnFilterPanel
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
-        :hidden-tags="['orderFk', 'orderBy']"
+        :hidden-tags="['filter', 'orderFk', 'orderBy']"
         :un-removable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
         @remove="clearFilter"
-        v-model="currentParams"
     >
         <template #tags="{ tag, formatFn }">
-            <strong v-if="tag.label === 'typeFk'">
-                {{ t(selectedType?.name || '') }}
+            <strong v-if="tag.label === 'typeFk' && typeList">
+                {{ t(typeList.find((t) => t.id == tag.value)?.name || '') }}
             </strong>
             <div v-else class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #customTags="{ tags: customTags, params, searchFn }">
+        <template #customTags="{ params, tags: customTags, searchFn }">
             <template v-for="customTag in customTags" :key="customTag.label">
                 <VnFilterPanelChip
                     v-for="(tag, valIndex) in Array.isArray(customTag.value)
@@ -206,11 +184,16 @@ function addOrder(value, field, params) {
                     @remove="
                         customTag.label === 'categoryFk'
                             ? resetCategory(params, searchFn)
-                            : removeTagGroupParam(searchFn, valIndex)
+                            : removeTagGroupParam(params, searchFn, valIndex)
                     "
                 >
-                    <strong v-if="customTag.label === 'categoryFk'">
-                        {{ t(selectedCategory?.name || '') }}
+                    <strong v-if="customTag.label === 'categoryFk' && categoryList">
+                        {{
+                            t(
+                                categoryList.find((c) => c.id == customTag.value)?.name ||
+                                    ''
+                            )
+                        }}
                     </strong>
                     <strong v-if="tag?.tagSelection?.name" class="q-mr-xs">
                         {{ tag.tagSelection.name }}:
@@ -257,13 +240,8 @@ function addOrder(value, field, params) {
                         emit-value
                         use-input
                         sort-by="name ASC"
-                        :disable="!selectedCategoryFk"
-                        @update:model-value="
-                            (value) => {
-                                selectedTypeFk = value;
-                                searchFn();
-                            }
-                        "
+                        :disable="!params.categoryFk"
+                        @update:model-value="searchFn()"
                     >
                         <template #option="{ itemProps, opt }">
                             <QItem v-bind="itemProps">
@@ -333,7 +311,7 @@ function addOrder(value, field, params) {
                                 style="display: inline-block"
                                 :tags="tags"
                                 @apply-tags="
-                                    ($event) => applyTags($event, currentParams, searchFn)
+                                    ($event) => applyTags($event, params, searchFn)
                                 "
                             />
                         </QPopupProxy>

From 2db0369b741f57325e9f162eb45b0174b289b517 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 11:05:48 +0100
Subject: [PATCH 118/120] fix: resetCategory

---
 src/pages/Order/Card/OrderCatalogFilter.vue | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index eb9faf031..03c479ef4 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -54,7 +54,7 @@ const resetCategory = (params, search) => {
     params.categoryFk = null;
     params.typeFk = null;
     arrayData.store.userFilter = null;
-    removeTagGroupParam(params, search);
+    search();
 };
 
 const selectCategory = async (params, category, search) => {
@@ -137,12 +137,6 @@ const getCategoryClass = (category, params) => {
     }
 };
 
-const clearFilter = (key) => {
-    if (key === 'categoryFk') {
-        resetCategory();
-    }
-};
-
 function addOrder(value, field, params) {
     let { orderBy } = params;
     orderBy = JSON.parse(orderBy);
@@ -158,11 +152,10 @@ function addOrder(value, field, params) {
         ref="vnFilterPanelRef"
         :data-key="props.dataKey"
         :hidden-tags="['filter', 'orderFk', 'orderBy']"
-        :un-removable-params="['orderFk', 'orderBy']"
+        :unremovable-params="['orderFk', 'orderBy']"
         :expr-builder="exprBuilder"
         :custom-tags="['tagGroups', 'categoryFk']"
         :redirect="false"
-        @remove="clearFilter"
     >
         <template #tags="{ tag, formatFn }">
             <strong v-if="tag.label === 'typeFk' && typeList">

From 9d7f2b95e8357f00da17811d914385d84488e01e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 11:21:08 +0100
Subject: [PATCH 119/120] revert: VnVisibleColumn try catch

---
 src/components/VnTable/VnVisibleColumn.vue | 46 +++++++++++++---------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 57b1fdf21..f5c3458cd 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -57,27 +57,31 @@ async function getConfig(url, filter) {
 }
 
 async function fetchViewConfigData() {
-    const defaultFilter = {
-        where: { tableCode: $props.tableCode },
-    };
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
 
-    const userConfig = await getConfig('UserConfigViews', {
-        where: {
-            ...defaultFilter.where,
-            ...{ userFk: user.value.id },
-        },
-    });
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.value.id },
+            },
+        });
 
-    if (userConfig) {
-        initialUserConfigViewData.value = userConfig;
-        setUserConfigViewData(userConfig.configuration);
-        return;
-    }
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
 
-    const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
-    if (defaultConfig) {
-        setUserConfigViewData(defaultConfig.columns);
-        return;
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.error('Error fetching config view data', err);
     }
 }
 
@@ -88,6 +92,7 @@ async function saveConfig() {
     setUserConfigViewData(configuration, true);
     if (!$props.tableCode) return popupProxyRef.value.hide();
 
+    try {
         const params = {};
         // Si existe una view config del usuario hacemos un update si no la creamos
         if (initialUserConfigViewData.value) {
@@ -118,7 +123,10 @@ async function saveConfig() {
         }
         notify('globals.dataSaved', 'positive');
         popupProxyRef.value.hide();
-
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
 }
 
 onMounted(async () => {

From 14d2ddfa835205c72483585e7d719b4528523dc9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 22 Nov 2024 12:40:07 +0100
Subject: [PATCH 120/120] fix: merge errors

---
 src/components/ui/VnFilterPanel.vue         | 2 --
 src/pages/Order/Card/OrderCatalogFilter.vue | 5 -----
 2 files changed, 7 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index bf1fcfdb9..b188bde48 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -227,8 +227,6 @@ function sanitizer(params) {
     }
     return params;
 }
-
-defineExpose({ search, sanitizer, userParams });
 </script>
 
 <template>
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index b839be55e..6202a6f90 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -143,11 +143,6 @@ function addOrder(value, field, params) {
     params.orderBy = JSON.stringify(orderBy);
     vnFilterPanelRef.value.search();
 }
-
-onMounted(() => {
-    selectedCategoryFk.value = getParamWhere(route, 'categoryFk');
-    selectedTypeFk.value = getParamWhere(route, 'typeFk');
-});
 </script>
 
 <template>