From 4effba1580c4afa70c1fe2c01e3685a0b8e5b420 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 16:38:41 -0300
Subject: [PATCH 01/70] Ticket dms

---
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Ticket/Card/TicketDms.vue | 13 +++++++++++++
 src/router/modules/ticket.js        | 11 ++++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketDms.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..63d5f630a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        dms: File management
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..92b77a351 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        dms: Gestión documental
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
new file mode 100644
index 000000000..ae44fb795
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -0,0 +1,13 @@
+<script setup>
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+</script>
+<template>
+    <VnDmsList
+        model="TicketDms"
+        update-model="tickets"
+        delete-model="TicketDms"
+        download-model="dms"
+        default-dms-code="ticket"
+        filter="ticket"
+    />
+</template>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..05e323d50 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
             ],
         },
     ],

From c500dd6346479852457472558403e5bdfcf6a1d1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 16:58:26 -0300
Subject: [PATCH 02/70] Add allow import feature in VnDmsList

---
 src/components/common/VnDmsImportForm.vue | 81 +++++++++++++++++++++++
 src/components/common/VnDmsList.vue       | 12 ++++
 src/pages/Ticket/Card/TicketDms.vue       |  1 +
 3 files changed, 94 insertions(+)
 create mode 100644 src/components/common/VnDmsImportForm.vue

