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

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

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

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

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

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

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

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

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

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

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

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

From 2877ef8a335271cb18d4b2cfb3a08ac0453aae6f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 4 Oct 2024 11:50:55 +0200
Subject: [PATCH 05/50] 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 8381a250171c00c8bf832b9efde290bce4fd1ab9 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 18 Oct 2024 13:46:34 +0200
Subject: [PATCH 06/50] 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 07/50] 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 08/50] 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 09/50] 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 4e957ed8a7ef2c09d4e3af99922c510088055f63 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 29 Oct 2024 17:23:45 +0100
Subject: [PATCH 10/50] 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 76e35cc758f52b06a88fdfaa73a66d8e2e980719 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Tue, 12 Nov 2024 07:28:51 +0100
Subject: [PATCH 11/50] 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 12/50] 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 94c7ee3ae3afa39043c8e058695043c4a756a47f Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 14 Nov 2024 10:36:42 +0100
Subject: [PATCH 13/50] 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 14/50] 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 15/50] 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 16/50] 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 17/50] 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 18/50] 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 19/50] 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 20/50] 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 21/50] 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 22/50] 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 23/50] 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 24/50] 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 25/50] 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 26/50] 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 27/50] 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 28/50] 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 29/50] 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 30/50] 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 31/50] 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 32/50] 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 33/50] 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 34/50] 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 35/50] 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 36/50] 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 37/50] 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 38/50] 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 39/50] 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 40/50] 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 e230cc61a07c28980be2b7032c84c5539ff86924 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 18 Nov 2024 09:18:06 +0100
Subject: [PATCH 41/50] fix(TicketBasicData): getShipped, getLanded & bad try
 catch

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

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

From 9ea9239250ba209a644057b4be5102b631f3935d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 18 Nov 2024 10:41:25 +0100
Subject: [PATCH 42/50] 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 43/50] 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 44/50] 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 45/50] 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 46/50] 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 47/50] 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 48/50] fix(OrderCatalogFilter): hotFix use search-url="params"

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

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

From 8d997b5a7a0f2030d2dc78c251e079861608cc72 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 19 Nov 2024 07:59:48 +0100
Subject: [PATCH 49/50] 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 50/50] 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",