diff --git a/src/components/common/VnDmsImportForm.vue b/src/components/common/VnDmsImportForm.vue
new file mode 100644
index 000000000..b31197bbc
--- /dev/null
+++ b/src/components/common/VnDmsImportForm.vue
@@ -0,0 +1,81 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+
+const dmsOptions = ref([]);
+const dmsId = ref(null);
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+const importDms = async () => {
+    try {
+        if (!dmsId.value) throw new Error(t(`The document indentifier can't be empty`));
+
+        const data = {
+            ticketFk: route.params.id,
+            dmsFk: dmsId.value,
+        };
+
+        await axios.post('ticketDms', data);
+        notify(t('globals.dataSaved'), 'positive');
+        dmsId.value = null;
+        emit('onDataSaved');
+    } catch (e) {
+        throw new Error(e.message);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Dms"
+        :filter="{ fields: ['id'], order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (dmsOptions = data)"
+    />
+    <FormModelPopup
+        url-create="genera"
+        model="DmsImport"
+        :title="t('Select document id')"
+        :form-initial-data="{}"
+        :save-fn="importDms"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('Document')"
+                    :options="dmsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="dmsId"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Select document id: Introduzca id de gestion documental
+    Document: Documento
+    The document indentifier can't be empty: El número de documento no puede estar vacío
+</i18n>
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 769ba9959..0576ba266 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -3,6 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
+import VnDmsImportForm from 'src/components/common/VnDmsImportForm.vue';
 import axios from 'axios';
 
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -18,6 +19,7 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
+const showImportDialog = ref(false);
 
 const $props = defineProps({
     model: {
@@ -45,6 +47,10 @@ const $props = defineProps({
         type: String,
         required: true,
     },
+    allowImport: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dmsFilter = {
@@ -373,9 +379,15 @@ function shouldRenderButton(button, isExternal = false) {
             :description="$props.description"
         />
     </QDialog>
+    <QDialog v-model="showImportDialog">
+        <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
+    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
     </QPageSticky>
+    <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
+        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+    </QPageSticky>
 </template>
 <style scoped>
 .q-gutter-y-ms {
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index ae44fb795..423e15467 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -9,5 +9,6 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         download-model="dms"
         default-dms-code="ticket"
         filter="ticket"
+        allow-import
     />
 </template>

From 826e8ed068f52b76b7316eab3e9700dddaa89ba1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 17:19:07 -0300
Subject: [PATCH 03/70] changes

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

diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index 423e15467..7369ee7b2 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -8,7 +8,7 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         delete-model="TicketDms"
         download-model="dms"
         default-dms-code="ticket"
-        filter="ticket"
+        filter="ticketFk"
         allow-import
     />
 </template>

From 2d2fff1bf390b88fdb97f996c136c59f30ad8e3d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Jun 2024 13:22:39 +0200
Subject: [PATCH 04/70] perf: Dms buttons tooltip

---
 src/components/common/VnDmsList.vue | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 0576ba266..a5f0fa44e 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -383,10 +383,30 @@ function shouldRenderButton(button, isExternal = false) {
         <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="publish"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
+            <QTooltip>
+                {{ t('Import from existing') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
     <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
-        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+        <QBtn
+            fab
+            color="primary"
+            icon="file_copy"
+            @click="showImportDialog = true"
+            class="fill-icon"
+        >
+            <QTooltip>
+                {{ t('Upload file') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 <style scoped>
@@ -404,4 +424,7 @@ en:
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
-</i18n>
+    Upload file: Subir fichero
+    Import from existing: Importar desde existente
+
+    </i18n>

From 768b619904b2a5d2f68d4a5e1f7da5799a3ff473 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Sun, 30 Jun 2024 17:43:21 -0300
Subject: [PATCH 05/70] Sale tracking

---
 src/i18n/locale/en.yml                       |   1 +
 src/i18n/locale/es.yml                       |   1 +
 src/pages/Ticket/Card/TicketSaleTracking.vue | 539 +++++++++++++++++++
 src/pages/Ticket/locale/en.yml               |  18 +
 src/pages/Ticket/locale/es.yml               |  18 +
 src/router/modules/ticket.js                 |  11 +
 6 files changed, 588 insertions(+)
 create mode 100644 src/pages/Ticket/Card/TicketSaleTracking.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index fbab06966..2b8639ef7 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -448,6 +448,7 @@ ticket:
         futureTickets: Future tickets
         purchaseRequest: Purchase request
         weeklyTickets: Weekly tickets
+        saleTracking: Sale tracking
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index fec78d5e6..218976e76 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -447,6 +447,7 @@ ticket:
         futureTickets: Tickets a futuro
         purchaseRequest: Petición de compra
         weeklyTickets: Tickets programados
+        saleTracking: Líneas preparadas
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
new file mode 100644
index 000000000..a03f75387
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -0,0 +1,539 @@
+<script setup>
+import { ref, computed, nextTick, watch } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import FetchedTags from 'components/ui/FetchedTags.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+import { dashIfEmpty } from 'src/filters';
+import useNotify from 'src/composables/useNotify.js';
+import { toDateTimeFormat } from 'src/filters/date';
+
+import axios from 'axios';
+
+const route = useRoute();
+const { t } = useI18n();
+const { notify } = useNotify();
+const saleTrackingTableDialogRef = ref(null);
+const itemShelvingSaleDialogRef = ref(null);
+const saleTrackingFetchDataRef = ref(null);
+
+const sales = ref([]);
+const saleTrackings = ref([]);
+const itemShelvignsSales = ref([]);
+const shelvingsOptions = ref([]);
+const parkingsOptions = ref([]);
+const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
+
+watch(
+    () => route.params.id,
+    async () => nextTick(async () => await saleTrackingFetchDataRef.value.fetch())
+);
+
+const columns = computed(() => [
+    {
+        label: t('ticketSaleTracking.isChecked'),
+        name: 'isChecked',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.item'),
+        name: 'item',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.description'),
+        name: 'description',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.parking'),
+        name: 'parking',
+        field: 'parkingCode',
+        align: 'left',
+        sortable: true,
+        format: (value) => dashIfEmpty(value),
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        sortable: true,
+    },
+]);
+
+const logTableColumns = computed(() => [
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        field: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.original'),
+        name: 'original',
+        field: 'originalQuantity',
+        align: 'original',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.worker'),
+        name: 'worker',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        sortable: true,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const shelvingsTableColumns = computed(() => [
+    {
+        label: t('ticketSaleTracking.quantity'),
+        name: 'quantity',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.worker'),
+        name: 'worker',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.shelving'),
+        name: 'shelving',
+        align: 'original',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.parking'),
+        name: 'parking',
+        align: 'left',
+        sortable: true,
+    },
+    {
+        label: t('ticketSaleTracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        sortable: true,
+        format: (value) => toDateTimeFormat(value),
+    },
+]);
+
+const getSaleTrackings = async (sale) => {
+    try {
+        const filter = {
+            where: { saleFk: sale.saleFk },
+            order: ['itemFk DESC'],
+        };
+        const { data } = await axios.get(`SaleTrackings/listSaleTracking`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        saleTrackings.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showLog = async (sale) => {
+    await getSaleTrackings(sale);
+    saleTrackingTableDialogRef.value.show();
+};
+
+const getItemShelvingSales = async (sale) => {
+    try {
+        const filter = {
+            where: { saleFk: sale.saleFk },
+        };
+        const { data } = await axios.get(`ItemShelvingSales/filter`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        itemShelvignsSales.value = data;
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const showShelving = async (sale) => {
+    await getItemShelvingSales(sale);
+    itemShelvingSaleDialogRef.value.show();
+};
+
+const updateQuantity = async (sale) => {
+    try {
+        const params = {
+            quantity: sale.quantity,
+        };
+        await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const updateParking = async (sale) => {
+    try {
+        const filter = {
+            fields: ['id'],
+            where: {
+                code: sale.shelvingFk,
+            },
+        };
+        const { data } = await axios.get(`Shelvings/findOne`, {
+            params: { filter: JSON.stringify(filter) },
+        });
+        const params = {
+            parkingFk: sale.parkingFk,
+        };
+        await axios.patch(`Shelvings/${data.id}`, params);
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const updateShelving = async (sale) => {
+    const params = {
+        shelvingFk: sale.shelvingFk,
+    };
+
+    const { data: patchResponseData } = await axios.patch(
+        `ItemShelvings/${sale.itemShelvingFk}`,
+        params
+    );
+    const filter = {
+        fields: ['parkingFk'],
+        where: {
+            code: patchResponseData.shelvingFk,
+        },
+    };
+    const { data: getResponseData } = await axios.get(`Shelvings/findOne`, { filter });
+    sale.parkingFk = getResponseData.parkingFk;
+};
+
+const saleTrackingNew = async (sale, stateCode, isChecked) => {
+    try {
+        const params = {
+            saleFk: sale.saleFk,
+            isChecked: isChecked,
+            quantity: sale.quantity,
+            stateCode: stateCode,
+        };
+        await axios.post(`SaleTrackings/new`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const saleTrackingDel = async (sale, stateCode) => {
+    try {
+        const params = {
+            saleFk: sale.saleFk,
+            stateCodes: [stateCode],
+        };
+        await axios.post(`SaleTrackings/delete`, params);
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickSaleGroupDetail = async (sale) => {
+    try {
+        if (!sale.saleGroupDetailFk) return;
+
+        await axios.delete(`SaleGroupDetails/${sale.saleGroupDetailFk}`);
+        sale.hasSaleGroupDetail = false;
+        notify(t('globals.dataSaved'), 'positive');
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickPreviousSelected = (sale) => {
+    try {
+        if (!sale.isPreviousSelected) {
+            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
+            sale.isPreviousSelected = true;
+        } else {
+            saleTrackingDel(sale, 'PREVIOUS_PREPARATION');
+            sale.isPreviousSelected = false;
+            sale.isPrevious = false;
+        }
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickPrevious = (sale) => {
+    try {
+        if (!sale.isPrevious) {
+            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', true);
+            sale.isPrevious = true;
+            sale.isPreviousSelected = true;
+        } else {
+            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
+            sale.isPrevious = false;
+        }
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickPrepared = (sale) => {
+    try {
+        if (!sale.isPrepared) {
+            saleTrackingNew(sale, 'PREPARED', true);
+            sale.isPrepared = true;
+        } else {
+            saleTrackingDel(sale, 'PREPARED');
+            sale.isPrepared = false;
+        }
+    } catch (error) {
+        console.error(error);
+    }
+};
+
+const clickControled = (sale) => {
+    try {
+        if (!sale.isControled) {
+            saleTrackingNew(sale, 'CHECKED', true);
+            sale.isControled = true;
+        } else {
+            saleTrackingDel(sale, 'CHECKED');
+            sale.isControled = false;
+        }
+    } catch (error) {
+        console.error(error);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        ref="saleTrackingFetchDataRef"
+        :url="saleTrackingUrl"
+        :filter="{ order: ['concept ASC', 'quantity DESC'] }"
+        auto-load
+        @on-fetch="(data) => (sales = data)"
+    />
+    <FetchData
+        url="Shelvings"
+        auto-load
+        @on-fetch="(data) => (shelvingsOptions = data)"
+    />
+    <FetchData url="Parkings" auto-load @on-fetch="(data) => (parkingsOptions = data)" />
+    <QTable
+        :rows="sales"
+        :columns="columns"
+        row-key="id"
+        :pagination="{ rowsPerPage: 0 }"
+        class="full-width q-mt-md"
+        :no-data-label="t('globals.noResults')"
+    >
+        <template #body-cell-isChecked="{ row }">
+            <QTd @click.stop>
+                <QCheckbox
+                    :model-value="!!row.hasSaleGroupDetail"
+                    color="pink"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickSaleGroupDetail(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.saleGroupDetail') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPreviousSelected"
+                    color="info"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickPreviousSelected(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.previousSelected') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPrevious"
+                    color="cyan"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickPrevious(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.previous') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isPrepared"
+                    color="warning"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickPrepared(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.prepared') }}
+                    </QTooltip>
+                </QCheckbox>
+                <QCheckbox
+                    :model-value="!!row.isControled"
+                    color="yellow"
+                    :toggle-indeterminate="false"
+                    @update:model-value="clickControled(row)"
+                >
+                    <QTooltip>
+                        {{ t('ticketSaleTracking.checked') }}
+                    </QTooltip>
+                </QCheckbox>
+            </QTd>
+        </template>
+        <template #body-cell-item="{ row }">
+            <QTd @click.stop>
+                <div>
+                    <QBtn flat color="primary">
+                        {{ row.itemFk }}
+                    </QBtn>
+                    <ItemDescriptorProxy :id="row.itemFk" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-description="{ row }">
+            <QTd class="col">
+                <div class="column">
+                    <span>{{ row.concept }}</span>
+                    <span v-if="row.subName" class="color-vn-label">
+                        {{ row.subName }}
+                    </span>
+                    <FetchedTags :item="row" :max-length="6" />
+                </div>
+            </QTd>
+        </template>
+        <template #body-cell-actions="{ row }">
+            <QTd>
+                <QBtn
+                    @click.stop="showLog(row)"
+                    color="primary"
+                    icon="history"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('ticketSaleTracking.historyAction') }}
+                    </QTooltip>
+                </QBtn>
+                <QBtn
+                    @click.stop="showShelving(row)"
+                    color="primary"
+                    icon="vn:inventory"
+                    size="md"
+                    flat
+                >
+                    <QTooltip class="text-no-wrap">
+                        {{ t('ticketSaleTracking.shelvingAction') }}
+                    </QTooltip>
+                </QBtn>
+            </QTd>
+        </template>
+    </QTable>
+    <QDialog
+        ref="saleTrackingTableDialogRef"
+        transition-show="scale"
+        transition-hide="scale"
+    >
+        <QTable
+            data-key="saleTrackingLog"
+            :rows="saleTrackings"
+            :columns="logTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-worker="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.workerFk" />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
+    <QDialog
+        ref="itemShelvingSaleDialogRef"
+        transition-show="scale"
+        transition-hide="scale"
+    >
+        <QTable
+            data-key="itemShelvingsSales"
+            :rows="itemShelvignsSales"
+            :columns="shelvingsTableColumns"
+            class="q-pa-sm"
+        >
+            <template #body-cell-quantity="{ row }">
+                <QTd auto-width>
+                    <VnInput
+                        v-model.number="row.quantity"
+                        @keyup.enter="updateQuantity(row)"
+                        @blur="updateQuantity(row)"
+                        @focus="edit.oldQuantity = row.quantity"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-worker="{ row }">
+                <QTd auto-width>
+                    <QBtn flat dense color="primary">{{ row.name }}</QBtn>
+                    <WorkerDescriptorProxy :id="row.userFk" />
+                </QTd>
+            </template>
+            <template #body-cell-shelving="{ row }">
+                <QTd auto-width>
+                    <VnSelect
+                        :options="shelvingsOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="code"
+                        v-model="row.shelvingFk"
+                        @update:model-value="updateShelving(row)"
+                        style="max-width: 120px"
+                    />
+                </QTd>
+            </template>
+            <template #body-cell-parking="{ row }">
+                <QTd auto-width>
+                    <VnSelect
+                        :options="parkingsOptions"
+                        hide-selected
+                        option-label="code"
+                        option-value="id"
+                        v-model="row.parkingFk"
+                        @update:model-value="updateParking(row)"
+                        style="max-width: 120px"
+                    />
+                </QTd>
+            </template>
+        </QTable>
+    </QDialog>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 2c648e7f2..2b173eae9 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -136,3 +136,21 @@ weeklyTickets:
     salesperson: Salesperson
     search: Search weekly tickets
     searchInfo: Search weekly tickets by id or client id
+ticketSaleTracking:
+    isChecked: Is checked
+    item: Item
+    description: Description
+    quantity: Quantity
+    parking: Parking
+    historyAction: Log states
+    shelvingAction: Shelvings sale
+    original: Original
+    worker: Worker
+    state: State
+    created: Created
+    shelving: Shelving
+    saleGroupDetail: sale group detail
+    previousSelected: previous selected
+    previous: previous
+    prepared: prepared
+    checked: checked
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 3ce4c0545..f5f4d89f5 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -138,3 +138,21 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
+ticketSaleTracking:
+    isChecked: Comprobado
+    item: Artículo
+    description: Descripción
+    quantity: Cantidad
+    parking: Parking
+    historyAction: Historial estados
+    shelvingAction: Carros línea
+    original: Original
+    worker: Trabajador
+    state: Estado
+    created: Fecha creación
+    shelving: Matrícula
+    saleGroupDetail: detalle grupo líneas
+    previousSelected: previa seleccionado
+    previous: previa
+    prepared: preparado
+    checked: revisado
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 81ca405ee..5850458bb 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -19,6 +19,7 @@ export default {
             'TicketSale',
             'TicketLog',
             'TicketPurchaseRequest',
+            'TicketSaleTracking',
         ],
     },
     children: [
@@ -147,6 +148,16 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'sale-tracking',
+                    name: 'TicketSaleTracking',
+                    meta: {
+                        title: 'saleTracking',
+                        icon: 'vn:buyrequest',
+                    },
+                    component: () =>
+                        import('src/pages/Ticket/Card/TicketSaleTracking.vue'),
+                },
             ],
         },
     ],

From f23b7837b78e0527e6150df5beabc18bc8ce4d83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 09:58:05 +0200
Subject: [PATCH 06/70] perf: Dms buttons tooltip

---
 src/components/common/VnDmsList.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index a5f0fa44e..9f7b07c0e 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -383,15 +383,9 @@ function shouldRenderButton(button, isExternal = false) {
         <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            fab
-            color="primary"
-            icon="publish"
-            @click="showFormDialog()"
-            class="fill-icon"
-        >
+        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
             <QTooltip>
-                {{ t('Import from existing') }}
+                {{ t('Upload file') }}
             </QTooltip>
         </QBtn>
     </QPageSticky>
@@ -404,7 +398,7 @@ function shouldRenderButton(button, isExternal = false) {
             class="fill-icon"
         >
             <QTooltip>
-                {{ t('Upload file') }}
+                {{ t('Import from existing') }}
             </QTooltip>
         </QBtn>
     </QPageSticky>

From c3a064eeda37837c78ef2128656f3dc41e5e38f3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 1 Jul 2024 09:48:27 -0300
Subject: [PATCH 07/70] Change dms import form ubication

---
 src/components/common/VnDmsList.vue              | 16 ++++------------
 src/pages/Ticket/Card/TicketDms.vue              | 14 ++++++++++++++
 .../Ticket/Card/TicketDmsImportForm.vue}         |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)
 rename src/{components/common/VnDmsImportForm.vue => pages/Ticket/Card/TicketDmsImportForm.vue} (95%)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 0576ba266..31d3303d9 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
-import VnDmsImportForm from 'src/components/common/VnDmsImportForm.vue';
 import axios from 'axios';
 
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -19,7 +18,6 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
-const showImportDialog = ref(false);
 
 const $props = defineProps({
     model: {
@@ -47,10 +45,6 @@ const $props = defineProps({
         type: String,
         required: true,
     },
-    allowImport: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const dmsFilter = {
@@ -279,6 +273,10 @@ function shouldRenderButton(button, isExternal = false) {
     if (button.name == 'download') return true;
     return button.external === isExternal;
 }
+
+defineExpose({
+    dmsRef,
+});
 </script>
 <template>
     <VnPaginate
@@ -379,15 +377,9 @@ function shouldRenderButton(button, isExternal = false) {
             :description="$props.description"
         />
     </QDialog>
-    <QDialog v-model="showImportDialog">
-        <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
-    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
     </QPageSticky>
-    <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
-        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
-    </QPageSticky>
 </template>
 <style scoped>
 .q-gutter-y-ms {
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index 7369ee7b2..b63578527 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -1,8 +1,16 @@
 <script setup>
+import { ref } from 'vue';
 import VnDmsList from 'src/components/common/VnDmsList.vue';
+import TicketDmsImportForm from 'src/pages/Ticket/Card/TicketDmsImportForm.vue';
+
+const dmsListRef = ref(null);
+const showImportDialog = ref(false);
+
+const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
 </script>
 <template>
     <VnDmsList
+        ref="dmsListRef"
         model="TicketDms"
         update-model="tickets"
         delete-model="TicketDms"
@@ -11,4 +19,10 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         filter="ticketFk"
         allow-import
     />
+    <QDialog v-model="showImportDialog">
+        <TicketDmsImportForm @on-data-saved="onDataSaved()" />
+    </QDialog>
+    <QPageSticky position="bottom-right" :offset="[25, 90]">
+        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+    </QPageSticky>
 </template>
diff --git a/src/components/common/VnDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
similarity index 95%
rename from src/components/common/VnDmsImportForm.vue
rename to src/pages/Ticket/Card/TicketDmsImportForm.vue
index b31197bbc..ff876affd 100644
--- a/src/components/common/VnDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -26,7 +26,7 @@ const onDataSaved = (formData, requestResponse) => {
 
 const importDms = async () => {
     try {
-        if (!dmsId.value) throw new Error(t(`The document indentifier can't be empty`));
+        if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
 
         const data = {
             ticketFk: route.params.id,

From 34ee92ac2464c6af177a70fbb2d83e341c88df19 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 2 Jul 2024 21:46:45 -0300
Subject: [PATCH 08/70] Small change

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

diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index a03f75387..86f391a1d 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -29,6 +29,7 @@ const itemShelvignsSales = ref([]);
 const shelvingsOptions = ref([]);
 const parkingsOptions = ref([]);
 const saleTrackingUrl = computed(() => `SaleTrackings/${route.params.id}/filter`);
+const oldQuantity = ref(null);
 
 watch(
     () => route.params.id,
@@ -191,10 +192,12 @@ const showShelving = async (sale) => {
 
 const updateQuantity = async (sale) => {
     try {
+        if (oldQuantity.value === sale.quantity) return;
         const params = {
             quantity: sale.quantity,
         };
         await axios.patch(`ItemShelvingSales/${sale.id}`, params);
+        oldQuantity.value = null;
     } catch (error) {
         console.error(error);
     }
@@ -431,7 +434,7 @@ const clickControled = (sale) => {
                     <span v-if="row.subName" class="color-vn-label">
                         {{ row.subName }}
                     </span>
-                    <FetchedTags :item="row" :max-length="6" />
+                    <FetchedTags :item="row" :max-length="6" tag="value" />
                 </div>
             </QTd>
         </template>
@@ -498,7 +501,7 @@ const clickControled = (sale) => {
                         v-model.number="row.quantity"
                         @keyup.enter="updateQuantity(row)"
                         @blur="updateQuantity(row)"
-                        @focus="edit.oldQuantity = row.quantity"
+                        @focus="oldQuantity = row.quantity"
                     />
                 </QTd>
             </template>

From c25b04e07553df5be5c5aa262233347f326d3701 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 3 Jul 2024 11:48:51 +0200
Subject: [PATCH 09/70] improve QChebox

---
 src/pages/Ticket/Card/TicketSaleTracking.vue | 27 ++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 86f391a1d..823fe762f 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -368,6 +368,7 @@ const clickControled = (sale) => {
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
                     color="pink"
+                    class="pink"
                     :toggle-indeterminate="false"
                     @update:model-value="clickSaleGroupDetail(row)"
                 >
@@ -378,6 +379,7 @@ const clickControled = (sale) => {
                 <QCheckbox
                     :model-value="!!row.isPreviousSelected"
                     color="info"
+                    class="info"
                     :toggle-indeterminate="false"
                     @update:model-value="clickPreviousSelected(row)"
                 >
@@ -388,6 +390,7 @@ const clickControled = (sale) => {
                 <QCheckbox
                     :model-value="!!row.isPrevious"
                     color="cyan"
+                    class="cyan"
                     :toggle-indeterminate="false"
                     @update:model-value="clickPrevious(row)"
                 >
@@ -398,6 +401,7 @@ const clickControled = (sale) => {
                 <QCheckbox
                     :model-value="!!row.isPrepared"
                     color="warning"
+                    class="warning"
                     :toggle-indeterminate="false"
                     @update:model-value="clickPrepared(row)"
                 >
@@ -408,6 +412,8 @@ const clickControled = (sale) => {
                 <QCheckbox
                     :model-value="!!row.isControled"
                     color="yellow"
+                    class="yellow"
+                    style="stroke: red"
                     :toggle-indeterminate="false"
                     @update:model-value="clickControled(row)"
                 >
@@ -540,3 +546,24 @@ const clickControled = (sale) => {
         </QTable>
     </QDialog>
 </template>
+
+<style lang="scss">
+$estados: (
+    info: var(--q-info),
+    warning: var(--q-warning),
+    cyan: #00bcd4,
+    pink: pink,
+    yellow: #ffeb3b,
+);
+
+@each $estado, $color in $estados {
+    .q-checkbox.#{$estado} {
+        > .q-checkbox__inner > .q-checkbox__bg.absolute {
+            border-radius: 50% !important;
+            & .q-checkbox__svg > .q-checkbox__truthy {
+                stroke: $color;
+            }
+        }
+    }
+}
+</style>

From 2340aaba0b48f8114d9c64ce4feb4d21a3d26585 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Wed, 3 Jul 2024 14:39:15 +0200
Subject: [PATCH 10/70] feat: list use vnTable, fix descriptor

---
 src/components/ui/CardDescriptor.vue      |   7 +-
 src/i18n/locale/en.yml                    |  63 -----
 src/i18n/locale/es.yml                    |  63 -----
 src/pages/Claim/Card/ClaimAction.vue      |   8 +-
 src/pages/Claim/Card/ClaimActionTable.vue |  99 ++++++++
 src/pages/Claim/Card/ClaimBasicData.vue   |  17 +-
 src/pages/Claim/Card/ClaimDescriptor.vue  |  27 +--
 src/pages/Claim/Card/ClaimPhoto.vue       |   8 +-
 src/pages/Claim/ClaimFilter.vue           | 277 +++++++++-------------
 src/pages/Claim/ClaimList.vue             | 174 +++++++-------
 src/pages/Claim/locale/en.yml             |  46 ++++
 src/pages/Claim/locale/es.yml             |  46 ++++
 src/pages/Order/Card/OrderDescriptor.vue  |   2 +-
 13 files changed, 419 insertions(+), 418 deletions(-)
 create mode 100644 src/pages/Claim/Card/ClaimActionTable.vue
 create mode 100644 src/pages/Claim/locale/en.yml

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 2bb5234ad..e4e007567 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -56,7 +56,12 @@ onBeforeMount(async () => {
         skip: 0,
     });
     store = arrayData.store;
-    entity = computed(() => (Array.isArray(store.data) ? store.data[0] : store.data));
+    entity = computed(() => {
+        const data = Array.isArray(store.data) ? store.data[0] : store.data;
+        emit('onFetch', data);
+        return data;
+    });
+
     // It enables to load data only once if the module is the same as the dataKey
     if (!isSameDataKey.value || !route.params.id) await getData();
     watch(
diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index e4ef31f8e..766463c1e 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -627,69 +627,6 @@ ticket:
         landed: Landed
         warehouse: Warehouse
         agency: Agency
-claim:
-    list:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-    rmaList:
-        code: Code
-        records: records
-    card:
-        claimId: Claim ID
-        attendedBy: Attended by
-        created: Created
-        state: State
-        ticketId: Ticket ID
-        customerSummary: Customer summary
-        claimedTicket: Claimed ticket
-        saleTracking: Sale tracking
-        ticketTracking: Ticket tracking
-        commercial: Commercial
-        province: Province
-        zone: Zone
-        customerId: client ID
-    summary:
-        customer: Customer
-        assignedTo: Assigned
-        attendedBy: Attended by
-        created: Created
-        state: State
-        details: Details
-        item: Item
-        landed: Landed
-        quantity: Quantity
-        claimed: Claimed
-        price: Price
-        discount: Discount
-        total: Total
-        actions: Actions
-        responsibility: Responsibility
-        company: Company
-        person: Employee/Customer
-        notes: Notes
-        photos: Photos
-        development: Development
-        reason: Reason
-        result: Result
-        responsible: Responsible
-        worker: Worker
-        redelivery: Redelivery
-        changeState: Change state
-    basicData:
-        customer: Customer
-        assignedTo: Assigned
-        created: Created
-        state: State
-        pickup: Pick up
-        null: No
-        agency: Agency
-        delivery: Delivery
-    photo:
-        fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
-        noData: 'There are no images/videos, click here or drag and drop the file'
-        dragDrop: Drag and drop it here
 invoiceOut:
     list:
         ref: Reference
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d02f47afd..585ced8b5 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -625,69 +625,6 @@ ticket:
         landed: F. entrega
         warehouse: Almacén
         agency: Agencia
-claim:
-    list:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-    rmaList:
-        code: Código
-        records: registros
-    card:
-        claimId: ID reclamación
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        ticketId: ID ticket
-        customerSummary: Resumen del cliente
-        claimedTicket: Ticket reclamado
-        saleTracking: Líneas preparadas
-        ticketTracking: Estados del ticket
-        commercial: Comercial
-        province: Provincia
-        zone: Zona
-        customerId: ID del cliente
-    summary:
-        customer: Cliente
-        assignedTo: Asignada a
-        attendedBy: Atendida por
-        created: Creada
-        state: Estado
-        details: Detalles
-        item: Artículo
-        landed: Entregado
-        quantity: Cantidad
-        claimed: Reclamado
-        price: Precio
-        discount: Descuento
-        total: Total
-        actions: Acciones
-        responsibility: Responsabilidad
-        company: Empresa
-        person: Comercial/Cliente
-        notes: Observaciones
-        photos: Fotos
-        development: Trazabilidad
-        reason: Motivo
-        result: Consecuencias
-        responsible: Responsable
-        worker: Trabajador
-        redelivery: Devolución
-        changeState: Cambiar estado
-    basicData:
-        customer: Cliente
-        assignedTo: Asignada a
-        created: Creada
-        state: Estado
-        pickup: Recogida
-        null: No
-        agency: Agencia
-        delivery: Reparto
-    photo:
-        fileDescription: 'Reclamacion ID {claimId} del cliente {clientName} id {clientId}'
-        noData: No hay imágenes/videos haz click aquí o arrastra y suelta el archivo
-        dragDrop: Arrástralo y sueltalo aquí
 invoiceOut:
     list:
         ref: Referencia
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index a24a2a15e..e64eab81d 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -33,8 +33,8 @@ const DEFAULT_MAX_RESPONSABILITY = 5;
 const DEFAULT_MIN_RESPONSABILITY = 1;
 const arrayData = useArrayData('claimData');
 const marker_labels = [
-    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.summary.company') },
-    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.summary.person') },
+    { value: DEFAULT_MIN_RESPONSABILITY, label: t('claim.company') },
+    { value: DEFAULT_MAX_RESPONSABILITY, label: t('claim.person') },
 ];
 const multiplicatorValue = ref();
 const loading = ref(false);
@@ -209,12 +209,12 @@ async function post(query, params) {
             <QItem class="justify-between">
                 <QItemLabel class="slider-container">
                     <p class="text-primary">
-                        {{ t('claim.summary.actions') }}
+                        {{ t('claim.actions') }}
                     </p>
                     <QSlider
                         class="responsibility { 'background-color:primary': quasar.platform.is.mobile }"
                         v-model="claim.responsibility"
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         @change="(value) => save({ responsibility: value })"
                         label-always
                         color="primary"
diff --git a/src/pages/Claim/Card/ClaimActionTable.vue b/src/pages/Claim/Card/ClaimActionTable.vue
new file mode 100644
index 000000000..f31f47522
--- /dev/null
+++ b/src/pages/Claim/Card/ClaimActionTable.vue
@@ -0,0 +1,99 @@
+<script setup>
+import { ref, computed, onMounted } from 'vue';
+import { useQuasar } from 'quasar';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+import axios from 'axios';
+import { useStateStore } from 'src/stores/useStateStore';
+import { toDate, toPercentage, toCurrency } from 'filters/index';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import { useArrayData } from 'composables/useArrayData';
+
+const { t } = useI18n();
+const quasar = useQuasar();
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+
+const columns = computed(() => [
+    {
+        name: 'id',
+        label: t('Id item'),
+        field: (row) => row.itemFk,
+    },
+    {
+        name: 'ticketFk',
+        label: t('Ticket'),
+        align: 'center',
+    },
+    {
+        name: 'destination',
+        label: t('Destination'),
+        field: (row) => row.claimDestinationFk,
+        align: 'left',
+    },
+    {
+        name: 'Landed',
+        label: t('Landed'),
+        field: (row) => toDate(row.landed),
+    },
+    {
+        name: 'quantity',
+        label: t('Quantity'),
+        field: (row) => row.quantity,
+    },
+    {
+        name: 'concept',
+        label: t('Description'),
+        field: (row) => row.concept,
+        align: 'left',
+    },
+    {
+        name: 'price',
+        label: t('Price'),
+        field: (row) => row.price,
+        format: (value) => value,
+        align: 'center',
+    },
+    {
+        name: 'discount',
+        label: t('Discount'),
+        field: (row) => row.discount,
+        format: (value) => toPercentage(value / 100),
+        align: 'left',
+    },
+    {
+        name: 'total',
+        label: t('Total'),
+        field: (row) => row.total,
+        format: (value) => value,
+        align: 'center',
+    },
+    {
+        name: 'delete',
+    },
+]);
+</script>
+<template>
+    <VnTable
+        data-key="ClaimEndsTable"
+        url="ClaimEnds/filter"
+        default-mode="table"
+        :right-search="false"
+        :column-search="false"
+        :disable-option="{ card: true, table: true }"
+        search-url="actions"
+        :filter="{ where: { claimFk: $props.id } }"
+        :columns="columns"
+        :limit="0"
+        auto-load
+    />
+</template>
diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
index 4656980d9..de0dc50c3 100644
--- a/src/pages/Claim/Card/ClaimBasicData.vue
+++ b/src/pages/Claim/Card/ClaimBasicData.vue
@@ -30,7 +30,7 @@ function setClaimStates(data) {
 }
 
 async function getEnumValues() {
-    optionsList.value = [{ id: null, description: t('claim.basicData.null') }];
+    optionsList.value = [{ id: null, description: t('claim.null') }];
     const { data } = await axios.get(`Applications/get-enum-values`, {
         params: {
             schema: 'vn',
@@ -39,7 +39,7 @@ async function getEnumValues() {
         },
     });
     for (let value of data)
-        optionsList.value.push({ id: value, description: t(`claim.basicData.${value}`) });
+        optionsList.value.push({ id: value, description: t(`claim.${value}`) });
 }
 
 getEnumValues();
@@ -77,17 +77,14 @@ const statesFilter = {
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnInput
                     v-model="data.client.name"
-                    :label="t('claim.basicData.customer')"
+                    :label="t('claim.customer')"
                     disable
                 />
-                <VnInputDate
-                    v-model="data.created"
-                    :label="t('claim.basicData.created')"
-                />
+                <VnInputDate v-model="data.created" :label="t('claim.created')" />
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <VnSelect
-                    :label="t('claim.basicData.assignedTo')"
+                    :label="t('claim.assignedTo')"
                     v-model="data.workerFk"
                     :options="workersOptions"
                     option-value="id"
@@ -114,7 +111,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.state')"
+                    :label="t('claim.state')"
                     map-options
                     use-input
                     @filter="(value, update) => filter(value, update, statesFilter)"
@@ -136,7 +133,7 @@ const statesFilter = {
                     option-value="id"
                     option-label="description"
                     emit-value
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     map-options
                     use-input
                     :input-debounce="0"
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index ecf16f4c6..85bc88258 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -2,7 +2,7 @@
 import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { toDate, toPercentage } from 'src/filters';
+import { toDateHourMinSec, toPercentage } from 'src/filters';
 import { useState } from 'src/composables/useState';
 import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
 import ClaimDescriptorMenu from 'pages/Claim/Card/ClaimDescriptorMenu.vue';
@@ -52,7 +52,6 @@ onMounted(async () => {
 
 <template>
     <CardDescriptor
-        ref="descriptor"
         :url="`Claims/${entityId}`"
         :filter="filter"
         module="Claim"
@@ -64,7 +63,7 @@ onMounted(async () => {
             <ClaimDescriptorMenu :claim="entity" />
         </template>
         <template #body="{ entity }">
-            <VnLv v-if="entity.claimState" :label="t('claim.card.state')">
+            <VnLv v-if="entity.claimState" :label="t('claim.state')">
                 <template #value>
                     <QBadge
                         :color="stateColor(entity.claimState.code)"
@@ -75,8 +74,8 @@ onMounted(async () => {
                     </QBadge>
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.created')" :value="toDate(entity.created)" />
-            <VnLv :label="t('claim.card.commercial')">
+            <VnLv :label="t('claim.created')" :value="toDateHourMinSec(entity.created)" />
+            <VnLv :label="t('claim.commercial')">
                 <template #value>
                     <VnUserLink
                         :name="entity.client?.salesPersonUser?.name"
@@ -86,17 +85,17 @@ onMounted(async () => {
             </VnLv>
             <VnLv
                 v-if="entity.worker"
-                :label="t('claim.card.attendedBy')"
+                :label="t('claim.attendedBy')"
                 :value="entity.worker.user.name"
             >
                 <template #value>
                     <VnUserLink
-                        :name="entity.worker.user.nickname"
+                        :name="entity.worker.user.name"
                         :worker-id="entity.worker.id"
                     />
                 </template>
             </VnLv>
-            <VnLv :label="t('claim.card.zone')">
+            <VnLv :label="t('claim.zone')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticket?.zone?.name }}
@@ -105,10 +104,10 @@ onMounted(async () => {
                 </template>
             </VnLv>
             <VnLv
-                :label="t('claim.card.province')"
+                :label="t('claim.province')"
                 :value="entity.ticket?.address?.province?.name"
             />
-            <VnLv :label="t('claim.card.ticketId')">
+            <VnLv :label="t('claim.ticketId')">
                 <template #value>
                     <span class="link">
                         {{ entity.ticketFk }}
@@ -130,7 +129,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -138,7 +137,7 @@ onMounted(async () => {
                     color="primary"
                     :to="{ name: 'TicketCard', params: { id: entity.ticketFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.claimedTicket') }}</QTooltip>
+                    <QTooltip>{{ t('claim.claimedTicket') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -146,7 +145,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/sale-tracking'"
                 >
-                    <QTooltip>{{ t('claim.card.saleTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.saleTracking') }}</QTooltip>
                 </QBtn>
                 <QBtn
                     size="md"
@@ -154,7 +153,7 @@ onMounted(async () => {
                     color="primary"
                     :href="salixUrl + 'ticket/' + entity.ticketFk + '/tracking/index'"
                 >
-                    <QTooltip>{{ t('claim.card.ticketTracking') }}</QTooltip>
+                    <QTooltip>{{ t('claim.ticketTracking') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>
diff --git a/src/pages/Claim/Card/ClaimPhoto.vue b/src/pages/Claim/Card/ClaimPhoto.vue
index dd97b60df..076f8d092 100644
--- a/src/pages/Claim/Card/ClaimPhoto.vue
+++ b/src/pages/Claim/Card/ClaimPhoto.vue
@@ -18,7 +18,7 @@ const claimId = computed(() => router.currentRoute.value.params.id);
 
 const claimDms = ref([
     {
-        dmsFk: 1,
+        dmsFk: claimId,
     },
 ]);
 const client = ref({});
@@ -113,7 +113,7 @@ async function create() {
         warehouseId: config.value.warehouseFk,
         companyId: config.value.companyFk,
         dmsTypeId: dmsType.value.id,
-        description: t('claim.photo.fileDescription', {
+        description: t('claim.fileDescription', {
             claimId: claimId.value,
             clientName: client.value.name,
             clientId: client.value.id,
@@ -177,7 +177,7 @@ function onDrag() {
         >
             <QIcon size="xl" name="file_download" />
             <h5>
-                {{ t('claim.photo.dragDrop') }}
+                {{ t('claim.dragDrop') }}
             </h5>
         </div>
         <div
@@ -188,7 +188,7 @@ function onDrag() {
             <QIcon size="xl" name="image"></QIcon>
             <QIcon size="xl" name="movie"></QIcon>
             <h5>
-                {{ t('claim.photo.noData') }}
+                {{ t('claim.noData') }}
             </h5>
         </div>
         <div class="multimediaParent bg-transparent" v-if="claimDms?.length && !dragFile">
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 6b9e92d97..eaeaaabbb 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -16,19 +16,12 @@ const props = defineProps({
     },
 });
 
-const workers = ref();
-const states = ref();
+const states = ref([]);
 </script>
 
 <template>
     <FetchData url="ClaimStates" @on-fetch="(data) => (states = data)" auto-load />
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        :filter="{ where: { role: 'salesPerson' } }"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true" search-url="table">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -36,156 +29,110 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem class="q-my-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Customer ID')"
-                        v-model="params.clientFk"
-                        lazy-rules
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="badge" size="xs"></QIcon> </template
-                    ></VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection>
-                    <VnInput
-                        :label="t('Client Name')"
-                        v-model="params.clientName"
-                        lazy-rules
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Salesperson')"
-                        v-model="params.salesPersonFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Attender')"
-                        v-model="params.attenderFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!workers">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="workers">
-                    <VnSelect
-                        :label="t('Responsible')"
-                        v-model="params.claimResponsibleFk"
-                        @update:model-value="searchFn()"
-                        :options="workers"
-                        option-value="id"
-                        option-label="name"
-                        emit-value
-                        map-options
-                        use-input
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                        :input-debounce="0"
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem class="q-mb-sm">
-                <QItemSection v-if="!states">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="states">
-                    <VnSelect
-                        :label="t('State')"
-                        v-model="params.claimStateFk"
-                        @update:model-value="searchFn()"
-                        :options="states"
-                        option-value="id"
-                        option-label="description"
-                        emit-value
-                        map-options
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        v-model="params.myTeam"
-                        :label="t('myTeam')"
-                        toggle-indeterminate
-                    />
-                </QItemSection>
-            </QItem>
-            <QSeparator />
-            <QExpansionItem :label="t('More options')" expand-separator>
-                <!-- <QItem>
-                        <QItemSection>
-                            <qSelect
-                                :label="t('Item')"
-                                v-model="params.itemFk"
-                                :options="items"
-                                :loading="loading"
-                                @filter="filterFn"
-                                @virtual-scroll="onScroll"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                            />
-                        </QItemSection>
-                    </QItem> -->
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="t('Created')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QExpansionItem>
+            <div class="q-pa-sm q-gutter-y-sm">
+                <VnInput
+                    :label="t('claim.customerId')"
+                    v-model="params.clientFk"
+                    lazy-rules
+                    is-outlined
+                >
+                    <template #prepend> <QIcon name="badge" size="xs"></QIcon></template>
+                </VnInput>
+                <VnInput
+                    :label="t('Client Name')"
+                    v-model="params.clientName"
+                    lazy-rules
+                    is-outlined
+                />
+                <VnSelect
+                    :label="t('Salesperson')"
+                    v-model="params.salesPersonFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('claim.attendedBy')"
+                    v-model="params.attenderFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnSelect
+                    :label="t('claim.state')"
+                    v-model="params.claimStateFk"
+                    @update:model-value="searchFn()"
+                    :options="states"
+                    option-value="id"
+                    option-label="description"
+                    dense
+                    outlined
+                    rounded
+                />
+                <VnInputDate
+                    v-model="params.created"
+                    @update:model-value="searchFn()"
+                    :label="t('claim.created')"
+                    outlined
+                    rounded
+                    dense
+                />
+                <VnSelect
+                    :label="t('Item')"
+                    v-model="params.itemFk"
+                    @update:model-value="searchFn()"
+                    url="Items/withName"
+                    option-value="id"
+                    option-label="name"
+                    sort-by="id DESC"
+                    outlined
+                    rounded
+                    dense
+                >
+                    <template #option="scope">
+                        <QItem v-bind="scope.itemProps">
+                            <QItemSection>
+                                <QItemLabel> #{{ scope.opt?.id }} </QItemLabel>
+                                <QItemLabel caption>{{ scope.opt?.name }}</QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template>
+                </VnSelect>
+                <VnSelect
+                    :label="t('claim.responsible')"
+                    v-model="params.claimResponsibleFk"
+                    @update:model-value="searchFn()"
+                    url="Workers/activeWithInheritedRole"
+                    :filter="{ where: { role: 'salesPerson' } }"
+                    :use-like="false"
+                    option-value="id"
+                    option-label="name"
+                    option-filter="firstName"
+                    dense
+                    outlined
+                    rounded
+                />
+                <QCheckbox
+                    v-model="params.myTeam"
+                    :label="t('myTeam')"
+                    @update:model-value="searchFn()"
+                    toggle-indeterminate
+                />
+            </div>
         </template>
     </VnFilterPanel>
 </template>
@@ -201,7 +148,8 @@ en:
         claimResponsibleFk: Responsible
         claimStateFk: State
         created: Created
-    myTeam: My team
+        myTeam: My team
+        itemFk: Item
 es:
     params:
         search: Contiene
@@ -212,14 +160,9 @@ es:
         claimResponsibleFk: Responsable
         claimStateFk: Estado
         created: Creada
-    Customer ID: ID cliente
+        myTeam: Mi equipo
+        itemFk: Artículo
     Client Name: Nombre del cliente
     Salesperson: Comercial
-    Attender: Asistente
-    Responsible: Responsable
-    State: Estado
     Item: Artículo
-    Created: Creada
-    More options: Más opciones
-    myTeam: Mi equipo
 </i18n>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index eee2713d3..e98964fc5 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -1,38 +1,81 @@
 <script setup>
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
 import { toDate } from 'filters/index';
-import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import ClaimFilter from './ClaimFilter.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
-import CardList from 'src/components/ui/CardList.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
 import ClaimSummary from './Card/ClaimSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
 
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('customer.extendedList.tableVisibleColumns.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        label: t('customer.extendedList.tableVisibleColumns.name'),
+        name: 'clientName',
+        isTitle: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.customer'),
+        name: 'clientFk',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.attendedBy'),
+        name: 'attendedBy',
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.created'),
+        name: 'created',
+        format: ({ created }) => toDate(created),
+        cardVisible: true,
+    },
+    {
+        align: 'left',
+        label: t('claim.state'),
+        name: 'stateCode',
+        chip: {
+            condition: () => true,
+            color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
+        },
+    },
+    {
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Client ticket list'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, ClaimSummary),
+            },
+        ],
+    },
+]);
+
 const STATE_COLOR = {
-    pending: 'warning',
-    managed: 'info',
-    resolved: 'positive',
+    pending: 'bg-warning',
+    managed: 'bg-info',
+    resolved: 'bg-positive',
 };
-function getApiUrl() {
-    return new URL(window.location).origin;
-}
-function stateColor(code) {
-    return STATE_COLOR[code];
-}
-function navigate(event, id) {
-    if (event.ctrlKey || event.metaKey)
-        return window.open(`${getApiUrl()}/#/claim/${id}/summary`);
-    router.push({ path: `/claim/${id}` });
-}
 </script>
 
 <template>
@@ -46,78 +89,27 @@ function navigate(event, id) {
             <ClaimFilter data-key="ClaimList" />
         </template>
     </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="ClaimList"
-                url="Claims/filter"
-                :order="['priority ASC', 'created DESC']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        :id="row.id"
-                        :key="row.id"
-                        :title="row.clientName"
-                        @click="navigate($event, row.id)"
-                        v-for="row of rows"
-                    >
-                        <template #list-items>
-                            <VnLv :label="t('claim.list.customer')">
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row.clientName }}
-                                        <CustomerDescriptorProxy :id="row.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv :label="t('claim.list.assignedTo')">
-                                <template #value>
-                                    <span @click.stop>
-                                        <VnUserLink
-                                            :name="row.workerName"
-                                            :worker-id="row.workerFk"
-                                        />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('claim.list.created')"
-                                :value="toDate(row.created)"
-                            />
-                            <VnLv :label="t('claim.list.state')">
-                                <template #value>
-                                    <QBadge
-                                        text-color="black"
-                                        :color="stateColor(row.stateCode)"
-                                        dense
-                                    >
-                                        {{ row.stateDescription }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('globals.description')"
-                                @click.stop
-                                outline
-                                style="margin-top: 15px"
-                            >
-                                <CustomerDescriptorProxy :id="row.clientFk" />
-                            </QBtn>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, ClaimSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-    </QPage>
+    <VnTable
+        data-key="ClaimList"
+        url="Claims/filter"
+        :order="['priority ASC', 'created DESC']"
+        :columns="columns"
+        redirect="claim"
+        :right-search="false"
+        auto-load
+    >
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.clientName }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+        <template #column-attendedBy="{ row }">
+            <span @click.stop>
+                <VnUserLink :name="row.workerName" :worker-id="row.workerFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
 
 <i18n>
diff --git a/src/pages/Claim/locale/en.yml b/src/pages/Claim/locale/en.yml
new file mode 100644
index 000000000..ffcb44df6
--- /dev/null
+++ b/src/pages/Claim/locale/en.yml
@@ -0,0 +1,46 @@
+claim:
+    customer: Customer
+    code: Code
+    records: records
+    claimId: Claim ID
+    attendedBy: Attended by
+    ticketId: Ticket ID
+    customerSummary: Customer summary
+    claimedTicket: Claimed ticket
+    saleTracking: Sale tracking
+    ticketTracking: Ticket tracking
+    commercial: Commercial
+    province: Province
+    zone: Zone
+    customerId: client ID
+    assignedTo: Assigned
+    created: Created
+    details: Details
+    item: Item
+    landed: Landed
+    quantity: Quantity
+    claimed: Claimed
+    price: Price
+    discount: Discount
+    total: Total
+    actions: Actions
+    responsibility: Responsibility
+    company: Company
+    person: Employee/Customer
+    notes: Notes
+    photos: Photos
+    development: Development
+    reason: Reason
+    result: Result
+    responsible: Responsible
+    worker: Worker
+    redelivery: Redelivery
+    changeState: Change state
+    state: State
+    pickup: Pick up
+    null: No
+    agency: Agency
+    delivery: Delivery
+    fileDescription: 'Claim id {claimId} from client {clientName} id {clientId}'
+    noData: 'There are no images/videos, click here or drag and drop the file'
+    dragDrop: Drag and drop it here
diff --git a/src/pages/Claim/locale/es.yml b/src/pages/Claim/locale/es.yml
index 710d3485d..90bef8e66 100644
--- a/src/pages/Claim/locale/es.yml
+++ b/src/pages/Claim/locale/es.yml
@@ -1,2 +1,48 @@
 Search claim: Buscar reclamación
 You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+claim:
+    customer: Cliente
+    code: Código
+    records: Registros
+    claimId: ID de reclamación
+    attendedBy: Atendido por
+    ticketId: ID de ticket
+    customerSummary: Resumen del cliente
+    claimedTicket: Ticket reclamado
+    saleTracking: Seguimiento de ventas
+    ticketTracking: Seguimiento de tickets
+    commercial: Comercial
+    province: Provincia
+    zone: Zona
+    customerId: ID de cliente
+    assignedTo: Asignado a
+    created: Creado
+    details: Detalles
+    item: Artículo
+    landed: Llegado
+    quantity: Cantidad
+    claimed: Reclamado
+    price: Precio
+    discount: Descuento
+    total: Total
+    actions: Acciones
+    responsibility: Responsabilidad
+    company: Empresa
+    person: Empleado/Cliente
+    notes: Notas
+    photos: Fotos
+    development: Trazabilidad
+    reason: Razón
+    result: Resultado
+    responsible: Responsable
+    worker: Trabajador
+    redelivery: Reentrega
+    changeState: Cambiar estado
+    state: Estado
+    pickup: Recoger
+    null: No
+    agency: Agencia
+    delivery: Entrega
+    fileDescription: 'ID de reclamación {claimId} del cliente {clientName} con ID {clientId}'
+    noData: 'No hay imágenes/videos, haz clic aquí o arrastra y suelta el archivo'
+    dragDrop: Arrastra y suelta aquí
diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index 60e86d04e..f70ba4520 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -131,7 +131,7 @@ const total = ref(null);
                     color="primary"
                     :to="{ name: 'CustomerCard', params: { id: entity.clientFk } }"
                 >
-                    <QTooltip>{{ t('claim.card.customerSummary') }}</QTooltip>
+                    <QTooltip>{{ t('claim.customerSummary') }}</QTooltip>
                 </QBtn>
             </QCardActions>
         </template>

From 4a01f1d930b750c82b7ed6979b28a3aa2ad589c4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 4 Jul 2024 10:40:11 +0200
Subject: [PATCH 11/70] perf: cleancode

---
 src/pages/Ticket/Card/TicketSaleTracking.vue | 66 +++++++-------------
 1 file changed, 23 insertions(+), 43 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 823fe762f..858a35e61 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -246,9 +246,9 @@ const saleTrackingNew = async (sale, stateCode, isChecked) => {
     try {
         const params = {
             saleFk: sale.saleFk,
-            isChecked: isChecked,
+            isChecked,
             quantity: sale.quantity,
-            stateCode: stateCode,
+            stateCode,
         };
         await axios.post(`SaleTrackings/new`, params);
         notify(t('globals.dataSaved'), 'positive');
@@ -257,10 +257,10 @@ const saleTrackingNew = async (sale, stateCode, isChecked) => {
     }
 };
 
-const saleTrackingDel = async (sale, stateCode) => {
+const saleTrackingDel = async ({ saleFk }, stateCode) => {
     try {
         const params = {
-            saleFk: sale.saleFk,
+            saleFk,
             stateCodes: [stateCode],
         };
         await axios.post(`SaleTrackings/delete`, params);
@@ -284,14 +284,8 @@ const clickSaleGroupDetail = async (sale) => {
 
 const clickPreviousSelected = (sale) => {
     try {
-        if (!sale.isPreviousSelected) {
-            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
-            sale.isPreviousSelected = true;
-        } else {
-            saleTrackingDel(sale, 'PREVIOUS_PREPARATION');
-            sale.isPreviousSelected = false;
-            sale.isPrevious = false;
-        }
+        qCheckBoxController(sale, 'isPreviousSelected');
+        if (!sale.isPreviousSelected) sale.isPrevious = false;
     } catch (error) {
         console.error(error);
     }
@@ -299,41 +293,28 @@ const clickPreviousSelected = (sale) => {
 
 const clickPrevious = (sale) => {
     try {
-        if (!sale.isPrevious) {
-            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', true);
-            sale.isPrevious = true;
-            sale.isPreviousSelected = true;
-        } else {
-            saleTrackingNew(sale, 'PREVIOUS_PREPARATION', false);
-            sale.isPrevious = false;
-        }
+        qCheckBoxController(sale, 'isPrevious');
+        if (sale.isPrevious) sale.isPreviousSelected = true;
     } catch (error) {
         console.error(error);
     }
 };
 
-const clickPrepared = (sale) => {
+const qCheckBoxController = (sale, action) => {
+    const STATE_CODES = {
+        isControled: 'CHECKED',
+        isPrepared: 'PREPARED',
+        isPrevious: 'PREVIOUS_PREPARATION',
+        isPreviousSelected: 'PREVIOUS_PREPARATION',
+    };
+    const stateCode = STATE_CODES[action];
     try {
-        if (!sale.isPrepared) {
-            saleTrackingNew(sale, 'PREPARED', true);
-            sale.isPrepared = true;
+        if (!sale[action]) {
+            saleTrackingNew(sale, stateCode, true);
+            sale[action] = true;
         } else {
-            saleTrackingDel(sale, 'PREPARED');
-            sale.isPrepared = false;
-        }
-    } catch (error) {
-        console.error(error);
-    }
-};
-
-const clickControled = (sale) => {
-    try {
-        if (!sale.isControled) {
-            saleTrackingNew(sale, 'CHECKED', true);
-            sale.isControled = true;
-        } else {
-            saleTrackingDel(sale, 'CHECKED');
-            sale.isControled = false;
+            saleTrackingDel(sale, stateCode);
+            sale[action] = false;
         }
     } catch (error) {
         console.error(error);
@@ -403,7 +384,7 @@ const clickControled = (sale) => {
                     color="warning"
                     class="warning"
                     :toggle-indeterminate="false"
-                    @update:model-value="clickPrepared(row)"
+                    @update:model-value="qCheckBoxController(row, 'isPrepared')"
                 >
                     <QTooltip>
                         {{ t('ticketSaleTracking.prepared') }}
@@ -413,9 +394,8 @@ const clickControled = (sale) => {
                     :model-value="!!row.isControled"
                     color="yellow"
                     class="yellow"
-                    style="stroke: red"
                     :toggle-indeterminate="false"
-                    @update:model-value="clickControled(row)"
+                    @update:model-value="qCheckBoxController(row, 'isControled')"
                 >
                     <QTooltip>
                         {{ t('ticketSaleTracking.checked') }}

From 1b839a89f78f4367efb1d01f9f23b0d410fdfbc9 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 4 Jul 2024 13:35:27 +0200
Subject: [PATCH 12/70] refactor: refs #6896 Order migration

---
 src/components/VnTable/VnTable.vue    |   2 +
 src/components/common/VnCard.vue      |   2 +-
 src/components/ui/VnPaginate.vue      |   5 +
 src/composables/useArrayData.js       |  10 +-
 src/pages/Order/Card/OrderForm.vue    |  42 +---
 src/pages/Order/Card/OrderSummary.vue |   2 +-
 src/pages/Order/OrderLines.vue        | 285 ++++++++++++++------------
 src/pages/Order/OrderList.vue         | 268 +++++++++++++-----------
 src/pages/Order/locale/en.yml         |  22 ++
 src/pages/Order/locale/es.yml         |  22 ++
 src/router/modules/order.js           |   2 +-
 11 files changed, 377 insertions(+), 285 deletions(-)
 create mode 100644 src/pages/Order/locale/en.yml
 create mode 100644 src/pages/Order/locale/es.yml

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1610735a4..f2084aeb9 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -210,6 +210,7 @@ defineExpose({
                 v-model="params"
                 :disable-submit-event="true"
                 :search-url="searchUrl"
+                :redirect="!!redirect"
             >
                 <template #body>
                     <VnTableFilter
@@ -287,6 +288,7 @@ defineExpose({
                             :options="tableModes"
                         />
                         <QBtn
+                            v-if="$props.rightSearch"
                             icon="filter_alt"
                             title="asd"
                             class="bg-vn-section-color q-ml-md"
diff --git a/src/components/common/VnCard.vue b/src/components/common/VnCard.vue
index c81bcd8e2..17fa74317 100644
--- a/src/components/common/VnCard.vue
+++ b/src/components/common/VnCard.vue
@@ -39,7 +39,7 @@ const arrayData = useArrayData(props.dataKey, {
 
 onBeforeMount(async () => {
     if (!props.baseUrl) arrayData.store.filter.where = { id: route.params.id };
-    await arrayData.fetch({ append: false });
+    await arrayData.fetch({ append: false, updateRouter: false });
 });
 
 if (props.baseUrl) {
diff --git a/src/components/ui/VnPaginate.vue b/src/components/ui/VnPaginate.vue
index 8e426b471..fd903e759 100644
--- a/src/components/ui/VnPaginate.vue
+++ b/src/components/ui/VnPaginate.vue
@@ -26,6 +26,10 @@ const props = defineProps({
         type: Object,
         default: null,
     },
+    userFilter: {
+        type: Object,
+        default: null,
+    },
     where: {
         type: Object,
         default: null,
@@ -80,6 +84,7 @@ const pagination = ref({
 const arrayData = useArrayData(props.dataKey, {
     url: props.url,
     filter: props.filter,
+    userFilter: props.userFilter,
     where: props.where,
     limit: props.limit,
     order: props.order,
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 8111bcae4..6253c9df2 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -85,8 +85,10 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         Object.assign(filter, store.userFilter, exprFilter);
-        Object.assign(store.filter, filter);
-        const params = { filter: store.filter };
+        const where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
+        Object.assign(filter, store.filter);
+        filter.where = where;
+        const params = { filter };
 
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
@@ -148,7 +150,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilter({ filter, params }) {
-        if (filter) store.userFilter = Object.assign(store.userFilter, filter);
+        if (filter) store.filter = filter;
 
         let userParams = { ...store.userParams, ...params };
         userParams = sanitizerParams(userParams, store?.exprBuilder);
@@ -161,7 +163,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilterWhere(where) {
-        const storedFilter = { ...store.userFilter };
+        const storedFilter = { ...store.filter };
         if (!storedFilter?.where) storedFilter.where = {};
         where = { ...storedFilter.where, ...where };
         await addFilter({ filter: { where } });
diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 98bcf4d3a..41c536326 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -1,11 +1,10 @@
 <script setup>
 import { useRoute, useRouter } from 'vue-router';
-import { reactive, ref } from 'vue';
+import { ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import axios from 'axios';
 import { useState } from 'composables/useState';
 import FormModel from 'components/FormModel.vue';
-import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
@@ -18,29 +17,9 @@ const ORDER_MODEL = 'order';
 
 const router = useRouter();
 const isNew = Boolean(!route.params.id);
-const initialFormState = reactive({
-    clientFk: null,
-    addressFk: null,
-    agencyModeFk: null,
-    landed: null,
-});
 const clientList = ref([]);
 const agencyList = ref([]);
 const addressList = ref([]);
-const clientId = ref(null);
-
-const onClientsFetched = (data) => {
-    clientList.value = data;
-    initialFormState.clientFk = Number(route.query?.clientFk) || null;
-    clientId.value = initialFormState.clientFk;
-
-    const client = clientList.value.find(
-        (client) => client.id === initialFormState.clientFk
-    );
-    if (!client?.defaultAddressFk)
-        throw new Error(t(`No default address found for the client`));
-    fetchAddressList(client.defaultAddressFk);
-};
 
 const fetchAddressList = async (addressId) => {
     try {
@@ -129,27 +108,18 @@ const onClientChange = async (clientId) => {
 };
 
 async function onDataSaved(data) {
-    await router.push({ path: `/order/${data}/catalog` });
+    await router.push({ path: `/order/${data.id}/catalog` });
 }
 </script>
 
 <template>
-    <FetchData
-        url="Clients"
-        @on-fetch="(data) => onClientsFetched(data)"
-        :filter="{ fields: ['id', 'name', 'defaultAddressFk'] }"
-        auto-load
-    />
     <VnSubToolbar v-if="isNew" />
     <div class="q-pa-md">
         <FormModel
-            :url="!isNew ? `Orders/${route.params.id}` : null"
-            url-create="Orders/new"
+            :url="`Orders/${route.params.id}`"
             @on-data-saved="onDataSaved"
             :model="ORDER_MODEL"
-            :form-initial-data="isNew ? initialFormState : null"
-            :observe-form-changes="!isNew"
-            :mapper="isNew ? orderMapper : null"
+            :mapper="orderMapper"
             :filter="orderFilter"
             @on-fetch="fetchOrderDetails"
             auto-load
@@ -157,11 +127,15 @@ async function onDataSaved(data) {
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
                     <VnSelect
+                        url="Clients"
                         :label="t('order.form.clientFk')"
                         v-model="data.clientFk"
                         :options="clientList"
                         option-value="id"
                         option-label="name"
+                        :option-filter="{
+                            fields: ['id', 'name', 'defaultAddressFk'],
+                        }"
                         hide-selected
                         @update:model-value="onClientChange"
                     >
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index 7961b250e..cb708fb1d 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -196,7 +196,7 @@ const detailsColumns = ref([
                                     {{ props.row.quantity }}
                                 </QTd>
                                 <QTd key="price" :props="props">
-                                    {{ props.row.price }}
+                                    {{ toCurrency(props.row.price) }}
                                 </QTd>
                                 <QTd key="amount" :props="props">
                                     {{
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 6758fb170..60b190932 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -1,33 +1,67 @@
 <script setup>
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { ref } from 'vue';
+import { ref, computed } from 'vue';
 import { useQuasar } from 'quasar';
 
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import FetchData from 'components/FetchData.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import FetchedTags from 'components/ui/FetchedTags.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
-import VnImg from 'components/ui/VnImg.vue';
-
 import { toCurrency, toDate } from 'src/filters';
 import axios from 'axios';
-import ItemDescriptorProxy from '../Item/Card/ItemDescriptorProxy.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnImg from 'src/components/ui/VnImg.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import FetchedTags from 'src/components/ui/FetchedTags.vue';
 
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
+const componentKey = ref(0);
+const tableLinesRef = ref();
+const refresh = () => {
+    componentKey.value += 1;
+};
 const orderSummary = ref({
     total: null,
     vat: null,
 });
-const componentKey = ref(0);
-const order = ref(0);
 
-const refresh = () => {
-    componentKey.value += 1;
-};
+const lineFilter = ref({
+    include: [
+        {
+            relation: 'item',
+            scope: {
+                fields: [
+                    'id',
+                    'name',
+                    'subName',
+                    'image',
+                    'tag4',
+                    'value4',
+                    'tag5',
+                    'value5',
+                    'tag6',
+                    'value6',
+                    'tag7',
+                    'value7',
+                    'tag8',
+                    'value8',
+                    'tag9',
+                    'value9',
+                    'tag10',
+                    'value10',
+                ],
+            },
+        },
+        {
+            relation: 'warehouse',
+            scope: {
+                fields: ['id', 'name'],
+            },
+        },
+    ],
+    where: { orderFk: route.params.id },
+});
 
 function confirmRemove(item) {
     quasar.dialog({
@@ -60,53 +94,103 @@ async function confirmOrder() {
     });
 }
 
-const detailsColumns = ref([
+const columns = computed(() => [
     {
-        name: 'img',
-        label: '',
-        field: (row) => row?.item?.id,
+        align: 'center',
+        label: t('lines.image'),
+        name: 'image',
+        columnField: {
+            component: VnImg,
+            attrs: (id) => {
+                return {
+                    id,
+                    width: '50px',
+                };
+            },
+        },
+        columnFilter: false,
     },
     {
-        name: 'item',
-        label: t('order.summary.item'),
-        field: (row) => row?.item?.id,
-        sortable: true,
+        align: 'left',
+        name: 'id',
+        label: t('lines.item'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
-        name: 'description',
+        align: 'left',
+        name: 'itemFk',
         label: t('globals.description'),
-        field: (row) => row?.item?.name,
+        isTitle: true,
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Items',
+            fields: ['id', 'name', 'subName'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.item?.name,
     },
     {
-        name: 'warehouse',
-        label: t('warehouse'),
-        field: (row) => row?.warehouse?.name,
-        sortable: true,
+        align: 'left',
+        name: 'warehouseFk',
+        label: t('lines.warehouse'),
+        cardVisible: true,
+        component: 'select',
+        attrs: {
+            url: 'Warehouses',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+        format: (row) => row?.warehouse?.name,
     },
     {
+        align: 'left',
         name: 'shipped',
-        label: t('shipped'),
-        field: (row) => toDate(row?.shipped),
+        label: t('lines.shipped'),
+        cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
+        format: (row) => toDate(row.shipped),
     },
     {
+        align: 'left',
         name: 'quantity',
-        label: t('order.summary.quantity'),
-        field: (row) => row?.quantity,
+        label: t('lines.quantity'),
     },
     {
+        align: 'left',
         name: 'price',
-        label: t('order.summary.price'),
-        field: (row) => toCurrency(row?.price),
+        label: t('lines.price'),
+        cardVisible: true,
+        format: (row) => toCurrency(row.price),
     },
     {
+        align: 'left',
         name: 'amount',
-        label: t('order.summary.amount'),
-        field: (row) => toCurrency(row?.quantity * row?.price),
+        label: t('lines.amount'),
+        format: (row) => toCurrency(row.amount),
     },
     {
-        name: 'actions',
+        align: 'right',
         label: '',
-        field: (row) => row?.id,
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('delete'),
+                icon: 'delete',
+                click: (row) => confirmRemove(row.item),
+                isPrimary: true,
+            },
+        ],
     },
 ]);
 </script>
@@ -135,7 +219,6 @@ const detailsColumns = ref([
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
-
             <QDrawer side="right" :width="270" show-if-above>
                 <QCard class="order-lines-summary q-pa-lg">
                     <p class="header text-right block">
@@ -143,107 +226,48 @@ const detailsColumns = ref([
                     </p>
                     <VnLv
                         v-if="orderSummary.vat && orderSummary.total"
-                        :label="t('subtotal')"
+                        :label="t('subtotal') + ': '"
                         :value="toCurrency(orderSummary.total - orderSummary.vat)"
                     />
                     <VnLv
                         v-if="orderSummary.vat"
-                        :label="t('VAT')"
+                        :label="t('VAT') + ': '"
                         :value="toCurrency(orderSummary?.vat)"
                     />
                     <VnLv
                         v-if="orderSummary.total"
-                        :label="t('total')"
+                        :label="t('total') + ': '"
                         :value="toCurrency(orderSummary?.total)"
                     />
                 </QCard>
             </QDrawer>
-            <VnPaginate
+            <VnTable
+                ref="tableLinesRef"
                 data-key="OrderLines"
                 url="OrderRows"
-                :limit="20"
+                :columns="columns"
+                default-mode="table"
+                :right-search="false"
+                :use-model="true"
                 auto-load
-                :filter="{
-                    include: [
-                        {
-                            relation: 'item',
-                        },
-                        {
-                            relation: 'warehouse',
-                        },
-                    ],
-                    where: { orderFk: route.params.id },
-                }"
+                :user-filter="lineFilter"
             >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            :columns="detailsColumns"
-                            :rows="rows"
-                            flat
-                            class="full-width"
-                            style="text-align: center"
-                        >
-                            <template #header="props">
-                                <QTr class="tr-header" :props="props">
-                                    <QTh
-                                        v-for="col in props.cols"
-                                        :key="col.name"
-                                        :props="props"
-                                        style="text-align: center"
-                                    >
-                                        {{ t(col.label) }}
-                                    </QTh>
-                                </QTr>
-                            </template>
-                            <template #body-cell-img="{ value }">
-                                <QTd>
-                                    <div class="image-wrapper">
-                                        <VnImg :id="value" class="rounded" />
-                                    </div>
-                                </QTd>
-                            </template>
-                            <template #body-cell-item="{ value }">
-                                <QTd class="item">
-                                    <span class="link">
-                                        <QBtn flat>
-                                            {{ value }}
-                                        </QBtn>
-                                        <ItemDescriptorProxy :id="value" />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-description="{ row, value }">
-                                <QTd>
-                                    <div
-                                        class="row column full-width justify-between items-start"
-                                    >
-                                        {{ value }}
-                                        <div v-if="value" class="subName">
-                                            {{ value.toUpperCase() }}
-                                        </div>
-                                    </div>
-                                    <FetchedTags :item="row.item" :max-length="6" />
-                                </QTd>
-                            </template>
-
-                            <template #body-cell-actions="{ value }">
-                                <QTd>
-                                    <QIcon
-                                        name="delete"
-                                        color="primary"
-                                        size="sm"
-                                        class="cursor-pointer"
-                                        @click.stop="confirmRemove(value)"
-                                    >
-                                        <QTooltip>{{ t('Remove thermograph') }}</QTooltip>
-                                    </QIcon>
-                                </QTd>
-                            </template>
-                        </QTable>
+                <template #column-image="{ row }">
+                    <div class="image-wrapper">
+                        <VnImg :id="row?.item?.image" class="rounded" />
                     </div>
                 </template>
-            </VnPaginate>
+
+                <template #column-itemFk="{ row }">
+                    <div class="row column full-width justify-between items-start">
+                        {{ row?.item?.name }}
+                        <div v-if="row?.item?.subName" class="subName">
+                            {{ row?.item?.subName.toUpperCase() }}
+                        </div>
+                    </div>
+                    <FetchedTags :item="row?.item" :max-length="6" />
+                </template>
+            </VnTable>
         </div>
         <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
@@ -253,7 +277,8 @@ const detailsColumns = ref([
         </QPageSticky>
     </QPage>
 </template>
-<style lang="scss">
+
+<style lang="scss" scoped>
 .order-lines-summary {
     .vn-label-value {
         display: flex;
@@ -274,8 +299,13 @@ const detailsColumns = ref([
         }
     }
 }
-</style>
-<style lang="scss" scoped>
+
+.image-wrapper {
+    height: 50px;
+    width: 50px;
+    margin-left: 30%;
+}
+
 .header {
     color: $primary;
     font-weight: bold;
@@ -284,12 +314,6 @@ const detailsColumns = ref([
     display: inline-block;
 }
 
-.image-wrapper {
-    height: 50px;
-    width: 50px;
-    margin-left: 30%;
-}
-
 .no-result {
     font-size: 24px;
     font-weight: bold;
@@ -302,6 +326,7 @@ const detailsColumns = ref([
     color: var(--vn-label-color);
 }
 </style>
+
 <i18n>
 en:
     summary: Summary
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 0e6e11482..ae95f3488 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -1,31 +1,128 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { onMounted, onUnmounted } from 'vue';
-import { useRouter } from 'vue-router';
-import { useStateStore } from 'stores/useStateStore';
-import { toCurrency, toDate } from 'src/filters';
-import CardList from 'components/ui/CardList.vue';
-import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnLv from 'components/ui/VnLv.vue';
+import { computed, ref } from 'vue';
+import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
 import OrderSummary from 'pages/Order/Card/OrderSummary.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'src/components/VnTable/VnTable.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
 
-const stateStore = useStateStore();
-const router = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
+const tableRef = ref();
+const clientList = ref([]);
+const agencyList = ref([]);
 
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
-function navigate(id) {
-    router.push({ path: `/order/${id}` });
-}
+const columns = computed(() => [
+    {
+        align: 'left',
+        name: 'id',
+        label: t('module.id'),
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'clientName',
+        label: t('module.customer'),
+        isTitle: true,
+        cardVisible: true,
+        create: true,
+        component: 'select',
+        attrs: {
+            url: 'Clients',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'name',
+        label: t('module.salesPerson'),
+        component: 'select',
+        attrs: {
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'name'],
+            where: { role: 'salesPerson' },
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'isConfirmed',
+        label: t('module.isConfirmed'),
+    },
+    {
+        align: 'left',
+        name: 'created',
+        label: t('module.created'),
+        component: 'date',
+        cardVisible: true,
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'landed',
+        label: t('module.landed'),
+        component: 'date',
+        format: (row) => toDate(row?.landed),
+        columnField: {
+            component: null,
+        },
+        style: 'color="positive"',
+    },
+    {
+        align: 'left',
+        name: 'hour',
+        label: t('module.hour'),
+        format: ({ hourTheoretical, hourEffective }) =>
+            dashIfEmpty(hourTheoretical || hourEffective),
+    },
+    {
+        align: 'left',
+        name: 'agencyName',
+        label: t('module.agency'),
+        component: 'select',
+        cardVisible: true,
+        attrs: {
+            url: 'Agencies',
+            fields: ['id', 'name'],
+        },
+        columnField: {
+            component: null,
+        },
+    },
+    {
+        align: 'left',
+        name: 'total',
+        label: t('module.total'),
+        format: ({ total }) => toCurrency(total),
+        cardVisible: true,
+    },
+    {
+        align: 'right',
+        label: '',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('InvoiceOutSummary'),
+                icon: 'preview',
+                action: (row) => viewSummary(row.id, OrderSummary),
+            },
+        ],
+    },
+]);
 </script>
 <template>
     <VnSearchbar
@@ -33,100 +130,43 @@ function navigate(id) {
         :label="t('Search order')"
         :info="t('You can search orders by reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <OrderFilter data-key="OrderList" />
+    <VnTable
+        ref="tableRef"
+        data-key="OrderList"
+        url="Orders/filter"
+        :create="{
+            urlCreate: 'Orders/new',
+            title: 'Create Order',
+            onDataSaved: (url) => {
+                tableRef.redirect(url);
+            },
+            formInitialData: {
+                active: true,
+            },
+        }"
+        :columns="columns"
+        default-mode="table"
+        redirect="order"
+        auto-load
+    >
+        <template #more-create-dialog="{ data }">
+            <VnSelect
+                url="Clients"
+                v-model="data.addressId"
+                :label="t('module.address')"
+                :options="clientList"
+                option-value="defaultAddressFk"
+                option-label="street"
+            />
+            <VnInputDate v-model="data.landed" :label="t('module.landed')" />
+            <VnSelect
+                url="Agencies"
+                v-model="data.agencyModeId"
+                :label="t('module.agency')"
+                :options="agencyList"
+                option-value="id"
+                option-label="name"
+            />
         </template>
-    </RightMenu>
-    <QPage class="column items-center q-pa-md">
-        <div class="vn-card-list">
-            <VnPaginate
-                data-key="OrderList"
-                url="Orders/filter"
-                :limit="20"
-                :order="['landed DESC', 'clientFk', 'id DESC']"
-                :user-params="{ showEmpty: false }"
-                :keep-opts="['userParams']"
-                auto-load
-            >
-                <template #body="{ rows }">
-                    <CardList
-                        v-for="row of rows"
-                        :key="row.id"
-                        :id="row.id"
-                        :title="`${row?.clientName} (${row?.clientFk})`"
-                        @click="navigate(row.id)"
-                    >
-                        <template #list-items>
-                            <VnLv
-                                :label="t('order.field.salesPersonFk')"
-                                :title-label="t('order.field.salesPersonFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.name || '-' }}
-                                        <WorkerDescriptorProxy :id="row?.salesPersonFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.clientFk')"
-                                :title-label="t('order.field.clientFk')"
-                            >
-                                <template #value>
-                                    <span class="link" @click.stop>
-                                        {{ row?.clientName || '-' }}
-                                        <CustomerDescriptorProxy :id="row?.clientFk" />
-                                    </span>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.isConfirmed')"
-                                :value="row?.isConfirmed === 1"
-                            />
-                            <VnLv
-                                :label="t('order.field.created')"
-                                :value="toDate(row?.created)"
-                            />
-                            <VnLv :label="t('order.field.landed')">
-                                <template #value>
-                                    <QBadge text-color="black" color="positive" dense>
-                                        {{ toDate(row?.landed) }}
-                                    </QBadge>
-                                </template>
-                            </VnLv>
-                            <VnLv
-                                :label="t('order.field.hour')"
-                                :value="row.hourTheoretical || row.hourEffective"
-                            />
-                            <VnLv
-                                :label="t('order.field.agency')"
-                                :value="row?.agencyName"
-                            />
-                            <VnLv
-                                :label="t('order.field.total')"
-                                :value="toCurrency(row?.total)"
-                            />
-                        </template>
-                        <template #actions>
-                            <QBtn
-                                :label="t('components.smartCard.openSummary')"
-                                @click.stop="viewSummary(row.id, OrderSummary)"
-                                color="primary"
-                                style="margin-top: 15px"
-                            />
-                        </template>
-                    </CardList>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'OrderCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('order.list.newOrder') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
+    </VnTable>
 </template>
diff --git a/src/pages/Order/locale/en.yml b/src/pages/Order/locale/en.yml
new file mode 100644
index 000000000..b630a18ed
--- /dev/null
+++ b/src/pages/Order/locale/en.yml
@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Name
+    customer: Client
+    isConfirmed: Confirmed
+    created: Created
+    landed: Landed
+    hour: Hour
+    agency: Agency
+    total: Total
+    salesPerson: Sales Person
+    address: Address
+lines:
+    item: Item
+    warehouse: Warehouse
+    shipped: Shipped
+    quantity: Quantity
+    price: Price
+    amount: Amount
+    image: Image
+params:
+    tagGroups: Tags
diff --git a/src/pages/Order/locale/es.yml b/src/pages/Order/locale/es.yml
new file mode 100644
index 000000000..055d22719
--- /dev/null
+++ b/src/pages/Order/locale/es.yml
@@ -0,0 +1,22 @@
+module:
+    id: ID
+    name: Nombre
+    customer: Cliente
+    isConfirmed: Confirmado
+    created: Creado
+    landed: F. Entrega
+    hour: Hora
+    agency: Agencia
+    total: Total
+    salesPerson: Comercial
+    address: Dirección
+lines:
+    item: Artículo
+    warehouse: Almacén
+    shipped: Envío
+    quantity: Cantidad
+    price: Precio
+    amount: Importe
+    image: Imagen
+params:
+    tagGroups: Tags
diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index eb5424e75..910ecbb74 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -37,7 +37,7 @@ export default {
                         title: 'orderCreate',
                         icon: 'add',
                     },
-                    component: () => import('src/pages/Order/Card/OrderForm.vue'),
+                    component: () => import('src/pages/Order/Card/OrderList.vue'),
                 },
             ],
         },

From 317746b1f5ed078064be819ef0c71d9b59c60ee6 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 5 Jul 2024 07:10:41 +0200
Subject: [PATCH 13/70] hotfix: refs #6769 Changes

---
 src/pages/Item/Card/ItemDiary.vue             | 71 +++++++++++++++----
 src/pages/Item/locale/en.yml                  |  4 +-
 src/pages/Item/locale/es.yml                  |  4 +-
 src/pages/Order/Card/OrderDescriptorProxy.vue | 17 +++++
 4 files changed, 77 insertions(+), 19 deletions(-)
 create mode 100644 src/pages/Order/Card/OrderDescriptorProxy.vue

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index c2687e0fd..9e2deef1c 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -5,7 +5,9 @@ import { useRoute } from 'vue-router';
 
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
 import EntryDescriptorProxy from 'src/pages/Entry/Card/EntryDescriptorProxy.vue';
+import OrderDescriptorProxy from 'src/pages/Order/Card/OrderDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import SupplierDescriptorProxy from 'src/pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import FetchData from 'components/FetchData.vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import VnInputDate from 'src/components/common/VnInputDate.vue';
@@ -45,8 +47,8 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        label: t('itemDiary.id'),
-        name: 'id',
+        label: t('itemDiary.origin'),
+        name: 'origin',
         align: 'left',
     },
     {
@@ -65,8 +67,8 @@ const columns = computed(() => [
     },
 
     {
-        label: t('itemDiary.client'),
-        name: 'client',
+        label: t('itemDiary.entity'),
+        name: 'entity',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
@@ -111,10 +113,30 @@ const getBadgeAttrs = (_date) => {
     return attrs;
 };
 
-const getIdDescriptor = (row) => {
-    let descriptor = EntryDescriptorProxy;
-    if (row.isTicket) descriptor = TicketDescriptorProxy;
-    return descriptor;
+const originTypeMap = {
+    entry: {
+        descriptor: EntryDescriptorProxy,
+        icon: 'vn:entry',
+    },
+    ticket: {
+        descriptor: TicketDescriptorProxy,
+        icon: 'vn:ticket',
+    },
+    order: {
+        descriptor: OrderDescriptorProxy,
+        icon: 'vn:basket',
+    },
+};
+
+const entityTypeMap = {
+    client: {
+        descriptor: CustomerDescriptorProxy,
+        icon: 'vn:client',
+    },
+    supplier: {
+        descriptor: SupplierDescriptorProxy,
+        icon: 'vn:supplier',
+    },
 };
 
 onMounted(async () => {
@@ -206,10 +228,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-id="{ row }">
+            <template #body-cell-origin="{ row }">
                 <QTd @click.stop>
                     <component
-                        :is="getIdDescriptor(row)"
+                        :is="originTypeMap[row.originType]?.descriptor"
                         :id="row.origin"
                         class="q-ma-none"
                         dense
@@ -217,10 +239,17 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     >
                         {{ row.origin }}
                     </component>
-                    <span class="link">{{ row.origin }}</span>
+                    <span class="link">
+                        <QIcon
+                            :name="originTypeMap[row.originType]?.icon"
+                            class="fill-icon q-mr-sm"
+                            size="xs"
+                        />
+                        {{ row.origin }}
+                    </span>
                 </QTd>
             </template>
-            <template #body-cell-client="{ row }">
+            <template #body-cell-entity="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         :color="row.highlighted ? 'warning' : 'transparent'"
@@ -228,11 +257,23 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                         dense
                         style="font-size: 14px"
                     >
-                        <span v-if="row.isTicket" class="link">
+                        <component
+                            :is="entityTypeMap[row.entityType]?.descriptor"
+                            :id="row.entity"
+                            class="q-ma-none"
+                            dense
+                            style="font-size: 14px"
+                        >
+                            {{ row.entity }}
+                        </component>
+                        <span class="link">
+                            <QIcon
+                                :name="entityTypeMap[row.entityType]?.icon"
+                                class="fill-icon q-mr-sm"
+                                size="xs"
+                            />
                             {{ dashIfEmpty(row.name) }}
-                            <CustomerDescriptorProxy :id="row.clientFk" />
                         </span>
-                        <span v-else>{{ dashIfEmpty(row.name) }}</span>
                     </QBadge>
                 </QTd>
             </template>
diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index 363e9fcbe..cf8127108 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: Are you sure you want to continue?
 itemDiary:
     date: Date
-    id: Id
+    origin: Otigin
     state: State
     reference: Reference
-    client: Client
+    entity: Entity
     in: In
     out: Out
     balance: Balance
diff --git a/src/pages/Item/locale/es.yml b/src/pages/Item/locale/es.yml
index 3ef040098..451b75698 100644
--- a/src/pages/Item/locale/es.yml
+++ b/src/pages/Item/locale/es.yml
@@ -14,10 +14,10 @@ shelvings:
     removeConfirmSubtitle: ¿Seguro que quieres continuar?
 itemDiary:
     date: Fecha
-    id: Id
+    origin: Origen
     state: Estado
     reference: Referencia
-    client: Cliente
+    entity: Entidad
     in: Entrada
     out: Salida
     balance: Balance
diff --git a/src/pages/Order/Card/OrderDescriptorProxy.vue b/src/pages/Order/Card/OrderDescriptorProxy.vue
new file mode 100644
index 000000000..04ebb054a
--- /dev/null
+++ b/src/pages/Order/Card/OrderDescriptorProxy.vue
@@ -0,0 +1,17 @@
+<script setup>
+import OrderDescriptor from './OrderDescriptor.vue';
+import OrderSummary from './OrderSummary.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <OrderDescriptor v-if="$props.id" :id="$props.id" :summary="OrderSummary" />
+    </QPopupProxy>
+</template>

From a616498d1a82472c5fcd2e415d83a04ed0335e38 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 5 Jul 2024 08:42:13 +0200
Subject: [PATCH 14/70] hotfix: refs #6769 Fix

---
 src/components/ui/VnSubToolbar.vue          | 2 +-
 src/pages/Entry/Card/EntrySummary.vue       | 2 +-
 src/pages/Supplier/Card/SupplierSummary.vue | 2 +-
 src/pages/Ticket/TicketFilter.vue           | 2 --
 src/pages/Travel/Card/TravelSummary.vue     | 2 +-
 5 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index df6fcbcb7..cfefe98a7 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, onBeforeUnmount, ref, nextTick } from 'vue';
+import { onMounted, onBeforeUnmount, ref } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
 
 const stateStore = useStateStore();
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index 7b92b29d4..fe530795c 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, ref, computed, onUpdated } from 'vue';
+import { onMounted, ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 
diff --git a/src/pages/Supplier/Card/SupplierSummary.vue b/src/pages/Supplier/Card/SupplierSummary.vue
index 9337724b0..43b8964ff 100644
--- a/src/pages/Supplier/Card/SupplierSummary.vue
+++ b/src/pages/Supplier/Card/SupplierSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import CardSummary from 'components/ui/CardSummary.vue';
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index 63ac48393..3570cfc03 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -5,8 +5,6 @@ import { useI18n } from 'vue-i18n';
 import FetchData from 'components/FetchData.vue';
 import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
 import VnInput from 'src/components/common/VnInput.vue';
-
-import toDateString from 'filters/toDateString';
 import VnInputDate from 'components/common/VnInputDate.vue';
 
 const { t } = useI18n();
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index af9aa5f7f..d7dce911b 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { ref, computed, onUpdated } from 'vue';
+import { ref, computed } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 

From f81c5d4fb0bb7e56d80c599baa0e7dd0cc2da971 Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Fri, 5 Jul 2024 09:06:17 +0200
Subject: [PATCH 15/70] feat: refs #7348 add checkbox

---
 src/pages/Customer/Card/CustomerFiscalData.vue | 2 ++
 src/pages/Customer/Card/CustomerGreuges.vue    | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
index d8592421f..a7cdfafc5 100644
--- a/src/pages/Customer/Card/CustomerFiscalData.vue
+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
@@ -147,6 +147,7 @@ function handleLocation(data, location) {
                     :label="t('Electronic invoice')"
                     v-model="data.hasElectronicInvoice"
                 />
+                <QCheckbox :label="t('Daily invoice')" v-model="data.hasDailyInvoice" />
             </VnRow>
         </template>
     </FormModel>
@@ -176,6 +177,7 @@ es:
     onlyLetters: Sólo se pueden usar letras, números y espacios
     whenActivatingIt: Al activarlo, no informar el código del país en el campo nif
     inOrderToInvoice: Para facturar no se consulta este campo, sino el RE de consignatario. Al modificar este campo si no esta marcada la casilla Facturar por consignatario, se propagará automaticamente el cambio a todos lo consignatarios, en caso contrario preguntará al usuario si quiere o no propagar
+    Daily invoice: Facturación diaria
 en:
     onlyLetters: Only letters, numbers and spaces can be used
     whenActivatingIt: When activating it, do not enter the country code in the ID field
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 0dcb3a3a9..bbcd217b0 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -108,7 +108,7 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
+    <template v-if="stateStore.isHeaderMounted()"> 
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn

From 7fae6b92a1b2d31ce39d1c48c14212716a5da9b6 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 5 Jul 2024 09:45:13 +0200
Subject: [PATCH 16/70] hotfix: refs #6769 Minor changes

---
 src/pages/Item/Card/ItemDiary.vue | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index 9e2deef1c..b48512dd2 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -48,7 +48,7 @@ const columns = computed(() => [
     },
     {
         label: t('itemDiary.origin'),
-        name: 'origin',
+        name: 'originId',
         align: 'left',
     },
     {
@@ -68,7 +68,7 @@ const columns = computed(() => [
 
     {
         label: t('itemDiary.entity'),
-        name: 'entity',
+        name: 'entityId',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
@@ -228,16 +228,16 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     </QBadge>
                 </QTd>
             </template>
-            <template #body-cell-origin="{ row }">
+            <template #body-cell-originId="{ row }">
                 <QTd @click.stop>
                     <component
                         :is="originTypeMap[row.originType]?.descriptor"
-                        :id="row.origin"
+                        :id="row.originId"
                         class="q-ma-none"
                         dense
                         style="font-size: 14px"
                     >
-                        {{ row.origin }}
+                        {{ row.originId }}
                     </component>
                     <span class="link">
                         <QIcon
@@ -245,11 +245,11 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             class="fill-icon q-mr-sm"
                             size="xs"
                         />
-                        {{ row.origin }}
+                        {{ row.originId }}
                     </span>
                 </QTd>
             </template>
-            <template #body-cell-entity="{ row }">
+            <template #body-cell-entityId="{ row }">
                 <QTd @click.stop>
                     <QBadge
                         :color="row.highlighted ? 'warning' : 'transparent'"
@@ -259,12 +259,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                     >
                         <component
                             :is="entityTypeMap[row.entityType]?.descriptor"
-                            :id="row.entity"
+                            :id="row.entityId"
                             class="q-ma-none"
                             dense
                             style="font-size: 14px"
                         >
-                            {{ row.entity }}
+                            {{ row.entityId }}
                         </component>
                         <span class="link">
                             <QIcon
@@ -272,7 +272,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                                 class="fill-icon q-mr-sm"
                                 size="xs"
                             />
-                            {{ dashIfEmpty(row.name) }}
+                            {{ dashIfEmpty(row.entityName) }}
                         </span>
                     </QBadge>
                 </QTd>

From 0436dbae51da8db4de059d12b890b31d9073e9c4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 10:21:02 +0200
Subject: [PATCH 17/70] fix: refs #6896 fixed OrderList path

---
 src/router/modules/order.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/router/modules/order.js b/src/router/modules/order.js
index 910ecbb74..aa1ca774d 100644
--- a/src/router/modules/order.js
+++ b/src/router/modules/order.js
@@ -37,7 +37,7 @@ export default {
                         title: 'orderCreate',
                         icon: 'add',
                     },
-                    component: () => import('src/pages/Order/Card/OrderList.vue'),
+                    component: () => import('src/pages/Order/OrderList.vue'),
                 },
             ],
         },

From 3a117a9f0e7c2a152ba8077a987f727639bf3944 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 5 Jul 2024 10:51:20 +0200
Subject: [PATCH 18/70] feat: add ClaimSummaryAction

---
 src/components/VnTable/VnFilter.vue           |   8 -
 src/components/VnTable/VnTable.vue            |  25 ++-
 src/pages/Claim/Card/ClaimNotes.vue           |   2 +-
 src/pages/Claim/Card/ClaimSummary.vue         | 147 ++++++++----------
 ...ActionTable.vue => ClaimSummaryAction.vue} |  73 +++++----
 .../Customer/Card/CustomerDescriptor.vue      |   2 +-
 6 files changed, 123 insertions(+), 134 deletions(-)
 rename src/pages/Claim/Card/{ClaimActionTable.vue => ClaimSummaryAction.vue} (54%)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b3386899f..d4395fa06 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -138,14 +138,6 @@ const showFilter = computed(
 );
 </script>
 <template>
-    <div
-        v-if="showTitle"
-        class="q-pt-sm q-px-sm ellipsis"
-        :class="`text-${column?.align ?? 'left'}`"
-        :style="!showFilter ? { 'min-height': 72 + 'px' } : ''"
-    >
-        {{ column?.label }}
-    </div>
     <div v-if="showFilter" class="full-width" :class="alignRow()">
         <VnTableColumn
             :column="$props.column"
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1610735a4..85c9380fc 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -67,6 +67,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({ card: false, table: false }),
     },
+    withoutHeader: {
+        type: Boolean,
+        default: false,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -268,10 +272,10 @@ defineExpose({
                     @row-click="(_, row) => rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
                 >
-                    <template #top-left>
+                    <template #top-left v-if="!$props.withoutHeader">
                         <slot name="top-left"></slot>
                     </template>
-                    <template #top-right>
+                    <template #top-right v-if="!$props.withoutHeader">
                         <!-- <QBtn
                         icon="visibility"
                         title="asd"
@@ -292,15 +296,22 @@ defineExpose({
                             class="bg-vn-section-color q-ml-md"
                             dense
                             @click="stateStore.toggleRightDrawer()"
+                            v-if="$props.rightSearch"
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh
-                            auto-width
-                            style="min-width: 100px"
-                            v-if="$props.columnSearch"
-                        >
+                        <QTh auto-width style="min-width: 100px">
+                            <div
+                                class="q-pt-sm q-px-sm ellipsis"
+                                :class="`text-${col?.align ?? 'left'}`"
+                                :style="
+                                    $props.columnSearch ? { 'min-height': 72 + 'px' } : ''
+                                "
+                            >
+                                {{ col?.label }}
+                            </div>
                             <VnTableFilter
+                                v-if="$props.columnSearch"
                                 :column="col"
                                 :show-title="true"
                                 :data-key="$attrs['data-key']"
diff --git a/src/pages/Claim/Card/ClaimNotes.vue b/src/pages/Claim/Card/ClaimNotes.vue
index 8aa6e1d62..83e144e97 100644
--- a/src/pages/Claim/Card/ClaimNotes.vue
+++ b/src/pages/Claim/Card/ClaimNotes.vue
@@ -9,7 +9,7 @@ const state = useState();
 const user = state.getUser();
 
 const $props = defineProps({
-    id: { type: Number, default: null },
+    id: { type: [Number, String], default: null },
     addNote: { type: Boolean, default: true },
 });
 const claimId = computed(() => $props.id || route.params.id);
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 55d59822d..2a679b73d 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -15,6 +15,7 @@ import VnTitle from 'src/components/common/VnTitle.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import axios from 'axios';
 import dashIfEmpty from 'src/filters/dashIfEmpty';
+import ClaimSummaryAction from 'src/pages/Claim/Card/ClaimSummaryAction.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -50,26 +51,26 @@ onMounted(async () => {
 const detailsColumns = ref([
     {
         name: 'item',
-        label: 'claim.summary.item',
+        label: 'claim.item',
         field: (row) => row.sale.itemFk,
         sortable: true,
     },
     {
         name: 'landed',
-        label: 'claim.summary.landed',
+        label: 'claim.landed',
         field: (row) => row.sale.ticket.landed,
         format: (value) => toDate(value),
         sortable: true,
     },
     {
         name: 'quantity',
-        label: 'claim.summary.quantity',
+        label: 'claim.quantity',
         field: (row) => row.sale.quantity,
         sortable: true,
     },
     {
         name: 'claimed',
-        label: 'claim.summary.claimed',
+        label: 'claim.claimed',
         field: (row) => row.quantity,
         sortable: true,
     },
@@ -80,20 +81,20 @@ const detailsColumns = ref([
     },
     {
         name: 'price',
-        label: 'claim.summary.price',
+        label: 'claim.price',
         field: (row) => row.sale.price,
         sortable: true,
     },
     {
         name: 'discount',
-        label: 'claim.summary.discount',
+        label: 'claim.discount',
         field: (row) => row.sale.discount,
         format: (value) => `${value} %`,
         sortable: true,
     },
     {
         name: 'total',
-        label: 'claim.summary.total',
+        label: 'claim.total',
         field: ({ sale }) =>
             toCurrency(sale.quantity * sale.price * ((100 - sale.discount) / 100)),
         sortable: true,
@@ -113,31 +114,31 @@ function stateColor(code) {
 const developmentColumns = ref([
     {
         name: 'claimReason',
-        label: 'claim.summary.reason',
+        label: 'claim.reason',
         field: (row) => row.claimReason.description,
         sortable: true,
     },
     {
         name: 'claimResult',
-        label: 'claim.summary.result',
+        label: 'claim.result',
         field: (row) => row.claimResult.description,
         sortable: true,
     },
     {
         name: 'claimResponsible',
-        label: 'claim.summary.responsible',
+        label: 'claim.responsible',
         field: (row) => row.claimResponsible.description,
         sortable: true,
     },
     {
         name: 'worker',
-        label: 'claim.summary.worker',
+        label: 'claim.worker',
         field: (row) => row.worker?.user.nickname,
         sortable: true,
     },
     {
         name: 'claimRedelivery',
-        label: 'claim.summary.redelivery',
+        label: 'claim.redelivery',
         field: (row) => row.claimRedelivery.description,
         sortable: true,
     },
@@ -221,16 +222,13 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body="{ entity: { claim, salesClaimed, developments } }">
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="$route.name != 'ClaimSummary'">
                 <VnTitle
                     :url="`#/claim/${entityId}/basic-data`"
                     :text="t('globals.pageTitles.basicData')"
                 />
-                <VnLv
-                    :label="t('claim.summary.created')"
-                    :value="toDate(claim.created)"
-                />
-                <VnLv :label="t('claim.summary.state')">
+                <VnLv :label="t('claim.created')" :value="toDate(claim.created)" />
+                <VnLv :label="t('claim.state')">
                     <template #value>
                         <QChip :color="stateColor(claim.claimState.code)" dense>
                             {{ claim.claimState.description }}
@@ -245,7 +243,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.attendedBy')">
+                <VnLv :label="t('claim.attendedBy')">
                     <template #value>
                         <VnUserLink
                             :name="claim.worker?.user?.nickname"
@@ -253,7 +251,7 @@ async function changeState(value) {
                         />
                     </template>
                 </VnLv>
-                <VnLv :label="t('claim.summary.customer')">
+                <VnLv :label="t('claim.customer')">
                     <template #value>
                         <span class="link cursor-pointer">
                             {{ claim.client?.name }}
@@ -262,15 +260,12 @@ async function changeState(value) {
                     </template>
                 </VnLv>
                 <VnLv
-                    :label="t('claim.basicData.pickup')"
+                    :label="t('claim.pickup')"
                     :value="`${dashIfEmpty(claim.pickup)}`"
                 />
             </QCard>
-            <QCard class="vn-three">
-                <VnTitle
-                    :url="`#/claim/${entityId}/notes`"
-                    :text="t('claim.summary.notes')"
-                />
+            <QCard class="vn-two">
+                <VnTitle :url="`#/claim/${entityId}/notes`" :text="t('claim.notes')" />
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
@@ -278,53 +273,8 @@ async function changeState(value) {
                     order="created ASC"
                 />
             </QCard>
-            <QCard class="vn-two" v-if="salesClaimed.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/lines`"
-                    :text="t('claim.summary.details')"
-                />
-                <QTable
-                    :columns="detailsColumns"
-                    :rows="salesClaimed"
-                    flat
-                    dense
-                    :rows-per-page-options="[0]"
-                    hide-bottom
-                >
-                    <template #header="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                {{ t(col.label) }}
-                            </QTh>
-                        </QTr>
-                    </template>
-                    <template #body="props">
-                        <QTr :props="props">
-                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
-                                <span v-if="col.name != 'description'">{{
-                                    t(col.value)
-                                }}</span>
-                                <QBtn
-                                    v-if="col.name == 'description'"
-                                    flat
-                                    color="blue"
-                                    >{{ col.value }}</QBtn
-                                >
-                                <ItemDescriptorProxy
-                                    v-if="col.name == 'description'"
-                                    :id="props.row.sale.itemFk"
-                                    :sale-fk="props.row.saleFk"
-                                ></ItemDescriptorProxy>
-                            </QTh>
-                        </QTr>
-                    </template>
-                </QTable>
-            </QCard>
             <QCard class="vn-two" v-if="claimDms.length > 0">
-                <VnTitle
-                    :url="`#/claim/${entityId}/photos`"
-                    :text="t('claim.summary.photos')"
-                />
+                <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
                 <div class="container">
                     <div
                         class="multimedia-container"
@@ -362,11 +312,47 @@ async function changeState(value) {
                     </div>
                 </div>
             </QCard>
+            <QCard class="vn-two" v-if="salesClaimed.length > 0">
+                <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
+                <QTable
+                    :columns="detailsColumns"
+                    :rows="salesClaimed"
+                    flat
+                    dense
+                    :rows-per-page-options="[0]"
+                    hide-bottom
+                >
+                    <template #header="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                {{ t(col.label) }}
+                            </QTh>
+                        </QTr>
+                    </template>
+                    <template #body="props">
+                        <QTr :props="props">
+                            <QTh v-for="col in props.cols" :key="col.name" :props="props">
+                                <span v-if="col.name != 'description'">{{
+                                    t(col.value)
+                                }}</span>
+                                <QBtn
+                                    v-if="col.name == 'description'"
+                                    flat
+                                    color="blue"
+                                    >{{ col.value }}</QBtn
+                                >
+                                <ItemDescriptorProxy
+                                    v-if="col.name == 'description'"
+                                    :id="props.row.sale.itemFk"
+                                    :sale-fk="props.row.saleFk"
+                                ></ItemDescriptorProxy>
+                            </QTh>
+                        </QTr>
+                    </template>
+                </QTable>
+            </QCard>
             <QCard class="vn-two" v-if="developments.length > 0">
-                <VnTitle
-                    :url="claimUrl + 'development'"
-                    :text="t('claim.summary.development')"
-                />
+                <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
                 <QTable
                     :columns="developmentColumns"
                     :rows="developments"
@@ -385,24 +371,25 @@ async function changeState(value) {
                 </QTable>
             </QCard>
             <QCard class="vn-max">
-                <VnTitle :url="claimUrl + 'action'" :text="t('claim.summary.actions')" />
+                <VnTitle :url="claimUrl + 'action'" :text="t('claim.actions')" />
                 <div id="slider-container" class="q-px-xl q-py-md">
                     <QSlider
                         v-model="claim.responsibility"
                         label
-                        :label-value="t('claim.summary.responsibility')"
+                        :label-value="t('claim.responsibility')"
                         label-always
                         color="var()"
                         markers
                         :marker-labels="[
-                            { value: 1, label: t('claim.summary.company') },
-                            { value: 5, label: t('claim.summary.person') },
+                            { value: 1, label: t('claim.company') },
+                            { value: 5, label: t('claim.person') },
                         ]"
                         :min="1"
                         :max="5"
                         readonly
                     />
                 </div>
+                <ClaimSummaryAction :id="entityId" />
             </QCard>
             <QDialog
                 v-model="multimediaDialog"
diff --git a/src/pages/Claim/Card/ClaimActionTable.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
similarity index 54%
rename from src/pages/Claim/Card/ClaimActionTable.vue
rename to src/pages/Claim/Card/ClaimSummaryAction.vue
index f31f47522..b08504768 100644
--- a/src/pages/Claim/Card/ClaimActionTable.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -1,86 +1,71 @@
 <script setup>
-import { ref, computed, onMounted } from 'vue';
-import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
-import axios from 'axios';
-import { useStateStore } from 'src/stores/useStateStore';
-import { toDate, toPercentage, toCurrency } from 'filters/index';
+import { toDate, toPercentage } from 'filters/index';
 import VnTable from 'src/components/VnTable/VnTable.vue';
-import FetchData from 'src/components/FetchData.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
 import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
-import { useArrayData } from 'composables/useArrayData';
 
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const $props = defineProps({
     id: {
-        type: Number,
+        type: [Number, String],
         required: true,
     },
 });
 
-const columns = computed(() => [
+const columns = [
     {
-        name: 'id',
+        name: 'itemFk',
         label: t('Id item'),
-        field: (row) => row.itemFk,
+        columnFilter: false,
+        align: 'left',
     },
     {
         name: 'ticketFk',
         label: t('Ticket'),
-        align: 'center',
-    },
-    {
-        name: 'destination',
-        label: t('Destination'),
-        field: (row) => row.claimDestinationFk,
+        columnFilter: false,
         align: 'left',
     },
     {
-        name: 'Landed',
+        name: 'claimDestinationFk',
+        label: t('Destination'),
+        columnFilter: false,
+        align: 'left',
+    },
+    {
+        name: 'landed',
         label: t('Landed'),
-        field: (row) => toDate(row.landed),
+        format: (row) => toDate(row.landed),
+        align: 'left',
     },
     {
         name: 'quantity',
         label: t('Quantity'),
-        field: (row) => row.quantity,
+        align: 'left',
     },
     {
         name: 'concept',
         label: t('Description'),
-        field: (row) => row.concept,
         align: 'left',
     },
     {
         name: 'price',
         label: t('Price'),
-        field: (row) => row.price,
-        format: (value) => value,
-        align: 'center',
+        align: 'left',
     },
     {
         name: 'discount',
         label: t('Discount'),
-        field: (row) => row.discount,
-        format: (value) => toPercentage(value / 100),
+        format: ({ discount }) => toPercentage(discount / 100),
         align: 'left',
     },
     {
         name: 'total',
         label: t('Total'),
-        field: (row) => row.total,
-        format: (value) => value,
-        align: 'center',
+        align: 'left',
     },
-    {
-        name: 'delete',
-    },
-]);
+];
 </script>
 <template>
     <VnTable
@@ -94,6 +79,20 @@ const columns = computed(() => [
         :filter="{ where: { claimFk: $props.id } }"
         :columns="columns"
         :limit="0"
+        :without-header="true"
         auto-load
-    />
+    >
+        <template #column-itemFk="{ row }">
+            <span class="link">
+                {{ row.itemFk }}
+                <ItemDescriptorProxy :id="row.itemFk" />
+            </span>
+        </template>
+        <template #column-ticketFk="{ row }">
+            <span class="link">
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
diff --git a/src/pages/Customer/Card/CustomerDescriptor.vue b/src/pages/Customer/Card/CustomerDescriptor.vue
index 5e688076a..938d90ab1 100644
--- a/src/pages/Customer/Card/CustomerDescriptor.vue
+++ b/src/pages/Customer/Card/CustomerDescriptor.vue
@@ -32,7 +32,7 @@ const entityId = computed(() => {
 });
 
 const data = ref(useCardDescription());
-const setData = (entity) => (data.value = useCardDescription(entity.name, entity.id));
+const setData = (entity) => (data.value = useCardDescription(entity?.name, entity?.id));
 </script>
 
 <template>

From 2f173ac2e79a6dd545a70da2c52448ae08a81220 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 5 Jul 2024 13:35:45 +0200
Subject: [PATCH 19/70] refactor: refs #6896 requested changes & deleted
 basicData and Lines warnings

---
 src/pages/Order/Card/OrderForm.vue | 9 ++++-----
 src/pages/Order/OrderLines.vue     | 3 ++-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 41c536326..43a9b2e57 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -107,8 +107,8 @@ const onClientChange = async (clientId) => {
     }
 };
 
-async function onDataSaved(data) {
-    await router.push({ path: `/order/${data.id}/catalog` });
+async function onDataSaved(id) {
+    await router.push({ path: `/order/${id}/catalog` });
 }
 </script>
 
@@ -117,7 +117,7 @@ async function onDataSaved(data) {
     <div class="q-pa-md">
         <FormModel
             :url="`Orders/${route.params.id}`"
-            @on-data-saved="onDataSaved"
+            @on-data-saved="(row) => onDataSaved(row.id)"
             :model="ORDER_MODEL"
             :mapper="orderMapper"
             :filter="orderFilter"
@@ -133,7 +133,7 @@ async function onDataSaved(data) {
                         :options="clientList"
                         option-value="id"
                         option-label="name"
-                        :option-filter="{
+                        :filter="{
                             fields: ['id', 'name', 'defaultAddressFk'],
                         }"
                         hide-selected
@@ -157,7 +157,6 @@ async function onDataSaved(data) {
                         option-label="street"
                         hide-selected
                         :disable="!addressList?.length"
-                        @update:model-value="onAddressChange"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 60b190932..baeb23560 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -18,6 +18,7 @@ const { t } = useI18n();
 const quasar = useQuasar();
 const componentKey = ref(0);
 const tableLinesRef = ref();
+const order = ref();
 const refresh = () => {
     componentKey.value += 1;
 };
@@ -254,7 +255,7 @@ const columns = computed(() => [
             >
                 <template #column-image="{ row }">
                     <div class="image-wrapper">
-                        <VnImg :id="row?.item?.image" class="rounded" />
+                        <VnImg :id="parseInt(row?.item?.image)" class="rounded" />
                     </div>
                 </template>
 

From 2e02027a00871d87427e4d6218b532ac848dc697 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 5 Jul 2024 14:11:50 +0200
Subject: [PATCH 20/70] fix: cardDescriptor

---
 src/components/ui/CardDescriptor.vue     | 4 ++--
 src/pages/Entry/Card/EntryDescriptor.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index e4e007567..380806540 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -58,8 +58,8 @@ onBeforeMount(async () => {
     store = arrayData.store;
     entity = computed(() => {
         const data = Array.isArray(store.data) ? store.data[0] : store.data;
-        emit('onFetch', data);
-        return data;
+        if (data) emit('onFetch', data ?? {});
+        return data ?? {};
     });
 
     // It enables to load data only once if the module is the same as the dataKey
diff --git a/src/pages/Entry/Card/EntryDescriptor.vue b/src/pages/Entry/Card/EntryDescriptor.vue
index a55ad67cd..3efdf1bf7 100644
--- a/src/pages/Entry/Card/EntryDescriptor.vue
+++ b/src/pages/Entry/Card/EntryDescriptor.vue
@@ -73,7 +73,7 @@ onMounted(async () => {
 
 const data = ref(useCardDescription());
 const setData = (entity) =>
-    (data.value = useCardDescription(entity.supplier.nickname, entity.id));
+    (data.value = useCardDescription(entity.supplier?.nickname, entity.id));
 
 const currentEntry = computed(() => state.get('entry'));
 

From ab5347d302ecf7f18758779d455658018bcbb34a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 5 Jul 2024 14:58:02 +0200
Subject: [PATCH 21/70] fix: e2e and min-height vnTable

---
 src/components/VnTable/VnTable.vue                            | 4 +++-
 .../cypress/integration/invoiceIn/invoiceInCorrective.spec.js | 3 ++-
 .../cypress/integration/invoiceIn/invoiceInDescriptor.spec.js | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 85c9380fc..709ca16c8 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -305,7 +305,9 @@ defineExpose({
                                 class="q-pt-sm q-px-sm ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
                                 :style="
-                                    $props.columnSearch ? { 'min-height': 72 + 'px' } : ''
+                                    $props.columnSearch && col.columnFilter == false
+                                        ? { 'min-height': 72 + 'px' }
+                                        : ''
                                 "
                             >
                                 {{ col?.label }}
diff --git a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
index 7863d6bfa..efe5550c3 100644
--- a/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInCorrective.spec.js
@@ -8,7 +8,8 @@ describe('InvoiceInCorrective', () => {
     it('should create a correcting invoice', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
-        cy.visit(`/#/invoice-in/1/summary?limit=10`);
+        cy.visit(`/#/invoice-in/1/summary`);
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
 
diff --git a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
index a2e9998bb..4b5b993df 100644
--- a/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInDescriptor.spec.js
@@ -7,6 +7,7 @@ describe('InvoiceInDescriptor', () => {
         cy.viewport(1280, 720);
         cy.login('developer');
         cy.visit('/#/invoice-in/1/summary');
+        cy.waitForElement('.q-page');
 
         cy.openActionsDescriptor();
         cy.get(firstDescritorOpt).click();

From 5be762d7818c89f495109cae461d09deccfec28c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 09:00:01 +0200
Subject: [PATCH 22/70] refactors

---
 src/components/ui/CardDescriptor.vue     | 12 +++++------
 src/pages/Claim/Card/ClaimDescriptor.vue |  2 +-
 src/pages/Claim/Card/ClaimSummary.vue    | 27 +++++++++++++-----------
 src/pages/Claim/ClaimFilter.vue          |  2 +-
 4 files changed, 23 insertions(+), 20 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 380806540..fe76fceb6 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -57,9 +57,9 @@ onBeforeMount(async () => {
     });
     store = arrayData.store;
     entity = computed(() => {
-        const data = Array.isArray(store.data) ? store.data[0] : store.data;
-        if (data) emit('onFetch', data ?? {});
-        return data ?? {};
+        const data = (Array.isArray(store.data) ? store.data[0] : store.data) ?? {};
+        if (data) emit('onFetch', data);
+        return data;
     });
 
     // It enables to load data only once if the module is the same as the dataKey
@@ -90,9 +90,9 @@ function getValueFromPath(path) {
     const keys = path.toString().split('.');
     let current = entity.value;
 
-    for (let i = 0; i < keys.length; i++) {
-        if (current[keys[i]] === undefined) return undefined;
-        else current = current[keys[i]];
+    for (const key of keys) {
+        if (current[key] === undefined) return undefined;
+        else current = current[key];
     }
     return current;
 }
diff --git a/src/pages/Claim/Card/ClaimDescriptor.vue b/src/pages/Claim/Card/ClaimDescriptor.vue
index 85bc88258..02b63dd8e 100644
--- a/src/pages/Claim/Card/ClaimDescriptor.vue
+++ b/src/pages/Claim/Card/ClaimDescriptor.vue
@@ -42,7 +42,7 @@ function stateColor(code) {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity.id);
     state.set('ClaimDescriptor', entity);
 };
 onMounted(async () => {
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 2a679b73d..bf645e1ea 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -35,6 +35,9 @@ const ClaimStates = ref([]);
 const claimUrl = ref();
 const salixUrl = ref();
 const claimDmsRef = ref();
+const claimDms = ref([]);
+const multimediaDialog = ref();
+const multimediaSlide = ref();
 const claimDmsFilter = ref({
     include: [
         {
@@ -43,11 +46,6 @@ const claimDmsFilter = ref({
     ],
 });
 
-onMounted(async () => {
-    salixUrl.value = await getUrl('');
-    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
-});
-
 const detailsColumns = ref([
     {
         name: 'item',
@@ -101,12 +99,18 @@ const detailsColumns = ref([
     },
 ]);
 
+const markerLabels = [
+    { value: 1, label: t('claim.company') },
+    { value: 5, label: t('claim.person') },
+];
+
 const STATE_COLOR = {
     pending: 'warning',
     incomplete: 'info',
     resolved: 'positive',
     canceled: 'negative',
 };
+
 function stateColor(code) {
     return STATE_COLOR[code];
 }
@@ -143,9 +147,11 @@ const developmentColumns = ref([
         sortable: true,
     },
 ]);
-const claimDms = ref([]);
-const multimediaDialog = ref();
-const multimediaSlide = ref();
+
+onMounted(async () => {
+    salixUrl.value = await getUrl('');
+    claimUrl.value = salixUrl.value + `claim/${entityId.value}/`;
+});
 
 async function getClaimDms() {
     claimDmsFilter.value.where = { claimFk: entityId.value };
@@ -380,10 +386,7 @@ async function changeState(value) {
                         label-always
                         color="var()"
                         markers
-                        :marker-labels="[
-                            { value: 1, label: t('claim.company') },
-                            { value: 5, label: t('claim.person') },
-                        ]"
+                        :marker-labels="markerLabels"
                         :min="1"
                         :max="5"
                         readonly
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index eaeaaabbb..b77ac05cf 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -36,7 +36,7 @@ const states = ref([]);
                     lazy-rules
                     is-outlined
                 >
-                    <template #prepend> <QIcon name="badge" size="xs"></QIcon></template>
+                    <template #prepend> <QIcon name="badge" size="xs" /></template>
                 </VnInput>
                 <VnInput
                     :label="t('Client Name')"

From 32d2087bce84993833aa0bea28a3c4faa24bff6d Mon Sep 17 00:00:00 2001
From: jgallego <jgallego@verdnatura.es>
Date: Mon, 8 Jul 2024 12:56:34 +0200
Subject: [PATCH 23/70] feat: #7348 restore template

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

diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index 8056afe5a..8cca2ef23 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -108,23 +108,6 @@ const setRows = (data) => {
 
 <template>
     <FetchData :filter="filter" @on-fetch="setRows" auto-load url="greuges" />
-    <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#actions-append">
-            <div class="row q-gutter-x-sm">
-                <QBtn
-                    flat
-                    @click="stateStore.toggleRightDrawer()"
-                    round
-                    dense
-                    icon="menu"
-                >
-                    <QTooltip bottom anchor="bottom right">
-                        {{ t('globals.collapseMenu') }}
-                    </QTooltip>
-                </QBtn>
-            </div>
-        </Teleport>
-    </template>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="300" show-if-above>
         <QCard class="full-width q-pa-sm">
             <h6 class="flex justify-end q-my-lg q-pr-lg" v-if="totalAmount !== undefined">

From 41deb8217415e2097d1ac25b7b6150a65102731d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 13:23:42 +0200
Subject: [PATCH 24/70] feat(VnTable): add visibleColumns

---
 src/components/VnTable/VnTable.vue         |  41 +++--
 src/components/VnTable/VnVisibleColumn.vue | 181 +++++++++++++++++++++
 2 files changed, 205 insertions(+), 17 deletions(-)
 create mode 100644 src/components/VnTable/VnVisibleColumn.vue

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1610735a4..c26478360 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -13,6 +13,7 @@ import VnLv from 'components/ui/VnLv.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
+import TableVisibleColumns from 'src/components/VnTable/VnVisibleColumn.vue';
 
 const $props = defineProps({
     columns: {
@@ -67,6 +68,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({ card: false, table: false }),
     },
+    tableCode: {
+        type: String,
+        default: null,
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -115,6 +120,14 @@ watch(
     (val) => setUserParams(val)
 );
 
+const rowClickFunction = computed(() => {
+    if ($props.rowClick) return $props.rowClick;
+    if ($props.redirect) return ({ id }) => redirectFn(id);
+    return () => {};
+});
+
+const isTableMode = computed(() => mode.value == TABLE_MODE);
+
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
@@ -158,12 +171,6 @@ function splitColumns(columns) {
     }
 }
 
-const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
-    if ($props.redirect) return ({ id }) => redirectFn(id);
-    return () => {};
-});
-
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -236,7 +243,7 @@ defineExpose({
             :limit="20"
             ref="CrudModelRef"
             :search-url="searchUrl"
-            :disable-infinite-scroll="mode == TABLE_MODE"
+            :disable-infinite-scroll="isTableMode"
             @save-changes="reload"
             :has-sub-toolbar="$attrs['hasSubToolbar'] ?? isEditable"
         >
@@ -254,11 +261,11 @@ defineExpose({
                     :columns="splittedColumns.columns"
                     :rows="rows"
                     v-model:selected="selected"
-                    :grid="mode != TABLE_MODE"
+                    :grid="!isTableMode"
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="mode == TABLE_MODE && 'max-height: 90vh'"
+                    :style="isTableMode && 'max-height: 90vh'"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
@@ -272,13 +279,12 @@ defineExpose({
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <!-- <QBtn
-                        icon="visibility"
-                        title="asd"
-                        class="bg-vn-section-color q-mr-md"
-                        dense
-                        v-if="mode == 'table'"
-                    /> -->
+                        <TableVisibleColumns
+                            v-if="isTableMode"
+                            v-model="splittedColumns.columns"
+                            :table-code="tableCode ?? route.name"
+                            class="q-mr-md"
+                        />
                         <QBtnToggle
                             v-model="mode"
                             toggle-color="primary"
@@ -298,7 +304,7 @@ defineExpose({
                         <QTh
                             auto-width
                             style="min-width: 100px"
-                            v-if="$props.columnSearch"
+                            v-if="$props.columnSearch && col.visible"
                         >
                             <VnTableFilter
                                 :column="col"
@@ -330,6 +336,7 @@ defineExpose({
                             auto-width
                             class="no-margin q-px-xs"
                             :class="getColAlign(col)"
+                            v-if="col.visible"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
new file mode 100644
index 000000000..ab9c5d5c3
--- /dev/null
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -0,0 +1,181 @@
+<script setup>
+import { useI18n } from 'vue-i18n';
+import { ref, computed, onMounted } from 'vue';
+
+import { useState } from 'src/composables/useState';
+import axios from 'axios';
+import useNotify from 'src/composables/useNotify.js';
+
+const columns = defineModel({ type: Object, default: [] });
+const $props = defineProps({
+    tableCode: {
+        type: String,
+        default: '',
+    },
+});
+
+const { notify } = useNotify();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const popupProxyRef = ref();
+const initialUserConfigViewData = ref();
+const localColumns = ref([]);
+
+const areAllChecksMarked = computed(() => {
+    return columns.value.every((col) => col.visible);
+});
+
+function setUserConfigViewData(data, isLocal) {
+    if (!data) return;
+    // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
+    if (!isLocal) localColumns.value = [];
+    for (let column of columns.value) {
+        const { label, name } = column;
+        column.visible = data[name] ?? true;
+        if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
+    }
+}
+
+function toggleMarkAll(val) {
+    columns.value.forEach((col) => (col.visible = val));
+}
+
+async function getConfig(url, filter) {
+    const response = await axios.get(url, {
+        params: { filter: filter },
+    });
+    return response.data && response.data.length > 0 ? response.data[0] : null;
+}
+
+async function fetchViewConfigData() {
+    try {
+        const defaultFilter = {
+            where: { tableCode: $props.tableCode },
+        };
+
+        const userConfig = await getConfig('UserConfigViews', {
+            where: {
+                ...defaultFilter.where,
+                ...{ userFk: user.id },
+            },
+        });
+
+        if (userConfig) {
+            initialUserConfigViewData.value = userConfig;
+            setUserConfigViewData(userConfig.configuration);
+            return;
+        }
+
+        const defaultConfig = await getConfig('DefaultViewConfigs', defaultFilter);
+        if (defaultConfig) {
+            setUserConfigViewData(defaultConfig.columns);
+            return;
+        }
+    } catch (err) {
+        console.err('Error fetching config view data', err);
+    }
+}
+
+async function saveConfig() {
+    const configuration = {};
+    for (const { name, visible } of localColumns.value)
+        configuration[name] = visible ?? true;
+    setUserConfigViewData(configuration, true);
+    if (!$props.tableCode) return popupProxyRef.value.hide();
+
+    try {
+        const params = {};
+        // Si existe una view config del usuario hacemos un update si no la creamos
+        if (initialUserConfigViewData.value) {
+            params.updates = [
+                {
+                    data: {
+                        configuration,
+                    },
+                    where: {
+                        id: initialUserConfigViewData.value.id,
+                    },
+                },
+            ];
+        } else {
+            params.creates = [
+                {
+                    userFk: user.value.id,
+                    tableCode: $props.tableCode,
+                    tableConfig: $props.tableCode,
+                    configuration,
+                },
+            ];
+        }
+
+        const response = await axios.post('UserConfigViews/crud', params);
+        if (response.data && response.data[0]) {
+            initialUserConfigViewData.value = response.data[0];
+        }
+        notify('globals.dataSaved', 'positive');
+        popupProxyRef.value.hide();
+    } catch (err) {
+        console.error('Error saving user view config', err);
+        notify('errors.writeRequest', 'negative');
+    }
+}
+
+onMounted(async () => {
+    setUserConfigViewData({});
+    await fetchViewConfigData();
+});
+</script>
+<template>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md" dense>
+        <QPopupProxy ref="popupProxyRef">
+            <QCard class="column q-pa-md">
+                <QIcon name="info" size="sm" class="info-icon">
+                    <QTooltip>{{ t('Check the columns you want to see') }}</QTooltip>
+                </QIcon>
+                <span class="text-body1 q-mb-sm">{{ t('Visible columns') }}</span>
+                <QCheckbox
+                    :label="t('Tick all')"
+                    :model-value="areAllChecksMarked"
+                    @update:model-value="toggleMarkAll($event)"
+                    class="q-mb-sm"
+                />
+                <div v-if="columns.length > 0" class="checks-layout">
+                    <QCheckbox
+                        v-for="col in localColumns"
+                        :key="col.name"
+                        :label="col.label"
+                        v-model="col.visible"
+                    />
+                </div>
+                <QBtn
+                    class="full-width q-mt-md"
+                    color="primary"
+                    @click="saveConfig()"
+                    :label="t('globals.save')"
+                />
+            </QCard>
+        </QPopupProxy>
+        <QTooltip>{{ t('Visible columns') }}</QTooltip>
+    </QBtn>
+</template>
+
+<style lang="scss" scoped>
+.info-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+}
+
+.checks-layout {
+    display: grid;
+    grid-template-columns: repeat(3, 200px);
+}
+</style>
+
+<i18n>
+    es:
+        Check the columns you want to see: Marca las columnas que quieres ver
+        Visible columns: Columnas visibles
+        Tick all: Marcar todas
+</i18n>

From dd872dba3b4892f10f8729cec7121204be2018d8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 13:51:56 +0200
Subject: [PATCH 25/70] fix: areAllChecksMarked

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

diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index ab9c5d5c3..0f979acd3 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -23,7 +23,7 @@ const initialUserConfigViewData = ref();
 const localColumns = ref([]);
 
 const areAllChecksMarked = computed(() => {
-    return columns.value.every((col) => col.visible);
+    return localColumns.value.every((col) => col.visible);
 });
 
 function setUserConfigViewData(data, isLocal) {
@@ -38,7 +38,7 @@ function setUserConfigViewData(data, isLocal) {
 }
 
 function toggleMarkAll(val) {
-    columns.value.forEach((col) => (col.visible = val));
+    localColumns.value.forEach((col) => (col.visible = val));
 }
 
 async function getConfig(url, filter) {

From b23915ea2ddeaa52960c6e80c771aeda77ff0ab2 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 14:14:24 +0200
Subject: [PATCH 26/70] fix: vnTable filter class

---
 src/components/VnTable/VnFilter.vue | 4 ++--
 src/components/VnTable/VnTable.vue  | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b3386899f..f91478051 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -40,7 +40,7 @@ const enterEvent = {
 
 const defaultAttrs = {
     filled: !$props.showTitle,
-    class: 'q-px-sm q-pb-xs q-pt-none fit',
+    class: 'q-px-xs q-pb-xs q-pt-none fit',
     dense: true,
 };
 
@@ -101,7 +101,7 @@ const components = {
         component: markRaw(VnSelect),
         event: updateEvent,
         attrs: {
-            class: 'q-px-md q-pb-xs q-pt-none fit',
+            class: 'q-px-sm q-pb-xs q-pt-none fit',
             dense: true,
             filled: !$props.showTitle,
         },
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 1d5072646..9c6ea89ed 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -287,7 +287,6 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
-                            class="q-mr-md"
                         />
                         <QBtnToggle
                             v-model="mode"

From 092909512a9acb414ce293980ca094b4b0e2840c Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 8 Jul 2024 14:25:50 +0200
Subject: [PATCH 27/70] feat(ClaimSummary): add workerDescriptor in development

---
 src/pages/Claim/Card/ClaimSummary.vue | 24 +++++++++++++++++-------
 src/pages/Claim/ClaimFilter.vue       |  2 +-
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index bf645e1ea..88ca48081 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -1,21 +1,25 @@
 <script setup>
+import axios from 'axios';
 import { onMounted, ref, computed } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { toDate, toCurrency } from 'src/filters';
-import CardSummary from 'components/ui/CardSummary.vue';
-import FetchData from 'components/FetchData.vue';
+import dashIfEmpty from 'src/filters/dashIfEmpty';
 import { getUrl } from 'src/composables/getUrl';
 import { useSession } from 'src/composables/useSession';
+
 import VnLv from 'src/components/ui/VnLv.vue';
-import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
 import VnUserLink from 'src/components/ui/VnUserLink.vue';
-import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 import VnTitle from 'src/components/common/VnTitle.vue';
-import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
-import axios from 'axios';
-import dashIfEmpty from 'src/filters/dashIfEmpty';
+import FetchData from 'components/FetchData.vue';
+import CardSummary from 'components/ui/CardSummary.vue';
+
 import ClaimSummaryAction from 'src/pages/Claim/Card/ClaimSummaryAction.vue';
+import ClaimNotes from 'src/pages/Claim/Card/ClaimNotes.vue';
+
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 
 const route = useRoute();
 const router = useRouter();
@@ -374,6 +378,12 @@ async function changeState(value) {
                             </QTh>
                         </QTr>
                     </template>
+                    <template #body-cell-worker="props">
+                        <QTd :props="props" class="link">
+                            {{ props.value }}
+                            <WorkerDescriptorProxy :id="props.row.worker.id" />
+                        </QTd>
+                    </template>
                 </QTable>
             </QCard>
             <QCard class="vn-max">
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index b77ac05cf..9ff5847c2 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -128,7 +128,7 @@ const states = ref([]);
                 />
                 <QCheckbox
                     v-model="params.myTeam"
-                    :label="t('myTeam')"
+                    :label="t('params.myTeam')"
                     @update:model-value="searchFn()"
                     toggle-indeterminate
                 />

From 286fbc5abaa66c5699e13a0e4a8495278134ceb0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 8 Jul 2024 14:59:12 +0200
Subject: [PATCH 28/70] fix: Right menu double icon

---
 src/pages/Order/Card/OrderForm.vue |  4 +--
 src/pages/Order/OrderLines.vue     | 48 ++++++++++++++++--------------
 2 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
index 43a9b2e57..e4dfcd0e0 100644
--- a/src/pages/Order/Card/OrderForm.vue
+++ b/src/pages/Order/Card/OrderForm.vue
@@ -107,7 +107,7 @@ const onClientChange = async (clientId) => {
     }
 };
 
-async function onDataSaved(id) {
+async function onDataSaved({ id }) {
     await router.push({ path: `/order/${id}/catalog` });
 }
 </script>
@@ -117,7 +117,7 @@ async function onDataSaved(id) {
     <div class="q-pa-md">
         <FormModel
             :url="`Orders/${route.params.id}`"
-            @on-data-saved="(row) => onDataSaved(row.id)"
+            @on-data-saved="onDataSaved"
             :model="ORDER_MODEL"
             :mapper="orderMapper"
             :filter="orderFilter"
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index baeb23560..e66a3f7c4 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -12,7 +12,9 @@ import FetchData from 'src/components/FetchData.vue';
 import VnImg from 'src/components/ui/VnImg.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import FetchedTags from 'src/components/ui/FetchedTags.vue';
+import { useStateStore } from 'stores/useStateStore';
 
+const stateStore = useStateStore();
 const route = useRoute();
 const { t } = useI18n();
 const quasar = useQuasar();
@@ -215,33 +217,33 @@ const columns = computed(() => [
         @on-fetch="(data) => (orderSummary.vat = data)"
         auto-load
     />
-    <QPage :key="componentKey" class="column items-center q-pa-md">
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <QCard class="order-lines-summary q-pa-lg">
+            <p class="header text-right block">
+                {{ t('summary') }}
+            </p>
+            <VnLv
+                v-if="orderSummary.vat && orderSummary.total"
+                :label="t('subtotal') + ': '"
+                :value="toCurrency(orderSummary.total - orderSummary.vat)"
+            />
+            <VnLv
+                v-if="orderSummary.vat"
+                :label="t('VAT') + ': '"
+                :value="toCurrency(orderSummary?.vat)"
+            />
+            <VnLv
+                v-if="orderSummary.total"
+                :label="t('total') + ': '"
+                :value="toCurrency(orderSummary?.total)"
+            />
+        </QCard>
+    </QDrawer>
+    <QPage :key="componentKey" class="column items-center">
         <div class="order-list full-width">
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
-            <QDrawer side="right" :width="270" show-if-above>
-                <QCard class="order-lines-summary q-pa-lg">
-                    <p class="header text-right block">
-                        {{ t('summary') }}
-                    </p>
-                    <VnLv
-                        v-if="orderSummary.vat && orderSummary.total"
-                        :label="t('subtotal') + ': '"
-                        :value="toCurrency(orderSummary.total - orderSummary.vat)"
-                    />
-                    <VnLv
-                        v-if="orderSummary.vat"
-                        :label="t('VAT') + ': '"
-                        :value="toCurrency(orderSummary?.vat)"
-                    />
-                    <VnLv
-                        v-if="orderSummary.total"
-                        :label="t('total') + ': '"
-                        :value="toCurrency(orderSummary?.total)"
-                    />
-                </QCard>
-            </QDrawer>
             <VnTable
                 ref="tableLinesRef"
                 data-key="OrderLines"

From 20eb26127acef27074e328bd4c9dbeae47168867 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 8 Jul 2024 15:00:45 +0200
Subject: [PATCH 29/70] fix: Right menu double icon

---
 src/pages/Ticket/Card/TicketSale.vue | 56 +++++++++++++---------------
 1 file changed, 25 insertions(+), 31 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 32408bf67..37be07a79 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -515,38 +515,32 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QBtnGroup>
         </template>
     </VnSubToolbar>
-    <RightMenu>
-        <template #right-panel>
-            <div
-                class="q-pa-md q-mb-md q-ma-md color-vn-text"
-                style="border: 2px solid black"
+    <QDrawer side="right" :width="270" v-model="stateStore.rightDrawer">
+        <div
+            class="q-pa-md q-mb-md q-ma-md color-vn-text"
+            style="border: 2px solid black"
+        >
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"
+                    >{{ t('ticketSale.subtotal') }}:
+                </span>
+                <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
+            </QCardSection>
+            <QCardSection class="justify-center text-subtitle1" horizontal>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.tax') }}: </span>
+                <span>{{
+                    toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
+                }}</span>
+            </QCardSection>
+            <QCardSection
+                class="justify-center text-weight-bold text-subtitle1"
+                horizontal
             >
-                <QCardSection class="justify-center text-subtitle1" horizontal>
-                    <span class="q-mr-xs color-vn-label"
-                        >{{ t('ticketSale.subtotal') }}:
-                    </span>
-                    <span>{{ toCurrency(store.data?.totalWithoutVat) }}</span>
-                </QCardSection>
-                <QCardSection class="justify-center text-subtitle1" horizontal>
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.tax') }}:
-                    </span>
-                    <span>{{
-                        toCurrency(store.data?.totalWithVat - store.data?.totalWithoutVat)
-                    }}</span>
-                </QCardSection>
-                <QCardSection
-                    class="justify-center text-weight-bold text-subtitle1"
-                    horizontal
-                >
-                    <span class="q-mr-xs color-vn-label">
-                        {{ t('ticketSale.total') }}:
-                    </span>
-                    <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
-                </QCardSection>
-            </div>
-        </template>
-    </RightMenu>
+                <span class="q-mr-xs color-vn-label"> {{ t('ticketSale.total') }}: </span>
+                <span>{{ toCurrency(store.data?.totalWithVat) }}</span>
+            </QCardSection>
+        </div></QDrawer
+    >
     <QTable
         :rows="sales"
         :columns="columns"

From 6482dbad226bb0b159007204c80a838b67f744c7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 09:13:44 +0200
Subject: [PATCH 30/70] fix: TicketDmsImportForm

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

diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
index ff876affd..869e166ca 100644
--- a/src/pages/Ticket/Card/TicketDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -20,10 +20,6 @@ const route = useRoute();
 const dmsOptions = ref([]);
 const dmsId = ref(null);
 
-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
-};
-
 const importDms = async () => {
     try {
         if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
@@ -56,7 +52,6 @@ const importDms = async () => {
         :title="t('Select document id')"
         :form-initial-data="{}"
         :save-fn="importDms"
-        @on-data-saved="onDataSaved"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">

From 3f2b675d074c484caa4dff4b190306f36a5c7008 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 09:15:20 +0200
Subject: [PATCH 31/70] feat: change ticketDms leftMenuItem position

---
 src/router/modules/ticket.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 42a8fc44f..0a8fed551 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -202,15 +202,7 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },
-                {
-                    path: 'dms',
-                    name: 'TicketDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'cloud_upload',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
-                },
+
                 {
                     path: 'components',
                     name: 'TicketComponents',
@@ -220,6 +212,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
                 },
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
                 {
                     path: 'boxing',
                     name: 'TicketBoxing',

From a9e19309eefa37a48a762e7489059195c3fa187a Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 09:59:39 +0200
Subject: [PATCH 32/70] fix warning

---
 src/pages/Ticket/Card/TicketSaleTracking.vue | 6 +++---
 src/pages/Ticket/TicketList.vue              | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 858a35e61..367b73952 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -348,8 +348,8 @@ const qCheckBoxController = (sale, action) => {
             <QTd @click.stop>
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
-                    color="pink"
-                    class="pink"
+                    color="transparent"
+                    class="transparent"
                     :toggle-indeterminate="false"
                     @update:model-value="clickSaleGroupDetail(row)"
                 >
@@ -532,7 +532,7 @@ $estados: (
     info: var(--q-info),
     warning: var(--q-warning),
     cyan: #00bcd4,
-    pink: pink,
+    transparent: transparent,
     yellow: #ffeb3b,
 );
 
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ae635fb4e..6783065fd 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -11,6 +11,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import RightMenu from 'src/components/common/RightMenu.vue';
+import { toDate, toCurrency } from 'src/filters';
 
 const router = useRouter();
 const { t } = useI18n();

From 4eaab6f4ae8817b63ea6b111900c028db886917f Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 10:07:22 +0200
Subject: [PATCH 33/70] fix warning when quasar build

---
 src/pages/Ticket/Card/TicketSaleTracking.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketSaleTracking.vue b/src/pages/Ticket/Card/TicketSaleTracking.vue
index 367b73952..d519bc2c6 100644
--- a/src/pages/Ticket/Card/TicketSaleTracking.vue
+++ b/src/pages/Ticket/Card/TicketSaleTracking.vue
@@ -348,8 +348,8 @@ const qCheckBoxController = (sale, action) => {
             <QTd @click.stop>
                 <QCheckbox
                     :model-value="!!row.hasSaleGroupDetail"
-                    color="transparent"
-                    class="transparent"
+                    color="pink"
+                    class="pink"
                     :toggle-indeterminate="false"
                     @update:model-value="clickSaleGroupDetail(row)"
                 >
@@ -529,11 +529,11 @@ const qCheckBoxController = (sale, action) => {
 
 <style lang="scss">
 $estados: (
-    info: var(--q-info),
-    warning: var(--q-warning),
-    cyan: #00bcd4,
-    transparent: transparent,
-    yellow: #ffeb3b,
+    'info': var(--q-info),
+    'warning': var(--q-warning),
+    'cyan': #00bcd4,
+    'pink': pink,
+    'yellow': #ffeb3b,
 );
 
 @each $estado, $color in $estados {

From 38dd54b2f5f158f51654aa91880f9c4b5e7e8712 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 10:18:01 +0200
Subject: [PATCH 34/70] fix: i18n components

---
 src/pages/Ticket/Card/TicketComponents.vue | 42 +++++++++++-----------
 src/pages/Ticket/locale/en.yml             |  2 +-
 src/pages/Ticket/locale/es.yml             |  2 +-
 3 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketComponents.vue b/src/pages/Ticket/Card/TicketComponents.vue
index 19d25d259..47a1f0aa1 100644
--- a/src/pages/Ticket/Card/TicketComponents.vue
+++ b/src/pages/Ticket/Card/TicketComponents.vue
@@ -71,39 +71,39 @@ const salesFilter = computed(() => ({
 
 const columns = computed(() => [
     {
-        label: t('components.item'),
+        label: t('ticketComponents.item'),
         name: 'item',
         align: 'left',
     },
     {
-        label: t('components.description'),
+        label: t('ticketComponents.description'),
         name: 'description',
         align: 'left',
     },
     {
-        label: t('components.quantity'),
+        label: t('ticketComponents.quantity'),
         name: 'quantity',
         field: 'quantity',
         align: 'left',
         format: (val) => dashIfEmpty(val),
     },
     {
-        label: t('components.serie'),
+        label: t('ticketComponents.serie'),
         name: 'serie',
         align: 'left',
     },
     {
-        label: t('components.components'),
+        label: t('ticketComponents.components'),
         name: 'components',
         align: 'left',
     },
     {
-        label: t('components.import'),
+        label: t('ticketComponents.import'),
         name: 'import',
         align: 'left',
     },
     {
-        label: t('components.total'),
+        label: t('ticketComponents.total'),
         name: 'total',
         align: 'left',
     },
@@ -111,7 +111,7 @@ const columns = computed(() => [
 
 const getBase = computed(() => {
     let sum = 0;
-    for (let sale of components.value) {
+    for (let sale of ticketComponents.value) {
         for (let saleComponent of sale.components) {
             if (saleComponent.component.componentType.isBase) {
                 sum += sale.quantity * saleComponent.value;
@@ -123,7 +123,7 @@ const getBase = computed(() => {
 
 const getTotal = computed(() => {
     let total = 0;
-    for (let sale of components.value) {
+    for (let sale of ticketComponents.value) {
         for (let saleComponent of sale.components) {
             total += sale.quantity * saleComponent.value;
         }
@@ -184,18 +184,18 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.total') }}
+                        {{ t('ticketComponents.total') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
-                        >{{ t('components.baseToCommission') }}:
+                        >{{ t('ticketComponents.baseToCommission') }}:
                     </span>
                     <span>{{ toCurrency(getBase) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label"
-                        >{{ t('components.totalWithoutVat') }}:
+                        >{{ t('ticketComponents.totalWithoutVat') }}:
                     </span>
                     <span>{{ toCurrency(getTotal) }}</span>
                 </QCardSection>
@@ -208,7 +208,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.components') }}
+                        {{ t('ticketComponents.components') }}
                     </span>
                 </QCardSection>
                 <QCardSection
@@ -232,24 +232,24 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.zoneBreakdown') }}
+                        {{ t('ticketComponents.zoneBreakdown') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.price') }}:
+                        {{ t('ticketComponents.price') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zonePrice, 'EUR', 2) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.bonus') }}:
+                        {{ t('ticketComponents.bonus') }}:
                     </span>
                     <span>{{ toCurrency(ticketData?.zoneBonus, 'EUR', 2) }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.zone') }}:
+                        {{ t('ticketComponents.zone') }}:
                     </span>
                     <span class="link">
                         {{ dashIfEmpty(ticketData?.zone?.name) }}
@@ -258,13 +258,13 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                 </QCardSection>
                 <QCardSection v-if="ticketData?.zone?.isVolumetric" horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.volume') }}:
+                        {{ t('ticketComponents.volume') }}:
                     </span>
                     <span>{{ ticketVolume }}</span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.packages') }}:
+                        {{ t('ticketComponents.packages') }}:
                     </span>
                     <span>{{ dashIfEmpty(ticketData?.packages) }}</span>
                 </QCardSection>
@@ -277,12 +277,12 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             >
                 <QCardSection horizontal>
                     <span class="text-weight-bold text-subtitle1 text-center full-width">
-                        {{ t('components.theoricalCost') }}
+                        {{ t('ticketComponents.theoricalCost') }}
                     </span>
                 </QCardSection>
                 <QCardSection horizontal>
                     <span class="q-mr-xs color-vn-label">
-                        {{ t('components.totalPrice') }}:
+                        {{ t('ticketComponents.totalPrice') }}:
                     </span>
                     <span>{{ toCurrency(theoricalCost, 'EUR', 2) }}</span>
                 </QCardSection>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 861b06c9c..d5530926f 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -196,7 +196,7 @@ service:
     addService: Add service
     quantityInfo: To create services with negative amounts mark the service on the source ticket and press the pay button.
     createRefundSuccess: 'The following refund ticket have been created: { ticketId }'
-components:
+ticketComponents:
     item: Item
     description: Description
     quantity: Quantity
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 7308644c8..132c61928 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -164,7 +164,7 @@ ticketSale:
     shipped: F. Envío
     agency: Agencia
     address: Consignatario
-components:
+ticketComponents:
     item: Artículo
     description: Descripción
     quantity: Cantidad

From 66a5516116f1ea60b4f34d5248dd730a594d6a3d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 9 Jul 2024 10:34:15 +0200
Subject: [PATCH 35/70] warmFix: delete params.filter url query

---
 src/components/VnTable/VnTable.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index e3ae80bd4..c88a97c78 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -139,6 +139,7 @@ function setUserParams(watchedParams) {
     const where = JSON.parse(watchedParams?.filter)?.where;
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
+    delete params.value?.filter;
     params.value = { ...params.value, ...watchedParams };
 }
 

From 1978157a08981c52c741d6325f2c4ea7ae2b0c07 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 9 Jul 2024 11:43:32 +0200
Subject: [PATCH 36/70] fix: props

---
 src/components/VnTable/VnTable.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 9345aee93..747ecd03b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -308,7 +308,6 @@ defineExpose({
                             class="bg-vn-section-color q-ml-md"
                             dense
                             @click="stateStore.toggleRightDrawer()"
-                            v-if="$props.rightSearch"
                         />
                     </template>
                     <template #header-cell="{ col }">

From 24368d99b575decb717bc5541457f614af9248a8 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 9 Jul 2024 14:09:04 +0200
Subject: [PATCH 37/70] fix: refs #6896 fixed list & lines error

---
 src/pages/Order/Card/OrderDescriptor.vue |  2 +-
 src/pages/Order/OrderLines.vue           | 72 ++++++++++++------------
 2 files changed, 37 insertions(+), 37 deletions(-)

diff --git a/src/pages/Order/Card/OrderDescriptor.vue b/src/pages/Order/Card/OrderDescriptor.vue
index f70ba4520..4d84a32fc 100644
--- a/src/pages/Order/Card/OrderDescriptor.vue
+++ b/src/pages/Order/Card/OrderDescriptor.vue
@@ -60,7 +60,7 @@ const filter = {
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.client.name, entity.id);
+    data.value = useCardDescription(entity?.client?.name, entity?.id);
     state.set('OrderDescriptor', entity);
 };
 
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index e66a3f7c4..aebc2ed85 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -21,9 +21,6 @@ const quasar = useQuasar();
 const componentKey = ref(0);
 const tableLinesRef = ref();
 const order = ref();
-const refresh = () => {
-    componentKey.value += 1;
-};
 const orderSummary = ref({
     total: null,
     vat: null,
@@ -66,37 +63,6 @@ const lineFilter = ref({
     where: { orderFk: route.params.id },
 });
 
-function confirmRemove(item) {
-    quasar.dialog({
-        component: VnConfirm,
-        componentProps: {
-            title: t('confirmDeletion'),
-            message: t('confirmDeletionMessage'),
-            promise: async () => remove(item),
-        },
-    });
-}
-
-async function remove(item) {
-    await axios.post('OrderRows/removes', {
-        actualOrderId: route.params.id,
-        rows: [item.id],
-    });
-    quasar.notify({
-        message: t('globals.dataDeleted'),
-        type: 'positive',
-    });
-    refresh();
-}
-
-async function confirmOrder() {
-    await axios.post(`Orders/${route.params.id}/confirm`);
-    quasar.notify({
-        message: t('globals.confirm'),
-        type: 'positive',
-    });
-}
-
 const columns = computed(() => [
     {
         align: 'center',
@@ -121,6 +87,7 @@ const columns = computed(() => [
             condition: () => true,
         },
         isId: true,
+        format: (row) => row?.item?.id,
     },
     {
         align: 'left',
@@ -190,12 +157,45 @@ const columns = computed(() => [
             {
                 title: t('delete'),
                 icon: 'delete',
-                click: (row) => confirmRemove(row.item),
+                action: (row) => confirmRemove(row),
                 isPrimary: true,
             },
         ],
     },
 ]);
+
+function confirmRemove(item) {
+    quasar.dialog({
+        component: VnConfirm,
+        componentProps: {
+            title: t('confirmDeletion'),
+            message: t('confirmDeletionMessage'),
+            promise: async () => remove(item),
+        },
+    });
+}
+
+async function remove(item) {
+    console.log('item: ', item);
+    console.log('id: ', route.params.id);
+    await axios.post('OrderRows/removes', {
+        actualOrderId: route.params.id,
+        rows: [item.id],
+    });
+    quasar.notify({
+        message: t('globals.dataDeleted'),
+        type: 'positive',
+    });
+    tableLinesRef.value.reload();
+}
+
+async function confirmOrder() {
+    await axios.post(`Orders/${route.params.id}/confirm`);
+    quasar.notify({
+        message: t('globals.confirm'),
+        type: 'positive',
+    });
+}
 </script>
 
 <template>
@@ -272,7 +272,7 @@ const columns = computed(() => [
                 </template>
             </VnTable>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed">
+        <QPageSticky :offset="[20, 20]" v-if="!order?.isConfirmed" style="z-index: 2">
             <QBtn fab icon="check" color="primary" @click="confirmOrder()" />
             <QTooltip>
                 {{ t('confirm') }}

From 58a2a320272bcd14b5cf0389e8d22bdb81fcde78 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 9 Jul 2024 14:21:41 +0200
Subject: [PATCH 38/70] warmFix(workerDescriptor): ?.

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

diff --git a/src/pages/Worker/Card/WorkerDescriptor.vue b/src/pages/Worker/Card/WorkerDescriptor.vue
index 82a698878..951c8511e 100644
--- a/src/pages/Worker/Card/WorkerDescriptor.vue
+++ b/src/pages/Worker/Card/WorkerDescriptor.vue
@@ -71,7 +71,7 @@ watch(
 const data = ref(useCardDescription());
 const setData = (entity) => {
     if (!entity) return;
-    data.value = useCardDescription(entity.user.nickname, entity.id);
+    data.value = useCardDescription(entity.user?.nickname, entity.id);
 };
 
 const openChangePasswordForm = () => changePasswordFormDialog.value.show();

From 36fc988df2f0259e8d5da7c6e56841bc7ef6aec0 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 9 Jul 2024 14:56:27 +0200
Subject: [PATCH 39/70] fix(VnTable): visible if is nullish

---
 src/components/VnTable/VnTable.vue | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 747ecd03b..31486091b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -152,7 +152,7 @@ function splitColumns(columns) {
         columns: [],
         chips: [],
         create: [],
-        visible: [],
+        cardVisible: [],
     };
 
     for (const col of columns) {
@@ -160,7 +160,7 @@ function splitColumns(columns) {
         if (col.chip) splittedColumns.value.chips.push(col);
         if (col.isTitle) splittedColumns.value.title = col;
         if (col.create) splittedColumns.value.create.push(col);
-        if (col.cardVisible) splittedColumns.value.visible.push(col);
+        if (col.cardVisible) splittedColumns.value.cardVisible.push(col);
         if ($props.isEditable && col.disable == null) col.disable = false;
         if ($props.useModel) col.columnFilter = { ...col.columnFilter, inWhere: true };
         splittedColumns.value.columns.push(col);
@@ -311,7 +311,11 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh v-if="col.visible" auto-width style="min-width: 100px">
+                        <QTh
+                            v-if="col.visible ?? true"
+                            auto-width
+                            style="min-width: 100px"
+                        >
                             <div
                                 class="q-pt-sm q-px-sm ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
@@ -354,7 +358,7 @@ defineExpose({
                             auto-width
                             class="no-margin q-px-xs"
                             :class="getColAlign(col)"
-                            v-if="col.visible"
+                            v-if="col.visible ?? true"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
                                 <VnTableColumn
@@ -443,7 +447,7 @@ defineExpose({
                                         :class="$props.cardClass"
                                     >
                                         <div
-                                            v-for="col of splittedColumns.visible"
+                                            v-for="col of splittedColumns.cardVisible"
                                             :key="col.name"
                                             class="fields"
                                         >

From 4b720d9b674497c112dd64dd3e357b76eece5451 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 19:33:02 +0000
Subject: [PATCH 40/70] warmfix: ticketList add imports

---
 src/pages/Ticket/TicketList.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index ae635fb4e..bf78177da 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -3,6 +3,8 @@ import { onMounted, onUnmounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
+import { toDate, toCurrency } from 'src/filters/index';
+
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';

From 93076f459c65783bc3283b78b81fb414fc16b4b4 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 19:33:48 +0000
Subject: [PATCH 41/70] Actualizar src/pages/Ticket/TicketList.vue

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

diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index bf78177da..6090bdbef 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -4,7 +4,6 @@ import { useI18n } from 'vue-i18n';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { toDate, toCurrency } from 'src/filters/index';
-
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import TicketSummary from './Card/TicketSummary.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';

From 3b43505c3e7104d3b540573b439a102c8c26efe2 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 10 Jul 2024 12:07:01 +0200
Subject: [PATCH 42/70] feat: refs #6769 Requested changes

---
 src/pages/Item/Card/ItemDiary.vue | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
index b48512dd2..4c0959153 100644
--- a/src/pages/Item/Card/ItemDiary.vue
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -131,11 +131,9 @@ const originTypeMap = {
 const entityTypeMap = {
     client: {
         descriptor: CustomerDescriptorProxy,
-        icon: 'vn:client',
     },
     supplier: {
         descriptor: SupplierDescriptorProxy,
-        icon: 'vn:supplier',
     },
 };
 
@@ -267,11 +265,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
                             {{ row.entityId }}
                         </component>
                         <span class="link">
-                            <QIcon
-                                :name="entityTypeMap[row.entityType]?.icon"
-                                class="fill-icon q-mr-sm"
-                                size="xs"
-                            />
                             {{ dashIfEmpty(row.entityName) }}
                         </span>
                     </QBadge>

From 5a4be3de4a6891845be803b64c7429130bc95711 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 10 Jul 2024 13:09:35 +0200
Subject: [PATCH 43/70] feat: refs #6769 Requested changes

---
 src/pages/Item/locale/en.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Item/locale/en.yml b/src/pages/Item/locale/en.yml
index cf8127108..0e855523c 100644
--- a/src/pages/Item/locale/en.yml
+++ b/src/pages/Item/locale/en.yml
@@ -14,7 +14,7 @@ shelvings:
     removeConfirmSubtitle: Are you sure you want to continue?
 itemDiary:
     date: Date
-    origin: Otigin
+    origin: Origin
     state: State
     reference: Reference
     entity: Entity

From b1e6e725cf1cb43922cb563e5255dff5185a9571 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Thu, 11 Jul 2024 08:50:10 +0200
Subject: [PATCH 44/70] feat: refs #7704 Deleted minQuantity label

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

diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
index 103b3af59..7af3e0fa0 100644
--- a/src/pages/Item/Card/ItemSummary.vue
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -135,10 +135,6 @@ const isAdministrative = computed(() => {
                     :label="t('item.summary.nonRecycledPlastic')"
                     :value="item.nonRecycledPlastic"
                 />
-                <VnLv
-                    :label="t('item.summary.minSalesQuantity')"
-                    :value="item.minQuantity"
-                />
             </QCard>
             <QCard class="vn-one">
                 <component

From fd6b395f347f8c73b9bc9c39f35280132d45abcc Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jul 2024 10:22:02 +0200
Subject: [PATCH 45/70] feat(VnTable): order column

---
 src/components/VnTable/VnFilter.vue           |  7 +-
 src/components/VnTable/VnOrder.vue            | 93 +++++++++++++++++++
 src/components/VnTable/VnTable.vue            | 87 ++++++++++++-----
 src/components/VnTable/VnVisibleColumn.vue    |  2 +-
 src/composables/useArrayData.js               | 41 +++++++-
 .../composables/useArrayData.spec.js          |  2 +-
 6 files changed, 202 insertions(+), 30 deletions(-)
 create mode 100644 src/components/VnTable/VnOrder.vue

diff --git a/src/components/VnTable/VnFilter.vue b/src/components/VnTable/VnFilter.vue
index b0b7c4756..15e1cc947 100644
--- a/src/components/VnTable/VnFilter.vue
+++ b/src/components/VnTable/VnFilter.vue
@@ -138,7 +138,12 @@ const showFilter = computed(
 );
 </script>
 <template>
-    <div v-if="showFilter" class="full-width" :class="alignRow()">
+    <div
+        v-if="showFilter"
+        class="full-width"
+        :class="alignRow()"
+        style="max-height: 45px; overflow: hidden"
+    >
         <VnTableColumn
             :column="$props.column"
             default="input"
diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
new file mode 100644
index 000000000..ac77c8ac6
--- /dev/null
+++ b/src/components/VnTable/VnOrder.vue
@@ -0,0 +1,93 @@
+<script setup>
+import { ref } from 'vue';
+import { useArrayData } from 'composables/useArrayData';
+const model = defineModel({ type: Object, required: true });
+const $props = defineProps({
+    name: {
+        type: String,
+        required: true,
+    },
+    label: {
+        type: String,
+        default: undefined,
+    },
+    dataKey: {
+        type: String,
+        required: true,
+    },
+    searchUrl: {
+        type: String,
+        default: 'params',
+    },
+    vertical: {
+        type: Boolean,
+        default: false,
+    },
+});
+const hover = ref();
+const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
+
+async function orderBy(name, direction) {
+    switch (direction) {
+        case 'DESC':
+            direction = undefined;
+            break;
+        case undefined:
+            direction = 'ASC';
+            break;
+        case 'ASC':
+            direction = 'DESC';
+            break;
+    }
+    if (!direction) return await arrayData.deleteOrder(name);
+    await arrayData.addOrder($props.name, direction);
+}
+
+defineExpose({ orderBy });
+</script>
+<template>
+    <div
+        @mouseenter="hover = true"
+        @mouseleave="hover = false"
+        @click="orderBy(name, model?.direction)"
+        class="row items-center no-wrap cursor-pointer"
+    >
+        <span>{{ label }}</span>
+        <QChip
+            v-if="name != 'tableStatus'"
+            :label="!vertical && model?.index"
+            :icon="
+                (model?.index || hover) && !vertical
+                    ? model?.direction == 'DESC'
+                        ? 'arrow_downward'
+                        : 'arrow_upward'
+                    : undefined
+            "
+            :size="vertical ? '' : 'sm'"
+            :class="[
+                model?.index ? 'color-vn-text' : 'bg-transparent',
+                vertical ? 'q-px-none' : '',
+            ]"
+            class="no-box-shadow q-mr-lg"
+            :clickable="true"
+        >
+            <div
+                class="column flex-center"
+                v-if="vertical"
+                :style="!model?.index && 'color: #5d5d5d'"
+            >
+                {{ model?.index }}
+                <QIcon
+                    :name="
+                        model?.index
+                            ? model?.direction == 'DESC'
+                                ? 'arrow_downward'
+                                : 'arrow_upward'
+                            : 'swap_vert'
+                    "
+                    size="xs"
+                />
+            </div>
+        </QChip>
+    </div>
+</template>
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 31486091b..853bb6d9b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -13,7 +13,8 @@ import VnLv from 'components/ui/VnLv.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
-import TableVisibleColumns from 'src/components/VnTable/VnVisibleColumn.vue';
+import VnVisibleColumn from 'src/components/VnTable/VnVisibleColumn.vue';
+import VnTableOrder from 'src/components/VnTable/VnOrder.vue';
 
 const $props = defineProps({
     columns: {
@@ -93,6 +94,7 @@ const mode = ref(DEFAULT_MODE);
 const selected = ref([]);
 const routeQuery = JSON.parse(route?.query[$props.searchUrl] ?? '{}');
 const params = ref({ ...routeQuery, ...routeQuery.filter?.where });
+const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
@@ -140,11 +142,15 @@ function setUserParams(watchedParams) {
     if (!watchedParams) return;
 
     if (typeof watchedParams == 'string') watchedParams = JSON.parse(watchedParams);
-    const where = JSON.parse(watchedParams?.filter)?.where;
+    const filter = JSON.parse(watchedParams?.filter);
+    const where = filter?.where;
+    const order = filter?.order;
+
     watchedParams = { ...watchedParams, ...where };
     delete watchedParams.filter;
     delete params.value?.filter;
     params.value = { ...params.value, ...watchedParams };
+    orders.value = parseOrder(order);
 }
 
 function splitColumns(columns) {
@@ -204,6 +210,17 @@ function getColAlign(col) {
     return 'text-' + (col.align ?? 'left');
 }
 
+function parseOrder(urlOrders) {
+    const orderObject = {};
+    if (!urlOrders) return orderObject;
+    if (typeof urlOrders == 'string') urlOrders = [urlOrders];
+    for (const [index, orders] of urlOrders.entries()) {
+        const [name, direction] = orders.split(' ');
+        orderObject[name] = { direction, index: index + 1 };
+    }
+    return orderObject;
+}
+
 const emit = defineEmits(['onFetch', 'update:selected', 'saveChanges']);
 defineExpose({
     reload,
@@ -229,14 +246,25 @@ defineExpose({
                 :redirect="!!redirect"
             >
                 <template #body>
-                    <VnTableFilter
-                        :column="col"
-                        :data-key="$attrs['data-key']"
+                    <div
+                        class="row no-wrap flex-center"
                         v-for="col of splittedColumns.columns"
                         :key="col.id"
-                        v-model="params[columnName(col)]"
-                        :search-url="searchUrl"
-                    />
+                    >
+                        <VnTableFilter
+                            :column="col"
+                            :data-key="$attrs['data-key']"
+                            v-model="params[columnName(col)]"
+                            :search-url="searchUrl"
+                        />
+                        <VnTableOrder
+                            v-model="orders[col.name]"
+                            :name="col.name"
+                            :data-key="$attrs['data-key']"
+                            :search-url="searchUrl"
+                            :vertical="true"
+                        />
+                    </div>
                 </template>
                 <slot
                     name="moreFilterPanel"
@@ -289,7 +317,7 @@ defineExpose({
                         <slot name="top-left"></slot>
                     </template>
                     <template #top-right>
-                        <TableVisibleColumns
+                        <VnVisibleColumn
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
@@ -317,24 +345,31 @@ defineExpose({
                             style="min-width: 100px"
                         >
                             <div
-                                class="q-pt-sm q-px-sm ellipsis"
+                                class="column self-start q-ml-xs ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
-                                :style="
-                                    $props.columnSearch && col.columnFilter == false
-                                        ? { 'min-height': 72 + 'px' }
-                                        : ''
-                                "
+                                style="height: 75px"
                             >
-                                {{ col?.label }}
+                                <div
+                                    class="row items-center no-wrap"
+                                    style="height: 30px"
+                                >
+                                    <VnTableOrder
+                                        v-model="orders[col.name]"
+                                        :name="col.name"
+                                        :label="col?.label"
+                                        :data-key="$attrs['data-key']"
+                                        :search-url="searchUrl"
+                                    />
+                                </div>
+                                <VnTableFilter
+                                    v-if="$props.columnSearch"
+                                    :column="col"
+                                    :show-title="true"
+                                    :data-key="$attrs['data-key']"
+                                    v-model="params[columnName(col)]"
+                                    :search-url="searchUrl"
+                                />
                             </div>
-                            <VnTableFilter
-                                v-if="$props.columnSearch"
-                                :column="col"
-                                :show-title="true"
-                                :data-key="$attrs['data-key']"
-                                v-model="params[columnName(col)]"
-                                :search-url="searchUrl"
-                            />
                         </QTh>
                     </template>
                     <template #header-cell-tableActions>
@@ -561,6 +596,10 @@ es:
     color: var(--vn-text-color);
 }
 
+.color-vn-text {
+    color: var(--vn-text-color);
+}
+
 .q-table--dark .q-table__bottom,
 .q-table--dark thead,
 .q-table--dark tr,
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 0f979acd3..75cde2b99 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -127,7 +127,7 @@ onMounted(async () => {
 });
 </script>
 <template>
-    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md" dense>
+    <QBtn icon="vn:visible_columns" class="bg-vn-section-color q-mr-md q-px-sm" dense>
         <QPopupProxy ref="popupProxyRef">
             <QCard class="column q-pa-md">
                 <QIcon name="info" size="sm" class="info-icon">
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 0fcbbbb48..1185db05a 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -24,10 +24,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         const searchUrl = store.searchUrl;
         if (query[searchUrl]) {
             const params = JSON.parse(query[searchUrl]);
-            const filter = params?.filter;
+            const filter = params?.filter && JSON.parse(params?.filter ?? '{}');
             delete params.filter;
             store.userParams = { ...params, ...store.userParams };
-            store.userFilter = { ...JSON.parse(filter ?? '{}'), ...store.userFilter };
+            store.userFilter = { ...filter, ...store.userFilter };
+            if (filter.order) store.order = filter.order;
         }
     });
 
@@ -69,7 +70,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         canceller = new AbortController();
 
         const filter = {
-            order: store.order,
             limit: store.limit,
         };
 
@@ -94,6 +94,8 @@ 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;
+        else delete params.filter.order;
 
         params.filter = JSON.stringify(params.filter);
         store.currentFilter = params;
@@ -171,6 +173,37 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         await addFilter({ filter: { where } });
     }
 
+    async function addOrder(field, direction = 'ASC') {
+        const newOrder = field + ' ' + direction;
+        let order = store.order ?? [];
+        if (typeof order == 'string') order = [order];
+
+        let index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) {
+            order[index] = newOrder;
+        } else {
+            index = order.length;
+            order.push(newOrder);
+        }
+
+        store.order = order;
+        fetch({ append: false, updateRouter: true });
+        index++;
+
+        return { index, order };
+    }
+
+    async function deleteOrder(field) {
+        let order = store.order ?? [];
+        if (typeof order == 'string') order = [order];
+
+        const index = order.findIndex((o) => o.split(' ')[0] === field);
+        if (index > -1) order.splice(index, 1);
+
+        store.order = order;
+        fetch({ append: false, updateRouter: true });
+    }
+
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
             if (params[param] === '' || params[param] === null) {
@@ -240,6 +273,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         applyFilter,
         addFilter,
         addFilterWhere,
+        addOrder,
+        deleteOrder,
         refresh,
         destroy,
         loadMore,
diff --git a/test/vitest/__tests__/composables/useArrayData.spec.js b/test/vitest/__tests__/composables/useArrayData.spec.js
index 5e4d12560..21323395b 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 = '{"order":"","limit":10,"skip":0}';
+    const filter = '{"limit":10,"skip":0}';
     const params = { supplierFk: 2 };
     beforeEach(() => {
         vi.spyOn(useRouter(), 'replace');

From b3570878bff3cc9d73565ff63350950c3200d153 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jul 2024 10:30:54 +0200
Subject: [PATCH 46/70] fix(VnTable): moreFilterPanel slot

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

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 31486091b..8cad7e02b 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -237,12 +237,12 @@ defineExpose({
                         v-model="params[columnName(col)]"
                         :search-url="searchUrl"
                     />
+                    <slot
+                        name="moreFilterPanel"
+                        :params="params"
+                        :columns="splittedColumns.columns"
+                    />
                 </template>
-                <slot
-                    name="moreFilterPanel"
-                    :params="params"
-                    :columns="splittedColumns.columns"
-                />
             </VnFilterPanel>
         </QScrollArea>
     </QDrawer>

From 5232df259548f8c9a69811f079c91d91326f1d72 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jul 2024 15:03:39 +0200
Subject: [PATCH 47/70] feat: claimList better support vnTable, claimSummary
 redesign. BREAKING CHANGE: VnTable default-mode table

---
 src/components/VnTable/VnOrder.vue            |  5 ++-
 src/components/VnTable/VnTable.vue            | 12 ++++--
 src/components/VnTable/VnVisibleColumn.vue    |  8 ++++
 src/composables/useArrayData.js               | 10 ++---
 src/pages/Claim/Card/ClaimSummary.vue         | 23 +++++++----
 src/pages/Claim/Card/ClaimSummaryAction.vue   |  1 -
 src/pages/Claim/ClaimFilter.vue               |  2 +
 src/pages/Claim/ClaimList.vue                 | 41 ++++++++++++++++++-
 src/pages/Customer/CustomerList.vue           |  1 -
 src/pages/Entry/EntryLatestBuys.vue           |  1 -
 src/pages/Entry/EntryList.vue                 |  1 -
 src/pages/InvoiceOut/InvoiceOutList.vue       |  1 -
 .../InvoiceOut/InvoiceOutNegativeBases.vue    |  1 -
 src/pages/Order/OrderLines.vue                |  1 -
 src/pages/Order/OrderList.vue                 |  1 -
 src/pages/Route/Agency/AgencyList.vue         |  3 +-
 src/pages/Route/Cmr/CmrList.vue               |  1 +
 src/pages/Route/RouteList.vue                 |  1 -
 src/pages/Supplier/SupplierList.vue           |  1 -
 src/pages/Travel/TravelList.vue               |  1 -
 src/pages/Worker/Card/WorkerBalance.vue       |  1 -
 src/pages/Worker/Card/WorkerFormation.vue     |  1 -
 22 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index ac77c8ac6..63e5eecb4 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -5,7 +5,7 @@ const model = defineModel({ type: Object, required: true });
 const $props = defineProps({
     name: {
         type: String,
-        required: true,
+        default: '',
     },
     label: {
         type: String,
@@ -28,6 +28,7 @@ const hover = ref();
 const arrayData = useArrayData($props.dataKey, { searchUrl: $props.searchUrl });
 
 async function orderBy(name, direction) {
+    if (!name) return;
     switch (direction) {
         case 'DESC':
             direction = undefined;
@@ -54,7 +55,7 @@ defineExpose({ orderBy });
     >
         <span>{{ label }}</span>
         <QChip
-            v-if="name != 'tableStatus'"
+            v-if="name"
             :label="!vertical && model?.index"
             :icon="
                 (model?.index || hover) && !vertical
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 554117a1a..d48151228 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -23,7 +23,7 @@ const $props = defineProps({
     },
     defaultMode: {
         type: String,
-        default: 'card', // 'table', 'card'
+        default: 'table', // 'table', 'card'
     },
     columnSearch: {
         type: Boolean,
@@ -137,6 +137,10 @@ const rowClickFunction = computed(() => {
 });
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
+const columnsVisibilitySkiped = computed(() => [
+    ...splittedColumns.value.columns.filter((c) => c.visible == false).map((c) => c.name),
+    ...['tableActions'],
+]);
 
 function setUserParams(watchedParams) {
     if (!watchedParams) return;
@@ -182,6 +186,7 @@ function splitColumns(columns) {
                 label: t('status'),
                 name: 'tableStatus',
                 columnFilter: false,
+                orderBy: false,
             });
     }
 }
@@ -259,7 +264,7 @@ defineExpose({
                         />
                         <VnTableOrder
                             v-model="orders[col.name]"
-                            :name="col.name"
+                            :name="col.orderBy ?? col.name"
                             :data-key="$attrs['data-key']"
                             :search-url="searchUrl"
                             :vertical="true"
@@ -321,6 +326,7 @@ defineExpose({
                             v-if="isTableMode"
                             v-model="splittedColumns.columns"
                             :table-code="tableCode ?? route.name"
+                            :skip="columnsVisibilitySkiped"
                         />
                         <QBtnToggle
                             v-model="mode"
@@ -355,7 +361,7 @@ defineExpose({
                                 >
                                     <VnTableOrder
                                         v-model="orders[col.name]"
-                                        :name="col.name"
+                                        :name="col.orderBy ?? col.name"
                                         :label="col?.label"
                                         :data-key="$attrs['data-key']"
                                         :search-url="searchUrl"
diff --git a/src/components/VnTable/VnVisibleColumn.vue b/src/components/VnTable/VnVisibleColumn.vue
index 75cde2b99..e3bb52637 100644
--- a/src/components/VnTable/VnVisibleColumn.vue
+++ b/src/components/VnTable/VnVisibleColumn.vue
@@ -12,6 +12,10 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    skip: {
+        type: Array,
+        default: () => [],
+    },
 });
 
 const { notify } = useNotify();
@@ -30,8 +34,12 @@ function setUserConfigViewData(data, isLocal) {
     if (!data) return;
     // Importante: El name de las columnas de la tabla debe conincidir con el name de las variables que devuelve la view config
     if (!isLocal) localColumns.value = [];
+    // Array to Object
+    const skippeds = $props.skip.reduce((a, v) => ({ ...a, [v]: v }), {});
+
     for (let column of columns.value) {
         const { label, name } = column;
+        if (skippeds[name]) continue;
         column.visible = data[name] ?? true;
         if (!isLocal) localColumns.value.push({ name, label, visible: column.visible });
     }
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 1185db05a..3563e0dbd 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -149,7 +149,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.filter = {};
         if (params) store.userParams = { ...params };
 
-        const response = await fetch({ append: false });
+        const response = await fetch({});
         return response;
     }
 
@@ -162,7 +162,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         store.userParams = userParams;
         arrayDataStore.reset(['skip', 'filter.skip', 'page']);
 
-        await fetch({ append: false });
+        await fetch({});
         return { filter, params };
     }
 
@@ -187,7 +187,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         }
 
         store.order = order;
-        fetch({ append: false, updateRouter: true });
+        fetch({});
         index++;
 
         return { index, order };
@@ -201,7 +201,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         if (index > -1) order.splice(index, 1);
 
         store.order = order;
-        fetch({ append: false, updateRouter: true });
+        fetch({});
     }
 
     function sanitizerParams(params, exprBuilder) {
@@ -231,7 +231,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function refresh() {
-        if (Object.values(store.userParams).length) await fetch({ append: false });
+        if (Object.values(store.userParams).length) await fetch({});
     }
 
     function updateStateParams() {
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 88ca48081..a34830631 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -211,7 +211,7 @@ async function changeState(value) {
             >
                 <QList>
                     <QVirtualScroll
-                        style="max-height: 300px"
+                        class="max-container-height"
                         :items="ClaimStates"
                         separator
                         v-slot="{ item, index }"
@@ -279,13 +279,13 @@ async function changeState(value) {
                 <ClaimNotes
                     :id="entityId"
                     :add-note="false"
-                    style="max-height: 300px"
+                    class="max-container-height"
                     order="created ASC"
                 />
             </QCard>
-            <QCard class="vn-two" v-if="claimDms.length > 0">
+            <QCard class="vn-two" v-if="claimDms?.length">
                 <VnTitle :url="`#/claim/${entityId}/photos`" :text="t('claim.photos')" />
-                <div class="container">
+                <div class="container max-container-height" style="overflow: auto">
                     <div
                         class="multimedia-container"
                         v-for="(media, index) of claimDms"
@@ -302,7 +302,10 @@ async function changeState(value) {
                             >
                                 <QTooltip>Video</QTooltip>
                             </QIcon>
-                            <QCard class="multimedia relative-position">
+                            <QCard
+                                class="multimedia relative-position"
+                                style="max-height: 128px"
+                            >
                                 <QImg
                                     :src="media.url"
                                     class="rounded-borders cursor-pointer fit"
@@ -322,7 +325,7 @@ async function changeState(value) {
                     </div>
                 </div>
             </QCard>
-            <QCard class="vn-two" v-if="salesClaimed.length > 0">
+            <QCard class="vn-max" v-if="salesClaimed.length > 0">
                 <VnTitle :url="`#/claim/${entityId}/lines`" :text="t('claim.details')" />
                 <QTable
                     :columns="detailsColumns"
@@ -361,7 +364,7 @@ async function changeState(value) {
                     </template>
                 </QTable>
             </QCard>
-            <QCard class="vn-two" v-if="developments.length > 0">
+            <QCard class="vn-max" v-if="developments.length > 0">
                 <VnTitle :url="claimUrl + 'development'" :text="t('claim.development')" />
                 <QTable
                     :columns="developmentColumns"
@@ -458,7 +461,7 @@ async function changeState(value) {
     gap: 15px;
 }
 .multimedia-container {
-    flex: 1 0 21%;
+    flex: 0 0 128px;
 }
 .multimedia {
     transition: all 0.5s;
@@ -491,4 +494,8 @@ async function changeState(value) {
 .change-state {
     width: 10%;
 }
+
+.max-container-height {
+    max-height: 300px;
+}
 </style>
diff --git a/src/pages/Claim/Card/ClaimSummaryAction.vue b/src/pages/Claim/Card/ClaimSummaryAction.vue
index b08504768..d875126cb 100644
--- a/src/pages/Claim/Card/ClaimSummaryAction.vue
+++ b/src/pages/Claim/Card/ClaimSummaryAction.vue
@@ -71,7 +71,6 @@ const columns = [
     <VnTable
         data-key="ClaimEndsTable"
         url="ClaimEnds/filter"
-        default-mode="table"
         :right-search="false"
         :column-search="false"
         :disable-option="{ card: true, table: true }"
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index 9ff5847c2..8878040f6 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -17,6 +17,8 @@ const props = defineProps({
 });
 
 const states = ref([]);
+
+defineExpose({ states });
 </script>
 
 <template>
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index e98964fc5..2a445f14a 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed } from 'vue';
+import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { toDate } from 'filters/index';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -14,6 +14,7 @@ import VnTable from 'src/components/VnTable/VnTable.vue';
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
+const claimFilterRef = ref();
 const columns = computed(() => [
     {
         align: 'left',
@@ -29,18 +30,38 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.name'),
         name: 'clientName',
         isTitle: true,
+        visible: false,
     },
     {
         align: 'left',
         label: t('claim.customer'),
         name: 'clientFk',
         cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Clients',
+                fields: ['id', 'name'],
+            },
+        },
     },
     {
         align: 'left',
         label: t('claim.attendedBy'),
         name: 'attendedBy',
         cardVisible: true,
+        columnFilter: {
+            component: 'select',
+            attrs: {
+                url: 'Workers/activeWithInheritedRole',
+                fields: ['id', 'name'],
+                where: { role: 'salesPerson' },
+                useLike: false,
+                optionValue: 'id',
+                optionLabel: 'name',
+                optionFilter: 'firstName',
+            },
+        },
     },
     {
         align: 'left',
@@ -48,6 +69,9 @@ const columns = computed(() => [
         name: 'created',
         format: ({ created }) => toDate(created),
         cardVisible: true,
+        columnFilter: {
+            component: 'date',
+        },
     },
     {
         align: 'left',
@@ -57,6 +81,14 @@ const columns = computed(() => [
             condition: () => true,
             color: ({ stateCode }) => STATE_COLOR[stateCode] ?? 'bg-grey',
         },
+        columnFilter: {
+            name: 'claimStateFk',
+            component: 'select',
+            attrs: {
+                options: claimFilterRef.value?.states,
+                optionLabel: 'description',
+            },
+        },
     },
     {
         align: 'right',
@@ -86,7 +118,7 @@ const STATE_COLOR = {
     />
     <RightMenu>
         <template #right-panel>
-            <ClaimFilter data-key="ClaimList" />
+            <ClaimFilter data-key="ClaimList" ref="claimFilterRef" />
         </template>
     </RightMenu>
     <VnTable
@@ -116,4 +148,9 @@ const STATE_COLOR = {
 es:
     Search claim: Buscar reclamación
     You can search by claim id or customer name: Puedes buscar por id de la reclamación o nombre del cliente
+    params:
+        stateCode: Estado
+en:
+    params:
+        stateCode: State
 </i18n>
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 394c472c2..78904b473 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -405,7 +405,6 @@ function handleLocation(data, location) {
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         redirect="customer"
         auto-load
     >
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 176820668..3f199314d 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -191,7 +191,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
         order="id DESC"
         :columns="columns"
         redirect="entry"
-        default-mode="table"
         auto-load
         :right-search="false"
     />
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 1d00b5af5..4272ce10e 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -199,7 +199,6 @@ onMounted(async () => {
         order="id DESC"
         :columns="columns"
         redirect="entry"
-        default-mode="table"
         auto-load
         :right-search="false"
     />
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 0f7bb5032..5a611d388 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -207,7 +207,6 @@ watchEffect(selectedRows);
         v-model:selected="selectedRows"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         redirect="invoice-out"
         auto-load
         :table="{
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 0b9dd7ad7..dfc051563 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -164,7 +164,6 @@ const downloadCSV = async () => {
         "
         :limit="0"
         :columns="columns"
-        default-mode="table"
         auto-load
         :is-editable="false"
         :use-model="true"
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index aebc2ed85..21b4efb9d 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -249,7 +249,6 @@ async function confirmOrder() {
                 data-key="OrderLines"
                 url="OrderRows"
                 :columns="columns"
-                default-mode="table"
                 :right-search="false"
                 :use-model="true"
                 auto-load
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 0598fc6b5..68c4e57a7 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -154,7 +154,6 @@ async function fetchClientAddress(id, data) {
             },
         }"
         :columns="columns"
-        default-mode="table"
         redirect="order"
         auto-load
     >
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index eb301c9ba..32e538172 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -78,10 +78,11 @@ const columns = computed(() => [
         :columns="columns"
         :right-search="false"
         :use-model="true"
+        default-mode="card"
     />
 </template>
 <i18n>
-    es: 
+    es:
         isOwn: Tiene propietario
         isAnyVolumeAllowed: Permite cualquier volumen
         Search agency: Buscar agencia
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 74a070cbf..dd9e2a75a 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -117,6 +117,7 @@ function downloadPdfs() {
         :columns="columns"
         :right-search="true"
         :use-model="true"
+        default-mode="card"
     />
 </template>
 <style lang="scss" scoped>
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index e116fd823..61fd79384 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -237,7 +237,6 @@ const openTicketsDialog = (id) => {
         url="Routes/filter"
         :columns="columns"
         :right-search="true"
-        default-mode="table"
         :is-editable="true"
         :create="{
             urlCreate: 'Routes',
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ce7d234c8..763fab812 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -99,7 +99,6 @@ const columns = computed(() => [
         }"
         order="id ASC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :use-model="true"
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 200ef817b..dbb8949a7 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -198,7 +198,6 @@ const columns = computed(() => [
         }"
         order="landed DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         redirect="travel"
         :is-editable="false"
diff --git a/src/pages/Worker/Card/WorkerBalance.vue b/src/pages/Worker/Card/WorkerBalance.vue
index ad18d61e0..037a65eaf 100644
--- a/src/pages/Worker/Card/WorkerBalance.vue
+++ b/src/pages/Worker/Card/WorkerBalance.vue
@@ -77,7 +77,6 @@ const columns = computed(() => [
         }"
         order="paymentDate DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :is-editable="true"
diff --git a/src/pages/Worker/Card/WorkerFormation.vue b/src/pages/Worker/Card/WorkerFormation.vue
index 0ac97d9ef..829326898 100644
--- a/src/pages/Worker/Card/WorkerFormation.vue
+++ b/src/pages/Worker/Card/WorkerFormation.vue
@@ -116,7 +116,6 @@ const columns = computed(() => [
         }"
         order="id DESC"
         :columns="columns"
-        default-mode="table"
         auto-load
         :right-search="false"
         :is-editable="true"

From fdb8f92a10e7f2e9a6b8f007fafbbe380b6cf2b8 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 11 Jul 2024 15:05:21 +0200
Subject: [PATCH 48/70] typo

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

diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 63e5eecb4..375def792 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -41,7 +41,7 @@ async function orderBy(name, direction) {
             break;
     }
     if (!direction) return await arrayData.deleteOrder(name);
-    await arrayData.addOrder($props.name, direction);
+    await arrayData.addOrder(name, direction);
 }
 
 defineExpose({ orderBy });

From 73049f7282bd76737360be1e772c65ce62bce7d7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 11 Jul 2024 19:56:37 +0200
Subject: [PATCH 49/70] add new filter by days

---
 src/pages/Entry/MyEntries.vue | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 58a69f70c..5317645b6 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -7,6 +7,7 @@ import { toDate } from 'src/filters/index';
 import { useQuasar } from 'quasar';
 import EntryBuysTableDialog from './EntryBuysTableDialog.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -34,6 +35,10 @@ const columns = computed(() => [
         isTitle: false,
         create: true,
         cardVisible: true,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
         format: ({ shipped }) => toDate(shipped),
     },
     {
@@ -43,6 +48,10 @@ const columns = computed(() => [
         isTitle: false,
         create: true,
         cardVisible: false,
+        component: 'date',
+        columnField: {
+            component: null,
+        },
         format: ({ landed }) => toDate(landed),
     },
     {
@@ -75,6 +84,7 @@ const printBuys = (rowId) => {
         },
     });
 };
+const DEFAULT_INTERVAL_DAYS = 3;
 </script>
 <template>
     <VnSearchbar
@@ -93,14 +103,30 @@ const printBuys = (rowId) => {
                 :columns="columns"
                 default-mode="card"
                 auto-load
+                :right-search="true"
+                :filter="{ days: DEFAULT_INTERVAL_DAYS }"
             >
+                <template #moreFilterPanel="{ params }">
+                    <VnInput
+                        :label="t('params.scopeDays')"
+                        v-model="params.days"
+                        class="q-px-xs q-pb-xs q-pt-none fit"
+                        dense
+                        filled
+                        outlined
+                    ></VnInput>
+                </template>
             </VnTable>
         </div>
     </QPage>
 </template>
 
 <i18n>
+en:
+    params:
+        scopeDays: Days onward
 es:
-    Search entries: Buscar entradas
+    params:
+        scopeDays: Días adelante
     You can search by entry reference: Puedes buscar por referencia de la entrada
 </i18n>

From ada666a26c9b4fdadb5e43add3225dc77e7b44b7 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 08:23:18 +0200
Subject: [PATCH 50/70] feat(VnTable): improve css columns

---
 src/components/VnTable/VnOrder.vue  |  5 +++--
 src/components/VnTable/VnTable.vue  |  9 +++------
 src/css/app.scss                    | 18 ++++++++++++++++++
 src/pages/Customer/CustomerList.vue | 15 ++++++++++++---
 4 files changed, 36 insertions(+), 11 deletions(-)

diff --git a/src/components/VnTable/VnOrder.vue b/src/components/VnTable/VnOrder.vue
index 375def792..1e1dc9e01 100644
--- a/src/components/VnTable/VnOrder.vue
+++ b/src/components/VnTable/VnOrder.vue
@@ -53,7 +53,7 @@ defineExpose({ orderBy });
         @click="orderBy(name, model?.direction)"
         class="row items-center no-wrap cursor-pointer"
     >
-        <span>{{ label }}</span>
+        <span :title="label">{{ label }}</span>
         <QChip
             v-if="name"
             :label="!vertical && model?.index"
@@ -69,8 +69,9 @@ defineExpose({ orderBy });
                 model?.index ? 'color-vn-text' : 'bg-transparent',
                 vertical ? 'q-px-none' : '',
             ]"
-            class="no-box-shadow q-mr-lg"
+            class="no-box-shadow"
             :clickable="true"
+            style="min-width: 40px"
         >
             <div
                 class="column flex-center"
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d48151228..665623755 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -345,11 +345,7 @@ defineExpose({
                         />
                     </template>
                     <template #header-cell="{ col }">
-                        <QTh
-                            v-if="col.visible ?? true"
-                            auto-width
-                            style="min-width: 100px"
-                        >
+                        <QTh v-if="col.visible ?? true" auto-width>
                             <div
                                 class="column self-start q-ml-xs ellipsis"
                                 :class="`text-${col?.align ?? 'left'}`"
@@ -374,6 +370,7 @@ defineExpose({
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
+                                    style="max-width: 128px"
                                 />
                             </div>
                         </QTh>
@@ -398,7 +395,7 @@ defineExpose({
                         <QTd
                             auto-width
                             class="no-margin q-px-xs"
-                            :class="getColAlign(col)"
+                            :class="[getColAlign(col), col.class, col.columnField?.class]"
                             v-if="col.visible ?? true"
                         >
                             <slot :name="`column-${col.name}`" :col="col" :row="row">
diff --git a/src/css/app.scss b/src/css/app.scss
index 27ed65534..c1298aead 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -229,3 +229,21 @@ input::-webkit-inner-spin-button {
 *::-webkit-scrollbar-track {
     background: transparent;
 }
+
+.q-table {
+    thead,
+    tbody {
+        td {
+            padding: 1px 10px 1px 10px;
+            max-width: 100px;
+            div span {
+                overflow: hidden;
+                white-space: nowrap;
+                text-overflow: ellipsis;
+            }
+        }
+        .expand {
+            max-width: 400px;
+        }
+    }
+}
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 78904b473..a9e4d978e 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -42,6 +42,9 @@ const columns = computed(() => [
         name: 'name',
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -49,6 +52,9 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.socialName'),
         isTitle: true,
         create: true,
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -78,8 +84,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.credit'),
         name: 'credit',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -87,8 +93,8 @@ const columns = computed(() => [
         align: 'left',
         label: t('customer.extendedList.tableVisibleColumns.creditInsurance'),
         name: 'creditInsurance',
-        component: 'number',
         columnFilter: {
+            component: 'number',
             inWhere: true,
         },
     },
@@ -130,6 +136,9 @@ const columns = computed(() => [
         columnFilter: {
             inWhere: true,
         },
+        columnField: {
+            class: 'expand',
+        },
     },
     {
         align: 'left',
@@ -179,8 +188,8 @@ const columns = computed(() => [
         label: t('customer.extendedList.tableVisibleColumns.created'),
         name: 'created',
         format: ({ created }) => toDate(created),
-        component: 'date',
         columnFilter: {
+            component: 'date',
             alias: 'c',
             inWhere: true,
         },

From b4853af69d5f5cd89839633ae3492bed48e97c96 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 08:33:06 +0200
Subject: [PATCH 51/70] fix(VnTable): max-width vn-select

---
 src/components/VnTable/VnTable.vue | 1 -
 src/css/app.scss                   | 5 +++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 665623755..762c9602d 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -370,7 +370,6 @@ defineExpose({
                                     :data-key="$attrs['data-key']"
                                     v-model="params[columnName(col)]"
                                     :search-url="searchUrl"
-                                    style="max-width: 128px"
                                 />
                             </div>
                         </QTh>
diff --git a/src/css/app.scss b/src/css/app.scss
index c1298aead..01bf0e579 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -233,6 +233,11 @@ input::-webkit-inner-spin-button {
 .q-table {
     thead,
     tbody {
+        th {
+            .q-select {
+                max-width: 100px;
+            }
+        }
         td {
             padding: 1px 10px 1px 10px;
             max-width: 100px;

From e1049f660e5143bc20a0ed2a0f3601c567f18c1a Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 08:33:44 +0200
Subject: [PATCH 52/70] fix(VnTable): max-width vn-select

---
 src/css/app.scss | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 01bf0e579..2c11c9ea6 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -235,7 +235,7 @@ input::-webkit-inner-spin-button {
     tbody {
         th {
             .q-select {
-                max-width: 100px;
+                max-width: 120px;
             }
         }
         td {

From b41dc28fdee0dd8a6d3465ec92c5788b1febd7e3 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 09:08:37 +0200
Subject: [PATCH 53/70] fix(VnTable): check column skipped only onMounted

---
 src/components/VnTable/VnTable.vue | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index d48151228..954da29fd 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -98,6 +98,7 @@ const orders = ref(parseOrder(routeQuery.filter?.order));
 const CrudModelRef = ref({});
 const showForm = ref(false);
 const splittedColumns = ref({ columns: [] });
+const columnsVisibilitySkiped = ref();
 const tableModes = [
     {
         icon: 'view_column',
@@ -117,6 +118,12 @@ onMounted(() => {
     mode.value = quasar.platform.is.mobile ? DEFAULT_MODE : $props.defaultMode;
     stateStore.rightDrawer = true;
     setUserParams(route.query[$props.searchUrl]);
+    columnsVisibilitySkiped.value = [
+        ...splittedColumns.value.columns
+            .filter((c) => c.visible == false)
+            .map((c) => c.name),
+        ...['tableActions'],
+    ];
 });
 
 watch(
@@ -137,10 +144,6 @@ const rowClickFunction = computed(() => {
 });
 
 const isTableMode = computed(() => mode.value == TABLE_MODE);
-const columnsVisibilitySkiped = computed(() => [
-    ...splittedColumns.value.columns.filter((c) => c.visible == false).map((c) => c.name),
-    ...['tableActions'],
-]);
 
 function setUserParams(watchedParams) {
     if (!watchedParams) return;

From 9098e63793a6fdec3d74365203a45c505ae7c032 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 12 Jul 2024 10:41:18 +0200
Subject: [PATCH 54/70] refactor: refs #7129 refactor with vnTable

---
 .vscode/settings.json                         |   2 +-
 src/components/FormModelPopup.vue             |   1 +
 src/components/VnTable/VnColumn.vue           |  10 +
 src/components/VnTable/VnTable.vue            |  43 ++-
 src/components/common/VnInputDate.vue         |   1 +
 src/components/common/VnInputTime.vue         |  10 +-
 src/components/ui/VnFilterPanel.vue           |  13 +-
 src/components/ui/VnSubToolbar.vue            |   1 +
 src/composables/useArrayData.js               |  12 +
 src/pages/Customer/CustomerList.vue           |   1 -
 src/pages/Route/Agency/AgencyList.vue         |   1 +
 src/pages/Route/Cmr/CmrFilter.vue             | 162 ---------
 src/pages/Route/Cmr/CmrList.vue               | 148 +++++----
 .../Route/Roadmap/RoadmapAddStopDialog.vue    |  88 -----
 src/pages/Route/Roadmap/RoadmapCreate.vue     |  45 ---
 src/pages/Route/Roadmap/RoadmapSummary.vue    |  46 +--
 src/pages/Route/RouteAutonomous.vue           | 310 +++++++-----------
 src/pages/Route/RouteList.vue                 | 158 +++++----
 src/pages/Route/RouteRoadmap.vue              | 260 ++++++---------
 src/router/modules/route.js                   |   9 -
 .../integration/route/routeAutonomus.spec.js  |  14 +
 .../integration/route/routeList.spec.js       |  15 +
 .../integration/route/routeRoadMaps.spec.js   |   0
 23 files changed, 498 insertions(+), 852 deletions(-)
 delete mode 100644 src/pages/Route/Cmr/CmrFilter.vue
 delete mode 100644 src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
 delete mode 100644 src/pages/Route/Roadmap/RoadmapCreate.vue
 create mode 100644 test/cypress/integration/route/routeAutonomus.spec.js
 create mode 100644 test/cypress/integration/route/routeList.spec.js
 create mode 100644 test/cypress/integration/route/routeRoadMaps.spec.js

diff --git a/.vscode/settings.json b/.vscode/settings.json
index 5026b7d3b..8f601aa77 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -14,5 +14,5 @@
     "[vue]": {
         "editor.defaultFormatter": "esbenp.prettier-vscode"
     },
-    "cSpell.words": ["axios"]
+    "cSpell.words": ["axios", "composables"]
 }
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 0f2b6cbf0..981b17fb9 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -35,6 +35,7 @@ const closeForm = async () => {
 
 defineExpose({
     isLoading,
+    onDataSaved,
 });
 </script>
 
diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index aeccdb2d6..c2afabc53 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -7,6 +7,7 @@ import { dashIfEmpty } from 'src/filters';
 import VnSelect from 'components/common/VnSelect.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'components/common/VnInputTime.vue';
 import VnComponent from 'components/common/VnComponent.vue';
 
 const model = defineModel(undefined, { required: true });
@@ -74,6 +75,15 @@ const defaultComponents = {
             label: $props.showLabel && $props.column.label,
         },
     },
+    time: {
+        component: markRaw(VnInputTime),
+        attrs: {
+            disable: !$props.isEditable,
+        },
+        forceAttrs: {
+            label: $props.showLabel && $props.column.label,
+        },
+    },
     checkbox: {
         component: markRaw(QCheckbox),
         attrs: (prop) => {
diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index 31486091b..231ab8a4d 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -3,17 +3,17 @@ import { ref, onMounted, computed, watch } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute, useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
 import { useStateStore } from 'stores/useStateStore';
-import FormModelPopup from 'components/FormModelPopup.vue';
-import CrudModel from 'src/components/CrudModel.vue';
-import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
-import VnLv from 'components/ui/VnLv.vue';
 
+import CrudModel from 'src/components/CrudModel.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
 import VnTableColumn from 'components/VnTable/VnColumn.vue';
 import VnTableFilter from 'components/VnTable/VnFilter.vue';
 import VnTableChip from 'components/VnTable/VnChip.vue';
 import TableVisibleColumns from 'src/components/VnTable/VnVisibleColumn.vue';
+import VnLv from 'components/ui/VnLv.vue';
 
 const $props = defineProps({
     columns: {
@@ -33,7 +33,7 @@ const $props = defineProps({
         default: true,
     },
     rowClick: {
-        type: Function,
+        type: [Function, Boolean],
         default: null,
     },
     redirect: {
@@ -80,6 +80,10 @@ const $props = defineProps({
         type: Object,
         default: () => ({}),
     },
+    tableHeight: {
+        type: String,
+        default: '90vh',
+    },
 });
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -128,12 +132,6 @@ watch(
     (val) => setUserParams(val)
 );
 
-const rowClickFunction = computed(() => {
-    if ($props.rowClick) return $props.rowClick;
-    if ($props.redirect) return ({ id }) => redirectFn(id);
-    return () => {};
-});
-
 const isTableMode = computed(() => mode.value == TABLE_MODE);
 
 function setUserParams(watchedParams) {
@@ -180,6 +178,12 @@ function splitColumns(columns) {
     }
 }
 
+const rowClickFunction = computed(() => {
+    if ($props.rowClick != undefined) return $props.rowClick;
+    if ($props.redirect) return ({ id }) => redirectFn(id);
+    return () => {};
+});
+
 function redirectFn(id) {
     router.push({ path: `/${$props.redirect}/${id}` });
 }
@@ -224,7 +228,6 @@ defineExpose({
                 :data-key="$attrs['data-key']"
                 :search-button="true"
                 v-model="params"
-                :disable-submit-event="true"
                 :search-url="searchUrl"
                 :redirect="!!redirect"
             >
@@ -275,14 +278,14 @@ defineExpose({
                     table-header-class="bg-header"
                     card-container-class="grid-three"
                     flat
-                    :style="isTableMode && 'max-height: 90vh'"
+                    :style="isTableMode && `max-height: ${tableHeight}`"
                     virtual-scroll
                     @virtual-scroll="
                         (event) =>
                             event.index > rows.length - 2 &&
                             CrudModelRef.vnPaginateRef.paginate()
                     "
-                    @row-click="(_, row) => rowClickFunction(row)"
+                    @row-click="(_, row) => rowClickFunction && rowClickFunction(row)"
                     @update:selected="emit('update:selected', $event)"
                 >
                     <template #top-left v-if="!$props.withoutHeader">
@@ -546,8 +549,12 @@ defineExpose({
 <i18n>
 en:
     status: Status
+    table view: Table view
+    grid view: Grid view
 es:
     status: Estados
+    table view: Vista en tabla
+    grid view: Vista en cuadrícula
 </i18n>
 
 <style lang="scss">
@@ -557,7 +564,7 @@ es:
 }
 
 .bg-header {
-    background-color: #5d5d5d;
+    background-color: var(--vn-section-color);
     color: var(--vn-text-color);
 }
 
@@ -566,7 +573,7 @@ es:
 .q-table--dark tr,
 .q-table--dark th,
 .q-table--dark td {
-    border-color: #222222;
+    border-color: var(--vn-section-color);
 }
 
 .q-table__container > div:first-child {
@@ -636,7 +643,7 @@ es:
         right: 0;
     }
     td.sticky {
-        background-color: var(--q-dark);
+        background-color: var(--vn-section-color);
         z-index: 1;
     }
 }
diff --git a/src/components/common/VnInputDate.vue b/src/components/common/VnInputDate.vue
index 184f8a158..72898483f 100644
--- a/src/components/common/VnInputDate.vue
+++ b/src/components/common/VnInputDate.vue
@@ -119,6 +119,7 @@ watch(
             >
                 <QDate
                     v-model="popupDate"
+                    :landscape="true"
                     :today-btn="true"
                     @update:model-value="
                         (date) => {
diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index 9344ff869..def5dda51 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -43,7 +43,7 @@ const formattedTime = computed({
             if (time?.length > 5) time = dateToTime(time);
             if (!props.timeOnly) {
                 const hours = time.split(':');
-                const date = new Date();
+                const date = new Date(model.value);
                 date.setHours(hours[0], hours[1], 0);
                 time = date.toISOString();
             }
@@ -100,13 +100,7 @@ watch(
                 self="top start"
                 :no-focus="true"
             >
-                <QTime
-                    :format24h="false"
-                    v-model="formattedTime"
-                    mask="HH:mm"
-                    landscape
-                    now-btn
-                />
+                <QTime v-model="formattedTime" mask="HH:mm" landscape now-btn />
             </QMenu>
         </QInput>
     </div>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 084f482d6..e9993c4df 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -18,19 +18,18 @@ const $props = defineProps({
     },
     searchButton: {
         type: Boolean,
-        required: false,
         default: false,
     },
     showAll: {
         type: Boolean,
         default: true,
     },
-    unremovableParams: {
+    unRemovableParams: {
         type: Array,
         required: false,
         default: () => [],
-        description:
-            'Algunos filtros vienen con parametros de búsqueda por default y necesitan tener si o si un valor, por eso de ser necesario, esta prop nos sirve para saber que filtros podemos remover y cuales no',
+        description: `Some filters come with default search parameters and require a value.
+            This prop helps us determine which filters can be removed and which cannot.`,
     },
     exprBuilder: {
         type: Function,
@@ -113,7 +112,7 @@ async function search(evt) {
     isLoading.value = true;
     const filter = { ...userParams.value };
     store.userParamsChanged = true;
-    arrayData.reset(['skip', 'filter.skip', 'page']);
+    console.log('userParams.value: ', userParams.value);
     const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
@@ -140,7 +139,7 @@ async function clearFilters() {
     arrayData.reset(['skip', 'filter.skip', 'page']);
     // Filtrar los params no removibles
     const removableFilters = Object.keys(userParams.value).filter((param) =>
-        $props.unremovableParams.includes(param)
+        $props.unRemovableParams.includes(param)
     );
     const newParams = {};
     // Conservar solo los params que no son removibles
@@ -249,7 +248,7 @@ function formatValue(value) {
                     <VnFilterPanelChip
                         v-for="chip of tags"
                         :key="chip.label"
-                        :removable="!unremovableParams.includes(chip.label)"
+                        :removable="!unRemovableParams.includes(chip.label)"
                         @remove="remove(chip.label)"
                     >
                         <slot name="tags" :tag="chip" :format-fn="formatValue">
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index df6fcbcb7..44947856b 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -30,6 +30,7 @@ onBeforeUnmount(() => stateStore.toggleSubToolbar());
 
 <template>
     <QToolbar
+        id="subToolbar"
         class="justify-end sticky"
         v-show="hasContent || $slots['st-actions'] || $slots['st-data']"
     >
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 0fcbbbb48..4e76d03f2 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -74,7 +74,11 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         };
 
         let exprFilter;
+        console.log('AQUIII: ', typeof store.userParams, store.userParams);
+
         let userParams = { ...store.userParams };
+        console.log('AQUIII: ', typeof userParams, userParams);
+
         if (store?.exprBuilder) {
             const where = buildFilter(userParams, (param, value) => {
                 const res = store.exprBuilder(param, value);
@@ -92,6 +96,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         filter.where = where;
         const params = { filter };
 
+        console.log('AQUIII: ', typeof userParams, userParams);
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
 
@@ -152,12 +157,18 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilter({ filter, params }) {
+        console.log('addFilter params: ', params);
         if (filter) store.filter = filter;
 
+        console.log('addFilter: ', store.userParams);
         let userParams = { ...store.userParams, ...params };
+        console.log('addFilter 2: ', userParams, store.userParams);
+
         userParams = sanitizerParams(userParams, store?.exprBuilder);
+        console.log('addFilter 2.5: ', userParams);
 
         store.userParams = userParams;
+        console.log('addFilter: 3', store.userParams);
         arrayDataStore.reset(['skip', 'filter.skip', 'page']);
 
         await fetch({ append: false });
@@ -173,6 +184,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
+            console.log('param: ', param);
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 394c472c2..91d20b310 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -407,7 +407,6 @@ function handleLocation(data, location) {
         :columns="columns"
         default-mode="table"
         redirect="customer"
-        auto-load
     >
         <template #more-create-dialog="{ data }">
             <VnLocation
diff --git a/src/pages/Route/Agency/AgencyList.vue b/src/pages/Route/Agency/AgencyList.vue
index eb301c9ba..13420c357 100644
--- a/src/pages/Route/Agency/AgencyList.vue
+++ b/src/pages/Route/Agency/AgencyList.vue
@@ -78,6 +78,7 @@ const columns = computed(() => [
         :columns="columns"
         :right-search="false"
         :use-model="true"
+        redirect="agency"
     />
 </template>
 <i18n>
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
deleted file mode 100644
index bea58b2d8..000000000
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-import FetchData from 'components/FetchData.vue';
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'src/components/common/VnInput.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const countries = ref();
-const warehouses = ref();
-</script>
-<template>
-    <FetchData url="Countries" @on-fetch="(data) => (countries = data)" auto-load />
-    <FetchData url="Warehouses" @on-fetch="(data) => (warehouses = data)" auto-load />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.cmrFk')"
-                        v-model="params.cmrFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="article" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QCheckbox
-                        :label="t('route.cmr.list.hasCmrDms')"
-                        v-model="params.hasCmrDms"
-                        lazy-rules
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.ticketFk')"
-                        v-model="params.ticketFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:ticket" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.routeFk')"
-                        v-model="params.routeFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:delivery" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        :label="t('route.cmr.list.clientFk')"
-                        v-model="params.clientFk"
-                        is-outlined
-                    >
-                        <template #prepend>
-                            <QIcon name="vn:client" size="sm"></QIcon>
-                        </template>
-                    </VnInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection v-if="!countries">
-                    <QSkeleton type="QInput" class="full-width" />
-                </QItemSection>
-                <QItemSection v-if="countries">
-                    <VnSelect
-                        :label="t('route.cmr.list.country')"
-                        v-model="params.country"
-                        :options="countries"
-                        option-label="name"
-                        option-value="id"
-                        transition-show="jump-down"
-                        transition-hide="jump-up"
-                        emit-value
-                        map-options
-                        dense
-                        outlined
-                        rounded
-                    >
-                        <template #prepend>
-                            <QIcon name="flag" size="sm"></QIcon>
-                        </template>
-                    </VnSelect>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <VnSelect
-                    :label="t('globals.warehouse')"
-                    :options="warehouses"
-                    hide-selected
-                    option-label="name"
-                    option-value="id"
-                    v-model="params.warehouseFk"
-                    rounded
-                    dense
-                    outlined
-                >
-                </VnSelect>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.shipped"
-                        :label="t('route.cmr.list.shipped')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-<i18n>
-    en:
-        params:
-            cmrFk: Cmr id
-            hasCmrDms: Attached in gestdoc
-            ticketFk: Ticketd id
-            country: Country
-            clientFk: Client id
-            shipped: Preparation date
-
-    es:
-        params:
-            cmrFk: Id cmr
-            hasCmrDms: Gestdoc
-            ticketFk: Id ticket
-            country: País
-            clientFk: Id cliente
-            shipped: Fecha preparación
-</i18n>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index 74a070cbf..6dfd3a1e5 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -2,82 +2,93 @@
 import { onBeforeMount, onMounted, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { Notify } from 'quasar';
-import axios from 'axios';
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useSession } from 'src/composables/useSession';
 import { toDate } from 'filters/index';
-import CmrFilter from './CmrFilter.vue';
-import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
-import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import { useStateStore } from 'src/stores/useStateStore';
 
+import axios from 'axios';
+import TicketDescriptorProxy from 'pages/Ticket/Card/TicketDescriptorProxy.vue';
+import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
+
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
 
 const { t } = useI18n();
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 const state = useStateStore();
-const selected = ref([]);
 const warehouses = ref([]);
-
+const selectedRows = ref([]);
 const columns = computed(() => [
     {
+        align: 'left',
         name: 'cmrFk',
         label: t('route.cmr.list.cmrFk'),
-        field: (row) => row.cmrFk,
-        sortable: true,
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
+        align: 'left',
         name: 'hasCmrDms',
         label: t('route.cmr.list.hasCmrDms'),
-        field: (row) => row.hasCmrDms,
-        align: 'center',
-        sortable: true,
+        component: 'checkbox',
+        cardVisible: true,
     },
     {
-        name: 'ticketFk',
         label: t('route.cmr.list.ticketFk'),
-        field: (row) => row.ticketFk,
-        sortable: true,
+        name: 'ticketFk',
     },
     {
-        name: 'routeFkFk',
         label: t('route.cmr.list.routeFk'),
-        field: (row) => row.routeFk,
-        sortable: true,
+        name: 'routeFk',
     },
     {
-        name: 'clientFk',
         label: t('route.cmr.list.clientFk'),
-        field: (row) => row.clientFk,
-        sortable: true,
+        name: 'clientFk',
     },
     {
-        name: 'country',
-        label: t('route.cmr.list.country'),
-        field: (row) => row.country,
         align: 'left',
-        sortable: true,
+        label: t('route.cmr.list.country'),
+        name: 'country',
+        cardVisible: true,
     },
     {
-        name: 'shipped',
-        label: t('route.cmr.list.shipped'),
-        field: (row) => toDate(row.shipped),
         align: 'center',
-        sortable: true,
+        label: t('route.cmr.list.shipped'),
+        name: 'shipped',
+        cardVisible: true,
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
+        align: 'center',
         name: 'warehouseFk',
         label: t('globals.warehouse'),
-        field: ({ warehouseFk }) => warehouseFk,
-        align: 'center',
-        sortable: true,
+        component: 'select',
+        attrs: {
+            url: 'warehouses',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'icons',
-        align: 'center',
-        field: (row) => row.cmrFk,
+        align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Ver cmr'),
+                icon: 'visibility',
+                isPrimary: true,
+                action: (row) => window.open(getCmrUrl(row?.cmrFk), '_blank'),
+            },
+        ],
     },
 ]);
 
@@ -95,7 +106,7 @@ function getCmrUrl(value) {
     return `${getApiUrl()}/api/Routes/${value}/cmr?access_token=${token}`;
 }
 function downloadPdfs() {
-    if (!selected.value.length) {
+    if (!selectedRows.value.length) {
         Notify.create({
             message: t('globals.noSelectedRows'),
             type: 'warning',
@@ -103,42 +114,51 @@ function downloadPdfs() {
         return;
     }
     let cmrs = [];
-    for (let value of selected.value) cmrs.push(value.cmrFk);
+    for (let value of selectedRows.value) cmrs.push(value.cmrFk);
     // prettier-ignore
     return window.open(`${getApiUrl()}/api/Routes/downloadCmrsZip?ids=${cmrs.join(',')}&access_token=${token}`);
 }
 </script>
 <template>
+    <VnSubToolbar>
+        <template #st-actions>
+            <QBtn
+                icon="cloud_download"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="downloadPdfs"
+            >
+                <QTooltip>{{ t('route.cmr.list.downloadCmrs') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
     <VnTable
         ref="tableRef"
         data-key="CmrList"
         url="Routes/cmrs"
-        order="cmrFk DESC"
         :columns="columns"
         :right-search="true"
-        :use-model="true"
-    />
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        :table="{
+            'row-key': 'cmrFk',
+            selection: 'multiple',
+        }"
+        :disable-option="{ card: true }"
+    >
+        <template #column-ticketFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <TicketDescriptorProxy :id="row.ticketFk" />
+            </span>
+        </template>
+        <template #column-clientFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.ticketFk }}
+                <CustomerDescriptorProxy :id="row.clientFk" />
+            </span>
+        </template>
+    </VnTable>
 </template>
-<style lang="scss" scoped>
-.list {
-    padding-top: 15px;
-    padding-bottom: 15px;
-    max-width: 1000px;
-    width: 100%;
-}
-.grid-style-transition {
-    transition: transform 0.28s, background-color 0.28s;
-}
-#true {
-    background-color: $positive;
-}
-#false {
-    background-color: $negative;
-}
-:deep(.q-table th) {
-    max-width: 80px;
-}
-:deep(.q-table th:nth-child(3)) {
-    max-width: 100px;
-}
-</style>
diff --git a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue b/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
deleted file mode 100644
index f20619033..000000000
--- a/src/pages/Route/Roadmap/RoadmapAddStopDialog.vue
+++ /dev/null
@@ -1,88 +0,0 @@
-<script setup>
-import { useDialogPluginComponent } from 'quasar';
-import { useI18n } from 'vue-i18n';
-import { reactive, ref } from 'vue';
-import axios from 'axios';
-import FetchData from 'components/FetchData.vue';
-import RoadmapAddStopForm from 'pages/Route/Roadmap/RoadmapAddStopForm.vue';
-
-const emit = defineEmits([...useDialogPluginComponent.emits]);
-const { dialogRef, onDialogHide } = useDialogPluginComponent();
-
-const { t } = useI18n();
-const props = defineProps({
-    roadmapFk: {
-        type: Number,
-        required: true,
-    },
-});
-
-const isLoading = ref(false);
-const roadmapStopForm = reactive({
-    roadmapFk: Number(props.roadmapFk) || 0,
-    warehouseFk: null,
-    eta: new Date().toISOString(),
-    description: '',
-});
-
-const updateDefaultStop = (data) => {
-    const eta = new Date(data.etd);
-    eta.setDate(eta.getDate() + 1);
-    roadmapStopForm.eta = eta.toISOString();
-};
-
-const onSave = async () => {
-    isLoading.value = true;
-    try {
-        await axios.post('RoadmapStops', { ...roadmapStopForm });
-        emit('ok');
-    } finally {
-        isLoading.value = false;
-        emit('hide');
-    }
-};
-</script>
-<template>
-    <FetchData
-        :url="`Roadmaps/${roadmapFk}`"
-        auto-load
-        :filter="{ fields: ['etd'] }"
-        @on-fetch="updateDefaultStop"
-    />
-    <QDialog ref="dialogRef" @hide="onDialogHide">
-        <QCard class="q-pa-lg">
-            <QCardSection class="row absolute absolute-top z-fullscreen">
-                <QSpace />
-                <QBtn icon="close" flat round dense v-close-popup />
-            </QCardSection>
-            <RoadmapAddStopForm
-                :roadmap-fk="roadmapFk"
-                :form-data="roadmapStopForm"
-                layout="dialog"
-            />
-            <QCardActions align="right">
-                <QBtn :label="t('globals.cancel')" color="primary" flat v-close-popup />
-                <QBtn
-                    :label="t('globals.confirm')"
-                    color="primary"
-                    :loading="isLoading"
-                    @click="onSave"
-                    unelevated
-                />
-            </QCardActions>
-        </QCard>
-    </QDialog>
-</template>
-<style lang="scss" scoped>
-.card-section {
-    gap: 16px;
-}
-</style>
-
-<i18n>
-es:
-    Warehouse: Almacén
-    ETA date: Fecha ETA
-    ETA time: Hora ETA
-    Description: Descripción
-</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapCreate.vue b/src/pages/Route/Roadmap/RoadmapCreate.vue
deleted file mode 100644
index fb3b29f33..000000000
--- a/src/pages/Route/Roadmap/RoadmapCreate.vue
+++ /dev/null
@@ -1,45 +0,0 @@
-<script setup>
-import { useI18n } from 'vue-i18n';
-import { useRouter } from 'vue-router';
-import VnRow from 'components/ui/VnRow.vue';
-import FormModel from 'components/FormModel.vue';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-
-const { t } = useI18n();
-const router = useRouter();
-const defaultInitialData = {
-    etd: Date.vnNew().toISOString(),
-};
-const onSave = (data, response) => {
-    router.push({ name: 'RoadmapSummary', params: { id: response?.id } });
-};
-</script>
-<template>
-    <VnSubToolbar />
-    <FormModel
-        :url="null"
-        url-create="Roadmaps"
-        model="roadmap"
-        :observe-form-changes="false"
-        :auto-load="false"
-        :form-initial-data="defaultInitialData"
-        @on-data-saved="onSave"
-    >
-        <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <VnInput v-model="data.name" :label="t('Roadmap')" clearable />
-                <VnInputDate v-model="data.etd" :label="t('ETD date')" />
-                <VnInputTime v-model="data.etd" :label="t('ETD hour')" />
-            </VnRow>
-        </template>
-    </FormModel>
-</template>
-<i18n>
-es:
-    Roadmap: Troncal
-    ETD date: Fecha ETD
-    ETD hour: Hora ETD
-</i18n>
diff --git a/src/pages/Route/Roadmap/RoadmapSummary.vue b/src/pages/Route/Roadmap/RoadmapSummary.vue
index 6c397bcc1..7f8b7107b 100644
--- a/src/pages/Route/Roadmap/RoadmapSummary.vue
+++ b/src/pages/Route/Roadmap/RoadmapSummary.vue
@@ -2,14 +2,14 @@
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
-import { QIcon, useQuasar } from 'quasar';
+import { QIcon } from 'quasar';
 import { dashIfEmpty, toDateHourMin } from 'src/filters';
 import { useStateStore } from 'stores/useStateStore';
 import VnLv from 'components/ui/VnLv.vue';
+import VnTitle from 'src/components/common/VnTitle.vue';
 import CardSummary from 'components/ui/CardSummary.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
 import VnLinkPhone from 'components/ui/VnLinkPhone.vue';
-import RoadmapAddStopDialog from 'pages/Route/Roadmap/RoadmapAddStopDialog.vue';
 
 const $props = defineProps({
     id: {
@@ -20,7 +20,6 @@ const $props = defineProps({
 const route = useRoute();
 const stateStore = useStateStore();
 const { t } = useI18n();
-const quasar = useQuasar();
 
 const summary = ref(null);
 const entityId = computed(() => $props.id || route.params.id);
@@ -37,7 +36,7 @@ const columns = ref([
     {
         name: 'address',
         label: t('Address'),
-        field: (row) => dashIfEmpty(row?.address?.nickname),
+        field: (row) => dashIfEmpty(row?.address?.addressFk),
         sortable: true,
         align: 'left',
     },
@@ -69,15 +68,6 @@ const filter = {
     ],
     where: { id: entityId },
 };
-
-const openAddStopDialog = () => {
-    quasar
-        .dialog({
-            component: RoadmapAddStopDialog,
-            componentProps: { roadmapFk: entityId.value },
-        })
-        .onOk(() => summary.value.fetch());
-};
 </script>
 
 <template>
@@ -98,6 +88,10 @@ const openAddStopDialog = () => {
             </template>
             <template #body="{ entity }">
                 <QCard class="vn-one">
+                    <VnTitle
+                        :url="`#/route/roadmap/${entityId}/basic-data`"
+                        :text="t('Basic Data')"
+                    />
                     <VnLv :label="t('Carrier')">
                         <template #value>
                             <span class="link" v-if="entity?.supplier?.id">
@@ -115,8 +109,6 @@ const openAddStopDialog = () => {
                         :label="t('Trailer Plate')"
                         :value="dashIfEmpty(entity?.trailerPlate)"
                     />
-                </QCard>
-                <QCard class="vn-one">
                     <VnLv :label="t('Phone')" :value="dashIfEmpty(entity?.phone)">
                         <template #value>
                             <span>
@@ -139,26 +131,10 @@ const openAddStopDialog = () => {
                     />
                 </QCard>
                 <QCard class="vn-max">
-                    <div class="flex items-center">
-                        <a class="header" :href="`#/route/roadmap/${entityId}/stops`">
-                            {{ t('Stops') }}
-                            <QIcon name="open_in_new" color="primary">
-                                <QTooltip>
-                                    {{ t('Go to stops') }}
-                                </QTooltip>
-                            </QIcon>
-                        </a>
-                        <QIcon
-                            name="add_circle"
-                            color="primary"
-                            class="q-ml-lg header cursor-pointer"
-                            @click.stop="openAddStopDialog"
-                        >
-                            <QTooltip>
-                                {{ t('Add stop') }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
+                    <VnTitle
+                        :url="`#/route/roadmap/${entityId}/stops`"
+                        :text="t('Stops')"
+                    />
                     <QTable
                         :columns="columns"
                         :rows="entity?.roadmapStop"
diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index daffcb3f2..83bc3b7c5 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -1,33 +1,29 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toCurrency, toDate } from 'src/filters';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import { toCurrency, toDate } from 'src/filters';
+import { useSummaryDialog } from 'composables/useSummaryDialog';
+import { useState } from 'composables/useState';
+
+import useNotify from 'composables/useNotify';
+import axios from 'axios';
+import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
+
 import RouteDescriptorProxy from 'pages/Route/Card/RouteDescriptorProxy.vue';
 import InvoiceInDescriptorProxy from 'pages/InvoiceIn/Card/InvoiceInDescriptorProxy.vue';
 import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnLv from 'components/ui/VnLv.vue';
-import useNotify from 'composables/useNotify';
-import RouteAutonomousFilter from 'pages/Route/Card/RouteAutonomousFilter.vue';
-import { useRouter } from 'vue-router';
-import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
-import { useSummaryDialog } from 'composables/useSummaryDialog';
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import VnDms from 'components/common/VnDms.vue';
-import { useState } from 'composables/useState';
-import axios from 'axios';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const { viewSummary } = useSummaryDialog();
+const { notify } = useNotify();
+const { t } = useI18n();
 
 const stateStore = useStateStore();
-const { t } = useI18n();
-const { notify } = useNotify();
-const router = useRouter();
-const { viewSummary } = useSummaryDialog();
-
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
+const refreshKey = ref(0);
 const state = useState();
 const user = state.getUser();
 const dmsDialog = ref({
@@ -36,87 +32,89 @@ const dmsDialog = ref({
     rowsToCreateInvoiceIn: [],
 });
 const selectedRows = ref([]);
+const tableRef = ref();
 const columns = computed(() => [
     {
-        name: 'ID',
+        align: 'left',
+        name: 'id',
         label: 'Id',
-        field: (row) => row.routeFk,
-        sortable: true,
-        align: 'left',
+        chip: {
+            condition: () => true,
+        },
+        isId: true,
     },
     {
-        name: 'date',
+        align: 'left',
+        name: 'created',
         label: t('Date'),
-        field: (row) => toDate(row.created),
-        sortable: true,
-        align: 'left',
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
-        name: 'agency-route',
+        align: 'left',
+        name: 'agencyModeName',
         label: t('Agency route'),
-        field: (row) => row?.agencyModeName,
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
-        name: 'agency-agreement',
+        align: 'left',
+        name: 'agencyAgreement',
         label: t('Agency agreement'),
-        field: (row) => row?.agencyAgreement,
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
+        align: 'left',
         name: 'packages',
         label: t('Packages'),
-        field: (row) => dashIfEmpty(row.packages),
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'volume',
+        align: 'left',
+        name: 'm3',
         label: 'm³',
-        field: (row) => dashIfEmpty(row.m3),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
-        name: 'km',
+        align: 'left',
+        name: 'kmTotal',
         label: t('Km'),
-        field: (row) => dashIfEmpty(row?.kmTotal),
-        sortable: true,
-        align: 'left',
+        cardVisible: true,
     },
     {
+        align: 'left',
         name: 'price',
         label: t('Price'),
-        field: (row) => (row?.price ? toCurrency(row.price) : '-'),
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'received',
+        align: 'left',
+        name: 'invoiceInFk',
         label: t('Received'),
-        field: (row) => row?.invoiceInFk,
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'autonomous',
+        align: 'left',
+        name: 'supplierName',
         label: t('Autonomous'),
-        field: (row) => row?.supplierName,
-        sortable: true,
-        align: 'left',
     },
     {
-        name: 'actions',
-        label: '',
-        sortable: false,
         align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Preview'),
+                icon: 'preview',
+                isPrimary: true,
+                action: (row) => viewSummary(row?.routeFk, RouteSummary),
+            },
+        ],
     },
 ]);
 
-const refreshKey = ref(0);
-
 const total = computed(() => {
     return selectedRows.value.reduce((sum, item) => sum + item.price, 0);
 });
@@ -169,9 +167,8 @@ const onDmsSaved = async (dms, response) => {
     refreshKey.value++;
 };
 
-function navigateToRouteSummary(event, row) {
-    router.push({ name: 'RouteSummary', params: { id: row.routeFk } });
-}
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
 </script>
 
 <template>
@@ -180,109 +177,63 @@ function navigateToRouteSummary(event, row) {
         :label="t('Search autonomous')"
         :info="t('You can search by autonomous reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <RouteAutonomousFilter data-key="RouteAutonomousList" />
-        </template>
-    </RightMenu>
-    <QPage class="column items-center">
-        <div class="route-list">
-            <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
-                    <VnLv class="flex">
-                        <template #label>
-                            <span class="text-h6">{{ t('Total') }}</span>
-                        </template>
-                        <template #value>
-                            <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
-                        </template>
-                    </VnLv>
-                    <QBtn
-                        icon="vn:invoice-in-create"
-                        color="primary"
-                        :disable="!selectedRows?.length"
-                        @click="openDmsUploadDialog"
-                    >
-                        <QTooltip>
-                            {{ t('Create invoiceIn') }}
-                        </QTooltip>
-                    </QBtn>
-                </QCard>
-            </div>
-            <VnPaginate
-                :key="refreshKey"
-                data-key="RouteAutonomousList"
-                url="AgencyTerms/filter"
-                :limit="20"
-            >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            v-model:selected="selectedRows"
-                            :columns="columns"
-                            :rows="rows"
-                            flat
-                            row-key="routeFk"
-                            selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
-                            @row-click="navigateToRouteSummary"
-                        >
-                            <template #body-cell-ID="props">
-                                <QTd :props="props">
-                                    <span class="link" @click.stop>
-                                        {{ props.value }}
-                                        <RouteDescriptorProxy :id="props.value" />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-received="props">
-                                <QTd :props="props">
-                                    <span :class="props.value && 'link'" @click.stop>
-                                        {{ dashIfEmpty(props.value) }}
-                                        <InvoiceInDescriptorProxy
-                                            v-if="props.value"
-                                            :id="props.value"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-autonomous="props">
-                                <QTd :props="props">
-                                    <span class="link" @click.stop>
-                                        {{ props.value }}
-                                        <SupplierDescriptorProxy
-                                            v-if="props.row?.supplierFk"
-                                            :id="props.row?.supplierFk"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props">
-                                    <div class="table-actions">
-                                        <QIcon
-                                            name="preview"
-                                            size="sm"
-                                            color="primary"
-                                            @click.stop="
-                                                viewSummary(
-                                                    props?.row?.routeFk,
-                                                    RouteSummary
-                                                )
-                                            "
-                                        >
-                                            <QTooltip>{{ t('Preview') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div>
+    <div class="q-pa-md">
+        <QCard class="vn-one q-py-sm q-px-lg flex justify-between">
+            <VnLv class="flex">
+                <template #label>
+                    <span class="text-h6">{{ t('Total') }}</span>
                 </template>
-            </VnPaginate>
-        </div>
-    </QPage>
+                <template #value>
+                    <span class="text-h6 q-ml-md">{{ toCurrency(total) }}</span>
+                </template>
+            </VnLv>
+            <QBtn
+                icon="vn:invoice-in-create"
+                color="primary"
+                :disable="!selectedRows?.length"
+                @click="openDmsUploadDialog"
+            >
+                <QTooltip>
+                    {{ t('Create invoiceIn') }}
+                </QTooltip>
+            </QBtn>
+        </QCard>
+    </div>
+    <VnTable
+        ref="tableRef"
+        data-key="RouteAutonomousList"
+        url="AgencyTerms/filter"
+        :columns="columns"
+        :right-search="true"
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        redirect="route"
+        :row-click="({ routeFk }) => tableRef.redirect(routeFk)"
+        :table="{
+            'row-key': '$index',
+            selection: 'multiple',
+        }"
+    >
+        <template #column-id="{ row }">
+            <span class="link" @click.stop>
+                {{ row.routeFk }}
+                <RouteDescriptorProxy :id="row.route.id" />
+            </span>
+        </template>
+        <template #column-invoiceInFk="{ row }">
+            <span class="link" @click.stop>
+                {{ row.invoiceInFk }}
+                <InvoiceInDescriptorProxy v-if="row.invoiceInFk" :id="row.invoiceInFk" />
+            </span>
+        </template>
+        <template #column-supplierName="{ row }">
+            <span class="link" @click.stop>
+                {{ row.supplierName }}
+                <SupplierDescriptorProxy :id="row.supplierFk" />
+            </span>
+        </template>
+    </VnTable>
     <QDialog v-model="dmsDialog.show">
         <VnDms
             url="dms/uploadFile"
@@ -292,29 +243,6 @@ function navigateToRouteSummary(event, row) {
         />
     </QDialog>
 </template>
-
-<style lang="scss" scoped>
-.route-list {
-    width: 100%;
-}
-
-.table-actions {
-    display: flex;
-    align-items: center;
-    gap: 12px;
-
-    i {
-        cursor: pointer;
-    }
-}
-
-th:last-child,
-td:last-child {
-    background-color: var(--vn-section-color);
-    position: sticky;
-    right: 0;
-}
-</style>
 <i18n>
 es:
     Search autonomous: Buscar autónomos
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index e116fd823..8387e24fb 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,50 +1,41 @@
 <script setup>
-import { useArrayData } from 'composables/useArrayData';
-import { dashIfEmpty, toHour } from 'src/filters';
-import { computed, onMounted, ref } from 'vue';
+import { computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useValidator } from 'composables/useValidator';
 import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import { useQuasar } from 'quasar';
+import { toDate } from 'src/filters';
+import { useRouter } from 'vue-router';
 
 import axios from 'axios';
 import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import FetchData from 'components/FetchData.vue';
 import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
-import { useRouter } from 'vue-router';
-import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
-import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
-import RightMenu from 'src/components/common/RightMenu.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import VnInput from 'components/common/VnInput.vue';
-import VnInputTime from 'components/common/VnInputTime.vue';
-import VnSelect from 'components/common/VnSelect.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
-import VnLv from 'src/components/ui/VnLv.vue';
 import VnTable from 'components/VnTable/VnTable.vue';
-import { useStateStore } from 'src/stores/useStateStore';
 
 const { t } = useI18n();
-const { validate } = useValidator();
 const { viewSummary } = useSummaryDialog();
 const quasar = useQuasar();
 const session = useSession();
-const paginate = ref();
-const visibleColumns = ref([]);
 const selectedRows = ref([]);
-const workers = ref([]);
-const agencyList = ref([]);
-const vehicleList = ref([]);
-const allColumnNames = ref([]);
+const tableRef = ref([]);
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 const refreshKey = ref(0);
 const router = useRouter();
-const stateStore = useStateStore();
+const routeFilter = {
+    include: [
+        {
+            relation: 'workers',
+            scope: {
+                fields: ['id', 'firstName'],
+            },
+        },
+    ],
+};
 const columns = computed(() => [
     {
         align: 'left',
@@ -60,75 +51,114 @@ const columns = computed(() => [
     },
     {
         align: 'left',
-        name: 'worker',
+        name: 'workerFk',
         label: t('Worker'),
         create: true,
         component: 'select',
         attrs: {
-            url: 'payrollComponents',
-            fields: ['id', 'name'],
+            url: 'Workers/activeWithInheritedRole',
+            fields: ['id', 'nickname'],
+            optionValue: 'id',
+            optionLabel: 'nickname',
         },
+        useLike: false,
         cardVisible: true,
+        format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
     },
     {
-        name: 'agency',
-        label: t('Agency'),
         align: 'left',
+        name: 'agencyModeFk',
+        label: t('Agency'),
         isTitle: true,
         cardVisible: true,
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'agencyModes',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'vehicle',
+        align: 'left',
+        name: 'vehicleFk',
         label: t('Vehicle'),
-        align: 'left',
         cardVisible: true,
         create: true,
+        component: 'select',
+        attrs: {
+            url: 'vehicles',
+            fields: ['id', 'numberPlate'],
+            optionLabel: 'numberPlate',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'date',
+        align: 'left',
+        name: 'created',
         label: t('Date'),
-        align: 'left',
         cardVisible: true,
         create: true,
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
     },
     {
-        name: 'volume',
-        label: 'm³',
         align: 'center',
+        name: 'm3',
+        label: 'volume',
         cardVisible: true,
     },
     {
+        align: 'left',
         name: 'description',
         label: t('Description'),
-        align: 'left',
         isTitle: true,
         create: true,
+        component: 'input',
+        field: 'description',
     },
     {
+        align: 'left',
         name: 'started',
         label: t('hourStarted'),
-        align: 'left',
+        component: 'time',
     },
     {
+        align: 'left',
         name: 'finished',
         label: t('hourFinished'),
-        align: 'left',
+        component: 'time',
     },
     {
-        name: 'isServed',
-        label: t('Served'),
         align: 'left',
+        name: 'isOk',
+        label: t('Served'),
+        component: 'checkbox',
     },
     {
         align: 'right',
-        label: 'asdasd',
         name: 'tableActions',
         actions: [
             {
-                title: t('Client ticket list'),
+                title: t('Add tickets'),
+                icon: 'vn:ticketAdd',
+                action: (row) => openTicketsDialog(row?.id),
+            },
+            {
+                title: t('Preview'),
                 icon: 'preview',
-                action: (row) => navigate(row.id),
+                action: (row) => viewSummary(row?.id, RouteSummary),
+            },
+            {
+                title: t('Route summary'),
+                icon: 'arrow_forward',
+                isPrimary: true,
+                action: (row) => navigate(row?.id),
             },
         ],
     },
@@ -138,22 +168,14 @@ function navigate(id) {
     router.push({ path: `/route/${id}` });
 }
 
-const updateRoute = async (route) => {
-    try {
-        return await axios.patch(`Routes/${route.id}`, route);
-    } catch (err) {
-        return err;
-    }
-};
-
 const cloneRoutes = () => {
+    if (!selectedRows.value.length || !startingDate.value) return;
     axios.post('Routes/clone', {
         created: startingDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     startingDate.value = null;
-    paginate.value.fetch();
 };
 
 const showRouteReport = () => {
@@ -175,16 +197,13 @@ const showRouteReport = () => {
 
 function markAsServed() {
     selectedRows.value.forEach(async (row) => {
-        if (row?.id) await axios.patch(`Routes/${row?.id}`, { isOk: true });
+        await axios.patch(`Routes/${row?.id}`, { isOk: true });
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     startingDate.value = null;
 }
 
 const openTicketsDialog = (id) => {
-    if (!id) {
-        return;
-    }
     quasar
         .dialog({
             component: RouteListTicketsDialog,
@@ -215,21 +234,10 @@ const openTicketsDialog = (id) => {
                 <QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
                 <QBtn color="primary" v-close-popup @click="cloneRoutes">
                     {{ t('globals.clone') }}
-                    <VnLv
-                        :label="t('route.summary.packages')"
-                        :value="getTotalPackages(entity.tickets)"
-                    />
                 </QBtn>
             </QCardActions>
         </QCard>
     </QDialog>
-    <FetchData
-        url="Workers/activeWithInheritedRole"
-        @on-fetch="(data) => (workers = data)"
-        auto-load
-    />
-    <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
-    <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <VnSubToolbar />
     <VnTable
         ref="tableRef"
@@ -239,13 +247,23 @@ const openTicketsDialog = (id) => {
         :right-search="true"
         default-mode="table"
         :is-editable="true"
+        :filter="routeFilter"
+        redirect="route"
         :create="{
             urlCreate: 'Routes',
             title: t('Create route'),
-            onDataSaved: () => tableRef.reload(),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
         }"
-        save-url="routes"
+        save-url="Routes/crud"
         :disable-option="{ card: true }"
+        :use-model="true"
+        table-height="85vh"
+        v-model:selected="selectedRows"
+        :table="{
+            'row-key': 'id',
+            selection: 'multiple',
+        }"
     >
         <template #moreBeforeActions>
             <QBtn
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index 2c9234c6e..050691af4 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -1,65 +1,68 @@
 <script setup>
-import VnPaginate from 'components/ui/VnPaginate.vue';
-import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toDateHourMin } from 'src/filters';
+import { computed, ref } from 'vue';
+import { dashIfEmpty } from 'src/filters';
+import { toDate } from 'filters/index';
 import { useQuasar } from 'quasar';
-import toCurrency from 'filters/toCurrency';
-import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import SupplierDescriptorProxy from 'pages/Supplier/Card/SupplierDescriptorProxy.vue';
-import VnSearchbar from 'components/ui/VnSearchbar.vue';
-import RoadmapFilter from 'pages/Route/Roadmap/RoadmapFilter.vue';
-import VnConfirm from 'components/ui/VnConfirm.vue';
-import axios from 'axios';
-import VnInputDate from 'components/common/VnInputDate.vue';
 import { useSummaryDialog } from 'composables/useSummaryDialog';
-import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
-import { useRouter } from 'vue-router';
-import RightMenu from 'src/components/common/RightMenu.vue';
+import toCurrency from 'filters/toCurrency';
+import axios from 'axios';
 
-const stateStore = useStateStore();
+import VnSearchbar from 'components/ui/VnSearchbar.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnTable from 'components/VnTable/VnTable.vue';
+import RoadmapSummary from 'pages/Route/Roadmap/RoadmapSummary.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnInputTime from 'src/components/common/VnInputTime.vue';
+
+const { viewSummary } = useSummaryDialog();
 const { t } = useI18n();
 const quasar = useQuasar();
-const router = useRouter();
-const { viewSummary } = useSummaryDialog();
-
-const to = Date.vnNew();
-to.setDate(to.getDate() + 1);
-to.setHours(0, 0, 0, 0);
-
-const from = Date.vnNew();
-from.setDate(from.getDate());
-from.setHours(0, 0, 0, 0);
-
-onMounted(() => (stateStore.rightDrawer = true));
-onUnmounted(() => (stateStore.rightDrawer = false));
-
 const selectedRows = ref([]);
 const columns = computed(() => [
     {
-        name: 'roadmap',
+        align: 'left',
+        name: 'id',
+        label: 'Id',
+        isId: true,
+    },
+    {
+        align: 'left',
+        name: 'name',
         label: t('Roadmap'),
-        field: (row) => row.name,
-        sortable: true,
-        align: 'left',
+        create: true,
+        cardVisible: true,
+        columnFilter: {
+            inWhere: true,
+        },
     },
     {
-        name: 'ETD',
+        align: 'left',
+        name: 'etd',
         label: t('ETD'),
-        field: (row) => toDateHourMin(row.etd),
-        sortable: true,
-        align: 'left',
+        component: 'date',
+        columnFilter: {
+            alias: 'c',
+            inWhere: true,
+        },
+        format: ({ date }) => toDate(date),
+        cardVisible: true,
     },
     {
-        name: 'carrier',
+        align: 'left',
+        name: 'supplierFk',
         label: t('Carrier'),
-        field: (row) => row.supplier?.nickname,
-        sortable: true,
-        align: 'left',
+        component: 'select',
+        attrs: {
+            url: 'suppliers',
+            fields: ['id', 'name'],
+            optionLabel: 'name',
+            optionValue: 'id',
+        },
     },
     {
-        name: 'plate',
+        name: 'tractorPlate',
         label: t('Plate'),
         field: (row) => row.tractorPlate,
         sortable: true,
@@ -80,30 +83,29 @@ const columns = computed(() => [
         align: 'left',
     },
     {
-        name: 'actions',
-        label: '',
-        sortable: false,
         align: 'right',
+        name: 'tableActions',
+        actions: [
+            {
+                title: t('Ver cmr'),
+                icon: 'visibility',
+                isPrimary: true,
+                action: (row) => viewSummary(row?.id, RoadmapSummary),
+            },
+        ],
     },
 ]);
 
-const refreshKey = ref(0);
+const tableRef = ref(0);
 const isCloneDialogOpen = ref(false);
 const etdDate = ref(null);
 
-const filter = {
-    include: { relation: 'supplier', scope: { fields: ['nickname'] } },
-    where: {
-        and: [{ etd: { gte: from } }, { etd: { lte: to } }],
-    },
-};
-
 const cloneSelection = async () => {
     await axios.post('Roadmaps/clone', {
         etd: etdDate.value,
         ids: selectedRows.value.map((row) => row?.id),
     });
-    refreshKey.value++;
+    tableRef.value.reload();
     etdDate.value = null;
 };
 
@@ -125,11 +127,7 @@ function confirmRemove() {
                 promise: removeSelection,
             },
         })
-        .onOk(() => refreshKey.value++);
-}
-
-function navigateToRoadmapSummary(_, { id }) {
-    router.push({ name: 'RoadmapSummary', params: { id } });
+        .onOk(() => tableRef.value++);
 }
 </script>
 
@@ -139,11 +137,6 @@ function navigateToRoadmapSummary(_, { id }) {
         :label="t('Search roadmaps')"
         :info="t('You can search by roadmap reference')"
     />
-    <RightMenu>
-        <template #right-panel>
-            <RoadmapFilter data-key="RoadmapList" />
-        </template>
-    </RightMenu>
     <QDialog v-model="isCloneDialogOpen">
         <QCard style="min-width: 350px">
             <QCardSection>
@@ -163,95 +156,55 @@ function navigateToRoadmapSummary(_, { id }) {
             </QCardActions>
         </QCard>
     </QDialog>
-    <QPage class="column items-center">
-        <VnSubToolbar class="justify-end">
-            <template #st-actions>
-                <QBtn
-                    icon="vn:clone"
-                    color="primary"
-                    class="q-mr-sm"
-                    :disable="!selectedRows?.length"
-                    @click="isCloneDialogOpen = true"
-                >
-                    <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
-                </QBtn>
-                <QBtn
-                    icon="delete"
-                    color="primary"
-                    class="q-mr-sm"
-                    :disable="!selectedRows?.length"
-                    @click="confirmRemove"
-                >
-                    <QTooltip>{{ t('Delete roadmap(s)') }}</QTooltip>
-                </QBtn>
-            </template>
-        </VnSubToolbar>
-        <div class="route-list">
-            <VnPaginate
-                :key="refreshKey"
-                data-key="RoadmapList"
-                url="Roadmaps"
-                :limit="20"
-                :filter="filter"
+    <VnSubToolbar class="justify-end">
+        <template #st-actions>
+            <QBtn
+                icon="vn:clone"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="isCloneDialogOpen = true"
             >
-                <template #body="{ rows }">
-                    <div class="q-pa-md">
-                        <QTable
-                            v-model:selected="selectedRows"
-                            :columns="columns"
-                            :rows="rows"
-                            flat
-                            row-key="id"
-                            selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
-                            @row-click="navigateToRoadmapSummary"
-                        >
-                            <template #body-cell-carrier="props">
-                                <QTd :props="props">
-                                    <span v-if="props.value" class="link" @click.stop>
-                                        {{ props.value }}
-                                        <SupplierDescriptorProxy
-                                            :id="props.row?.supplier?.id"
-                                        />
-                                    </span>
-                                </QTd>
-                            </template>
-                            <template #body-cell-actions="props">
-                                <QTd :props="props">
-                                    <div class="flex items-center table-actions">
-                                        <QIcon
-                                            name="preview"
-                                            size="sm"
-                                            color="primary"
-                                            @click.stop="
-                                                viewSummary(
-                                                    props?.row?.id,
-                                                    RoadmapSummary
-                                                )
-                                            "
-                                            class="cursor-pointer"
-                                        >
-                                            <QTooltip>{{ t('Preview') }}</QTooltip>
-                                        </QIcon>
-                                    </div>
-                                </QTd>
-                            </template>
-                        </QTable>
-                    </div>
-                </template>
-            </VnPaginate>
-        </div>
-        <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteRoadmapCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('Create roadmap') }}
-                </QTooltip>
-            </RouterLink>
-        </QPageSticky>
-    </QPage>
+                <QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
+            </QBtn>
+            <QBtn
+                icon="delete"
+                color="primary"
+                class="q-mr-sm"
+                :disable="!selectedRows?.length"
+                @click="confirmRemove"
+            >
+                <QTooltip>{{ t('Delete roadmap(s)') }}</QTooltip>
+            </QBtn>
+        </template>
+    </VnSubToolbar>
+    <VnTable
+        ref="tableRef"
+        data-key="RoadmapList"
+        url="roadmaps"
+        :columns="columns"
+        :right-search="true"
+        :use-model="true"
+        default-mode="table"
+        v-model:selected="selectedRows"
+        table-height="85vh"
+        :table="{
+            selection: 'multiple',
+        }"
+        redirect="route/roadmap"
+        :create="{
+            urlCreate: 'Roadmaps',
+            title: t('Create routemap'),
+            onDataSaved: ({ id }) => tableRef.redirect(id),
+            formInitialData: {},
+        }"
+        :disable-option="{ card: true }"
+    >
+        <template #more-create-dialog="{ data }">
+            <VnInputDate v-model="data.etd" />
+            <VnInputTime v-model="data.etd" />
+        </template>
+    </VnTable>
 </template>
 
 <style lang="scss" scoped>
@@ -264,6 +217,7 @@ function navigateToRoadmapSummary(_, { id }) {
 </style>
 <i18n>
 es:
+    Create routemap: Crear troncal
     Search roadmaps: Buscar troncales
     You can search by roadmap reference: Puedes buscar por referencia del troncal
     Delete roadmap(s): Eliminar troncal(es)
diff --git a/src/router/modules/route.js b/src/router/modules/route.js
index 72f423ae3..f6f92b7d9 100644
--- a/src/router/modules/route.js
+++ b/src/router/modules/route.js
@@ -57,15 +57,6 @@ export default {
                     },
                     component: () => import('src/pages/Route/RouteRoadmap.vue'),
                 },
-                {
-                    path: 'roadmap/create',
-                    name: 'RouteRoadmapCreate',
-                    meta: {
-                        title: 'RouteRoadmapCreate',
-                        icon: 'vn:troncales',
-                    },
-                    component: () => import('src/pages/Route/Roadmap/RoadmapCreate.vue'),
-                },
                 {
                     path: 'cmr',
                     name: 'CmrList',
diff --git a/test/cypress/integration/route/routeAutonomus.spec.js b/test/cypress/integration/route/routeAutonomus.spec.js
new file mode 100644
index 000000000..9e254a7b0
--- /dev/null
+++ b/test/cypress/integration/route/routeAutonomus.spec.js
@@ -0,0 +1,14 @@
+describe('Route', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/roadmap`);
+    });
+
+    it('Route list create route', () => {
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[name="name"]').eq(1).type('routeTestOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.url().should('include', '/summary');
+    });
+});
diff --git a/test/cypress/integration/route/routeList.spec.js b/test/cypress/integration/route/routeList.spec.js
new file mode 100644
index 000000000..d30595d52
--- /dev/null
+++ b/test/cypress/integration/route/routeList.spec.js
@@ -0,0 +1,15 @@
+describe('Route', () => {
+    beforeEach(() => {
+        cy.viewport(1920, 1080);
+        cy.login('developer');
+        cy.visit(`/#/route/list`);
+    });
+
+    it('Route list create route', () => {
+        cy.visit(`/#/route/list`);
+        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
+        cy.get('input[name="description"]').eq(1).type('routeTestOne{enter}');
+        cy.get('.q-notification__message').should('have.text', 'Data created');
+        cy.url().should('include', '/summary');
+    });
+});
diff --git a/test/cypress/integration/route/routeRoadMaps.spec.js b/test/cypress/integration/route/routeRoadMaps.spec.js
new file mode 100644
index 000000000..e69de29bb

From 72b86c0eec98aeb3877e3975758c5c4611cc0ddb Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 12 Jul 2024 10:43:15 +0200
Subject: [PATCH 55/70] remove: refs #7129 remove console log

---
 src/components/ui/VnFilterPanel.vue | 1 -
 src/composables/useArrayData.js     | 9 ---------
 2 files changed, 10 deletions(-)

diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index e9993c4df..b93ca7121 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -112,7 +112,6 @@ async function search(evt) {
     isLoading.value = true;
     const filter = { ...userParams.value };
     store.userParamsChanged = true;
-    console.log('userParams.value: ', userParams.value);
     const { params: newParams } = await arrayData.addFilter({ params: userParams.value });
     userParams.value = newParams;
 
diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 4e76d03f2..17f09bf2f 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -74,10 +74,8 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         };
 
         let exprFilter;
-        console.log('AQUIII: ', typeof store.userParams, store.userParams);
 
         let userParams = { ...store.userParams };
-        console.log('AQUIII: ', typeof userParams, userParams);
 
         if (store?.exprBuilder) {
             const where = buildFilter(userParams, (param, value) => {
@@ -96,7 +94,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
         filter.where = where;
         const params = { filter };
 
-        console.log('AQUIII: ', typeof userParams, userParams);
         Object.assign(params, userParams);
         params.filter.skip = store.skip;
 
@@ -157,18 +154,13 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
     }
 
     async function addFilter({ filter, params }) {
-        console.log('addFilter params: ', params);
         if (filter) store.filter = filter;
 
-        console.log('addFilter: ', store.userParams);
         let userParams = { ...store.userParams, ...params };
-        console.log('addFilter 2: ', userParams, store.userParams);
 
         userParams = sanitizerParams(userParams, store?.exprBuilder);
-        console.log('addFilter 2.5: ', userParams);
 
         store.userParams = userParams;
-        console.log('addFilter: 3', store.userParams);
         arrayDataStore.reset(['skip', 'filter.skip', 'page']);
 
         await fetch({ append: false });
@@ -184,7 +176,6 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     function sanitizerParams(params, exprBuilder) {
         for (const param in params) {
-            console.log('param: ', param);
             if (params[param] === '' || params[param] === null) {
                 delete store.userParams[param];
                 delete params[param];

From c754a8c110f074c2405b71cbb91c0980f804b615 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 12 Jul 2024 11:13:13 +0200
Subject: [PATCH 56/70] remove: refs #7129 remove spec

---
 .../integration/route/routeAutonomus.spec.js       | 14 --------------
 .../integration/route/routeRoadMaps.spec.js        |  0
 2 files changed, 14 deletions(-)
 delete mode 100644 test/cypress/integration/route/routeAutonomus.spec.js
 delete mode 100644 test/cypress/integration/route/routeRoadMaps.spec.js

diff --git a/test/cypress/integration/route/routeAutonomus.spec.js b/test/cypress/integration/route/routeAutonomus.spec.js
deleted file mode 100644
index 9e254a7b0..000000000
--- a/test/cypress/integration/route/routeAutonomus.spec.js
+++ /dev/null
@@ -1,14 +0,0 @@
-describe('Route', () => {
-    beforeEach(() => {
-        cy.viewport(1920, 1080);
-        cy.login('developer');
-        cy.visit(`/#/route/roadmap`);
-    });
-
-    it('Route list create route', () => {
-        cy.get('.q-page-sticky > div > .q-btn > .q-btn__content > .q-icon').click();
-        cy.get('input[name="name"]').eq(1).type('routeTestOne{enter}');
-        cy.get('.q-notification__message').should('have.text', 'Data created');
-        cy.url().should('include', '/summary');
-    });
-});
diff --git a/test/cypress/integration/route/routeRoadMaps.spec.js b/test/cypress/integration/route/routeRoadMaps.spec.js
deleted file mode 100644
index e69de29bb..000000000

From a77bf93e0d952cefbcd62ed87b12caf3899631a1 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 11:19:37 +0200
Subject: [PATCH 57/70] feat: create VnSelectCache and add in VnColumn

---
 src/components/VnTable/VnColumn.vue     | 24 ++++++++----
 src/components/common/VnSelect.vue      | 49 +++++++++++++++----------
 src/components/common/VnSelectCache.vue | 30 +++++++++++++++
 3 files changed, 77 insertions(+), 26 deletions(-)
 create mode 100644 src/components/common/VnSelectCache.vue

diff --git a/src/components/VnTable/VnColumn.vue b/src/components/VnTable/VnColumn.vue
index aeccdb2d6..35309d586 100644
--- a/src/components/VnTable/VnColumn.vue
+++ b/src/components/VnTable/VnColumn.vue
@@ -5,6 +5,7 @@ import { dashIfEmpty } from 'src/filters';
 
 /* basic input */
 import VnSelect from 'components/common/VnSelect.vue';
+import VnSelectCache from 'components/common/VnSelectCache.vue';
 import VnInput from 'components/common/VnInput.vue';
 import VnInputDate from 'components/common/VnInputDate.vue';
 import VnComponent from 'components/common/VnComponent.vue';
@@ -41,6 +42,17 @@ const $props = defineProps({
     },
 });
 
+const defaultSelect = {
+    attrs: {
+        row: $props.row,
+        disable: !$props.isEditable,
+        class: 'fit',
+    },
+    forceAttrs: {
+        label: $props.showLabel && $props.column.label,
+    },
+};
+
 const defaultComponents = {
     input: {
         component: markRaw(VnInput),
@@ -94,14 +106,12 @@ const defaultComponents = {
         },
     },
     select: {
+        component: markRaw(VnSelectCache),
+        ...defaultSelect,
+    },
+    rawSelect: {
         component: markRaw(VnSelect),
-        attrs: {
-            disable: !$props.isEditable,
-            class: 'fit',
-        },
-        forceAttrs: {
-            label: $props.showLabel && $props.column.label,
-        },
+        ...defaultSelect,
     },
     icon: {
         component: markRaw(QIcon),
diff --git a/src/components/common/VnSelect.vue b/src/components/common/VnSelect.vue
index 3e5cd4216..e3bda6c8e 100644
--- a/src/components/common/VnSelect.vue
+++ b/src/components/common/VnSelect.vue
@@ -75,6 +75,7 @@ const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
 const dataRef = ref();
+const lastVal = ref();
 
 const value = computed({
     get() {
@@ -85,14 +86,31 @@ const value = computed({
     },
 });
 
+watch(options, (newValue) => {
+    setOptions(newValue);
+});
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
+
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue && !findKeyInOptions())
+        fetchFilter($props.modelValue);
+    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
+});
+
+function findKeyInOptions() {
+    if (!$props.options) return;
+    return filter($props.modelValue, $props.options)?.length;
+}
+
 function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-onMounted(() => {
-    setOptions(options.value);
-    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
-});
 
 function filter(val, options) {
     const search = val.toString().toLowerCase();
@@ -125,15 +143,21 @@ async function fetchFilter(val) {
     const defaultWhere = $props.useLike
         ? { [key]: { like: `%${val}%` } }
         : { [key]: val };
-    const where = { ...defaultWhere, ...$props.where };
+    const where = { ...(val ? defaultWhere : {}), ...$props.where };
     const fetchOptions = { where, order: sortBy, limit };
     if (fields) fetchOptions.fields = fields;
     return dataRef.value.fetch(fetchOptions);
 }
 
 async function filterHandler(val, update) {
-    if (!$props.defaultFilter) return update();
+    if (!val && lastVal.value === val) {
+        lastVal.value = val;
+        return update();
+    }
+    lastVal.value = val;
     let newOptions;
+
+    if (!$props.defaultFilter) return update();
     if ($props.url) {
         newOptions = await fetchFilter(val);
     } else newOptions = filter(val, myOptionsOriginal.value);
@@ -149,19 +173,6 @@ async function filterHandler(val, update) {
         }
     );
 }
-
-watch(options, (newValue) => {
-    setOptions(newValue);
-});
-
-watch(modelValue, (newValue) => {
-    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
-        fetchFilter(newValue);
-});
-
-onMounted(async () => {
-    if ($props.focusOnMount) setTimeout(() => vnSelectRef.value.showPopup(), 300);
-});
 </script>
 
 <template>
diff --git a/src/components/common/VnSelectCache.vue b/src/components/common/VnSelectCache.vue
new file mode 100644
index 000000000..d03d0d280
--- /dev/null
+++ b/src/components/common/VnSelectCache.vue
@@ -0,0 +1,30 @@
+<script setup>
+import { ref, onBeforeMount } from 'vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import { useArrayData } from 'src/composables/useArrayData';
+
+const $props = defineProps({
+    row: {
+        type: [Object],
+        default: null,
+    },
+    find: {
+        type: String,
+        default: null,
+    },
+    url: {
+        type: String,
+        default: '',
+    },
+});
+const options = ref([]);
+onBeforeMount(async () => {
+    const findBy =
+        $props.find ?? $props.url.charAt(0).toLocaleLowerCase() + $props.url.slice(1, -1);
+    options.value = [$props.row[findBy]];
+});
+</script>
+
+<template>
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" :url="url" />
+</template>

From eaea8a50f0a1d6e455cd07663733fa2a2e595431 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Fri, 12 Jul 2024 11:49:37 +0200
Subject: [PATCH 58/70] fix: refs #7129 fix styles

---
 src/components/VnTable/VnTable.vue | 2 +-
 src/css/app.scss                   | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/VnTable/VnTable.vue b/src/components/VnTable/VnTable.vue
index deb0568c3..1e2593403 100644
--- a/src/components/VnTable/VnTable.vue
+++ b/src/components/VnTable/VnTable.vue
@@ -608,7 +608,7 @@ es:
 }
 
 .bg-header {
-    background-color: var(--vn-section-color);
+    background-color: var(--vn-header-color);
     color: var(--vn-text-color);
 }
 
diff --git a/src/css/app.scss b/src/css/app.scss
index 27ed65534..3a33e3236 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -4,9 +4,10 @@
 
 body.body--light {
     --font-color: black;
+    --vn-header-color: #cecece;
+    --vn-page-color: #ffffff;
     --vn-section-color: #e0e0e0;
     --vn-section-hover-color: #b9b9b9;
-    --vn-page-color: #ffffff;
     --vn-text-color: var(--font-color);
     --vn-label-color: #5f5f5f;
     --vn-accent-color: #e7e3e3;
@@ -18,6 +19,7 @@ body.body--light {
     }
 }
 body.body--dark {
+    --vn-header-color: #5d5d5d;
     --vn-page-color: #222;
     --vn-section-color: #3d3d3d;
     --vn-section-hover-color: #747474;

From 58d029c5bb622ba8c0681448ffa721f76dab9c68 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 13:03:49 +0200
Subject: [PATCH 59/70] fix(vnTable_order): default value

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

diff --git a/src/composables/useArrayData.js b/src/composables/useArrayData.js
index 3563e0dbd..8eaf72a06 100644
--- a/src/composables/useArrayData.js
+++ b/src/composables/useArrayData.js
@@ -175,7 +175,7 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
 
     async function addOrder(field, direction = 'ASC') {
         const newOrder = field + ' ' + direction;
-        let order = store.order ?? [];
+        let order = store.order || [];
         if (typeof order == 'string') order = [order];
 
         let index = order.findIndex((o) => o.split(' ')[0] === field);

From 73c5e0f1f4b89a50ee0e4d2850a9c3efd30b7260 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 13:34:31 +0200
Subject: [PATCH 60/70] fix: formModelPoup defaultActions false

---
 src/components/FormModel.vue      | 132 +++++++++++++++---------------
 src/components/FormModelPopup.vue |   6 +-
 2 files changed, 65 insertions(+), 73 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index becc1c174..758ddd433 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -90,7 +90,7 @@ const $props = defineProps({
 });
 const emit = defineEmits(['onFetch', 'onDataSaved']);
 const modelValue = computed(
-    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`,
+    () => $props.model ?? `formModel_${route?.meta?.title ?? route.name}`
 ).value;
 const componentIsRendered = ref(false);
 const arrayData = useArrayData(modelValue);
@@ -137,7 +137,7 @@ onMounted(async () => {
                     JSON.stringify(newVal) !== JSON.stringify(originalData.value);
                 isResetting.value = false;
             },
-            { deep: true },
+            { deep: true }
         );
     }
 });
@@ -145,7 +145,7 @@ onMounted(async () => {
 if (!$props.url)
     watch(
         () => arrayData.store.data,
-        (val) => updateAndEmit('onFetch', val),
+        (val) => updateAndEmit('onFetch', val)
     );
 
 watch(formUrl, async () => {
@@ -239,7 +239,7 @@ function filter(value, update, filterOptions) {
         (ref) => {
             ref.setOptionIndex(-1);
             ref.moveOptionSelection(1, true);
-        },
+        }
     );
 }
 
@@ -261,13 +261,7 @@ defineExpose({
 </script>
 <template>
     <div class="column items-center full-width">
-        <QForm
-            
-            @submit="save"
-            @reset="reset"
-            class="q-pa-md"
-            id="formModel"
-        >
+        <QForm @submit="save" @reset="reset" class="q-pa-md" id="formModel">
             <QCard>
                 <slot
                     v-if="formData"
@@ -276,70 +270,72 @@ defineExpose({
                     :validate="validate"
                     :filter="filter"
                 />
-                <SkeletonForm v-else/>
+                <SkeletonForm v-else />
             </QCard>
         </QForm>
     </div>
     <Teleport
         to="#st-actions"
-        v-if="stateStore?.isSubToolbarShown() && componentIsRendered"
+        v-if="
+            $props.defaultActions &&
+            stateStore?.isSubToolbarShown() &&
+            componentIsRendered
+        "
     >
-        <div v-if="$props.defaultActions">
-            <QBtnGroup push class="q-gutter-x-sm">
-                <slot name="moreActions" />
-                <QBtn
-                    :label="tMobile(defaultButtons.reset.label)"
-                    :color="defaultButtons.reset.color"
-                    :icon="defaultButtons.reset.icon"
-                    flat
-                    @click="reset"
-                    :disable="!hasChanges"
-                    :title="t(defaultButtons.reset.label)"
-                />
-                <QBtnDropdown
-                    v-if="$props.goTo"
-                    @click="saveAndGo"
-                    :label="tMobile('globals.saveAndContinue')"
-                    :title="t('globals.saveAndContinue')"
-                    :disable="!hasChanges"
-                    color="primary"
-                    icon="save"
-                    split
-                >
-                    <QList>
-                        <QItem
-                            clickable
-                            v-close-popup
-                            @click="save"
-                            :title="t('globals.save')"
-                        >
-                            <QItemSection>
-                                <QItemLabel>
-                                    <QIcon
-                                        name="save"
-                                        color="white"
-                                        class="q-mr-sm"
-                                        size="sm"
-                                    />
-                                    {{ t('globals.save').toUpperCase() }}
-                                </QItemLabel>
-                            </QItemSection>
-                        </QItem>
-                    </QList>
-                </QBtnDropdown>
-                <QBtn
-                    v-else
-                    :label="tMobile('globals.save')"
-                    color="primary"
-                    icon="save"
-                    @click="save"
-                    :disable="!hasChanges"
-                    :title="t(defaultButtons.save.label)"
-                />
-            </QBtnGroup>
-        </div>
+        <QBtnGroup push class="q-gutter-x-sm">
+            <slot name="moreActions" />
+            <QBtn
+                :label="tMobile(defaultButtons.reset.label)"
+                :color="defaultButtons.reset.color"
+                :icon="defaultButtons.reset.icon"
+                flat
+                @click="reset"
+                :disable="!hasChanges"
+                :title="t(defaultButtons.reset.label)"
+            />
+            <QBtnDropdown
+                v-if="$props.goTo"
+                @click="saveAndGo"
+                :label="tMobile('globals.saveAndContinue')"
+                :title="t('globals.saveAndContinue')"
+                :disable="!hasChanges"
+                color="primary"
+                icon="save"
+                split
+            >
+                <QList>
+                    <QItem
+                        clickable
+                        v-close-popup
+                        @click="save"
+                        :title="t('globals.save')"
+                    >
+                        <QItemSection>
+                            <QItemLabel>
+                                <QIcon
+                                    name="save"
+                                    color="white"
+                                    class="q-mr-sm"
+                                    size="sm"
+                                />
+                                {{ t('globals.save').toUpperCase() }}
+                            </QItemLabel>
+                        </QItemSection>
+                    </QItem>
+                </QList>
+            </QBtnDropdown>
+            <QBtn
+                v-else
+                :label="tMobile('globals.save')"
+                color="primary"
+                icon="save"
+                @click="save"
+                :disable="!hasChanges"
+                :title="t(defaultButtons.save.label)"
+            />
+        </QBtnGroup>
     </Teleport>
-    
+
     <QInnerLoading
         :showing="isLoading"
         :label="t('globals.pleaseWait')"
diff --git a/src/components/FormModelPopup.vue b/src/components/FormModelPopup.vue
index 981b17fb9..118c8f5f4 100644
--- a/src/components/FormModelPopup.vue
+++ b/src/components/FormModelPopup.vue
@@ -23,16 +23,12 @@ const formModelRef = ref(null);
 const closeButton = ref(null);
 
 const onDataSaved = (formData, requestResponse) => {
-    closeForm();
+    if (closeButton.value) closeButton.value.click();
     emit('onDataSaved', formData, requestResponse);
 };
 
 const isLoading = computed(() => formModelRef.value?.isLoading);
 
-const closeForm = async () => {
-    if (closeButton.value) closeButton.value.click();
-};
-
 defineExpose({
     isLoading,
     onDataSaved,

From 9494a30ddd1474c91a89044e690e7b52e0ade382 Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Fri, 12 Jul 2024 13:59:03 +0200
Subject: [PATCH 61/70] feat: refs #7704 Added min quantity label in catalog

---
 src/components/ui/CatalogItem.vue | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/components/ui/CatalogItem.vue b/src/components/ui/CatalogItem.vue
index 2b4724e35..5c5d71018 100644
--- a/src/components/ui/CatalogItem.vue
+++ b/src/components/ui/CatalogItem.vue
@@ -52,6 +52,10 @@ const dialog = ref(null);
                         :value="item?.[`value${index + 4}`]"
                     />
                 </template>
+                <div v-if="item.minQuantity" class="min-quantity">
+                    <QIcon name="production_quantity_limits" size="xs" />
+                    {{ item.minQuantity }}
+                </div>
                 <div class="footer">
                     <div class="price">
                         <p v-if="isCatalog">
@@ -133,6 +137,11 @@ const dialog = ref(null);
     }
 }
 
+.min-quantity {
+    text-align: right;
+    color: $negative !important;
+}
+
 .footer {
     .price {
         overflow: hidden;

From 3087dbf512241ce8cf47229cba8d089ac39dce4d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 14:02:29 +0200
Subject: [PATCH 62/70] fix(CrudModel): onChange $index

---
 src/components/CrudModel.vue | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/components/CrudModel.vue b/src/components/CrudModel.vue
index a55bde6f2..74c4a9bc0 100644
--- a/src/components/CrudModel.vue
+++ b/src/components/CrudModel.vue
@@ -98,19 +98,17 @@ defineExpose({
 });
 
 async function fetch(data) {
-    if (data && Array.isArray(data)) {
-        let $index = 0;
-        data.map((d) => (d.$index = $index++));
-    }
-
     resetData(data);
-
     emit('onFetch', data);
     return data;
 }
 
 function resetData(data) {
     if (!data) return;
+    if (data && Array.isArray(data)) {
+        let $index = 0;
+        data.map((d) => (d.$index = $index++));
+    }
     originalData.value = JSON.parse(JSON.stringify(data));
     formData.value = JSON.parse(JSON.stringify(data));
 
@@ -299,7 +297,7 @@ watch(formUrl, async () => {
         :url="url"
         :limit="limit"
         @on-fetch="fetch"
-        @on-change="resetData"
+        @on-change="fetch"
         :skeleton="false"
         ref="vnPaginateRef"
         v-bind="$attrs"

From bfab1ec3146a24cb28d4d7546fe8a330b210faa5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 12 Jul 2024 14:13:35 +0200
Subject: [PATCH 63/70] useAttrs

---
 src/components/common/VnSelectCache.vue | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/components/common/VnSelectCache.vue b/src/components/common/VnSelectCache.vue
index d03d0d280..51873ef6e 100644
--- a/src/components/common/VnSelectCache.vue
+++ b/src/components/common/VnSelectCache.vue
@@ -1,7 +1,6 @@
 <script setup>
-import { ref, onBeforeMount } from 'vue';
+import { ref, onBeforeMount, useAttrs } from 'vue';
 import VnSelect from 'src/components/common/VnSelect.vue';
-import { useArrayData } from 'src/composables/useArrayData';
 
 const $props = defineProps({
     row: {
@@ -12,19 +11,15 @@ const $props = defineProps({
         type: String,
         default: null,
     },
-    url: {
-        type: String,
-        default: '',
-    },
 });
 const options = ref([]);
 onBeforeMount(async () => {
-    const findBy =
-        $props.find ?? $props.url.charAt(0).toLocaleLowerCase() + $props.url.slice(1, -1);
-    options.value = [$props.row[findBy]];
+    const { url } = useAttrs();
+    const findBy = $props.find ?? url?.charAt(0)?.toLocaleLowerCase() + url?.slice(1, -1);
+    if (findBy) options.value = [$props.row[findBy]];
 });
 </script>
 
 <template>
-    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" :url="url" />
+    <VnSelect v-bind="$attrs" :options="$attrs.options ?? options" />
 </template>

From 65381e653622615af2652996eac44b9dd0cb8aab Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 22:38:23 +0200
Subject: [PATCH 64/70] perf: #7648 remove default value

---
 src/pages/Entry/MyEntries.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 5317645b6..5c2146b97 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -84,7 +84,6 @@ const printBuys = (rowId) => {
         },
     });
 };
-const DEFAULT_INTERVAL_DAYS = 3;
 </script>
 <template>
     <VnSearchbar
@@ -110,7 +109,7 @@ const DEFAULT_INTERVAL_DAYS = 3;
                     <VnInput
                         :label="t('params.scopeDays')"
                         v-model="params.days"
-                        class="q-px-xs q-pb-xs q-pt-none fit"
+                        class="q-px-xs row"
                         dense
                         filled
                         outlined

From 20403287ddc8320bf02b6bc4a1e5fb68baa13656 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 22:38:38 +0200
Subject: [PATCH 65/70] feat: scopeDays replace by daysOnward

---
 src/i18n/locale/en.yml               |   1 +
 src/i18n/locale/es.yml               |   1 +
 src/pages/Entry/MyEntries.vue        |   9 +-
 src/pages/Item/ItemRequestFilter.vue |   4 +-
 src/pages/Travel/TravelFilter.vue    | 225 ---------------------------
 src/pages/Travel/locale/en.yml       |   7 +-
 src/pages/Travel/locale/es.yml       |   6 -
 7 files changed, 5 insertions(+), 248 deletions(-)
 delete mode 100644 src/pages/Travel/TravelFilter.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 373773635..d5ceaeba5 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -46,6 +46,7 @@ globals:
     noPinnedModules: You don't have any pinned modules
     summary:
         basicData: Basic data
+    daysOnward: Days onward
     today: Today
     yesterday: Yesterday
     dateFormat: en-GB
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index f8c6363c2..d42064666 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -45,6 +45,7 @@ globals:
     noPinnedModules: No has fijado ningún módulo
     summary:
         basicData: Datos básicos
+    daysOnward: Días adelante
     today: Hoy
     yesterday: Ayer
     dateFormat: es-ES
diff --git a/src/pages/Entry/MyEntries.vue b/src/pages/Entry/MyEntries.vue
index 5c2146b97..d4b73b479 100644
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@@ -103,11 +103,10 @@ const printBuys = (rowId) => {
                 default-mode="card"
                 auto-load
                 :right-search="true"
-                :filter="{ days: DEFAULT_INTERVAL_DAYS }"
             >
                 <template #moreFilterPanel="{ params }">
                     <VnInput
-                        :label="t('params.scopeDays')"
+                        :label="t('globals.daysOnward')"
                         v-model="params.days"
                         class="q-px-xs row"
                         dense
@@ -121,11 +120,5 @@ const printBuys = (rowId) => {
 </template>
 
 <i18n>
-en:
-    params:
-        scopeDays: Days onward
-es:
-    params:
-        scopeDays: Días adelante
     You can search by entry reference: Puedes buscar por referencia de la entrada
 </i18n>
diff --git a/src/pages/Item/ItemRequestFilter.vue b/src/pages/Item/ItemRequestFilter.vue
index 2fbe849d1..c9340dc1f 100644
--- a/src/pages/Item/ItemRequestFilter.vue
+++ b/src/pages/Item/ItemRequestFilter.vue
@@ -209,7 +209,7 @@ const decrement = (paramsObj, key) => {
                     <QItemSection>
                         <VnInput
                             v-model="params.scopeDays"
-                            :label="t('params.scopeDays')"
+                            :label="t('globals.daysOnward')"
                             type="number"
                             dense
                             outlined
@@ -281,7 +281,6 @@ en:
         requesterFk: Salesperson
         from: From
         to: To
-        scopeDays: Days onward
         mine: For me
         state: State
     dateFiltersTooltip: Cannot choose a range of dates and days onward at the same time
@@ -299,7 +298,6 @@ es:
         requesterFk: Comercial
         from: Desde
         to: Hasta
-        scopeDays: Días adelante
         mine: Para mi
         state: Estado
     dateFiltersTooltip: No se puede seleccionar un rango de fechas y días en adelante a la vez
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
deleted file mode 100644
index 77f7ec112..000000000
--- a/src/pages/Travel/TravelFilter.vue
+++ /dev/null
@@ -1,225 +0,0 @@
-<script setup>
-import { ref } from 'vue';
-import { useI18n } from 'vue-i18n';
-
-import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
-import VnSelect from 'src/components/common/VnSelect.vue';
-import FetchData from 'components/FetchData.vue';
-import VnInputDate from 'components/common/VnInputDate.vue';
-
-const { t } = useI18n();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
-
-const warehousesOptions = ref([]);
-const continentsOptions = ref([]);
-const agenciesOptions = ref([]);
-
-const add = (paramsObj, key) => {
-    if (paramsObj[key] === undefined) {
-        paramsObj[key] = 1;
-    } else {
-        paramsObj[key]++;
-    }
-};
-
-const decrement = (paramsObj, key) => {
-    if (paramsObj[key] === 0) return;
-
-    paramsObj[key]--;
-};
-</script>
-
-<template>
-    <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="Continents"
-        @on-fetch="(data) => (continentsOptions = data)"
-        auto-load
-    />
-    <FetchData
-        url="AgencyModes"
-        @on-fetch="(data) => (agenciesOptions = data)"
-        auto-load
-    />
-
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
-        <template #tags="{ tag, formatFn }">
-            <div class="q-gutter-x-xs">
-                <strong>{{ t(`params.${tag.label}`) }}: </strong>
-                <span>{{ formatFn(tag.value) }}</span>
-            </div>
-        </template>
-        <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.agencyModeFk')"
-                        v-model="params.agencyModeFk"
-                        @update:model-value="searchFn()"
-                        :options="agenciesOptions"
-                        option-value="agencyFk"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.warehouseOutFk')"
-                        v-model="params.warehouseOutFk"
-                        @update:model-value="searchFn()"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('travelFilter.filter.warehouseInFk')"
-                        v-model="params.warehouseInFk"
-                        @update:model-value="searchFn()"
-                        :options="warehousesOptions"
-                        option-value="id"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QInput
-                        v-model="params.scopeDays"
-                        type="number"
-                        :label="t('travelFilter.filter.scopeDays')"
-                        dense
-                        outlined
-                        rounded
-                        class="input-number"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="add"
-                                flat
-                                dense
-                                size="12px"
-                                @click="add(params, 'scopeDays')"
-                            />
-                            <QBtn
-                                icon="remove"
-                                flat
-                                dense
-                                size="12px"
-                                @click="decrement(params, 'scopeDays')"
-                            />
-                        </template>
-                    </QInput>
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        v-model="params.landedFrom"
-                        :label="t('params.landedFrom')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnInputDate
-                        :label="t('params.landedTo')"
-                        v-model="params.landedTo"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <VnSelect
-                        :label="t('params.continent')"
-                        v-model="params.continent"
-                        @update:model-value="searchFn()"
-                        :options="continentsOptions"
-                        option-value="code"
-                        option-label="name"
-                        hide-selected
-                        dense
-                        outlined
-                        rounded
-                    />
-                </QItemSection>
-            </QItem>
-            <QItem>
-                <QItemSection>
-                    <QInput
-                        v-model="params.totalEntries"
-                        type="number"
-                        :label="t('params.totalEntries')"
-                        dense
-                        outlined
-                        rounded
-                        min="0"
-                        class="input-number"
-                    >
-                        <template #append>
-                            <QBtn
-                                icon="add"
-                                flat
-                                dense
-                                size="12px"
-                                @click="add(params, 'totalEntries')"
-                            />
-                            <QBtn
-                                icon="remove"
-                                flat
-                                dense
-                                size="12px"
-                                @click="decrement(params, 'totalEntries')"
-                            />
-                        </template>
-                    </QInput>
-                </QItemSection>
-            </QItem>
-        </template>
-    </VnFilterPanel>
-</template>
-
-<i18n>
-en:
-    params:
-        search: Id/Reference
-        landedFrom: Landed from
-        landedTo: Landed to
-        continent: Continent out
-        totalEntries: Total entries
-es:
-    params:
-        search: Id/Referencia
-        landedFrom: Llegada desde
-        landedTo: Llegada hasta
-        continent: Cont. Salida
-        totalEntries: Ent. totales
-
-</i18n>
diff --git a/src/pages/Travel/locale/en.yml b/src/pages/Travel/locale/en.yml
index c67eddce0..8b1378917 100644
--- a/src/pages/Travel/locale/en.yml
+++ b/src/pages/Travel/locale/en.yml
@@ -1,6 +1 @@
-travelFilter:
-    filter:
-        warehouseOutFk: Warehouse Out
-        warehouseInFk: Warehouse In
-        agencyModeFk: Agency
-        scopeDays: Days onward
+
diff --git a/src/pages/Travel/locale/es.yml b/src/pages/Travel/locale/es.yml
index 8e958c074..e69de29bb 100644
--- a/src/pages/Travel/locale/es.yml
+++ b/src/pages/Travel/locale/es.yml
@@ -1,6 +0,0 @@
-travelFilter:
-    filter:
-        warehouseInFk: Alm. entrada
-        warehouseOutFk: Alm. salida
-        agencyModeFk: Agencia
-        scopeDays: Días adelante

From 7f7bf9c0e68341a5fccf23df555d7b49efc89fd7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 12 Jul 2024 22:40:34 +0200
Subject: [PATCH 66/70] feat: remove empty locales

---
 src/pages/Travel/locale/en.yml | 1 -
 src/pages/Travel/locale/es.yml | 0
 2 files changed, 1 deletion(-)
 delete mode 100644 src/pages/Travel/locale/en.yml
 delete mode 100644 src/pages/Travel/locale/es.yml

diff --git a/src/pages/Travel/locale/en.yml b/src/pages/Travel/locale/en.yml
deleted file mode 100644
index 8b1378917..000000000
--- a/src/pages/Travel/locale/en.yml
+++ /dev/null
@@ -1 +0,0 @@
-
diff --git a/src/pages/Travel/locale/es.yml b/src/pages/Travel/locale/es.yml
deleted file mode 100644
index e69de29bb..000000000

From b3d14ebeeedaea9e48350e865f2e96dd34138950 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 15 Jul 2024 07:11:02 +0200
Subject: [PATCH 67/70] fix: order left panel

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

diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 51f266800..961e80377 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -21,9 +21,9 @@ export const useNavigationStore = defineStore('navigationStore', () => {
         'route',
         'ticket',
         'worker',
+        'account',
         'wagon',
         'zone',
-        'account',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From dbba7589ef8eba00bf45a9ae2b51ef13f4ba0702 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 15 Jul 2024 08:32:53 +0200
Subject: [PATCH 68/70] fix: VnBreadcrumbs return if not has matched

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

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 337507233..02226e497 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -18,7 +18,7 @@ watchEffect(() => {
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
-
+    if (!matched.value[0]) return;
     if (matched.value[0].name != 'Dashboard') {
         root.value = useCamelCase(matched.value[0].path.substring(1).toLowerCase());
 

From 3f3d0c73375173c3a88725d40541409225811964 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 15 Jul 2024 09:39:57 +0200
Subject: [PATCH 69/70] fix(claimList): claimList client column

---
 src/css/app.scss              | 3 +++
 src/pages/Claim/ClaimList.vue | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/css/app.scss b/src/css/app.scss
index 2c11c9ea6..dfc89cc54 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -246,6 +246,9 @@ input::-webkit-inner-spin-button {
                 white-space: nowrap;
                 text-overflow: ellipsis;
             }
+            overflow: hidden;
+            white-space: nowrap;
+            text-overflow: ellipsis;
         }
         .expand {
             max-width: 400px;
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index 2a445f14a..05698debe 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -44,6 +44,7 @@ const columns = computed(() => [
                 fields: ['id', 'name'],
             },
         },
+        class: 'expand',
     },
     {
         align: 'left',

From 6007e0c7ccabdaba40ecf2f5a57b917934d57858 Mon Sep 17 00:00:00 2001
From: pablone <pablone@verdnatura.es>
Date: Mon, 15 Jul 2024 10:42:11 +0200
Subject: [PATCH 70/70] fix: refs #7129 fix e2e

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

diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index f118c7c1c..78904b473 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -406,6 +406,7 @@ function handleLocation(data, location) {
         order="id DESC"
         :columns="columns"
         redirect="customer"
+        auto-load
     >
         <template #more-create-dialog="{ data }">
             <VnLocation