From 1af5b270a0d1669297509223d17836e3b9941f9f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Feb 2024 10:26:20 +0100
Subject: [PATCH 01/54] fear: refs #5186 WIP parking section

---
 src/i18n/en/index.js                          |  27 +++++
 src/i18n/es/index.js                          |  25 +++++
 .../Parking/Card/ParkingBasicData.vue         |  59 +++++++++++
 .../Shelving/Parking/Card/ParkingCard.vue     |  56 ++++++++++
 .../Parking/Card/ParkingDescriptor.vue        |  52 +++++++++
 .../Shelving/Parking/Card/ParkingLog.vue      |   6 ++
 .../Shelving/Parking/Card/ParkingSummary.vue  |  50 +++++++++
 src/pages/Shelving/Parking/ParkingFilter.vue  |  77 ++++++++++++++
 src/pages/Shelving/Parking/ParkingList.vue    | 100 ++++++++++++++++++
 src/pages/Shelving/Parking/ParkingMain.vue    |  17 +++
 src/router/modules/index.js                   |   2 +
 src/router/modules/parking.js                 |  63 +++++++++++
 src/router/modules/shelving.js                |  23 ++--
 src/router/routes.js                          |   2 +
 14 files changed, 551 insertions(+), 8 deletions(-)
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingBasicData.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingCard.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingLog.vue
 create mode 100644 src/pages/Shelving/Parking/Card/ParkingSummary.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingFilter.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingList.vue
 create mode 100644 src/pages/Shelving/Parking/ParkingMain.vue
 create mode 100644 src/router/modules/parking.js

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 9e0ad7c9b..f79c3c157 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -656,6 +656,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             log: 'Logs',
+            parkingList: 'Parking list',
         },
         list: {
             parking: 'Parking',
@@ -676,6 +677,32 @@ export default {
             recyclable: 'Recyclable',
         },
     },
+    parking: {
+        pageTitles: {
+            parking: 'Parking',
+            parkingList: 'Parkings list',
+            summary: 'Summary',
+            basicData: 'Basic data',
+            log: 'Logs',
+        },
+        list: {
+            pickingOrder: 'Picking order',
+        },
+        searchBar: {
+            info: 'You can search by parking code',
+            label: 'Search parking...',
+        },
+        summary: {
+            code: 'Code',
+            pickingOrder: 'Picking order',
+            sector: 'Sector',
+        },
+        basicData: {
+            code: 'Code',
+            pickingOrder: 'Picking order',
+            sector: 'Sector',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Invoices In',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6083dfad7..fd9aafef6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -715,6 +715,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Registros de auditoría',
+            parkingList: 'Listado de parkings',
         },
         list: {
             parking: 'Parking',
@@ -735,6 +736,30 @@ export default {
             recyclable: 'Reciclable',
         },
     },
+    parking: {
+        pageTitles: {
+            parking: 'Parking',
+            parkingList: 'Listado de parkings',
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            log: 'Registros de auditoría',
+        },
+        list: {
+            pickingOrder: 'Orden de recogida',
+        },
+        searchBar: {
+            info: 'Puedes buscar por código de parking',
+            label: 'Buscar parking...',
+        },
+        summary: {
+            code: 'Código',
+            pickingOrder: 'Orden de recogida',
+        },
+        basicData: {
+            code: 'Código',
+            pickingOrder: 'Orden de recogida',
+        },
+    },
     invoiceIn: {
         pageTitles: {
             invoiceIns: 'Fact. recibidas',
diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
new file mode 100644
index 000000000..e5b886eff
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
@@ -0,0 +1,59 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FormModel from 'components/FormModel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+const route = useRoute();
+const parkingId = route.params?.id || null;
+const sectors = ref([]);
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+<template>
+    <FetchData
+        url="Sectors"
+        :filter="{ fields: ['id', 'description'] }"
+        sort-by="description"
+        @on-fetch="(data) => (sectors = data)"
+        auto-load
+    />
+    <VnSubToolbar />
+    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
+        <template #form="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
+                </div>
+                <div class="col">
+                    <VnInput
+                        v-model="data.pickingOrder"
+                        :label="t('parking.basicData.pickingOrder')"
+                    />
+                </div>
+            </VnRow>
+            <VnRow>
+                <div class="col">
+                    <VnSelectFilter
+                        v-model="data.sectorFk"
+                        option-value="id"
+                        option-label="description"
+                        :label="t('parking.basicData.sector')"
+                        :options="sectors"
+                        use-input
+                        input-debounce="0"
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModel>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Shelving/Parking/Card/ParkingCard.vue
new file mode 100644
index 000000000..1dfc51173
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingCard.vue
@@ -0,0 +1,56 @@
+<script setup>
+import { onMounted, watch } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'src/composables/useArrayData';
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
+
+const stateStore = useStateStore();
+const { t } = useI18n();
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+const route = useRoute();
+const arrayData = useArrayData('Parking', {
+    url: `Parkings/${route.params.id}`,
+    filter,
+});
+
+onMounted(async () => await arrayData.fetch({ append: false }));
+watch(
+    () => route.params.id,
+    async (newId) => {
+        if (newId) {
+            arrayData.store.url = `Parkings/${newId}`;
+            await arrayData.fetch({ append: false });
+        }
+    }
+);
+</script>
+<template>
+    <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
+        <VnSearchbar
+            :info="t('parking.searchBar.info')"
+            :label="t('parking.searchBar.label')"
+            data-key="Parking"
+        />
+    </Teleport>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ParkingDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <RouterView></RouterView>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
new file mode 100644
index 000000000..1805b5af0
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
@@ -0,0 +1,52 @@
+<script setup>
+import { ref, computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardDescriptor from 'components/ui/CardDescriptor.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import useCardDescription from 'composables/useCardDescription';
+
+const props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+});
+
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => props.id || route.params.id);
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+const header = ref(useCardDescription());
+const setHeader = (entity) => (header.value = useCardDescription(entity.code, entity.id));
+</script>
+
+<template>
+    <CardDescriptor
+        module="Parking"
+        :url="`Parkings/${entityId}`"
+        :filter="filter"
+        :title="header.title"
+        :subtitle="header.subtitle"
+        data-key="ParkingData"
+        @on-fetch="setHeader"
+    >
+        <template #body="{ entity: parking }">
+            <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+            <VnLv
+                :label="t('parking.summary.pickingOrder')"
+                :value="parking.pickingOrder"
+            />
+            <VnLv
+                :label="t('parking.summary.sector')"
+                :value="parking.sector?.description"
+            />
+        </template>
+    </CardDescriptor>
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Shelving/Parking/Card/ParkingLog.vue
new file mode 100644
index 000000000..f25abd2e4
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Parking" url="/ParkingLogs" />
+</template>
diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
new file mode 100644
index 000000000..e94fa8d9e
--- /dev/null
+++ b/src/pages/Shelving/Parking/Card/ParkingSummary.vue
@@ -0,0 +1,50 @@
+<script setup>
+import { computed } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import CardSummary from 'components/ui/CardSummary.vue';
+import VnLv from 'components/ui/VnLv.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        default: 0,
+    },
+});
+const route = useRoute();
+const { t } = useI18n();
+
+const entityId = computed(() => $props.id || route.params.id);
+
+const filter = {
+    fields: ['sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+</script>
+
+<template>
+    <div class="q-pa-md">
+        <CardSummary ref="summary" :url="`Parkings/${entityId}`" :filter="filter">
+            <template #header="{ entity: parking }">{{ parking.code }}</template>
+            <template #body="{ entity: parking }">
+                <QCard class="vn-one">
+                    <QCardSection class="q-pa-none">
+                        <a class="header" :href="`#/parking/${entityId}/basic-data`">
+                            {{ t('parking.pageTitles.basicData') }}
+                            <QIcon name="open_in_new" color="primary" />
+                        </a>
+                    </QCardSection>
+                    <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+                    <VnLv
+                        :label="t('parking.summary.pickingOrder')"
+                        :value="parking.pickingOrder"
+                    />
+                    <VnLv
+                        :label="t('parking.summary.sector')"
+                        :value="parking.sector?.description"
+                    />
+                </QCard>
+            </template>
+        </CardSummary>
+    </div>
+</template>
diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Shelving/Parking/ParkingFilter.vue
new file mode 100644
index 000000000..2e559a879
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingFilter.vue
@@ -0,0 +1,77 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import VnFilterPanel from 'components/ui/VnFilterPanel.vue';
+import VnInput from 'components/common/VnInput.vue';
+import FetchData from 'src/components/FetchData.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+
+const { t } = useI18n();
+defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const sectors = ref([]);
+const emit = defineEmits(['search']);
+</script>
+
+<template>
+    <FetchData
+        url="Sectors"
+        :filter="{ fields: ['id', 'description'] }"
+        sort-by="description"
+        @on-fetch="(data) => (sectors = data)"
+        auto-load
+    />
+    <VnFilterPanel :data-key="dataKey" :search-button="true" @search="emit('search')">
+        <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('params.code')"
+                        v-model="params.code"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        v-model="params.sectorFk"
+                        option-value="id"
+                        option-label="description"
+                        :label="t('params.sectorFk')"
+                        dense
+                        outlined
+                        rounded
+                        :options="sectors"
+                        use-input
+                        input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        code: Code
+        sectorFk: Sector
+        search: General Search
+es:
+    params:
+        code: Código
+        search: Búsqueda general
+
+</i18n>
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Shelving/Parking/ParkingList.vue
new file mode 100644
index 000000000..4fff9b3cb
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingList.vue
@@ -0,0 +1,100 @@
+<script setup>
+import { onMounted, onUnmounted } from 'vue';
+import { useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useStateStore } from 'stores/useStateStore';
+import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import CardList from 'components/ui/CardList.vue';
+import VnLv from 'components/ui/VnLv.vue';
+import ParkingFilter from './ParkingFilter.vue';
+import ParkingSummary from './Card/ParkingSummary.vue';
+
+const stateStore = useStateStore();
+const router = useRouter();
+const { t } = useI18n();
+const { viewSummary } = useSummaryDialog();
+
+onMounted(() => (stateStore.rightDrawer = true));
+onUnmounted(() => (stateStore.rightDrawer = false));
+
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
+
+function exprBuilder(param, value) {
+    switch (param) {
+        case 'code':
+            return { [param]: { like: `%${value}%` } };
+        case 'sectorFk':
+            return { [param]: value };
+        case 'search':
+            return { or: [{ code: { like: `%${value}%` } }, { id: value }] };
+    }
+}
+</script>
+
+<template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar" />
+        <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="256" show-if-above>
+        <QScrollArea class="fit text-grey-8">
+            <ParkingFilter data-key="ParkingList" />
+        </QScrollArea>
+    </QDrawer>
+    <QPage class="column items-center q-pa-md">
+        <div class="vn-card-list">
+            <VnPaginate
+                data-key="ParkingList"
+                url="Parkings"
+                :filter="filter"
+                :expr-builder="exprBuilder"
+                :limit="20"
+                auto-load
+                order="code"
+            >
+                <template #body="{ rows }">
+                    <CardList
+                        v-for="row of rows"
+                        :key="row.id"
+                        :id="row.id"
+                        :title="row.code"
+                        @click="router.push({ path: `/parking/${row.id}` })"
+                    >
+                        <template #list-items>
+                            <VnLv label="Sector" :value="row.sector?.description" />
+                            <VnLv
+                                :label="t('parking.list.pickingOrder')"
+                                :value="row.pickingOrder"
+                            />
+                        </template>
+                        <template #actions>
+                            <QBtn
+                                :label="t('components.smartCard.openSummary')"
+                                @click.stop="viewSummary(row.id, ParkingSummary)"
+                                color="primary"
+                            />
+                        </template>
+                    </CardList>
+                </template>
+            </VnPaginate>
+        </div>
+    </QPage>
+</template>
diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue
new file mode 100644
index 000000000..66ce78f23
--- /dev/null
+++ b/src/pages/Shelving/Parking/ParkingMain.vue
@@ -0,0 +1,17 @@
+<script setup>
+import { useStateStore } from 'stores/useStateStore';
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+const stateStore = useStateStore();
+</script>
+
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit text-grey-8">
+            <LeftMenu />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <RouterView></RouterView>
+    </QPageContainer>
+</template>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index 84a26798d..770941b23 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -13,6 +13,7 @@ import Travel from './travel';
 import Order from './order';
 import Department from './department';
 import Entry from './entry';
+import Parking from './parking';
 
 export default [
     Item,
@@ -30,4 +31,5 @@ export default [
     invoiceIn,
     Department,
     Entry,
+    Parking,
 ];
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
new file mode 100644
index 000000000..b6868cc22
--- /dev/null
+++ b/src/router/modules/parking.js
@@ -0,0 +1,63 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/parking',
+    name: 'Parking',
+    meta: {
+        title: 'parking',
+        icon: 'garage_home',
+    },
+    component: RouterView,
+    redirect: { name: 'ParkingMain' },
+    menus: {
+        main: ['ParkingList'],
+        card: ['ParkingBasicData', 'ParkingLog'],
+    },
+    children: [
+        {
+            path: '',
+            name: 'ParkingMain',
+            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
+            redirect: { name: 'ParkingList' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ParkingList',
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
+                },
+            ],
+        },
+        {
+            path: ':id',
+            name: 'ParkingCard',
+            component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
+            redirect: { name: 'ParkingSummary' },
+            children: [
+                {
+                    name: 'ParkingSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'view_list',
+                    },
+                    component: () =>
+                        import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
+                },
+                {
+                    name: 'ShelvingBasicData',
+                    path: 'basic-data',
+                    meta: {
+                        title: 'basicData',
+                        icon: 'vn:settings',
+                        roles: ['salesPerson'],
+                    },
+                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 494f286c3..92e479f27 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -1,17 +1,17 @@
-import {RouterView} from "vue-router";
+import { RouterView } from 'vue-router';
 
 export default {
     path: '/shelving',
     name: 'Shelving',
     meta: {
         title: 'shelving',
-        icon: 'vn:inventory'
+        icon: 'vn:inventory',
     },
     component: RouterView,
     redirect: { name: 'ShelvingMain' },
     menus: {
-        main: ['ShelvingList'],
-        card: ['ShelvingBasicData', 'ShelvingLog']
+        main: ['ShelvingList', 'ParkingList'],
+        card: ['ShelvingBasicData', 'ShelvingLog'],
     },
     children: [
         {
@@ -51,8 +51,7 @@ export default {
                     meta: {
                         title: 'summary',
                     },
-                    component: () =>
-                        import('pages/Shelving/Card/ShelvingSummary.vue'),
+                    component: () => import('pages/Shelving/Card/ShelvingSummary.vue'),
                 },
                 {
                     name: 'ShelvingBasicData',
@@ -75,6 +74,14 @@ export default {
                 },
             ],
         },
-    ]
+        {
+            path: 'parking',
+            name: 'ParkingList',
+            meta: {
+                title: 'parkingList',
+                icon: 'view_list',
+            },
+            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
+        },
+    ],
 };
-
diff --git a/src/router/routes.js b/src/router/routes.js
index d1027955f..a8ca03377 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -13,6 +13,7 @@ import department from './modules/department';
 import shelving from 'src/router/modules/shelving';
 import order from 'src/router/modules/order';
 import entry from 'src/router/modules/entry';
+import parking from 'src/router/modules/parking';
 
 const routes = [
     {
@@ -67,6 +68,7 @@ const routes = [
             travel,
             department,
             entry,
+            parking,
             {
                 path: '/:catchAll(.*)*',
                 name: 'NotFound',

From ddb6bdeb47e1fdf69dc89e27310a391f757249e4 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 21 Feb 2024 11:31:25 +0100
Subject: [PATCH 02/54] fix: refs #5186 parking routes

---
 src/router/modules/parking.js | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index b6868cc22..565a9eec6 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -48,14 +48,24 @@ export default {
                         import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
                 },
                 {
-                    name: 'ShelvingBasicData',
+                    name: 'ParkingBasicData',
                     path: 'basic-data',
                     meta: {
                         title: 'basicData',
                         icon: 'vn:settings',
-                        roles: ['salesPerson'],
                     },
-                    component: () => import('pages/Shelving/Card/ShelvingForm.vue'),
+                    component: () =>
+                        import('pages/Shelving/Parking/Card/ParkingBasicData.vue'),
+                },
+                {
+                    name: 'ParkingLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'history',
+                    },
+                    component: () =>
+                        import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
                 },
             ],
         },

From 46bcba99bcb6e085b8696a4ac6b8f7d715979fd1 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 09:59:32 +0100
Subject: [PATCH 03/54] fix: refs #5186 margin top

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index 6368a3e52..4ecefb92d 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -403,7 +403,7 @@ setLogTree();
         auto-load
     />
     <div
-        class="column items-center logs origin-log"
+        class="column items-center logs origin-log q-mt-md"
         v-for="(originLog, originLogIndex) in logTree"
         :key="originLogIndex"
     >

From ebbe38a14e02d5d089cdb2e064a41d6e406f2018 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:05:34 +0100
Subject: [PATCH 04/54] fix: refs #5186 parking routes

---
 .../Parking/Card/ParkingBasicData.vue         | 36 ++++++++-----------
 .../Parking/Card/ParkingCard.vue              |  2 +-
 .../Parking/Card/ParkingDescriptor.vue        |  0
 .../Parking/Card/ParkingLog.vue               |  0
 .../Parking/Card/ParkingSummary.vue           |  0
 .../{Shelving => }/Parking/ParkingFilter.vue  |  0
 .../{Shelving => }/Parking/ParkingList.vue    |  0
 src/pages/Shelving/Parking/ParkingMain.vue    | 17 ---------
 src/router/modules/parking.js                 | 34 ++++--------------
 src/router/modules/shelving.js                | 18 +++++-----
 10 files changed, 32 insertions(+), 75 deletions(-)
 rename src/pages/{Shelving => }/Parking/Card/ParkingBasicData.vue (57%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingCard.vue (95%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingDescriptor.vue (100%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingLog.vue (100%)
 rename src/pages/{Shelving => }/Parking/Card/ParkingSummary.vue (100%)
 rename src/pages/{Shelving => }/Parking/ParkingFilter.vue (100%)
 rename src/pages/{Shelving => }/Parking/ParkingList.vue (100%)
 delete mode 100644 src/pages/Shelving/Parking/ParkingMain.vue

diff --git a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
similarity index 57%
rename from src/pages/Shelving/Parking/Card/ParkingBasicData.vue
rename to src/pages/Parking/Card/ParkingBasicData.vue
index e5b886eff..5f3e824e1 100644
--- a/src/pages/Shelving/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -30,29 +30,23 @@ const filter = {
     <VnSubToolbar />
     <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
         <template #form="{ data }">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
-                </div>
-                <div class="col">
-                    <VnInput
-                        v-model="data.pickingOrder"
-                        :label="t('parking.basicData.pickingOrder')"
-                    />
-                </div>
+            <VnRow>
+                <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
+                <VnInput
+                    v-model="data.pickingOrder"
+                    :label="t('parking.basicData.pickingOrder')"
+                />
             </VnRow>
             <VnRow>
-                <div class="col">
-                    <VnSelectFilter
-                        v-model="data.sectorFk"
-                        option-value="id"
-                        option-label="description"
-                        :label="t('parking.basicData.sector')"
-                        :options="sectors"
-                        use-input
-                        input-debounce="0"
-                    />
-                </div>
+                <VnSelectFilter
+                    v-model="data.sectorFk"
+                    option-value="id"
+                    option-label="description"
+                    :label="t('parking.basicData.sector')"
+                    :options="sectors"
+                    use-input
+                    input-debounce="0"
+                />
             </VnRow>
         </template>
     </FormModel>
diff --git a/src/pages/Shelving/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
similarity index 95%
rename from src/pages/Shelving/Parking/Card/ParkingCard.vue
rename to src/pages/Parking/Card/ParkingCard.vue
index 1dfc51173..74d021fff 100644
--- a/src/pages/Shelving/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -6,7 +6,7 @@ import { useStateStore } from 'stores/useStateStore';
 import { useArrayData } from 'src/composables/useArrayData';
 import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
-import ParkingDescriptor from 'pages/Shelving/Parking/Card/ParkingDescriptor.vue';
+import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
diff --git a/src/pages/Shelving/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingDescriptor.vue
rename to src/pages/Parking/Card/ParkingDescriptor.vue
diff --git a/src/pages/Shelving/Parking/Card/ParkingLog.vue b/src/pages/Parking/Card/ParkingLog.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingLog.vue
rename to src/pages/Parking/Card/ParkingLog.vue
diff --git a/src/pages/Shelving/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
similarity index 100%
rename from src/pages/Shelving/Parking/Card/ParkingSummary.vue
rename to src/pages/Parking/Card/ParkingSummary.vue
diff --git a/src/pages/Shelving/Parking/ParkingFilter.vue b/src/pages/Parking/ParkingFilter.vue
similarity index 100%
rename from src/pages/Shelving/Parking/ParkingFilter.vue
rename to src/pages/Parking/ParkingFilter.vue
diff --git a/src/pages/Shelving/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
similarity index 100%
rename from src/pages/Shelving/Parking/ParkingList.vue
rename to src/pages/Parking/ParkingList.vue
diff --git a/src/pages/Shelving/Parking/ParkingMain.vue b/src/pages/Shelving/Parking/ParkingMain.vue
deleted file mode 100644
index 66ce78f23..000000000
--- a/src/pages/Shelving/Parking/ParkingMain.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<script setup>
-import { useStateStore } from 'stores/useStateStore';
-import LeftMenu from 'src/components/LeftMenu.vue';
-
-const stateStore = useStateStore();
-</script>
-
-<template>
-    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
-        <QScrollArea class="fit text-grey-8">
-            <LeftMenu />
-        </QScrollArea>
-    </QDrawer>
-    <QPageContainer>
-        <RouterView></RouterView>
-    </QPageContainer>
-</template>
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index 565a9eec6..993400f75 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -8,33 +8,16 @@ export default {
         icon: 'garage_home',
     },
     component: RouterView,
-    redirect: { name: 'ParkingMain' },
+    redirect: { name: 'ParkingCard' },
     menus: {
-        main: ['ParkingList'],
+        main: [],
         card: ['ParkingBasicData', 'ParkingLog'],
     },
     children: [
         {
-            path: '',
-            name: 'ParkingMain',
-            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
-            redirect: { name: 'ParkingList' },
-            children: [
-                {
-                    path: 'list',
-                    name: 'ParkingList',
-                    meta: {
-                        title: 'parkingList',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Shelving/Parking/ParkingList.vue'),
-                },
-            ],
-        },
-        {
-            path: ':id',
+            path: '/parking/:id',
             name: 'ParkingCard',
-            component: () => import('src/pages/Shelving/Parking/Card/ParkingCard.vue'),
+            component: () => import('src/pages/Parking/Card/ParkingCard.vue'),
             redirect: { name: 'ParkingSummary' },
             children: [
                 {
@@ -44,8 +27,7 @@ export default {
                         title: 'summary',
                         icon: 'view_list',
                     },
-                    component: () =>
-                        import('src/pages/Shelving/Parking/Card/ParkingSummary.vue'),
+                    component: () => import('src/pages/Parking/Card/ParkingSummary.vue'),
                 },
                 {
                     name: 'ParkingBasicData',
@@ -54,8 +36,7 @@ export default {
                         title: 'basicData',
                         icon: 'vn:settings',
                     },
-                    component: () =>
-                        import('pages/Shelving/Parking/Card/ParkingBasicData.vue'),
+                    component: () => import('pages/Parking/Card/ParkingBasicData.vue'),
                 },
                 {
                     name: 'ParkingLog',
@@ -64,8 +45,7 @@ export default {
                         title: 'log',
                         icon: 'history',
                     },
-                    component: () =>
-                        import('src/pages/Shelving/Parking/Card/ParkingLog.vue'),
+                    component: () => import('src/pages/Parking/Card/ParkingLog.vue'),
                 },
             ],
         },
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 92e479f27..af2605c93 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -37,6 +37,15 @@ export default {
                     },
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
+                {
+                    path: '/parking',
+                    name: 'ParkingList',
+                    meta: {
+                        title: 'parkingList',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Parking/ParkingList.vue'),
+                },
             ],
         },
         {
@@ -74,14 +83,5 @@ export default {
                 },
             ],
         },
-        {
-            path: 'parking',
-            name: 'ParkingList',
-            meta: {
-                title: 'parkingList',
-                icon: 'view_list',
-            },
-            component: () => import('src/pages/Shelving/Parking/ParkingMain.vue'),
-        },
     ],
 };

From 67d97eef8f03fccdfab8e15163b0e1af7f3ef5e0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:19:40 +0100
Subject: [PATCH 05/54] fix: refs #5186 add searchbar

---
 src/pages/Parking/ParkingList.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 4fff9b3cb..0830ef175 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -5,6 +5,7 @@ import { useI18n } from 'vue-i18n';
 import { useStateStore } from 'stores/useStateStore';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import CardList from 'components/ui/CardList.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import ParkingFilter from './ParkingFilter.vue';
@@ -37,7 +38,13 @@ function exprBuilder(param, value) {
 
 <template>
     <template v-if="stateStore.isHeaderMounted()">
-        <Teleport to="#searchbar" />
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="ParkingList"
+                :label="t('Search parking')"
+                :info="t('You can search by code')"
+            />
+        </Teleport>
         <Teleport to="#actions-append">
             <div class="row q-gutter-x-sm">
                 <QBtn

From 37985d853bd3d750eaa238b20b320817c1a6cc99 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 11:55:25 +0100
Subject: [PATCH 06/54] fix: refs #5186 add locale

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

diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 0830ef175..1615e99ed 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -42,7 +42,7 @@ function exprBuilder(param, value) {
             <VnSearchbar
                 data-key="ParkingList"
                 :label="t('Search parking')"
-                :info="t('You can search by code')"
+                :info="t('You can search by parking code')"
             />
         </Teleport>
         <Teleport to="#actions-append">
@@ -105,3 +105,8 @@ function exprBuilder(param, value) {
         </div>
     </QPage>
 </template>
+<i18n>
+es:
+    Search parking: Buscar parking
+    You can search by parking code: Puede buscar por el código del parking
+</i18n>

From b5edc987325856f12339e8d4706f192b80ff22db Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 1 Mar 2024 12:12:44 +0100
Subject: [PATCH 07/54] fix: refs #5186 add all fields basic data & summary

---
 src/i18n/en/index.js                        | 4 ++++
 src/i18n/es/index.js                        | 4 ++++
 src/pages/Parking/Card/ParkingBasicData.vue | 8 ++++++--
 src/pages/Parking/Card/ParkingSummary.vue   | 4 +++-
 4 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 8b514ca89..5dfeb3d6b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -706,11 +706,15 @@ export default {
             code: 'Code',
             pickingOrder: 'Picking order',
             sector: 'Sector',
+            row: 'Row',
+            column: 'Column',
         },
         basicData: {
             code: 'Code',
             pickingOrder: 'Picking order',
             sector: 'Sector',
+            row: 'Row',
+            column: 'Column',
         },
     },
     invoiceIn: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 3f4dcdff1..928965792 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -763,10 +763,14 @@ export default {
         summary: {
             code: 'Código',
             pickingOrder: 'Orden de recogida',
+            row: 'Fila',
+            column: 'Columna',
         },
         basicData: {
             code: 'Código',
             pickingOrder: 'Orden de recogida',
+            row: 'Fila',
+            column: 'Columna',
         },
     },
     invoiceIn: {
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 5f3e824e1..e945f9f93 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -15,7 +15,7 @@ const parkingId = route.params?.id || null;
 const sectors = ref([]);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
@@ -28,7 +28,7 @@ const filter = {
         auto-load
     />
     <VnSubToolbar />
-    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter">
+    <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
         <template #form="{ data }">
             <VnRow>
                 <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
@@ -37,6 +37,10 @@ const filter = {
                     :label="t('parking.basicData.pickingOrder')"
                 />
             </VnRow>
+            <VnRow>
+                <VnInput v-model="data.row" :label="t('parking.basicData.row')" />
+                <VnInput v-model="data.column" :label="t('parking.basicData.column')" />
+            </VnRow>
             <VnRow>
                 <VnSelectFilter
                     v-model="data.sectorFk"
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index e94fa8d9e..3322ba9ba 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -17,7 +17,7 @@ const { t } = useI18n();
 const entityId = computed(() => $props.id || route.params.id);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
@@ -43,6 +43,8 @@ const filter = {
                         :label="t('parking.summary.sector')"
                         :value="parking.sector?.description"
                     />
+                    <VnLv :label="t('parking.summary.row')" :value="parking.row" />
+                    <VnLv :label="t('parking.summary.column')" :value="parking.column" />
                 </QCard>
             </template>
         </CardSummary>

From 300e384f750ae21b28bb84cbac599f3e2d2ae48b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 8 Mar 2024 10:32:41 +0100
Subject: [PATCH 08/54] feat: refs #5186 add e2e

---
 src/router/modules/shelving.js                |  2 +-
 .../parking/parkingBasicData.spec.js          | 23 ++++++++++++++
 .../integration/parking/parkingList.spec.js   | 31 +++++++++++++++++++
 3 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 test/cypress/integration/parking/parkingBasicData.spec.js
 create mode 100644 test/cypress/integration/parking/parkingList.spec.js

diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index af2605c93..826629064 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -38,7 +38,7 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking',
+                    path: '/parking/list',
                     name: 'ParkingList',
                     meta: {
                         title: 'parkingList',
diff --git a/test/cypress/integration/parking/parkingBasicData.spec.js b/test/cypress/integration/parking/parkingBasicData.spec.js
new file mode 100644
index 000000000..b5633992c
--- /dev/null
+++ b/test/cypress/integration/parking/parkingBasicData.spec.js
@@ -0,0 +1,23 @@
+/// <reference types="cypress" />
+describe('ParkingBasicData', () => {
+    const codeInput = 'form .q-card .q-input input';
+    const sectorSelect = 'form .q-card .q-select input';
+    const sectorOpt = '.q-menu .q-item';
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/parking/1/basic-data`);
+    });
+
+    it('should edit the code and sector', () => {
+        cy.get(sectorSelect).type('Second');
+        cy.get(sectorOpt).click();
+
+        cy.get(codeInput).eq(0).clear();
+        cy.get(codeInput).eq(0).type(123);
+
+        cy.saveCard();
+
+        cy.get(sectorSelect).should('have.value', 'Second sector');
+        cy.get(codeInput).should('have.value', 123);
+    });
+});
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
new file mode 100644
index 000000000..37164dc77
--- /dev/null
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -0,0 +1,31 @@
+/// <reference types="cypress" />
+describe('ParkingList', () => {
+    const firstCard = '.q-card:nth-child(1)';
+    const firstChipId =
+        ':nth-child(1) > :nth-child(1) > .justify-between > .flex > .q-chip > .q-chip__content';
+    const firstDetailBtn =
+        ':nth-child(1) > :nth-child(1) > .card-list-body > .actions > .q-btn';
+    const summaryHeader = '.summaryBody .header';
+    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
+
+    beforeEach(() => {
+        cy.login('developer');
+        cy.visit(`/#/parking/list`);
+        cy.get(screen).click();
+    });
+
+    it('should redirect on clicking a invoice', () => {
+        cy.get(firstChipId)
+            .invoke('text')
+            .then((content) => {
+                const id = content.substring(4);
+                cy.get(firstCard).click();
+                cy.url().should('include', `/parking/${id}/summary`);
+            });
+    });
+
+    it('should open the details', () => {
+        cy.get(firstDetailBtn).click();
+        cy.get(summaryHeader).contains('Basic data');
+    });
+});

From 37f155aa859e2b426de877c633c61968dc4d2b10 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 11 Mar 2024 10:06:11 +0100
Subject: [PATCH 09/54] fix: refs #5186 css, required files & routes

---
 src/pages/Parking/Card/ParkingBasicData.vue |  1 +
 src/pages/Parking/Card/ParkingSummary.vue   |  7 +++++--
 src/router/modules/shelving.js              | 20 +++++++++++++-------
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index e945f9f93..d7d9f4002 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -50,6 +50,7 @@ const filter = {
                     :options="sectors"
                     use-input
                     input-debounce="0"
+                    :is-clearable="false"
                 />
             </VnRow>
         </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index 3322ba9ba..f72fc7d2c 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -29,9 +29,12 @@ const filter = {
             <template #body="{ entity: parking }">
                 <QCard class="vn-one">
                     <QCardSection class="q-pa-none">
-                        <a class="header" :href="`#/parking/${entityId}/basic-data`">
+                        <a
+                            class="header header-link"
+                            :href="`#/parking/${entityId}/basic-data`"
+                        >
                             {{ t('parking.pageTitles.basicData') }}
-                            <QIcon name="open_in_new" color="primary" />
+                            <QIcon name="open_in_new" />
                         </a>
                     </QCardSection>
                     <VnLv :label="t('parking.summary.code')" :value="parking.code" />
diff --git a/src/router/modules/shelving.js b/src/router/modules/shelving.js
index 826629064..8cd7d9a85 100644
--- a/src/router/modules/shelving.js
+++ b/src/router/modules/shelving.js
@@ -38,13 +38,19 @@ export default {
                     component: () => import('src/pages/Shelving/Card/ShelvingForm.vue'),
                 },
                 {
-                    path: '/parking/list',
-                    name: 'ParkingList',
-                    meta: {
-                        title: 'parkingList',
-                        icon: 'view_list',
-                    },
-                    component: () => import('src/pages/Parking/ParkingList.vue'),
+                    path: '/parking',
+                    redirect: { name: 'ParkingList' },
+                    children: [
+                        {
+                            path: 'list',
+                            name: 'ParkingList',
+                            meta: {
+                                title: 'parkingList',
+                                icon: 'view_list',
+                            },
+                            component: () => import('src/pages/Parking/ParkingList.vue'),
+                        },
+                    ],
                 },
             ],
         },

From b44dcdb28af1c42c8eb152e2fc667341efe2a7f6 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 11 Mar 2024 15:17:49 +0100
Subject: [PATCH 10/54] fix: refs #5186 tests

---
 src/pages/Parking/Card/ParkingBasicData.vue   |  5 ++--
 .../integration/parking/parkingList.spec.js   |  3 +--
 test/cypress/integration/vnSearchBar.spec.js  | 22 ++++++++---------
 test/cypress/support/commands.js              | 24 ++++++++++---------
 4 files changed, 28 insertions(+), 26 deletions(-)

diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index d7d9f4002..72f19a5e7 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -13,16 +13,17 @@ const { t } = useI18n();
 const route = useRoute();
 const parkingId = route.params?.id || null;
 const sectors = ref([]);
+const sectorFilter = { fields: ['id', 'description'] };
 
 const filter = {
     fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+    include: [{ relation: 'sector', scope: sectorFilter }],
 };
 </script>
 <template>
     <FetchData
         url="Sectors"
-        :filter="{ fields: ['id', 'description'] }"
+        :filter="sectorFilter"
         sort-by="description"
         @on-fetch="(data) => (sectors = data)"
         auto-load
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index 37164dc77..b4e706736 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -6,12 +6,11 @@ describe('ParkingList', () => {
     const firstDetailBtn =
         ':nth-child(1) > :nth-child(1) > .card-list-body > .actions > .q-btn';
     const summaryHeader = '.summaryBody .header';
-    const screen = '.q-page-container > .q-drawer-container > .fullscreen';
 
     beforeEach(() => {
         cy.login('developer');
         cy.visit(`/#/parking/list`);
-        cy.get(screen).click();
+        cy.closeSideMenu();
     });
 
     it('should redirect on clicking a invoice', () => {
diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index d6dea0780..803b111f2 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -5,15 +5,15 @@ describe('VnSearchBar', () => {
         cy.visit('/');
     });
 
-        it('should redirect to new customer', () => {
-            cy.visit('#/customer/1112/basic-data')
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
-            cy.closeLeftMenu();
-            cy.clearSearchbar();
-            cy.writeSearchbar('1{enter}');
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1')
-            cy.closeLeftMenu();
-        });
+    it('should redirect to new customer', () => {
+        cy.visit('#/customer/1112/basic-data');
+        cy.openLeftMenu();
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1112');
+        cy.closeSideMenu();
+        cy.clearSearchbar();
+        cy.writeSearchbar('1{enter}');
+        cy.openLeftMenu();
+        cy.get('.q-item > .q-item__label').should('have.text', ' #1');
+        cy.closeSideMenu();
+    });
 });
diff --git a/test/cypress/support/commands.js b/test/cypress/support/commands.js
index f075d500f..544e7e6b5 100755
--- a/test/cypress/support/commands.js
+++ b/test/cypress/support/commands.js
@@ -52,16 +52,18 @@ Cypress.Commands.add('getValue', (selector) => {
         }
         // Si es un QSelect
         if ($el.find('.q-select__dropdown-icon').length) {
-            return cy.get(
-                selector +
-                    '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
-            ).invoke('val')
+            return cy
+                .get(
+                    selector +
+                        '> .q-field > .q-field__inner > .q-field__control > .q-field__control-container > .q-field__native > input'
+                )
+                .invoke('val');
         }
         // Si es un QSelect
         if ($el.find('span').length) {
-            return cy.get(
-                selector + ' span'
-            ).then(($span) => { return $span[0].innerText })
+            return cy.get(selector + ' span').then(($span) => {
+                return $span[0].innerText;
+            });
         }
         // Puedes añadir un log o lanzar un error si el elemento no es reconocido
         cy.log('Elemento no soportado');
@@ -132,13 +134,13 @@ Cypress.Commands.add('validateRow', (rowSelector, expectedValues) => {
     cy.get(rowSelector).within(() => {
         for (const [index, value] of expectedValues.entries()) {
             cy.log('CHECKING ', index, value);
-            if(value === undefined) continue
+            if (value === undefined) continue;
             if (typeof value == 'boolean') {
                 const prefix = value ? '' : 'not.';
                 cy.getValue(`:nth-child(${index + 1})`).should(`${prefix}be.checked`);
                 continue;
             }
-            cy.getValue(`:nth-child(${index + 1})`).should('equal', value)
+            cy.getValue(`:nth-child(${index + 1})`).should('equal', value);
         }
     });
 });
@@ -174,9 +176,9 @@ Cypress.Commands.add('openLeftMenu', (element) => {
     if (element) cy.waitForElement(element);
     cy.get('.q-toolbar > .q-btn--round.q-btn--dense > .q-btn__content > .q-icon').click();
 });
-Cypress.Commands.add('closeLeftMenu', (element) => {
+Cypress.Commands.add('closeSideMenu', (element) => {
     if (element) cy.waitForElement(element);
-    cy.get('.fullscreen').click();
+    cy.get('.fullscreen.q-drawer__backdrop:not(.hidden)').click();
 });
 
 Cypress.Commands.add('clearSearchbar', (element) => {

From 374bc4a70387cebacdc0f1dc06afda8872d448e7 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 12 Mar 2024 09:58:24 +0100
Subject: [PATCH 11/54] refs #6905 add rows

---
 src/components/UserPanel.vue | 43 ++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index e0b6b86ed..5b51e283e 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -7,6 +7,8 @@ import axios from 'axios';
 import { useState } from 'src/composables/useState';
 import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnRow from 'components/ui/VnRow.vue';
 
 const state = useState();
 const session = useSession();
@@ -144,6 +146,28 @@ function copyUserToken() {
                 />
             </div>
         </div>
+        <QSeparator inset class="q-mx-lg" />
+        <VnRow class="row q-gutter-sm q-mb-sm q-pa-md">
+            <div class="col">
+                <VnSelectFilter :label="t('localWarehouse')" hide-selected />
+            </div>
+            <div class="col">
+                <VnSelectFilter :label="t('localBank')" hide-selected />
+            </div>
+        </VnRow>
+        <VnRow class="row q-gutter-sm q-mb-sm q-pa-md">
+            <div class="col">
+                <VnSelectFilter :label="t('localCompany')" hide-selected />
+            </div>
+            <div class="col">
+                <VnSelectFilter :label="t('userWarehouse')" hide-selected />
+            </div>
+        </VnRow>
+        <VnRow class="col q-gutter-sm q-pa-md">
+            <div class="col">
+                <VnSelectFilter :label="t('userCompany')" hide-selected />
+            </div>
+        </VnRow>
     </QMenu>
 </template>
 
@@ -158,3 +182,22 @@ function copyUserToken() {
     }
 }
 </style>
+
+<i18n>
+    en:
+        localWarehouse: Local warehouse
+        localBank: Local bank
+        localCompany: Local company
+        userWarehouse: User warehouse
+        userCompany: User company
+    es:
+        New province: Nueva provincia
+        Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
+        Name: Nombre
+        Autonomy: Autonomía
+        localWarehouse: Almacén local
+        localBank: Banco local
+        localCompany: Empresa local
+        userWarehouse: Almacén del usuario
+        userCompany: Empresa del usuario
+</i18n>

From 2d880be0f8b748a50295c42b4208ea18fcf1b081 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 12 Mar 2024 11:04:57 +0100
Subject: [PATCH 12/54] refs #6905 fix vnrow

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

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 5b51e283e..d6acb9a99 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -116,7 +116,7 @@ function copyUserToken() {
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="column items-center panel">
+            <div class="column items-center panel q-mb-sm q-pa-md">
                 <QAvatar size="80px">
                     <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
@@ -164,7 +164,7 @@ function copyUserToken() {
             </div>
         </VnRow>
         <VnRow class="col q-gutter-sm q-pa-md">
-            <div class="col">
+            <div class="col" style="flex: 0">
                 <VnSelectFilter :label="t('userCompany')" hide-selected />
             </div>
         </VnRow>

From 64d8f86ea952bf28cc503e9fc86b93dcbabf0a72 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 12 Mar 2024 12:25:31 +0100
Subject: [PATCH 13/54] refactor(routeList): refs #6971 moved button to
 subtoolbar + same functionality as other subtoolbar items

---
 src/pages/Route/RouteList.vue | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..de600bc0e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -255,6 +255,15 @@ const markAsServed = () => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
+                <RouterLink :to="{ name: 'RouteCreate' }">
+                    <QBtn
+                        icon="add"
+                        color="primary" 
+                        :disable="!selectedRows?.length"
+                        @click="{ navigate }"
+                    />
+                    <QTooltip>{{ t('newRoute') }}</QTooltip>
+                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -494,12 +503,6 @@ const markAsServed = () => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
-            <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn fab icon="add" color="primary" />
-                <QTooltip>
-                    {{ t('newRoute') }}
-                </QTooltip>
-            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>

From 31ac61b01f183a652add0b6e2fdd3cbd7d638fe4 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Wed, 13 Mar 2024 11:33:10 +0100
Subject: [PATCH 14/54] refactor: #6988 changed ticket summary view and fixed
 notes functionality

---
 src/css/app.scss                        |  2 +-
 src/pages/Ticket/Card/TicketSummary.vue | 64 ++++++++++++++++---------
 2 files changed, 42 insertions(+), 24 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 38dd642a3..741dbe332 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -110,4 +110,4 @@ input::-webkit-inner-spin-button {
     appearance: none;
     -webkit-appearance: none;
     -moz-appearance: none;
-}
+}
\ No newline at end of file
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index fbca21086..72bfe4a67 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -130,22 +130,6 @@ async function changeState(value) {
             </QBtnDropdown>
         </template>
         <template #body>
-            <QCard class="vn-max">
-                <div class="taxes">
-                    <VnLv
-                        :label="t('ticket.summary.subtotal')"
-                        :value="toCurrency(ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.vat')"
-                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
-                    />
-                    <VnLv
-                        :label="t('ticket.summary.total')"
-                        :value="toCurrency(ticket.totalWithVat)"
-                    />
-                </div>
-            </QCard>
             <QCard class="vn-one">
                 <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
                     {{ t('globals.summary.basicData') }}
@@ -235,7 +219,7 @@ async function changeState(value) {
                     :value="formattedAddress()"
                 />
             </QCard>
-            <QCard class="vn-one">
+            <QCard class="vn-one" v-if="ticket.notes.length">
                 <a class="header header-link" :href="ticketUrl + 'observation'">
                     {{ t('ticket.pageTitles.notes') }}
                     <QIcon name="open_in_new" />
@@ -254,9 +238,31 @@ async function changeState(value) {
                             class="notes"
                             readonly
                         />
+                        
                     </template>
                 </VnLv>
             </QCard>
+            <QCard class="vn-one ">
+                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
+                    {{t('Summary')}}
+                    <QIcon name="open_in_new" />
+                </a>
+                <div class="bodyCard">
+                    <VnLv
+                        :label="t('ticket.summary.subtotal')"
+                        :value="toCurrency(ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.vat')"
+                        :value="toCurrency(ticket.totalWithVat - ticket.totalWithoutVat)"
+                    />
+                    <VnLv
+                        :label="t('ticket.summary.total')"
+                        :value="toCurrency(ticket.totalWithVat)"
+                    />
+                </div>
+                    
+            </QCard>
             <QCard class="vn-max">
                 <a class="header header-link" :href="ticketUrl + 'sale'">
                     {{ t('ticket.summary.saleLines') }}
@@ -452,20 +458,32 @@ async function changeState(value) {
     width: max-content;
 }
 .cardSummary .summaryBody > .q-card > .taxes {
-    border: 2px solid gray;
+    margin-right: 90px;
     padding: 0;
-    > .vn-label-value {
-        text-align: right;
+    & > .vn-label-value {
+        text-align: left;
         display: flex;
         flex-direction: row;
         margin-top: 5px;
-        justify-content: flex-end;
-        padding-right: 20px;
+        justify-content: flex-start;
+        padding-left: 10px;
+    }
+}
+
+.q-card.q-card--dark.q-dark.vn-one {
+    & > .bodyCard{
+        padding: 1%;
+        margin-right: 40%;
     }
 }
 
 .cardSummary .summaryBody > .q-card:has(.taxes) {
     margin-top: 2px;
-    padding: 0;
+    padding: 0%;
 }
 </style>
+
+<i18n>
+    es:
+        Summary: Resumen
+</i18n>

From e793b3dd93c58f4cebab2f3226f4392bd15f568f Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 13 Mar 2024 15:06:02 +0100
Subject: [PATCH 15/54] feat: refs #5186 use global locales

---
 src/components/LeftMenuItem.vue              | 10 +++++--
 src/components/common/VnBreadcrumbs.vue      | 16 +++++++----
 src/i18n/en/index.js                         | 30 +++++++-------------
 src/i18n/es/index.js                         | 27 ++++++------------
 src/pages/Parking/Card/ParkingBasicData.vue  | 13 ++++-----
 src/pages/Parking/Card/ParkingDescriptor.vue | 12 ++------
 src/pages/Parking/Card/ParkingSummary.vue    | 12 ++++----
 src/pages/Parking/ParkingList.vue            |  2 +-
 8 files changed, 52 insertions(+), 70 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 976136394..7e7a7fe72 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -2,7 +2,7 @@
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 
-const { t } = useI18n();
+const { t, te } = useI18n();
 
 const props = defineProps({
     item: {
@@ -11,7 +11,13 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
+const item = computed(() => {
+    const item = JSON.parse(JSON.stringify(props.item));
+    const [, , section] = item.title.split('.');
+
+    if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
+    return item;
+}); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
     <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 666f14c72..5002c5a9a 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -5,16 +5,16 @@ import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
 import { useCamelCase } from 'src/composables/useCamelCase';
 
-const router = useRouter();
-const quasar = useQuasar();
-const { t } = useI18n();
+const { currentRoute } = useRouter();
+const { screen } = useQuasar();
+const { t, te } = useI18n();
 
 let matched = ref([]);
 let breadcrumbs = ref([]);
 let root = ref(null);
 
 watchEffect(() => {
-    matched.value = router.currentRoute.value.matched.filter(
+    matched.value = currentRoute.value.matched.filter(
         (matched) => Object.keys(matched.meta).length
     );
     breadcrumbs.value.length = 0;
@@ -36,11 +36,15 @@ function getBreadcrumb(param) {
         root: root.value,
     };
 
-    if (quasar.screen.gt.sm) {
+    if (screen.gt.sm) {
         breadcrumb.name = param.name;
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
+    breadcrumb.locale = te(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+        ? t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+        : t(`globals.pageTitles.${breadcrumb.title}`);
+
     return breadcrumb;
 }
 </script>
@@ -50,7 +54,7 @@ function getBreadcrumb(param) {
             v-for="(breadcrumb, index) of breadcrumbs"
             :key="index"
             :icon="breadcrumb.icon"
-            :label="t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)"
+            :label="breadcrumb.locale"
             :to="breadcrumb.path"
         />
     </QBreadcrumbs>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4cbcba102..6096fb404 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -83,6 +83,12 @@ export default {
         selectFile: 'Select a file',
         copyClipboard: 'Copy on clipboard',
         salesPerson: 'SalesPerson',
+        code: 'Code',
+        pageTitles: {
+            summary: 'Summary',
+            basicData: 'Basic data',
+            log: 'Logs',
+        },
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -685,34 +691,18 @@ export default {
         },
     },
     parking: {
+        pickingOrder: 'Picking order',
+        sector: 'Sector',
+        row: 'Row',
+        column: 'Column',
         pageTitles: {
             parking: 'Parking',
             parkingList: 'Parkings list',
-            summary: 'Summary',
-            basicData: 'Basic data',
-            log: 'Logs',
-        },
-        list: {
-            pickingOrder: 'Picking order',
         },
         searchBar: {
             info: 'You can search by parking code',
             label: 'Search parking...',
         },
-        summary: {
-            code: 'Code',
-            pickingOrder: 'Picking order',
-            sector: 'Sector',
-            row: 'Row',
-            column: 'Column',
-        },
-        basicData: {
-            code: 'Code',
-            pickingOrder: 'Picking order',
-            sector: 'Sector',
-            row: 'Row',
-            column: 'Column',
-        },
     },
     invoiceIn: {
         pageTitles: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 02647f581..ab14e0e82 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -83,6 +83,12 @@ export default {
         selectFile: 'Seleccione un fichero',
         copyClipboard: 'Copiar en portapapeles',
         salesPerson: 'Comercial',
+        code: 'Código',
+        pageTitles: {
+            summary: 'Resumen',
+            basicData: 'Datos básicos',
+            log: 'Historial',
+        },
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -743,32 +749,17 @@ export default {
         },
     },
     parking: {
+        pickingOrder: 'Orden de recogida',
+        row: 'Fila',
+        column: 'Columna',
         pageTitles: {
             parking: 'Parking',
             parkingList: 'Listado de parkings',
-            summary: 'Resumen',
-            basicData: 'Datos básicos',
-            log: 'Registros de auditoría',
-        },
-        list: {
-            pickingOrder: 'Orden de recogida',
         },
         searchBar: {
             info: 'Puedes buscar por código de parking',
             label: 'Buscar parking...',
         },
-        summary: {
-            code: 'Código',
-            pickingOrder: 'Orden de recogida',
-            row: 'Fila',
-            column: 'Columna',
-        },
-        basicData: {
-            code: 'Código',
-            pickingOrder: 'Orden de recogida',
-            row: 'Fila',
-            column: 'Columna',
-        },
     },
     invoiceIn: {
         pageTitles: {
diff --git a/src/pages/Parking/Card/ParkingBasicData.vue b/src/pages/Parking/Card/ParkingBasicData.vue
index 72f19a5e7..26a1ed8be 100644
--- a/src/pages/Parking/Card/ParkingBasicData.vue
+++ b/src/pages/Parking/Card/ParkingBasicData.vue
@@ -32,22 +32,19 @@ const filter = {
     <FormModel :url="`Parkings/${parkingId}`" model="parking" :filter="filter" auto-load>
         <template #form="{ data }">
             <VnRow>
-                <VnInput v-model="data.code" :label="t('parking.basicData.code')" />
-                <VnInput
-                    v-model="data.pickingOrder"
-                    :label="t('parking.basicData.pickingOrder')"
-                />
+                <VnInput v-model="data.code" :label="t('globals.code')" />
+                <VnInput v-model="data.pickingOrder" :label="t('parking.pickingOrder')" />
             </VnRow>
             <VnRow>
-                <VnInput v-model="data.row" :label="t('parking.basicData.row')" />
-                <VnInput v-model="data.column" :label="t('parking.basicData.column')" />
+                <VnInput v-model="data.row" :label="t('parking.row')" />
+                <VnInput v-model="data.column" :label="t('parking.column')" />
             </VnRow>
             <VnRow>
                 <VnSelectFilter
                     v-model="data.sectorFk"
                     option-value="id"
                     option-label="description"
-                    :label="t('parking.basicData.sector')"
+                    :label="t('parking.sector')"
                     :options="sectors"
                     use-input
                     input-debounce="0"
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 1805b5af0..e130fbd06 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -38,15 +38,9 @@ const setHeader = (entity) => (header.value = useCardDescription(entity.code, en
         @on-fetch="setHeader"
     >
         <template #body="{ entity: parking }">
-            <VnLv :label="t('parking.summary.code')" :value="parking.code" />
-            <VnLv
-                :label="t('parking.summary.pickingOrder')"
-                :value="parking.pickingOrder"
-            />
-            <VnLv
-                :label="t('parking.summary.sector')"
-                :value="parking.sector?.description"
-            />
+            <VnLv :label="t('globals.code')" :value="parking.code" />
+            <VnLv :label="t('parking.pickingOrder')" :value="parking.pickingOrder" />
+            <VnLv :label="t('parking.sector')" :value="parking.sector?.description" />
         </template>
     </CardDescriptor>
 </template>
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index f72fc7d2c..fe733f56c 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -33,21 +33,21 @@ const filter = {
                             class="header header-link"
                             :href="`#/parking/${entityId}/basic-data`"
                         >
-                            {{ t('parking.pageTitles.basicData') }}
+                            {{ t('globals.pageTitles.basicData') }}
                             <QIcon name="open_in_new" />
                         </a>
                     </QCardSection>
-                    <VnLv :label="t('parking.summary.code')" :value="parking.code" />
+                    <VnLv :label="t('globals.code')" :value="parking.code" />
                     <VnLv
-                        :label="t('parking.summary.pickingOrder')"
+                        :label="t('parking.pickingOrder')"
                         :value="parking.pickingOrder"
                     />
                     <VnLv
-                        :label="t('parking.summary.sector')"
+                        :label="t('parking.sector')"
                         :value="parking.sector?.description"
                     />
-                    <VnLv :label="t('parking.summary.row')" :value="parking.row" />
-                    <VnLv :label="t('parking.summary.column')" :value="parking.column" />
+                    <VnLv :label="t('parking.row')" :value="parking.row" />
+                    <VnLv :label="t('parking.column')" :value="parking.column" />
                 </QCard>
             </template>
         </CardSummary>
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 1615e99ed..2a1873d5a 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -88,7 +88,7 @@ function exprBuilder(param, value) {
                         <template #list-items>
                             <VnLv label="Sector" :value="row.sector?.description" />
                             <VnLv
-                                :label="t('parking.list.pickingOrder')"
+                                :label="t('parking.pickingOrder')"
                                 :value="row.pickingOrder"
                             />
                         </template>

From 37a2c33f9f51f199fcf8fed6b32e7ed65a440e79 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 14 Mar 2024 08:51:26 +0100
Subject: [PATCH 16/54] refactor: #6993 set default QTable pagination

---
 quasar.config.js                              |    2 +-
 quasar.patch                                  | 2013 +++++++++++++++++
 quasar.patch:Zone.Identifier                  |    4 +
 src/boot/setDefaults.js                       |   22 +
 src/components/FilterItemForm.vue             |    1 -
 src/components/FilterTravelForm.vue           |    1 -
 src/pages/Claim/Card/ClaimSummary.vue         |    2 -
 .../Customer/Defaulter/CustomerDefaulter.vue  |    2 -
 .../Notifications/CustomerNotifications.vue   |    2 -
 .../Customer/Payments/CustomerPayments.vue    |    2 -
 src/pages/Entry/Card/EntryBuys.vue            |    1 -
 src/pages/Entry/Card/EntryBuysImport.vue      |    7 +-
 src/pages/Entry/Card/EntrySummary.vue         |    1 -
 src/pages/Entry/EntryLatestBuys.vue           |    1 -
 .../InvoiceIn/Card/InvoiceInCorrective.vue    |    1 -
 src/pages/InvoiceIn/Card/InvoiceInDueDay.vue  |    1 -
 .../InvoiceIn/Card/InvoiceInIntrastat.vue     |    1 -
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |    5 +-
 src/pages/InvoiceIn/Card/InvoiceInVat.vue     |    4 +-
 src/pages/InvoiceOut/InvoiceOutGlobal.vue     |    2 -
 .../InvoiceOut/InvoiceOutNegativeBases.vue    |    1 -
 src/pages/Order/Card/OrderSummary.vue         |    1 -
 src/pages/Route/Card/RouteSummary.vue         |    2 -
 src/pages/Route/Cmr/CmrList.vue               |    2 -
 src/pages/Route/RouteList.vue                 |    2 -
 src/pages/Travel/Card/TravelSummary.vue       |    3 +-
 src/pages/Travel/ExtraCommunity.vue           |    2 -
 27 files changed, 2045 insertions(+), 43 deletions(-)
 create mode 100644 quasar.patch
 create mode 100644 quasar.patch:Zone.Identifier
 create mode 100644 src/boot/setDefaults.js

diff --git a/quasar.config.js b/quasar.config.js
index 2d8289508..aa42e19eb 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'setDefaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/quasar.patch b/quasar.patch
new file mode 100644
index 000000000..c65fce6cf
--- /dev/null
+++ b/quasar.patch
@@ -0,0 +1,2013 @@
+diff --git a/quasar.config.js b/quasar.config.js
+index 755e96bd..789b9f64 100644
+--- a/quasar.config.js
++++ b/quasar.config.js
+@@ -12,6 +12,7 @@ const { configure } = require('quasar/wrappers');
+ const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
+ const path = require('path');
+
++
+ module.exports = configure(function (/* ctx */) {
+     return {
+         eslint: {
+@@ -29,7 +30,8 @@ module.exports = configure(function (/* ctx */) {
+         // app boot file (/src/boot)
+         // --> boot files are part of "main.js"
+         // https://v2.quasar.dev/quasar-cli/boot-files
+-        boot: ['i18n', 'axios', 'vnDate', 'validations'],
++        //
++        boot: ['i18n', 'axios', 'vnDate','quasar','quasar.defaults','setDefaults', 'validations'],
+
+         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
+         css: ['app.scss'],
+@@ -122,6 +124,33 @@ module.exports = configure(function (/* ctx */) {
+         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
+         framework: {
+             config: {
++                form:{
++mixins:[{
++    data(d) {
++      return {
++        title: 'Mixins are cool',
++        copyright: 'All rights reserved. Product of super awesome people'
++      };
++    },
++    created: function(data) {
++        console.log(this)
++       if(this.$el){
++
++           console.log(this.$el
++            )
++            this.greetings();
++        }
++    },
++    methods: {
++        keyup:(event)=>{
++            console.log(event)
++        },
++      greetings: function() {
++        console.log('Howdy my good fellow!');
++      }
++    }
++  }],
++                },
+                 config: {
+                     brand: {
+                         primary: 'orange',
+diff --git a/src/App.vue b/src/App.vue
+index d0d8c935..6a201045 100644
+--- a/src/App.vue
++++ b/src/App.vue
+@@ -1,5 +1,5 @@
+ <script setup>
+-import { onMounted } from 'vue';
++import { onMounted, getCurrentInstance, resolveComponent, h } from 'vue';
+ import { useQuasar, Dark } from 'quasar';
+ import { useI18n } from 'vue-i18n';
+
+@@ -34,6 +34,7 @@ quasar.iconMapFn = (iconName) => {
+         content: iconName,
+     };
+ };
++// h(resolveComponent('QBtn'), { color: 'red' }, 'Click me');
+ </script>
+
+ <template>
+diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
+index 106dbec3..7a2a36fb 100644
+--- a/src/components/CreateBankEntityForm.vue
++++ b/src/components/CreateBankEntityForm.vue
+@@ -77,7 +77,6 @@ const onDataSaved = (data) => {
+                         :label="t('country')"
+                         v-model="data.countryFk"
+                         :options="countriesOptions"
+-                        option-value="id"
+                         option-label="country"
+                         hide-selected
+                         :required="true"
+diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
+index 7326ea7a..2d4d2667 100644
+--- a/src/components/CreateNewCityForm.vue
++++ b/src/components/CreateNewCityForm.vue
+@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
+                         :label="t('Province')"
+                         :options="provincesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.provinceFk"
+                         :rules="validate('city.provinceFk')"
+                     />
+diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
+index 47836c05..9572f96a 100644
+--- a/src/components/CreateNewPostcodeForm.vue
++++ b/src/components/CreateNewPostcodeForm.vue
+@@ -90,8 +90,6 @@ const onProvinceCreated = async ({ name }, formData) => {
+                         :options="townsLocationOptions"
+                         v-model="data.townFk"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         :rules="validate('postcode.city')"
+                         :roles-allowed-to-create="['deliveryAssistant']"
+                     >
+@@ -109,8 +107,6 @@ const onProvinceCreated = async ({ name }, formData) => {
+                         :label="t('Province')"
+                         :options="provincesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.provinceFk"
+                         :rules="validate('postcode.provinceFk')"
+                         :roles-allowed-to-create="['deliveryAssistant']"
+@@ -128,7 +124,6 @@ const onProvinceCreated = async ({ name }, formData) => {
+                         :options="countriesOptions"
+                         hide-selected
+                         option-label="country"
+-                        option-value="id"
+                         v-model="data.countryFk"
+                         :rules="validate('postcode.countryFk')"
+                     />
+diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
+index b972db2c..c79513dc 100644
+--- a/src/components/CreateNewProvinceForm.vue
++++ b/src/components/CreateNewProvinceForm.vue
+@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
+                         :label="t('Autonomy')"
+                         :options="autonomiesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.autonomyFk"
+                         :rules="validate('province.autonomyFk')"
+                     />
+diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
+index d4511a0e..b1dbad38 100644
+--- a/src/components/CreateThermographForm.vue
++++ b/src/components/CreateThermographForm.vue
+@@ -82,8 +82,6 @@ const onDataSaved = (dataSaved) => {
+                         :label="t('Warehouse')"
+                         :options="warehousesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.warehouseId"
+                         :required="true"
+                     />
+@@ -93,7 +91,6 @@ const onDataSaved = (dataSaved) => {
+                         :label="t('Temperature')"
+                         :options="temperaturesOptions"
+                         hide-selected
+-                        option-label="name"
+                         option-value="code"
+                         v-model="data.temperatureFk"
+                         :required="true"
+diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
+index 4c329a8e..155d88e6 100644
+--- a/src/components/FilterItemForm.vue
++++ b/src/components/FilterItemForm.vue
+@@ -164,8 +164,6 @@ const selectItem = ({ id }) => {
+                         :label="t('entry.buys.producer')"
+                         :options="producersOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="itemFilterParams.producerFk"
+                     />
+                 </div>
+@@ -174,8 +172,6 @@ const selectItem = ({ id }) => {
+                         :label="t('entry.buys.type')"
+                         :options="ItemTypesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="itemFilterParams.typeFk"
+                     />
+                 </div>
+@@ -184,8 +180,6 @@ const selectItem = ({ id }) => {
+                         :label="t('entry.buys.color')"
+                         :options="InksOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="itemFilterParams.inkFk"
+                     />
+                 </div>
+diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
+index 499d5bc4..10282267 100644
+--- a/src/components/FilterTravelForm.vue
++++ b/src/components/FilterTravelForm.vue
+@@ -150,8 +150,6 @@ const selectTravel = ({ id }) => {
+                         :label="t('entry.basicData.agency')"
+                         :options="agenciesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="travelFilterParams.agencyModeFk"
+                     />
+                 </div>
+@@ -160,8 +158,6 @@ const selectTravel = ({ id }) => {
+                         :label="t('entry.basicData.warehouseOut')"
+                         :options="warehousesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="travelFilterParams.warehouseOutFk"
+                     />
+                 </div>
+@@ -170,8 +166,6 @@ const selectTravel = ({ id }) => {
+                         :label="t('entry.basicData.warehouseIn')"
+                         :options="warehousesOptions"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="travelFilterParams.warehouseInFk"
+                     />
+                 </div>
+diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
+index 28236be1..f59867fa 100644
+--- a/src/components/RegularizeStockForm.vue
++++ b/src/components/RegularizeStockForm.vue
+@@ -63,8 +63,6 @@ const onDataSaved = (data) => {
+                         :label="t('Warehouse')"
+                         v-model="data.warehouseFk"
+                         :options="warehousesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                     />
+                 </div>
+diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
+index d2651f5d..22fa28f2 100644
+--- a/src/components/common/VnDms.vue
++++ b/src/components/common/VnDms.vue
+@@ -122,7 +122,6 @@ function addDefaultData(data) {
+                         :label="t('globals.company')"
+                         v-model="dms.companyFk"
+                         :options="companies"
+-                        option-value="id"
+                         option-label="code"
+                         input-debounce="0"
+                     />
+@@ -132,16 +131,12 @@ function addDefaultData(data) {
+                         :label="t('globals.warehouse')"
+                         v-model="dms.warehouseFk"
+                         :options="warehouses"
+-                        option-value="id"
+-                        option-label="name"
+                         input-debounce="0"
+                     />
+                     <VnSelectFilter
+                         :label="t('globals.type')"
+                         v-model="dms.dmsTypeFk"
+                         :options="dmsTypes"
+-                        option-value="id"
+-                        option-label="name"
+                         input-debounce="0"
+                     />
+                 </VnRow>
+diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
+index 6368a3e5..343bdb4b 100644
+--- a/src/components/common/VnLog.vue
++++ b/src/components/common/VnLog.vue
+@@ -693,8 +693,6 @@ setLogTree();
+                             class="full-width"
+                             :label="t('globals.user')"
+                             v-model="userSelect"
+-                            option-label="name"
+-                            option-value="id"
+                             :options="workers"
+                             @update:model-value="selectFilter('userSelect')"
+                             hide-selected
+diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
+index b5941239..9720d391 100644
+--- a/src/components/common/VnLogFilter.vue
++++ b/src/components/common/VnLogFilter.vue
+@@ -49,8 +49,6 @@ const workers = ref();
+                         v-model="params.userFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
+index 99710408..410e0515 100644
+--- a/src/components/ui/VnSearchbar.vue
++++ b/src/components/ui/VnSearchbar.vue
+@@ -81,8 +81,9 @@ onMounted(() => {
+ });
+
+ async function search() {
+-    const staticParams = Object.entries(store.userParams)
+-        .filter(([key, value]) => value && (props.staticParams || []).includes(key));
++    const staticParams = Object.entries(store.userParams).filter(
++        ([key, value]) => value && (props.staticParams || []).includes(key)
++    );
+     await arrayData.applyFilter({
+         params: {
+             ...Object.fromEntries(staticParams),
+@@ -107,7 +108,7 @@ async function search() {
+ </script>
+
+ <template>
+-    <QForm @submit="search">
++    <QForm @submit="search" id="searchbarForm">
+         <VnInput
+             id="searchbar"
+             v-model="searchText"
+diff --git a/src/css/app.scss b/src/css/app.scss
+index 750439e3..37c515cb 100644
+--- a/src/css/app.scss
++++ b/src/css/app.scss
+@@ -97,3 +97,6 @@ input::-webkit-inner-spin-button {
+     -webkit-appearance: none;
+     -moz-appearance: none;
+ }
++.q-table th, .q-table td {
++    text-align: left !important;
++}
+diff --git a/src/filters/toCurrency.js b/src/filters/toCurrency.js
+index f820c012..d998aac3 100644
+--- a/src/filters/toCurrency.js
++++ b/src/filters/toCurrency.js
+@@ -12,7 +12,7 @@ export default function (value, symbol = 'EUR', fractionSize = 2) {
+         maximumFractionDigits: fractionSize,
+     };
+
+-    const lang = locale.value == 'es' ? 'de' : locale.value;
++    // const lang = locale.value == 'es-ES' ?  : locale.value;
+
+-    return new Intl.NumberFormat(lang, options).format(value);
++    return new Intl.NumberFormat('de-DE', options).format(value);
+ }
+diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
+index ef45bf3d..3c27bd2e 100644
+--- a/src/pages/Claim/Card/ClaimAction.vue
++++ b/src/pages/Claim/Card/ClaimAction.vue
+@@ -308,7 +308,6 @@ async function importToNewRefundTicket() {
+                             v-model="row.claimDestinationFk"
+                             :options="destinationTypes"
+                             option-label="description"
+-                            option-value="id"
+                             :autofocus="true"
+                             dense
+                             input-debounce="0"
+@@ -350,7 +349,6 @@ async function importToNewRefundTicket() {
+                                                 v-model="props.row.claimDestinationFk"
+                                                 :options="destinationTypes"
+                                                 option-label="description"
+-                                                option-value="id"
+                                                 :autofocus="true"
+                                                 dense
+                                                 input-debounce="0"
+@@ -425,7 +423,6 @@ async function importToNewRefundTicket() {
+                     v-model="claimDestinationFk"
+                     :options="destinationTypes"
+                     option-label="description"
+-                    option-value="id"
+                     :autofocus="true"
+                     dense
+                     input-debounce="0"
+diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
+index 35f93c73..41007a46 100644
+--- a/src/pages/Claim/Card/ClaimBasicData.vue
++++ b/src/pages/Claim/Card/ClaimBasicData.vue
+@@ -122,8 +122,6 @@ const statesFilter = {
+                     <QSelect
+                         v-model="data.workerFk"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         :label="t('claim.basicData.assignedTo')"
+                         map-options
+@@ -147,7 +145,6 @@ const statesFilter = {
+                     <QSelect
+                         v-model="data.claimStateFk"
+                         :options="claimStates"
+-                        option-value="id"
+                         option-label="description"
+                         emit-value
+                         :label="t('claim.basicData.state')"
+diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
+index ee702ffd..761e2d9c 100644
+--- a/src/pages/Claim/ClaimFilter.vue
++++ b/src/pages/Claim/ClaimFilter.vue
+@@ -69,8 +69,6 @@ const states = ref();
+                         v-model="params.salesPersonFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -92,8 +90,6 @@ const states = ref();
+                         v-model="params.attenderFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -115,8 +111,6 @@ const states = ref();
+                         v-model="params.claimResponsibleFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -138,7 +132,6 @@ const states = ref();
+                         v-model="params.claimStateFk"
+                         @update:model-value="searchFn()"
+                         :options="states"
+-                        option-value="id"
+                         option-label="description"
+                         emit-value
+                         map-options
+@@ -160,8 +153,8 @@ const states = ref();
+                                 :loading="loading"
+                                 @filter="filterFn"
+                                 @virtual-scroll="onScroll"
+-                                option-value="id"
+-                                option-label="name"
++
++
+                                 emit-value
+                                 map-options
+                             />
+diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
+index fe873cfa..3e9eae22 100644
+--- a/src/pages/Customer/Card/CustomerBalance.vue
++++ b/src/pages/Customer/Card/CustomerBalance.vue
+@@ -97,59 +97,50 @@ const tableColumnComponents = {
+
+ const columns = computed(() => [
+     {
+-        align: 'left',
+         field: 'payed',
+         format: (value) => toDate(value),
+         label: t('Date'),
+         name: 'date',
+     },
+     {
+-        align: 'left',
+         field: 'created',
+         format: (value) => toDateHourMinSec(value),
+         label: t('Creation date'),
+         name: 'creationDate',
+     },
+     {
+-        align: 'left',
+         field: 'userName',
+         label: t('Employee'),
+         name: 'employee',
+     },
+     {
+-        align: 'left',
+         field: 'description',
+         label: t('Reference'),
+         name: 'reference',
+     },
+     {
+-        align: 'left',
+         field: 'bankFk',
+         label: t('Bank'),
+         name: 'bank',
+     },
+     {
+-        align: 'left',
+         field: 'debit',
+         label: t('Debit'),
+         name: 'debit',
+     },
+     {
+-        align: 'left',
+         field: 'credit',
+         format: (value) => toCurrency(value),
+         label: t('Havings'),
+         name: 'havings',
+     },
+     {
+-        align: 'left',
+         field: (value) => value.debit - value.credit,
+         format: (value) => toCurrency(value),
+         label: t('Balance'),
+         name: 'balance',
+     },
+     {
+-        align: 'left',
+         field: 'isConciliate',
+         label: t('Conciliated'),
+         name: 'conciliated',
+@@ -219,16 +210,15 @@ const saveFieldValue = async (event) => {
+     />
+
+     <QTable
++        name="customerBalance"
+         :columns="columns"
+-        :no-data-label="t('globals.noResults')"
+-        :pagination="{ rowsPerPage: 12 }"
+         :rows="rows"
+         class="full-width q-mt-md"
+-        row-key="id"
++        :class="defaultColumnsFormat"
+     >
+         <template #body-cell="props">
+             <QTd :props="props">
+-                <QTr :props="props" class="cursor-pointer">
++                <QTr :props="props" class="text-left cursor-pointer">
+                     <component
+                         :is="tableColumnComponents[props.col.name].component"
+                         class="col-content"
+@@ -284,7 +274,6 @@ const saveFieldValue = async (event) => {
+                 @update:model-value="updateCompanyId($event)"
+                 hide-selected
+                 option-label="code"
+-                option-value="id"
+                 v-model="companyId"
+                 :rules="validate('entry.companyFk')"
+             />
+diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
+index 9be4643f..f80f7f12 100644
+--- a/src/pages/Customer/Card/CustomerBasicData.vue
++++ b/src/pages/Customer/Card/CustomerBasicData.vue
+@@ -67,7 +67,12 @@ const filterOptions = {
+         url="Clients"
+     />
+
+-    <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
++    <FormModel
++        :url="`Clients/${route.params.id}`"
++        @keyup.enter="handleCloick"
++        auto-load
++        model="customer"
++    >
+         <template #form="{ data, validate, filter }">
+             <VnRow class="row q-gutter-md q-mb-md">
+                 <div class="col">
+@@ -148,8 +153,6 @@ const filterOptions = {
+                         @filter="(value, update) => filter(value, update, filterOptions)"
+                         emit-value
+                         map-options
+-                        option-label="name"
+-                        option-value="id"
+                         use-input
+                         v-model="data.salesPersonFk"
+                     >
+@@ -172,8 +175,6 @@ const filterOptions = {
+                         :rules="validate('client.contactChannelFk')"
+                         emit-value
+                         map-options
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.contactChannelFk"
+                     />
+                 </div>
+@@ -187,8 +188,6 @@ const filterOptions = {
+                         :rules="validate('client.transferorFk')"
+                         emit-value
+                         map-options
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.transferorFk"
+                     >
+                         <template #append>
+diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
+index e1b12619..3a553b88 100644
+--- a/src/pages/Customer/Card/CustomerBillingData.vue
++++ b/src/pages/Customer/Card/CustomerBillingData.vue
+@@ -53,8 +53,6 @@ const getBankEntities = (data, formData) => {
+                         :label="t('Billing data')"
+                         :options="payMethods"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.payMethod"
+                     />
+                 </div>
+@@ -85,8 +83,6 @@ const getBankEntities = (data, formData) => {
+                         :roles-allowed-to-create="['salesAssistant', 'hr']"
+                         :rules="validate('Worker.bankEntity')"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.bankEntityFk"
+                     >
+                         <template #form>
+diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
+index f74cbc2c..f61f88cd 100644
+--- a/src/pages/Customer/Card/CustomerFiscalData.vue
++++ b/src/pages/Customer/Card/CustomerFiscalData.vue
+@@ -74,7 +74,6 @@ function handleLocation(data, location) {
+                         :options="typesTaxes"
+                         hide-selected
+                         option-label="vat"
+-                        option-value="id"
+                         v-model="data.sageTaxTypeFk"
+                     />
+                 </div>
+@@ -84,7 +83,6 @@ function handleLocation(data, location) {
+                         :options="typesTransactions"
+                         hide-selected
+                         option-label="transaction"
+-                        option-value="id"
+                         v-model="data.sageTransactionTypeFk"
+                     >
+                         <template #option="scope">
+diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
+index c237e5fd..02b7b745 100644
+--- a/src/pages/Customer/Card/CustomerLog.vue
++++ b/src/pages/Customer/Card/CustomerLog.vue
+@@ -144,8 +144,6 @@ const setInq = (value, status) => {
+                 :options="[]"
+                 class="q-mt-md"
+                 hide-selected
+-                option-label="name"
+-                option-value="id"
+             />
+
+             <div class="q-mt-lg">
+@@ -184,8 +182,6 @@ const setInq = (value, status) => {
+                 :options="[]"
+                 class="q-mt-sm"
+                 hide-selected
+-                option-label="name"
+-                option-value="id"
+             />
+             <VnInput :label="t('Changes')" clearable class="q-mt-sm">
+                 <template #append>
+diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
+index 4addb1d6..627908a3 100644
+--- a/src/pages/Customer/CustomerCreate.vue
++++ b/src/pages/Customer/CustomerCreate.vue
+@@ -57,8 +57,6 @@ function handleLocation(data, location) {
+                             :label="t('Salesperson')"
+                             :options="workersOptions"
+                             hide-selected
+-                            option-label="name"
+-                            option-value="id"
+                             v-model="data.salesPersonFk"
+                         />
+                     </div>
+diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
+index 593b4550..333951b7 100644
+--- a/src/pages/Customer/CustomerFilter.vue
++++ b/src/pages/Customer/CustomerFilter.vue
+@@ -70,8 +70,6 @@ const zones = ref();
+                         v-model="params.salesPersonFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -93,8 +91,6 @@ const zones = ref();
+                         v-model="params.provinceFk"
+                         @update:model-value="searchFn()"
+                         :options="provinces"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         hide-selected
+@@ -140,8 +136,6 @@ const zones = ref();
+                             v-model="params.zoneFk"
+                             @update:model-value="searchFn()"
+                             :options="zones"
+-                            option-value="id"
+-                            option-label="name"
+                             emit-value
+                             map-options
+                             hide-selected
+diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+index 3ba7f655..c07dd5b4 100644
+--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
++++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+@@ -56,7 +56,6 @@ const authors = ref();
+                         emit-value
+                         hide-selected
+                         map-options
+-                        option-label="name"
+                         option-value="clientTypeFk"
+                         outlined
+                         rounded
+@@ -79,8 +78,6 @@ const authors = ref();
+                         emit-value
+                         hide-selected
+                         map-options
+-                        option-label="name"
+-                        option-value="id"
+                         outlined
+                         rounded
+                         use-input
+@@ -103,7 +100,6 @@ const authors = ref();
+                         hide-selected
+                         map-options
+                         option-label="country"
+-                        option-value="id"
+                         outlined
+                         rounded
+                         use-input
+@@ -147,8 +143,6 @@ const authors = ref();
+                         emit-value
+                         hide-selected
+                         map-options
+-                        option-label="name"
+-                        option-value="id"
+                         outlined
+                         rounded
+                         use-input
+diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+index df898e7c..b3191316 100644
+--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
++++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+@@ -208,8 +208,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.salesPersonFk"
+                         @update:model-value="searchFn()"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -275,7 +273,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.countryFk"
+                         @update:model-value="searchFn()"
+                         :options="countriesOptions"
+-                        option-value="id"
+                         option-label="country"
+                         map-options
+                         hide-selected
+@@ -292,8 +289,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.provinceFk"
+                         @update:model-value="searchFn()"
+                         :options="provincesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         map-options
+                         hide-selected
+                         dense
+@@ -368,8 +363,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.payMethodFk"
+                         :options="paymethodsOptions"
+                         @update:model-value="searchFn()"
+-                        option-value="id"
+-                        option-label="name"
+                         map-options
+                         hide-selected
+                         dense
+@@ -387,7 +380,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.sageTaxTypeFk"
+                         @update:model-value="searchFn()"
+                         :options="sageTaxTypesOptions"
+-                        option-value="id"
+                         option-label="vat"
+                         map-options
+                         hide-selected
+@@ -408,7 +400,6 @@ const shouldRenderColumn = (colName) => {
+                         v-model="params.sageTransactionTypeFk"
+                         @update:model-value="searchFn()"
+                         :options="sageTransactionTypesOptions"
+-                        option-value="id"
+                         option-label="transaction"
+                         map-options
+                         hide-selected
+diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+index 320fc205..539b9065 100644
+--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
++++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+@@ -85,7 +85,6 @@ const clients = ref();
+                         emit-value
+                         hide-selected
+                         map-options
+-                        option-label="name"
+                         option-value="name"
+                         outlined
+                         rounded
+diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
+index 30d4acf8..2d379448 100644
+--- a/src/pages/Customer/components/CustomerAddressCreate.vue
++++ b/src/pages/Customer/components/CustomerAddressCreate.vue
+@@ -119,8 +119,6 @@ function handleLocation(data, location) {
+                         :options="agencyModes"
+                         :rules="validate('route.agencyFk')"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.agencyModeFk"
+                     />
+                 </div>
+@@ -138,7 +136,6 @@ function handleLocation(data, location) {
+                         :label="t('Incoterms')"
+                         :options="incoterms"
+                         hide-selected
+-                        option-label="name"
+                         option-value="code"
+                         v-model="data.incotermsFk"
+                     />
+@@ -149,7 +146,6 @@ function handleLocation(data, location) {
+                         :options="customsAgents"
+                         hide-selected
+                         option-label="fiscalName"
+-                        option-value="id"
+                         v-model="data.customsAgentFk"
+                     >
+                         <template #form>
+diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
+index 8f4be134..85e6456a 100644
+--- a/src/pages/Customer/components/CustomerAddressEdit.vue
++++ b/src/pages/Customer/components/CustomerAddressEdit.vue
+@@ -190,8 +190,6 @@ function handleLocation(data, location) {
+                         :options="agencyModes"
+                         :rules="validate('route.agencyFk')"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.agencyModeFk"
+                     />
+                 </div>
+@@ -209,7 +207,6 @@ function handleLocation(data, location) {
+                         :label="t('Incoterms')"
+                         :options="incoterms"
+                         hide-selected
+-                        option-label="name"
+                         option-value="code"
+                         v-model="data.incotermsFk"
+                     />
+@@ -220,7 +217,6 @@ function handleLocation(data, location) {
+                         :options="customsAgents"
+                         hide-selected
+                         option-label="fiscalName"
+-                        option-value="id"
+                         v-model="data.customsAgentFk"
+                     >
+                         <template #form>
+@@ -242,7 +238,6 @@ function handleLocation(data, location) {
+                         :options="observationTypes"
+                         hide-selected
+                         option-label="description"
+-                        option-value="id"
+                         v-model="note.observationTypeFk"
+                     />
+                 </div>
+diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
+index 6d76c2b7..8bde9642 100644
+--- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
++++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
+@@ -154,7 +154,6 @@ const toCustomerFileManagement = () => {
+                             :options="optionsCompanies"
+                             :rules="validate('entry.companyFk')"
+                             option-label="code"
+-                            option-value="id"
+                             v-model="dms.companyId"
+                         />
+                     </div>
+@@ -165,8 +164,6 @@ const toCustomerFileManagement = () => {
+                         <VnSelectFilter
+                             :label="t('Warehouse')"
+                             :options="optionsWarehouses"
+-                            option-label="name"
+-                            option-value="id"
+                             v-model="dms.warehouseId"
+                         />
+                     </div>
+@@ -174,8 +171,6 @@ const toCustomerFileManagement = () => {
+                         <VnSelectFilter
+                             :label="t('Type')"
+                             :options="optionsDmsTypes"
+-                            option-label="name"
+-                            option-value="id"
+                             v-model="dms.dmsTypeId"
+                         />
+                     </div>
+diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
+index f1279b93..f813d1d6 100644
+--- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
++++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
+@@ -132,7 +132,6 @@ const toCustomerFileManagement = () => {
+                             :options="optionsCompanies"
+                             :rules="validate('entry.companyFk')"
+                             option-label="code"
+-                            option-value="id"
+                             v-model="dms.companyId"
+                         />
+                     </div>
+@@ -143,8 +142,6 @@ const toCustomerFileManagement = () => {
+                         <VnSelectFilter
+                             :label="t('Warehouse')"
+                             :options="optionsWarehouses"
+-                            option-label="name"
+-                            option-value="id"
+                             v-model="dms.warehouseId"
+                         />
+                     </div>
+@@ -152,8 +149,6 @@ const toCustomerFileManagement = () => {
+                         <VnSelectFilter
+                             :label="t('Type')"
+                             :options="optionsDmsTypes"
+-                            option-label="name"
+-                            option-value="id"
+                             v-model="dms.dmsTypeId"
+                         />
+                     </div>
+diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
+index d8915dc1..8eb67582 100644
+--- a/src/pages/Customer/components/CustomerGreugeCreate.vue
++++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
+@@ -78,8 +78,6 @@ const toCustomerGreuges = () => {
+                         :label="t('Type')"
+                         :options="greugeTypes"
+                         hide-selected
+-                        option-label="name"
+-                        option-value="id"
+                         v-model="data.greugeTypeFk"
+                     />
+                 </div>
+diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
+index c52cc18d..322c43c8 100644
+--- a/src/pages/Customer/components/CustomerNewPayment.vue
++++ b/src/pages/Customer/components/CustomerNewPayment.vue
+@@ -150,7 +150,6 @@ const onDataSaved = async () => {
+                             :rules="validate('entry.companyFk')"
+                             hide-selected
+                             option-label="code"
+-                            option-value="id"
+                             v-model="data.companyFk"
+                         />
+                     </div>
+@@ -165,7 +164,6 @@ const onDataSaved = async () => {
+                             @update:model-value="setPaymentType($event)"
+                             hide-selected
+                             option-label="bank"
+-                            option-value="id"
+                             v-model="data.bankFk"
+                         >
+                             <template #option="scope">
+diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
+index 7b0d34bd..ad7f98cd 100644
+--- a/src/pages/Customer/components/CustomerSamplesCreate.vue
++++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
+@@ -189,7 +189,6 @@ const toCustomerSamples = () => {
+                         @update:model-value="setSampleType"
+                         hide-selected
+                         option-label="description"
+-                        option-value="id"
+                         required="true"
+                         v-model="data.typeFk"
+                     />
+@@ -242,7 +241,6 @@ const toCustomerSamples = () => {
+                         :rules="validate('entry.companyFk')"
+                         hide-selected
+                         option-label="code"
+-                        option-value="id"
+                         required="true"
+                         v-model="data.companyFk"
+                         v-if="sampleType.hasCompany"
+@@ -254,7 +252,6 @@ const toCustomerSamples = () => {
+                         :options="optionsClientsAddressess"
+                         hide-selected
+                         option-label="nickname"
+-                        option-value="id"
+                         required="true"
+                         v-model="data.addressId"
+                         v-if="sampleType.id === 20"
+diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
+index 3b30a97e..819d6a2c 100644
+--- a/src/pages/Department/Card/DepartmentBasicData.vue
++++ b/src/pages/Department/Card/DepartmentBasicData.vue
+@@ -72,8 +72,6 @@ const clientsOptions = ref([]);
+                         :label="t('department.bossDepartment')"
+                         v-model="data.workerFk"
+                         :options="workersOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         map-options
+                         :rules="validate('department.workerFk')"
+@@ -84,8 +82,6 @@ const clientsOptions = ref([]);
+                         :label="t('department.selfConsumptionCustomer')"
+                         v-model="data.clientFk"
+                         :options="clientsOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         map-options
+                         :rules="validate('department.clientFk')"
+diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
+index a98a1227..57b29651 100644
+--- a/src/pages/Entry/Card/EntryBasicData.vue
++++ b/src/pages/Entry/Card/EntryBasicData.vue
+@@ -69,7 +69,6 @@ const onFilterTravelSelected = (formData, id) => {
+                         :label="t('entry.basicData.supplier')"
+                         v-model="data.supplierFk"
+                         :options="suppliersOptions"
+-                        option-value="id"
+                         option-label="nickname"
+                         hide-selected
+                         :required="true"
+@@ -92,7 +91,6 @@ const onFilterTravelSelected = (formData, id) => {
+                         :label="t('entry.basicData.travel')"
+                         v-model="data.travelFk"
+                         :options="travelsOptions"
+-                        option-value="id"
+                         option-label="warehouseInName"
+                         map-options
+                         hide-selected
+@@ -141,7 +139,6 @@ const onFilterTravelSelected = (formData, id) => {
+                         :label="t('entry.basicData.company')"
+                         v-model="data.companyFk"
+                         :options="companiesOptions"
+-                        option-value="id"
+                         option-label="code"
+                         map-options
+                         hide-selected
+@@ -155,7 +152,6 @@ const onFilterTravelSelected = (formData, id) => {
+                         :label="t('entry.basicData.currency')"
+                         v-model="data.currencyFk"
+                         :options="currenciesOptions"
+-                        option-value="id"
+                         option-label="code"
+                     />
+                 </div>
+diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
+index 0d2e5e51..846b891a 100644
+--- a/src/pages/Entry/Card/EntryNotes.vue
++++ b/src/pages/Entry/Card/EntryNotes.vue
+@@ -57,7 +57,6 @@ onMounted(() => {
+                             :options="entryObservationsOptions"
+                             :disable="!!row.id"
+                             option-label="description"
+-                            option-value="id"
+                             hide-selected
+                         />
+                     </div>
+diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
+index 8c434217..0f9dad2a 100644
+--- a/src/pages/Entry/EntryCreate.vue
++++ b/src/pages/Entry/EntryCreate.vue
+@@ -85,7 +85,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+                             class="full-width"
+                             v-model="data.supplierFk"
+                             :options="suppliersOptions"
+-                            option-value="id"
+                             option-label="nickname"
+                             hide-selected
+                             :required="true"
+@@ -111,7 +110,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+                             class="full-width"
+                             v-model="data.travelFk"
+                             :options="travelsOptions"
+-                            option-value="id"
+                             option-label="warehouseInName"
+                             map-options
+                             hide-selected
+@@ -143,7 +141,6 @@ const redirectToEntryBasicData = (_, { id }) => {
+                             class="full-width"
+                             v-model="data.companyFk"
+                             :options="companiesOptions"
+-                            option-value="id"
+                             option-label="code"
+                             map-options
+                             hide-selected
+diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
+index 22ddf0bb..ccef9b4e 100644
+--- a/src/pages/Entry/EntryFilter.vue
++++ b/src/pages/Entry/EntryFilter.vue
+@@ -97,7 +97,6 @@ const suppliersOptions = ref([]);
+                         v-model="params.companyFk"
+                         @update:model-value="searchFn()"
+                         :options="companiesOptions"
+-                        option-value="id"
+                         option-label="code"
+                         hide-selected
+                         dense
+@@ -113,8 +112,6 @@ const suppliersOptions = ref([]);
+                         v-model="params.currencyFk"
+                         @update:model-value="searchFn()"
+                         :options="currenciesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -129,8 +126,6 @@ const suppliersOptions = ref([]);
+                         v-model="params.supplierFk"
+                         @update:model-value="searchFn()"
+                         :options="suppliersOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+index f557c8ef..5dd0aa15 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+@@ -186,7 +186,6 @@ async function upsert() {
+                     <VnSelectFilter
+                         :label="t('supplierFk')"
+                         v-model="data.supplierFk"
+-                        option-value="id"
+                         option-label="nickname"
+                         url="Suppliers"
+                         :fields="['id', 'nickname']"
+@@ -405,7 +404,6 @@ async function upsert() {
+                         :label="t('Currency')"
+                         v-model="data.currencyFk"
+                         :options="currencies"
+-                        option-value="id"
+                         option-label="code"
+                     />
+                 </div>
+@@ -415,7 +413,6 @@ async function upsert() {
+                         :label="t('Company')"
+                         v-model="data.companyFk"
+                         :options="companies"
+-                        option-value="id"
+                         option-label="code"
+                     />
+                 </div>
+@@ -456,7 +453,6 @@ async function upsert() {
+                         :label="`${t('Company')}*`"
+                         v-model="dms.companyId"
+                         :options="companies"
+-                        option-value="id"
+                         option-label="code"
+                         :rules="[requiredFieldRule]"
+                     />
+@@ -467,8 +463,6 @@ async function upsert() {
+                         :label="`${t('Warehouse')}*`"
+                         v-model="dms.warehouseId"
+                         :options="warehouses"
+-                        option-value="id"
+-                        option-label="name"
+                         :rules="[requiredFieldRule]"
+                     />
+                     <VnSelectFilter
+@@ -476,8 +470,6 @@ async function upsert() {
+                         :label="`${t('Type')}*`"
+                         v-model="dms.dmsTypeId"
+                         :options="dmsTypes"
+-                        option-value="id"
+-                        option-label="name"
+                         :rules="[requiredFieldRule]"
+                     />
+                 </QItem>
+@@ -565,7 +557,6 @@ async function upsert() {
+                         :label="`${t('Company')}*`"
+                         v-model="dms.companyId"
+                         :options="companies"
+-                        option-value="id"
+                         option-label="code"
+                         :rules="[requiredFieldRule]"
+                     />
+@@ -576,8 +567,6 @@ async function upsert() {
+                         :label="`${t('Warehouse')}*`"
+                         v-model="dms.warehouseId"
+                         :options="warehouses"
+-                        option-value="id"
+-                        option-label="name"
+                         :rules="[requiredFieldRule]"
+                     />
+                     <VnSelectFilter
+@@ -585,8 +574,6 @@ async function upsert() {
+                         :label="`${t('Type')}*`"
+                         v-model="dms.dmsTypeId"
+                         :options="dmsTypes"
+-                        option-value="id"
+-                        option-label="name"
+                         :rules="[requiredFieldRule]"
+                     />
+                 </QItem>
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+index 5adaeca9..280c194d 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
+@@ -484,7 +484,6 @@ const createInvoiceInCorrection = async () => {
+                             :label="`${useCapitalize(t('globals.class'))}*`"
+                             v-model="correctionFormData.invoiceClass"
+                             :options="siiTypeInvoiceOuts"
+-                            option-value="id"
+                             option-label="code"
+                             :rules="[requiredFieldRule]"
+                         />
+@@ -494,7 +493,6 @@ const createInvoiceInCorrection = async () => {
+                             :label="`${useCapitalize(t('globals.type'))}*`"
+                             v-model="correctionFormData.invoiceType"
+                             :options="cplusRectificationTypes"
+-                            option-value="id"
+                             option-label="description"
+                             :rules="[requiredFieldRule]"
+                         />
+@@ -502,7 +500,6 @@ const createInvoiceInCorrection = async () => {
+                             :label="`${useCapitalize(t('globals.reason'))}*`"
+                             v-model="correctionFormData.invoiceReason"
+                             :options="invoiceCorrectionTypes"
+-                            option-value="id"
+                             option-label="description"
+                             :rules="[requiredFieldRule]"
+                         />
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+index e240e9a8..5cca5ee3 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+@@ -235,7 +235,6 @@ async function insert() {
+                                         class="full-width"
+                                         v-model="props.row['bankFk']"
+                                         :options="banks"
+-                                        option-value="id"
+                                         option-label="bank"
+                                     >
+                                         <template #option="scope">
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+index 58f52153..a6ccd8b0 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+@@ -151,7 +151,6 @@ function getTotal(type) {
+                             <VnSelectFilter
+                                 v-model="row[col.model]"
+                                 :options="col.options"
+-                                option-value="id"
+                                 option-label="description"
+                                 :filter-options="['id', 'description']"
+                             >
+@@ -168,7 +167,6 @@ function getTotal(type) {
+                             <VnSelectFilter
+                                 v-model="row[col.model]"
+                                 :options="col.options"
+-                                option-value="id"
+                                 option-label="code"
+                             />
+                         </QTd>
+@@ -187,7 +185,6 @@ function getTotal(type) {
+                                             class="full-width"
+                                             v-model="props.row['intrastatFk']"
+                                             :options="intrastats"
+-                                            option-value="id"
+                                             option-label="description"
+                                             :filter-options="['id', 'description']"
+                                         >
+@@ -222,7 +219,6 @@ function getTotal(type) {
+                                             class="full-width"
+                                             v-model="props.row['countryFk']"
+                                             :options="countries"
+-                                            option-value="id"
+                                             option-label="code"
+                                         />
+                                     </QItem>
+diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+index d8e74270..e94c2c98 100644
+--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
++++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+@@ -316,8 +316,6 @@ async function addExpense() {
+                                         class="full-width"
+                                         v-model="props.row['expenseFk']"
+                                         :options="expenses"
+-                                        option-value="id"
+-                                        option-label="name"
+                                         :filter-options="['id', 'name']"
+                                     >
+                                         <template #option="scope">
+@@ -352,7 +350,6 @@ async function addExpense() {
+                                         class="full-width"
+                                         v-model="props.row['taxTypeSageFk']"
+                                         :options="sageTaxTypes"
+-                                        option-value="id"
+                                         option-label="vat"
+                                         :filter-options="['id', 'vat']"
+                                     >
+@@ -375,7 +372,6 @@ async function addExpense() {
+                                         class="full-width"
+                                         v-model="props.row['transactionTypeSageFk']"
+                                         :options="sageTransactionTypes"
+-                                        option-value="id"
+                                         option-label="transaction"
+                                         :filter-options="['id', 'transaction']"
+                                     >
+diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
+index 8bf00723..4576f313 100644
+--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
++++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
+@@ -83,7 +83,6 @@ const suppliersRef = ref();
+                         :label="t('params.supplierFk')"
+                         v-model="params.supplierFk"
+                         :options="suppliers"
+-                        option-value="id"
+                         option-label="nickname"
+                         @input-value="suppliersRef.fetch()"
+                         dense
+diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+index c61b9f7f..5822c0ce 100644
+--- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
++++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
+@@ -99,8 +99,6 @@ onMounted(async () => {
+                 :label="t('client')"
+                 v-model="formData.clientId"
+                 :options="clientsOptions"
+-                option-value="id"
+-                option-label="name"
+                 hide-selected
+                 dense
+                 outlined
+@@ -120,7 +118,6 @@ onMounted(async () => {
+                 :label="t('company')"
+                 v-model="formData.companyFk"
+                 :options="companiesOptions"
+-                option-value="id"
+                 option-label="code"
+                 hide-selected
+                 dense
+@@ -131,8 +128,6 @@ onMounted(async () => {
+                 :label="t('printer')"
+                 v-model="formData.printer"
+                 :options="printersOptions"
+-                option-value="id"
+-                option-label="name"
+                 hide-selected
+                 dense
+                 outlined
+diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
+index 760c4872..aadb53b7 100644
+--- a/src/pages/Order/Card/OrderCatalogFilter.vue
++++ b/src/pages/Order/Card/OrderCatalogFilter.vue
+@@ -242,8 +242,6 @@ const getCategoryClass = (category, params) => {
+                         :label="t('params.type')"
+                         v-model="params.typeFk"
+                         :options="typeList"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+@@ -278,7 +276,6 @@ const getCategoryClass = (category, params) => {
+                         v-model="selectedOrder"
+                         :options="orderList || []"
+                         option-value="way"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+@@ -298,7 +295,6 @@ const getCategoryClass = (category, params) => {
+                         v-model="selectedOrderField"
+                         :options="OrderFields || []"
+                         option-value="field"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+@@ -318,8 +314,6 @@ const getCategoryClass = (category, params) => {
+                         :label="t('params.tag')"
+                         v-model="selectedTag"
+                         :options="props.tags || []"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
+index 62bfe0e0..78c153f2 100644
+--- a/src/pages/Order/Card/OrderFilter.vue
++++ b/src/pages/Order/Card/OrderFilter.vue
+@@ -79,8 +79,6 @@ const sourceList = ref(null);
+                         :label="t('agency')"
+                         v-model="params.agencyModeFk"
+                         :options="agencyList"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+@@ -100,8 +98,6 @@ const sourceList = ref(null);
+                         :label="t('salesPerson')"
+                         v-model="params.workerFk"
+                         :options="salesPersonList"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
+index 6a4ae6aa..afcd0180 100644
+--- a/src/pages/Order/Card/OrderForm.vue
++++ b/src/pages/Order/Card/OrderForm.vue
+@@ -149,8 +149,6 @@ const orderFilter = {
+                             :label="t('order.form.clientFk')"
+                             v-model="data.clientFk"
+                             :options="clientList"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                             @update:model-value="
+                                 (client) => fetchAddressList(client.defaultAddressFk)
+@@ -172,7 +170,6 @@ const orderFilter = {
+                             :label="t('order.form.addressFk')"
+                             v-model="data.addressFk"
+                             :options="addressList"
+-                            option-value="id"
+                             option-label="nickname"
+                             hide-selected
+                             :disable="!addressList?.length"
+diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
+index 4be1981a..93605b8d 100644
+--- a/src/pages/Route/Card/RouteFilter.vue
++++ b/src/pages/Route/Card/RouteFilter.vue
+@@ -67,7 +67,6 @@ const warehouseList = ref([]);
+                         :label="t('Worker')"
+                         v-model="params.workerFk"
+                         :options="workerList"
+-                        option-value="id"
+                         option-label="nickname"
+                         dense
+                         outlined
+@@ -96,8 +95,6 @@ const warehouseList = ref([]);
+                         :label="t('Agency')"
+                         v-model="params.agencyModeFk"
+                         :options="agencyList"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+@@ -152,7 +149,6 @@ const warehouseList = ref([]);
+                         :label="t('Vehicle')"
+                         v-model="params.vehicleFk"
+                         :options="vehicleList"
+-                        option-value="id"
+                         option-label="numberPlate"
+                         dense
+                         outlined
+@@ -175,8 +171,6 @@ const warehouseList = ref([]);
+                         :label="t('Warehouse')"
+                         v-model="params.warehouseFk"
+                         :options="warehouseList"
+-                        option-value="id"
+-                        option-label="name"
+                         dense
+                         outlined
+                         rounded
+diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
+index 604f0435..a08efae6 100644
+--- a/src/pages/Route/Card/RouteForm.vue
++++ b/src/pages/Route/Card/RouteForm.vue
+@@ -119,7 +119,6 @@ const onSave = (data, response) => {
+                         :label="t('Worker')"
+                         v-model="data.workerFk"
+                         :options="workerList"
+-                        option-value="id"
+                         option-label="nickname"
+                         emit-value
+                         map-options
+@@ -143,7 +142,6 @@ const onSave = (data, response) => {
+                         :label="t('Vehicle')"
+                         v-model="data.vehicleFk"
+                         :options="vehicleList"
+-                        option-value="id"
+                         option-label="numberPlate"
+                         emit-value
+                         map-options
+@@ -158,8 +156,6 @@ const onSave = (data, response) => {
+                         :label="t('Agency')"
+                         v-model="data.agencyModeFk"
+                         :options="agencyList"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
+index 0f5403ba..4eeff3f1 100644
+--- a/src/pages/Route/RouteList.vue
++++ b/src/pages/Route/RouteList.vue
+@@ -294,8 +294,6 @@ const markAsServed = () => {
+                                             :label="t('Worker')"
+                                             v-model="scope.value"
+                                             :options="workers"
+-                                            option-value="id"
+-                                            option-label="name"
+                                             hide-selected
+                                             autofocus
+                                             :emit-value="false"
+@@ -338,8 +336,6 @@ const markAsServed = () => {
+                                             :label="t('Agency')"
+                                             v-model="scope.value"
+                                             :options="agencyList"
+-                                            option-value="id"
+-                                            option-label="name"
+                                             hide-selected
+                                             autofocus
+                                             :emit-value="false"
+@@ -366,7 +362,6 @@ const markAsServed = () => {
+                                             :label="t('Vehicle')"
+                                             v-model="scope.value"
+                                             :options="vehicleList"
+-                                            option-value="id"
+                                             option-label="numberPlate"
+                                             hide-selected
+                                             autofocus
+diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
+index abc91373..baf83861 100644
+--- a/src/pages/Shelving/Card/ShelvingFilter.vue
++++ b/src/pages/Shelving/Card/ShelvingFilter.vue
+@@ -65,7 +65,6 @@ function setParkings(data) {
+                         :label="t('params.parkingFk')"
+                         v-model="params.parkingFk"
+                         :options="parkings"
+-                        option-value="id"
+                         option-label="code"
+                         emit-value
+                         map-options
+@@ -86,8 +85,6 @@ function setParkings(data) {
+                         :label="t('params.userFk')"
+                         v-model="params.userFk"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
+index 238879bd..d5e70fc2 100644
+--- a/src/pages/Shelving/Card/ShelvingForm.vue
++++ b/src/pages/Shelving/Card/ShelvingForm.vue
+@@ -97,7 +97,6 @@ const onSave = (shelving, newShelving) => {
+                     <QSelect
+                         v-model="data.parkingFk"
+                         :options="parkingList"
+-                        option-value="id"
+                         option-label="code"
+                         emit-value
+                         :label="t('shelving.basicData.parking')"
+diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
+index 302e0321..7b902585 100644
+--- a/src/pages/Supplier/Card/SupplierAccounts.vue
++++ b/src/pages/Supplier/Card/SupplierAccounts.vue
+@@ -114,8 +114,6 @@ onMounted(() => {
+                             :label="t('worker.create.bankEntity')"
+                             v-model="row.bankEntityFk"
+                             :options="bankEntitiesOptions"
+-                            option-label="name"
+-                            option-value="id"
+                             hide-selected
+                         >
+                             <template #form>
+diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+index 17786c1e..bcb281d2 100644
+--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
++++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+@@ -51,8 +51,6 @@ const onDataSaved = () => {
+                             :label="t('supplier.agencyTerms.agencyFk')"
+                             v-model="data.agencyFk"
+                             :options="agenciesOptions"
+-                            option-label="name"
+-                            option-value="id"
+                             hide-selected
+                             rounded
+                         />
+diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
+index bc50deb9..4152d8fd 100644
+--- a/src/pages/Supplier/Card/SupplierBasicData.vue
++++ b/src/pages/Supplier/Card/SupplierBasicData.vue
+@@ -42,8 +42,6 @@ const workersOptions = ref([]);
+                         :label="t('supplier.basicData.workerFk')"
+                         v-model="data.workerFk"
+                         :options="workersOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         map-options
+                         :rules="validate('supplier.workerFk')"
+diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
+index bf5ccb11..9a49214a 100644
+--- a/src/pages/Supplier/Card/SupplierBillingData.vue
++++ b/src/pages/Supplier/Card/SupplierBillingData.vue
+@@ -41,8 +41,6 @@ const formatPayDems = (data) => {
+                         :label="t('supplier.billingData.payMethodFk')"
+                         v-model="data.payMethodFk"
+                         :options="paymethodsOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         :rules="validate('supplier.payMethodFk')"
+                     />
+@@ -52,7 +50,6 @@ const formatPayDems = (data) => {
+                         :label="t('supplier.billingData.payDemFk')"
+                         v-model="data.payDemFk"
+                         :options="payDemsOptions"
+-                        option-value="id"
+                         option-label="payDem"
+                         hide-selected
+                         :rules="validate('supplier.payDemFk')"
+diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+index 339a9d0d..783f3ef8 100644
+--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
++++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+@@ -83,7 +83,6 @@ const itemCategoriesOptions = ref([]);
+                         v-model="params.buyerId"
+                         @update:model-value="searchFn()"
+                         :options="buyersOptions"
+-                        option-value="id"
+                         option-label="nickname"
+                         hide-selected
+                         dense
+@@ -99,8 +98,6 @@ const itemCategoriesOptions = ref([]);
+                         v-model="params.typeId"
+                         @update:model-value="searchFn()"
+                         :options="itemTypesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -126,8 +123,6 @@ const itemCategoriesOptions = ref([]);
+                         v-model="params.categoryId"
+                         @update:model-value="searchFn()"
+                         :options="itemCategoriesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
+index becf6d81..53648754 100644
+--- a/src/pages/Supplier/Card/SupplierFiscalData.vue
++++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
+@@ -84,7 +84,6 @@ function handleLocation(data, location) {
+                         :label="t('supplier.fiscalData.sageTaxTypeFk')"
+                         v-model="data.sageTaxTypeFk"
+                         :options="sageTaxTypesOptions"
+-                        option-value="id"
+                         option-label="vat"
+                         hide-selected
+                         map-options
+@@ -97,7 +96,6 @@ function handleLocation(data, location) {
+                         :label="t('supplier.fiscalData.sageWithholdingFk')"
+                         v-model="data.sageWithholdingFk"
+                         :options="sageWithholdingsOptions"
+-                        option-value="id"
+                         option-label="withholding"
+                         hide-selected
+                         map-options
+@@ -108,7 +106,6 @@ function handleLocation(data, location) {
+                         :label="t('supplier.fiscalData.sageTransactionTypeFk')"
+                         v-model="data.sageTransactionTypeFk"
+                         :options="sageTransactionTypesOptions"
+-                        option-value="id"
+                         option-label="transaction"
+                         hide-selected
+                         map-options
+@@ -122,7 +119,6 @@ function handleLocation(data, location) {
+                         v-model="data.supplierActivityFk"
+                         :options="supplierActivitiesOptions"
+                         option-value="code"
+-                        option-label="name"
+                         hide-selected
+                         map-options
+                     />
+diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
+index ff90df6e..5c4c2c78 100644
+--- a/src/pages/Supplier/SupplierListFilter.vue
++++ b/src/pages/Supplier/SupplierListFilter.vue
+@@ -75,8 +75,6 @@ const countriesOptions = ref([]);
+                         v-model="params.provinceFk"
+                         @update:model-value="searchFn()"
+                         :options="provincesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -91,7 +89,6 @@ const countriesOptions = ref([]);
+                         v-model="params.countryFk"
+                         @update:model-value="searchFn()"
+                         :options="countriesOptions"
+-                        option-value="id"
+                         option-label="country"
+                         hide-selected
+                         dense
+diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
+index 3fb9c008..9a844956 100644
+--- a/src/pages/Ticket/TicketCreate.vue
++++ b/src/pages/Ticket/TicketCreate.vue
+@@ -138,8 +138,6 @@ const redirectToTicketList = (_, { id }) => {
+                             :label="t('ticket.create.client')"
+                             v-model="data.clientId"
+                             :options="clientOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                             @update:model-value="(client) => onClientSelected(data)"
+                         >
+@@ -164,7 +162,6 @@ const redirectToTicketList = (_, { id }) => {
+                             :label="t('ticket.create.address')"
+                             v-model="data.addressId"
+                             :options="addressesOptions"
+-                            option-value="id"
+                             option-label="nickname"
+                             hide-selected
+                             :disable="!data.clientId"
+@@ -201,8 +198,6 @@ const redirectToTicketList = (_, { id }) => {
+                             :label="t('ticket.create.warehouse')"
+                             v-model="data.warehouseId"
+                             :options="warehousesOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                             @update:model-value="() => fetchAvailableAgencies(data)"
+                         />
+diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
+index 7b74117b..30432057 100644
+--- a/src/pages/Ticket/TicketFilter.vue
++++ b/src/pages/Ticket/TicketFilter.vue
+@@ -89,8 +89,6 @@ const warehouses = ref();
+                         :label="t('Salesperson')"
+                         v-model="params.salesPersonFk"
+                         :options="workers"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
+@@ -111,8 +109,6 @@ const warehouses = ref();
+                         v-model="params.stateFk"
+                         @update:model-value="searchFn()"
+                         :options="states"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         dense
+@@ -188,8 +184,6 @@ const warehouses = ref();
+                             v-model="params.provinceFk"
+                             @update:model-value="searchFn()"
+                             :options="provinces"
+-                            option-value="id"
+-                            option-label="name"
+                             emit-value
+                             map-options
+                             dense
+@@ -208,8 +202,6 @@ const warehouses = ref();
+                             v-model="params.agencyModeFk"
+                             @update:model-value="searchFn()"
+                             :options="agencies"
+-                            option-value="id"
+-                            option-label="name"
+                             emit-value
+                             map-options
+                             dense
+@@ -228,8 +220,6 @@ const warehouses = ref();
+                             v-model="params.warehouseFk"
+                             @update:model-value="searchFn()"
+                             :options="warehouses"
+-                            option-value="id"
+-                            option-label="name"
+                             emit-value
+                             map-options
+                             dense
+diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
+index 2edaac85..6b0ed81e 100644
+--- a/src/pages/Travel/Card/TravelBasicData.vue
++++ b/src/pages/Travel/Card/TravelBasicData.vue
+@@ -40,8 +40,6 @@ const agenciesOptions = ref([]);
+                         :label="t('travel.basicData.agency')"
+                         v-model="data.agencyModeFk"
+                         :options="agenciesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         map-options
+                         hide-selected
+                     />
+@@ -67,8 +65,6 @@ const agenciesOptions = ref([]);
+                         :label="t('travel.basicData.warehouseOut')"
+                         v-model="data.warehouseOutFk"
+                         :options="agenciesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         map-options
+                         hide-selected
+                     />
+@@ -78,8 +74,6 @@ const agenciesOptions = ref([]);
+                         :label="t('travel.basicData.warehouseIn')"
+                         v-model="data.warehouseInFk"
+                         :options="agenciesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         map-options
+                         hide-selected
+                     />
+diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
+index 4462846c..6a46c36a 100644
+--- a/src/pages/Travel/Card/TravelThermographsForm.vue
++++ b/src/pages/Travel/Card/TravelThermographsForm.vue
+@@ -272,8 +272,6 @@ const onThermographCreated = async (data) => {
+                             :label="t('travel.thermographs.type')"
+                             v-model="thermographForm.dmsTypeId"
+                             :options="dmsTypesOptions"
+-                            option-value="id"
+-                            option-label="name"
+                         />
+                     </div>
+                 </VnRow>
+@@ -283,7 +281,6 @@ const onThermographCreated = async (data) => {
+                             :label="t('travel.thermographs.company')"
+                             v-model="thermographForm.companyId"
+                             :options="companiesOptions"
+-                            option-value="id"
+                             option-label="code"
+                         />
+                     </div>
+@@ -292,8 +289,6 @@ const onThermographCreated = async (data) => {
+                             :label="t('travel.thermographs.warehouse')"
+                             v-model="thermographForm.warehouseId"
+                             :options="warehousesOptions"
+-                            option-value="id"
+-                            option-label="name"
+                         />
+                     </div>
+                 </VnRow>
+diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
+index 0b897516..19e24388 100644
+--- a/src/pages/Travel/ExtraCommunityFilter.vue
++++ b/src/pages/Travel/ExtraCommunityFilter.vue
+@@ -119,7 +119,6 @@ const decrement = (paramsObj, key) => {
+                         @update:model-value="searchFn()"
+                         :options="agenciesOptions"
+                         option-value="agencyFk"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -154,8 +153,6 @@ const decrement = (paramsObj, key) => {
+                         v-model="params.warehouseOutFk"
+                         @update:model-value="searchFn()"
+                         :options="warehousesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -170,8 +167,6 @@ const decrement = (paramsObj, key) => {
+                         v-model="params.warehouseInFk"
+                         @update:model-value="searchFn()"
+                         :options="warehousesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -186,8 +181,6 @@ const decrement = (paramsObj, key) => {
+                         v-model="params.cargoSupplierFk"
+                         @update:model-value="searchFn()"
+                         :options="suppliersOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -203,7 +196,6 @@ const decrement = (paramsObj, key) => {
+                         @update:model-value="searchFn()"
+                         :options="continentsOptions"
+                         option-value="code"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
+index abee0356..0a707871 100644
+--- a/src/pages/Travel/TravelCreate.vue
++++ b/src/pages/Travel/TravelCreate.vue
+@@ -77,7 +77,6 @@ const redirectToTravelBasicData = (_, { id }) => {
+                             v-model="data.agencyModeFk"
+                             :options="agenciesOptions"
+                             option-value="agencyFk"
+-                            option-label="name"
+                             hide-selected
+                         />
+                     </div>
+@@ -99,8 +98,6 @@ const redirectToTravelBasicData = (_, { id }) => {
+                             :label="t('globals.wareHouseOut')"
+                             v-model="data.warehouseOutFk"
+                             :options="warehousesOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                         />
+                     </div>
+@@ -109,8 +106,6 @@ const redirectToTravelBasicData = (_, { id }) => {
+                             :label="t('globals.wareHouseIn')"
+                             v-model="data.warehouseInFk"
+                             :options="warehousesOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                         />
+                     </div>
+diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
+index c1c0d1be..6c2cf21e 100644
+--- a/src/pages/Travel/TravelFilter.vue
++++ b/src/pages/Travel/TravelFilter.vue
+@@ -77,7 +77,6 @@ const decrement = (paramsObj, key) => {
+                         @update:model-value="searchFn()"
+                         :options="agenciesOptions"
+                         option-value="agencyFk"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -92,8 +91,6 @@ const decrement = (paramsObj, key) => {
+                         v-model="params.warehouseOutFk"
+                         @update:model-value="searchFn()"
+                         :options="warehousesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -108,8 +105,6 @@ const decrement = (paramsObj, key) => {
+                         v-model="params.warehouseInFk"
+                         @update:model-value="searchFn()"
+                         :options="warehousesOptions"
+-                        option-value="id"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+@@ -173,7 +168,6 @@ const decrement = (paramsObj, key) => {
+                         @update:model-value="searchFn()"
+                         :options="continentsOptions"
+                         option-value="code"
+-                        option-label="name"
+                         hide-selected
+                         dense
+                         outlined
+diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
+index cf6bc3ff..5642a238 100644
+--- a/src/pages/Wagon/WagonCreate.vue
++++ b/src/pages/Wagon/WagonCreate.vue
+@@ -132,8 +132,6 @@ function filterType(val, update) {
+                             fill-input
+                             hide-selected
+                             input-debounce="0"
+-                            option-label="name"
+-                            option-value="id"
+                             emit-value
+                             map-options
+                             :label="t('wagon.create.type')"
+diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
+index eef29a8a..a61c8fb2 100644
+--- a/src/pages/Worker/WorkerCreate.vue
++++ b/src/pages/Worker/WorkerCreate.vue
+@@ -198,7 +198,6 @@ onMounted(async () => {
+                             :label="t('worker.create.company')"
+                             v-model="data.companyFk"
+                             :options="companiesOptions"
+-                            option-value="id"
+                             option-label="code"
+                             hide-selected
+                             :rules="validate('Worker.company')"
+@@ -209,8 +208,6 @@ onMounted(async () => {
+                             :label="t('worker.create.boss')"
+                             v-model="data.bossFk"
+                             :options="workersOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             hide-selected
+                             :rules="validate('Worker.boss')"
+                         >
+@@ -234,8 +231,6 @@ onMounted(async () => {
+                             :label="t('worker.create.payMethods')"
+                             v-model="data.payMethodFk"
+                             :options="payMethodsOptions"
+-                            option-value="id"
+-                            option-label="name"
+                             map-options
+                             hide-selected
+                             :rules="validate('Worker.payMethodFk')"
+@@ -261,8 +256,6 @@ onMounted(async () => {
+                         :label="t('worker.create.bankEntity')"
+                         v-model="data.bankEntityFk"
+                         :options="bankEntitiesOptions"
+-                        option-label="name"
+-                        option-value="id"
+                         hide-selected
+                         :roles-allowed-to-create="['salesAssistant', 'hr']"
+                         :rules="validate('Worker.bankEntity')"
+diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
+index 0853791e..e2477372 100644
+--- a/src/pages/Worker/WorkerFilter.vue
++++ b/src/pages/Worker/WorkerFilter.vue
+@@ -72,8 +72,6 @@ const departments = ref();
+                         v-model="params.departmentFk"
+                         @update:model-value="searchFn()"
+                         :options="departments"
+-                        option-value="id"
+-                        option-label="name"
+                         emit-value
+                         map-options
+                         use-input
diff --git a/quasar.patch:Zone.Identifier b/quasar.patch:Zone.Identifier
new file mode 100644
index 000000000..99d1c88d1
--- /dev/null
+++ b/quasar.patch:Zone.Identifier
@@ -0,0 +1,4 @@
+[ZoneTransfer]
+ZoneId=3
+ReferrerUrl=https://chat.verdnatura.es/direct/4MYAaHTayrgLirGvuFzY9RyDvyg99NzPu5
+HostUrl=https://chat.verdnatura.es/file-upload/9whFtRhkNT95CdJud/quasar.patch?download
diff --git a/src/boot/setDefaults.js b/src/boot/setDefaults.js
new file mode 100644
index 000000000..a5e8c057d
--- /dev/null
+++ b/src/boot/setDefaults.js
@@ -0,0 +1,22 @@
+import { QTable } from 'quasar';
+
+const setDefault = (component, key, value) => {
+    const prop = component.props[key];
+    switch (typeof prop) {
+        case 'object':
+            prop.default = value;
+            break;
+        case 'function':
+            component.props[key] = {
+                type: prop,
+                default: value,
+            };
+            break;
+        case 'undefined':
+            throw new Error('unknown prop: ' + key);
+        default:
+            throw new Error('unhandled type: ' + typeof prop);
+    }
+};
+setDefault(QTable, 'pagination', { rowsPerPage: 25 });
+setDefault(QTable, 'hidePagination', true);
diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
index 4c329a8e8..cd4fff54c 100644
--- a/src/components/FilterItemForm.vue
+++ b/src/components/FilterItemForm.vue
@@ -202,7 +202,6 @@ const selectItem = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"
diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
index 499d5bc4e..e6060f06e 100644
--- a/src/components/FilterTravelForm.vue
+++ b/src/components/FilterTravelForm.vue
@@ -200,7 +200,6 @@ const selectTravel = ({ id }) => {
             <QTable
                 :columns="tableColumns"
                 :rows="tableRows"
-                :pagination="{ rowsPerPage: 0 }"
                 :loading="loading"
                 :hide-header="!tableRows || !tableRows.length > 0"
                 :no-data-label="t('Enter a new search')"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index bf6b57973..031702b53 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -247,7 +247,6 @@ function openDialog(dmsId) {
                     flat
                     dense
                     :rows-per-page-options="[0]"
-                    hide-bottom
                 >
                     <template #header="props">
                         <QTr :props="props">
@@ -290,7 +289,6 @@ function openDialog(dmsId) {
                     flat
                     dense
                     :rows-per-page-options="[0]"
-                    hide-bottom
                 >
                     <template #header="props">
                         <QTr :props="props">
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index 1dfd331e2..e330b092c 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -224,10 +224,8 @@ const refreshData = () => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="clientFk"
             selection="multiple"
             v-model:selected="selected"
diff --git a/src/pages/Customer/Notifications/CustomerNotifications.vue b/src/pages/Customer/Notifications/CustomerNotifications.vue
index cf66443b9..00b371bfc 100644
--- a/src/pages/Customer/Notifications/CustomerNotifications.vue
+++ b/src/pages/Customer/Notifications/CustomerNotifications.vue
@@ -108,10 +108,8 @@ const selectCustomerId = (id) => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 0 }"
             :rows="rows"
             class="full-width q-mt-md"
-            hide-bottom
             row-key="id"
             selection="multiple"
             v-model:selected="selected"
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index eedaaf137..78e0fc97c 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -151,10 +151,8 @@ function stateColor(row) {
                         :columns="columns"
                         :rows="rows"
                         row-key="id"
-                        :pagination="{ rowsPerPage: 0 }"
                         :grid="grid || $q.screen.lt.sm"
                         class="q-mt-xs custom-table"
-                        hide-pagination
                     >
                         <template #body-cell-actions="{ row }">
                             <QTd auto-width class="text-center">
diff --git a/src/pages/Entry/Card/EntryBuys.vue b/src/pages/Entry/Card/EntryBuys.vue
index 679afff1b..bddd22910 100644
--- a/src/pages/Entry/Card/EntryBuys.vue
+++ b/src/pages/Entry/Card/EntryBuys.vue
@@ -320,7 +320,6 @@ const showLockIcon = (groupingMode, mode) => {
                 :columns="entriesTableColumns"
                 selection="multiple"
                 row-key="id"
-                hide-bottom
                 class="full-width q-mt-md"
                 :grid="$q.screen.lt.md"
                 v-model:selected="rowsSelected"
diff --git a/src/pages/Entry/Card/EntryBuysImport.vue b/src/pages/Entry/Card/EntryBuysImport.vue
index 3e0ac1410..bd09eabe8 100644
--- a/src/pages/Entry/Card/EntryBuysImport.vue
+++ b/src/pages/Entry/Card/EntryBuysImport.vue
@@ -238,12 +238,7 @@ const redirectToBuysView = () => {
                     </div>
                 </VnRow>
                 <VnRow>
-                    <QTable
-                        :columns="columns"
-                        :rows="importData.buys"
-                        :pagination="{ rowsPerPage: 0 }"
-                        hide-pagination
-                    >
+                    <QTable :columns="columns" :rows="importData.buys">
                         <template #body-cell-item="{ row, col }">
                             <QTd auto-width>
                                 <VnSelectDialog
diff --git a/src/pages/Entry/Card/EntrySummary.vue b/src/pages/Entry/Card/EntrySummary.vue
index b6863f8f7..6423de152 100644
--- a/src/pages/Entry/Card/EntrySummary.vue
+++ b/src/pages/Entry/Card/EntrySummary.vue
@@ -277,7 +277,6 @@ const fetchEntryBuys = async () => {
                 <QTable
                     :rows="entryBuys"
                     :columns="entriesTableColumns"
-                    hide-bottom
                     row-key="index"
                     class="full-width q-mt-md"
                 >
diff --git a/src/pages/Entry/EntryLatestBuys.vue b/src/pages/Entry/EntryLatestBuys.vue
index 217a25870..d6945e2a3 100644
--- a/src/pages/Entry/EntryLatestBuys.vue
+++ b/src/pages/Entry/EntryLatestBuys.vue
@@ -659,7 +659,6 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             :columns="columns"
             selection="multiple"
             row-key="id"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :visible-columns="visibleColumns"
             v-model:selected="rowsSelected"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
index 6c05171e7..1011dbd6d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInCorrective.vue
@@ -111,7 +111,6 @@ const onSave = (data) => data.deletes && router.push(`/invoice-in/${invoiceId}/s
                 :rows="rows"
                 row-key="$index"
                 selection="single"
-                hide-pagination
                 :grid="$q.screen.lt.sm"
                 :pagination="{ rowsPerPage: 0 }"
             >
diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
index e36cd97b6..e71e48520 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
@@ -99,7 +99,6 @@ async function insert() {
                 :columns="columns"
                 :rows="rows"
                 row-key="$index"
-                hide-pagination
                 :grid="$q.screen.lt.sm"
             >
                 <template #body-cell-duedate="{ row }">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
index 58f521534..746ee130f 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
@@ -134,7 +134,6 @@ function getTotal(type) {
                     :columns="columns"
                     :rows="rows"
                     row-key="$index"
-                    hide-pagination
                     :grid="$q.screen.lt.sm"
                 >
                     <template #body-cell="{ row, col }">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 6d2d11509..6f4a984f1 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -327,7 +327,7 @@ function getLink(param) {
                     :columns="vatColumns"
                     :rows="invoiceIn.invoiceInTax"
                     flat
-                    hide-pagination
+                    
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">
@@ -361,7 +361,7 @@ function getLink(param) {
                     :columns="dueDayColumns"
                     :rows="invoiceIn.invoiceInDueDay"
                     flat
-                    hide-pagination
+                    
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">
@@ -390,7 +390,6 @@ function getLink(param) {
                     :columns="intrastatColumns"
                     :rows="invoiceIn.invoiceInIntrastat"
                     flat
-                    hide-pagination
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
index 8915a96ec..3eb9365d2 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
@@ -184,10 +184,8 @@ async function addExpense() {
                 selection="multiple"
                 :columns="columns"
                 :rows="rows"
-                row-key="$index"
-                hide-pagination
+                row-key="$index"                
                 :grid="$q.screen.lt.sm"
-                :pagination="{ rowsPerPage: 0 }"
             >
                 <template #body-cell-expense="{ row, col }">
                     <QTd auto-width>
diff --git a/src/pages/InvoiceOut/InvoiceOutGlobal.vue b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
index 7e2b43a76..b4f26aa7c 100644
--- a/src/pages/InvoiceOut/InvoiceOutGlobal.vue
+++ b/src/pages/InvoiceOut/InvoiceOutGlobal.vue
@@ -124,9 +124,7 @@ onUnmounted(() => {
             v-if="rows.length > 0"
             :rows="rows"
             :columns="columns"
-            hide-bottom
             row-key="id"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
             <template #body-cell="props">
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index aaae15111..4a10f55eb 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -231,7 +231,6 @@ const selectWorkerId = (id) => {
         <QTable
             :columns="columns"
             :rows="rows"
-            hide-bottom
             row-key="clientId"
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
diff --git a/src/pages/Order/Card/OrderSummary.vue b/src/pages/Order/Card/OrderSummary.vue
index f9704a480..488cd5846 100644
--- a/src/pages/Order/Card/OrderSummary.vue
+++ b/src/pages/Order/Card/OrderSummary.vue
@@ -162,7 +162,6 @@ const detailsColumns = ref([
                         :columns="detailsColumns"
                         :rows="entity?.rows"
                         flat
-                        hide-pagination
                     >
                         <template #header="props">
                             <QTr :props="props">
diff --git a/src/pages/Route/Card/RouteSummary.vue b/src/pages/Route/Card/RouteSummary.vue
index df4495d3a..5b3a1246a 100644
--- a/src/pages/Route/Card/RouteSummary.vue
+++ b/src/pages/Route/Card/RouteSummary.vue
@@ -213,10 +213,8 @@ const openBuscaman = async (route, ticket) => {
                     <QTable
                         :columns="ticketColumns"
                         :rows="entity?.tickets"
-                        :rows-per-page-options="[0]"
                         row-key="id"
                         flat
-                        hide-pagination
                     >
                         <template #body-cell-city="{ value, row }">
                             <QTd auto-width>
diff --git a/src/pages/Route/Cmr/CmrList.vue b/src/pages/Route/Cmr/CmrList.vue
index dc5602c1c..2b00ba26e 100644
--- a/src/pages/Route/Cmr/CmrList.vue
+++ b/src/pages/Route/Cmr/CmrList.vue
@@ -105,8 +105,6 @@ function downloadPdfs() {
                         :columns="columns"
                         :rows="rows"
                         :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: null }"
-                        hide-pagination
                         row-key="cmrFk"
                         selection="multiple"
                         v-model:selected="selected"
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 0b4aa6795..dd4b85254 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -275,8 +275,6 @@ const markAsServed = () => {
                             flat
                             row-key="id"
                             selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
                             :pagination="{ sortBy: 'ID', descending: true }"
                         >
                             <template #body-cell-worker="props">
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index 5a2c6bdb2..ef6a28d8c 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -300,7 +300,7 @@ async function setTravelData(travelData) {
                 <QTable
                     :rows="entriesTableRows"
                     :columns="entriesTableColumns"
-                    hide-bottom
+                    
                     row-key="id"
                     class="full-width q-mt-md"
                 >
@@ -365,7 +365,6 @@ async function setTravelData(travelData) {
                 <QTable
                     :rows="thermographs"
                     :columns="thermographsTableColumns"
-                    hide-bottom
                     row-key="id"
                     class="full-width q-mt-md"
                 />
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index e7805a7ed..34b9b449b 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -453,9 +453,7 @@ const handleDragScroll = (event) => {
         <QTable
             :rows="rows"
             :columns="columns"
-            hide-bottom
             row-key="clientId"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width"
             table-style="user-select: none;"
             @drag="handleDragScroll($event)"

From a96854063508d39c6808525430622d1b33234c2c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Thu, 14 Mar 2024 13:06:02 +0100
Subject: [PATCH 17/54] refactor: #6993 set default QTable pagination, created
 quasar.defaults for standards

---
 quasar.config.js                                    | 2 +-
 src/boot/defaults/qTable.js                         | 5 +++++
 src/boot/{setDefaults.js => defaults/setDefault.js} | 8 ++------
 src/boot/quasar.defaults.js                         | 1 +
 4 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 src/boot/defaults/qTable.js
 rename src/boot/{setDefaults.js => defaults/setDefault.js} (71%)
 create mode 100644 src/boot/quasar.defaults.js

diff --git a/quasar.config.js b/quasar.config.js
index aa42e19eb..c8bae3105 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations', 'setDefaults'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar.defaults'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js
new file mode 100644
index 000000000..4adc5b1c3
--- /dev/null
+++ b/src/boot/defaults/qTable.js
@@ -0,0 +1,5 @@
+import { QTable } from 'quasar';
+import setDefault from './setDefault';
+
+setDefault(QTable, 'pagination', { rowsPerPage: 25 });
+setDefault(QTable, 'hidePagination', true);
diff --git a/src/boot/setDefaults.js b/src/boot/defaults/setDefault.js
similarity index 71%
rename from src/boot/setDefaults.js
rename to src/boot/defaults/setDefault.js
index a5e8c057d..7d56a1a3e 100644
--- a/src/boot/setDefaults.js
+++ b/src/boot/defaults/setDefault.js
@@ -1,6 +1,4 @@
-import { QTable } from 'quasar';
-
-const setDefault = (component, key, value) => {
+export default function (component, key, value) {
     const prop = component.props[key];
     switch (typeof prop) {
         case 'object':
@@ -17,6 +15,4 @@ const setDefault = (component, key, value) => {
         default:
             throw new Error('unhandled type: ' + typeof prop);
     }
-};
-setDefault(QTable, 'pagination', { rowsPerPage: 25 });
-setDefault(QTable, 'hidePagination', true);
+}
diff --git a/src/boot/quasar.defaults.js b/src/boot/quasar.defaults.js
new file mode 100644
index 000000000..c792100d7
--- /dev/null
+++ b/src/boot/quasar.defaults.js
@@ -0,0 +1 @@
+export * from './defaults/qTable';

From dd91449818231343ab2b804d077a1c87786b1706 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 14 Mar 2024 15:16:50 +0100
Subject: [PATCH 18/54] feat: refs #5186 use global locales

---
 src/components/common/VnBreadcrumbs.vue | 5 +++--
 src/router/index.js                     | 7 +++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 5002c5a9a..e711b8541 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -41,8 +41,9 @@ function getBreadcrumb(param) {
         breadcrumb.title = useCamelCase(param.meta.title);
     }
 
-    breadcrumb.locale = te(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
-        ? t(`${breadcrumb.root}.pageTitles.${breadcrumb.title}`)
+    const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
+    breadcrumb.locale = te(moduleLocale)
+        ? t(moduleLocale)
         : t(`globals.pageTitles.${breadcrumb.title}`);
 
     return breadcrumb;
diff --git a/src/router/index.js b/src/router/index.js
index ca560e9c9..3e442f0e6 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -15,7 +15,7 @@ import { toLowerCamel } from 'src/filters';
 
 const state = useState();
 const session = useSession();
-const { t } = i18n.global;
+const { t, te } = i18n.global;
 
 const createHistory = process.env.SERVER
     ? createMemoryHistory
@@ -90,7 +90,10 @@ export default route(function (/* { store, ssrContext } */) {
         if (childPageTitle && matches.length > 2) {
             if (title != '') title += ': ';
 
-            const pageTitle = t(`${moduleName}.pageTitles.${childPageTitle}`);
+            const moduleLocale = `${moduleName}.pageTitles.${childPageTitle}`;
+            const pageTitle = te(moduleLocale)
+                ? t(moduleLocale)
+                : t(`globals.pageTitles.${childPageTitle}`);
             const idParam = to.params && to.params.id;
             const idPageTitle = `${idParam} - ${pageTitle}`;
             const builtTitle = idParam ? idPageTitle : pageTitle;

From d8419a146af82b3433dec238dff4261bcc6767cd Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 15 Mar 2024 10:48:02 +0100
Subject: [PATCH 19/54] refs #6905 fix userConfig

---
 src/components/UserPanel.vue | 114 +++++++++++++++++++++++++++--------
 1 file changed, 90 insertions(+), 24 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index d6acb9a99..6037b6405 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -9,12 +9,14 @@ import { useSession } from 'src/composables/useSession';
 import { localeEquivalence } from 'src/i18n/index';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import VnRow from 'components/ui/VnRow.vue';
+import FetchData from 'components/FetchData.vue';
 
 const state = useState();
 const session = useSession();
 const router = useRouter();
 const { t, locale } = useI18n();
 import { useClipboard } from 'src/composables/useClipboard';
+import { ref } from 'vue';
 const { copyText } = useClipboard();
 const userLocale = computed({
     get() {
@@ -47,6 +49,9 @@ const darkMode = computed({
 
 const user = state.getUser();
 const token = session.getToken();
+const warehousesData = ref();
+const companiesData = ref();
+const accountBankData = ref();
 
 onMounted(async () => {
     updatePreferences();
@@ -86,12 +91,35 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
+
+console.log('userWarehouse1', user);
+console.log('userWarehouse', user.value);
+console.log('userWarehouse', user.value.warehouseFk);
+console.log('userWarehouse', user.value.warehouseFk.name);
 </script>
 
 <template>
-    <QMenu anchor="bottom left">
+    <FetchData
+        url="Warehouses"
+        order="name"
+        @on-fetch="(data) => (warehousesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Companies"
+        order="name"
+        @on-fetch="(data) => (companiesData = data)"
+        auto-load
+    />
+    <FetchData
+        url="Accountings"
+        order="name"
+        @on-fetch="(data) => (accountBankData = data)"
+        auto-load
+    />
+    <QMenu>
         <div class="row no-wrap q-pa-md">
-            <div class="column panel">
+            <div class="column panel center">
                 <div class="text-h6 q-mb-md">
                     {{ t('components.userPanel.settings') }}
                 </div>
@@ -116,7 +144,7 @@ function copyUserToken() {
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="column items-center panel q-mb-sm q-pa-md">
+            <div class="icon column q-mb-sm q-pa-md">
                 <QAvatar size="80px">
                     <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"
@@ -143,31 +171,59 @@ function copyUserToken() {
                     icon="logout"
                     @click="logout()"
                     v-close-popup
+                    dense
                 />
             </div>
         </div>
         <QSeparator inset class="q-mx-lg" />
-        <VnRow class="row q-gutter-sm q-mb-sm q-pa-md">
-            <div class="col">
-                <VnSelectFilter :label="t('localWarehouse')" hide-selected />
-            </div>
-            <div class="col">
-                <VnSelectFilter :label="t('localBank')" hide-selected />
-            </div>
-        </VnRow>
-        <VnRow class="row q-gutter-sm q-mb-sm q-pa-md">
-            <div class="col">
-                <VnSelectFilter :label="t('localCompany')" hide-selected />
-            </div>
-            <div class="col">
-                <VnSelectFilter :label="t('userWarehouse')" hide-selected />
-            </div>
-        </VnRow>
-        <VnRow class="col q-gutter-sm q-pa-md">
-            <div class="col" style="flex: 0">
-                <VnSelectFilter :label="t('userCompany')" hide-selected />
-            </div>
-        </VnRow>
+        <div class="col q-gutter-xs q-pa-md">
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('localWarehouse')"
+                    v-model="user.localWarehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+                <VnSelectFilter
+                    :label="t('localBank')"
+                    hide-selected
+                    v-model="user.localBankFk"
+                    :options="accountBankData"
+                    option-label="name"
+                    option-value="id"
+                ></VnSelectFilter>
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('localCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                />
+                <VnSelectFilter
+                    :label="t('userWarehouse')"
+                    hide-selected
+                    v-model="user.warehouseFk"
+                    :options="warehousesData"
+                    option-label="name"
+                    option-value="id"
+                />
+            </VnRow>
+            <VnRow>
+                <VnSelectFilter
+                    :label="t('userCompany')"
+                    hide-selected
+                    v-model="user.companyFk"
+                    :options="companiesData"
+                    option-label="code"
+                    option-value="id"
+                    style="flex: 0"
+                />
+            </VnRow>
+        </div>
     </QMenu>
 </template>
 
@@ -181,6 +237,16 @@ function copyUserToken() {
         cursor: alias;
     }
 }
+
+.icon {
+    align-items: center;
+    padding-left: 7.5%;
+}
+
+.center {
+    display: flex;
+    flex: 0.96;
+}
 </style>
 
 <i18n>

From ff5e09d3159e46cccfa208c76603b7c6c1bd1113 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 12:45:15 +0100
Subject: [PATCH 20/54] refs #6993 fixed QTable behaviour

---
 .gitignore                                       |  6 +++++-
 src/boot/defaults/qTable.js                      |  2 +-
 src/components/common/VnDmsList.vue              |  1 -
 src/pages/Claim/Card/ClaimAction.vue             |  2 --
 src/pages/Claim/Card/ClaimDevelopment.vue        |  2 --
 src/pages/Claim/Card/ClaimLines.vue              |  2 --
 src/pages/Claim/Card/ClaimLinesImport.vue        |  1 -
 src/pages/Claim/Card/ClaimSummary.vue            | 16 ++--------------
 src/pages/Customer/Card/CustomerBalance.vue      |  1 -
 src/pages/Customer/Card/CustomerCredits.vue      |  8 +-------
 src/pages/Customer/Card/CustomerGreuges.vue      |  1 -
 src/pages/Customer/Card/CustomerRecoveries.vue   |  1 -
 .../ExtendedList/CustomerExtendedList.vue        |  1 -
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue    |  8 +-------
 src/pages/InvoiceOut/InvoiceOutNegativeBases.vue |  1 -
 src/pages/Route/RouteList.vue                    | 14 ++++++--------
 src/pages/Supplier/Card/SupplierConsumption.vue  |  1 -
 src/pages/Travel/Card/TravelSummary.vue          |  1 -
 src/pages/Travel/Card/TravelThermographs.vue     |  1 -
 19 files changed, 16 insertions(+), 54 deletions(-)

diff --git a/.gitignore b/.gitignore
index 213384ef5..4e055f4f2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,8 @@ yarn-error.log*
 
 # Cypress directories and files
 /tests/cypress/videos
-/tests/cypress/screenshots
\ No newline at end of file
+/tests/cypress/screenshots
+
+#File's changes differences
+quasar.patch
+quasar.patch:Zone.Identifier
\ No newline at end of file
diff --git a/src/boot/defaults/qTable.js b/src/boot/defaults/qTable.js
index 4adc5b1c3..8902d4266 100644
--- a/src/boot/defaults/qTable.js
+++ b/src/boot/defaults/qTable.js
@@ -1,5 +1,5 @@
 import { QTable } from 'quasar';
 import setDefault from './setDefault';
 
-setDefault(QTable, 'pagination', { rowsPerPage: 25 });
+setDefault(QTable, 'pagination', { rowsPerPage: 0 });
 setDefault(QTable, 'hidePagination', true);
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 5057c0790..b80fd36c8 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -218,7 +218,6 @@ function parseDms(data) {
     />
     <QTable
         :columns="columns"
-        :pagination="{ rowsPerPage: 0 }"
         :rows="rows"
         class="full-width q-mt-md"
         hide-bottom
diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
index ef45bf3dc..fa16e6af4 100644
--- a/src/pages/Claim/Card/ClaimAction.vue
+++ b/src/pages/Claim/Card/ClaimAction.vue
@@ -291,8 +291,6 @@ async function importToNewRefundTicket() {
                 selection="multiple"
                 v-model:selected="selectedRows"
                 :grid="$q.screen.lt.md"
-                :pagination="{ rowsPerPage: 0 }"
-                :hide-bottom="true"
             >
                 <template #body-cell-ticket="{ value }">
                     <QTd align="center">
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0b740cf64..9d38461f4 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -150,10 +150,8 @@ const columns = computed(() => [
             <QTable
                 :columns="columns"
                 :rows="rows"
-                :pagination="{ rowsPerPage: 0 }"
                 row-key="$index"
                 selection="multiple"
-                hide-pagination
                 v-model:selected="selected"
                 :grid="$q.screen.lt.md"
                 table-header-class="text-left"
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index 90dd31199..138c6ca98 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -201,11 +201,9 @@ function showImportDialog() {
                         :columns="columns"
                         :rows="rows"
                         :dense="$q.screen.lt.md"
-                        :pagination="{ rowsPerPage: 0 }"
                         row-key="id"
                         selection="multiple"
                         v-model:selected="selected"
-                        hide-pagination
                         :grid="$q.screen.lt.md"
                     >
                         <template #body-cell-claimed="{ row, value }">
diff --git a/src/pages/Claim/Card/ClaimLinesImport.vue b/src/pages/Claim/Card/ClaimLinesImport.vue
index be8914eec..d2b28c609 100644
--- a/src/pages/Claim/Card/ClaimLinesImport.vue
+++ b/src/pages/Claim/Card/ClaimLinesImport.vue
@@ -121,7 +121,6 @@ function cancel() {
                 class="my-sticky-header-table"
                 :columns="columns"
                 :rows="claimableSales"
-                :pagination="{ rowsPerPage: 10 }"
                 row-key="saleFk"
                 selection="multiple"
                 v-model:selected="selected"
diff --git a/src/pages/Claim/Card/ClaimSummary.vue b/src/pages/Claim/Card/ClaimSummary.vue
index 9cf658746..c2328c17a 100644
--- a/src/pages/Claim/Card/ClaimSummary.vue
+++ b/src/pages/Claim/Card/ClaimSummary.vue
@@ -242,13 +242,7 @@ function openDialog(dmsId) {
                     {{ t('claim.summary.details') }}
                     <QIcon name="open_in_new" />
                 </a>
-                <QTable
-                    :columns="detailsColumns"
-                    :rows="salesClaimed"
-                    flat
-                    dense
-                    :rows-per-page-options="[0]"
-                >
+                <QTable :columns="detailsColumns" :rows="salesClaimed" flat dense>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
@@ -284,13 +278,7 @@ function openDialog(dmsId) {
                     <QIcon name="open_in_new" />
                 </a>
 
-                <QTable
-                    :columns="developmentColumns"
-                    :rows="developments"
-                    flat
-                    dense
-                    :rows-per-page-options="[0]"
-                >
+                <QTable :columns="developmentColumns" :rows="developments" flat dense>
                     <template #header="props">
                         <QTr :props="props">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
index 184667d6e..3aeeb3b2d 100644
--- a/src/pages/Customer/Card/CustomerBalance.vue
+++ b/src/pages/Customer/Card/CustomerBalance.vue
@@ -198,7 +198,6 @@ const updateCompanyId = (id) => {
 
     <QTable
         :columns="columns"
-        :pagination="{ rowsPerPage: 12 }"
         :rows="rows"
         class="full-width q-mt-md"
         row-key="id"
diff --git a/src/pages/Customer/Card/CustomerCredits.vue b/src/pages/Customer/Card/CustomerCredits.vue
index 077312f1b..d243bff1b 100644
--- a/src/pages/Customer/Card/CustomerCredits.vue
+++ b/src/pages/Customer/Card/CustomerCredits.vue
@@ -97,13 +97,7 @@ const toCustomerCreditCreate = () => {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <QTable
-            :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
-            :rows="rows"
-            class="full-width q-mt-md"
-            row-key="id"
-        >
+        <QTable :columns="columns" :rows="rows" class="full-width q-mt-md" row-key="id">
             <template #body-cell="props">
                 <QTd :props="props">
                     <QTr :props="props" class="cursor-pointer">
diff --git a/src/pages/Customer/Card/CustomerGreuges.vue b/src/pages/Customer/Card/CustomerGreuges.vue
index d92d7b4ee..7726ea70b 100644
--- a/src/pages/Customer/Card/CustomerGreuges.vue
+++ b/src/pages/Customer/Card/CustomerGreuges.vue
@@ -140,7 +140,6 @@ const toCustomerGreugeCreate = () => {
 
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"
diff --git a/src/pages/Customer/Card/CustomerRecoveries.vue b/src/pages/Customer/Card/CustomerRecoveries.vue
index 7247145f2..6fd878089 100644
--- a/src/pages/Customer/Card/CustomerRecoveries.vue
+++ b/src/pages/Customer/Card/CustomerRecoveries.vue
@@ -97,7 +97,6 @@ const toCustomerRecoverieCreate = () => {
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index 9d98f479c..a24d3211a 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -510,7 +510,6 @@ const selectSalesPersonId = (id) => (selectedSalesPersonId.value = id);
     <QPage class="column items-center q-pa-md">
         <QTable
             :columns="columns"
-            :pagination="{ rowsPerPage: 12 }"
             :rows="rows"
             class="full-width q-mt-md"
             row-key="id"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index 6f4a984f1..0c413e1ac 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -323,12 +323,7 @@ function getLink(param) {
                     {{ t('invoiceIn.card.vat') }}
                     <QIcon name="open_in_new" />
                 </a>
-                <QTable
-                    :columns="vatColumns"
-                    :rows="invoiceIn.invoiceInTax"
-                    flat
-                    
-                >
+                <QTable :columns="vatColumns" :rows="invoiceIn.invoiceInTax" flat>
                     <template #header="props">
                         <QTr :props="props" class="bg">
                             <QTh v-for="col in props.cols" :key="col.name" :props="props">
@@ -361,7 +356,6 @@ function getLink(param) {
                     :columns="dueDayColumns"
                     :rows="invoiceIn.invoiceInDueDay"
                     flat
-                    
                 >
                     <template #header="props">
                         <QTr :props="props" class="bg">
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
index 4a10f55eb..b8fd77714 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBases.vue
@@ -232,7 +232,6 @@ const selectWorkerId = (id) => {
             :columns="columns"
             :rows="rows"
             row-key="clientId"
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
         >
             <template #body-cell="props">
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index dd4b85254..95b876be1 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -16,7 +16,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
-import {useSession} from "composables/useSession";
+import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
 
 const stateStore = useStateStore();
@@ -144,8 +144,8 @@ const cloneRoutes = () => {
 };
 
 const showRouteReport = () => {
-    const ids = selectedRows.value.map(row => row?.id)
-    const idString = ids.join(',')
+    const ids = selectedRows.value.map((row) => row?.id);
+    const idString = ids.join(',');
     let url;
 
     if (selectedRows.value.length <= 1) {
@@ -153,12 +153,12 @@ const showRouteReport = () => {
     } else {
         const params = new URLSearchParams({
             access_token: session.getToken(),
-            id: idString
-        })
+            id: idString,
+        });
         url = `api/Routes/downloadZip?${params.toString()}`;
     }
     window.open(url, '_blank');
-}
+};
 
 const markAsServed = () => {
     selectedRows.value.forEach((row) => {
@@ -263,7 +263,6 @@ const markAsServed = () => {
                 data-key="RouteList"
                 url="Routes/filter"
                 :order="['created DESC', 'id DESC']"
-                :limit="20"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -275,7 +274,6 @@ const markAsServed = () => {
                             flat
                             row-key="id"
                             selection="multiple"
-                            :pagination="{ sortBy: 'ID', descending: true }"
                         >
                             <template #body-cell-worker="props">
                                 <QTd :props="props">
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 59dd2281c..08298f503 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -151,7 +151,6 @@ onMounted(async () => {
             :rows="rows"
             row-key="id"
             hide-header
-            :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
             :no-data-label="t('No results')"
         >
diff --git a/src/pages/Travel/Card/TravelSummary.vue b/src/pages/Travel/Card/TravelSummary.vue
index c98560a57..72b043323 100644
--- a/src/pages/Travel/Card/TravelSummary.vue
+++ b/src/pages/Travel/Card/TravelSummary.vue
@@ -290,7 +290,6 @@ async function setTravelData(travelData) {
                 <QTable
                     :rows="entriesTableRows"
                     :columns="entriesTableColumns"
-                    
                     row-key="id"
                     class="full-width q-mt-md"
                 >
diff --git a/src/pages/Travel/Card/TravelThermographs.vue b/src/pages/Travel/Card/TravelThermographs.vue
index 435d9054f..d2195beb4 100644
--- a/src/pages/Travel/Card/TravelThermographs.vue
+++ b/src/pages/Travel/Card/TravelThermographs.vue
@@ -145,7 +145,6 @@ const removeThermograph = async (id) => {
                 :rows="rows"
                 :columns="TableColumns"
                 :no-data-label="t('No results')"
-                :rows-per-page-options="[0]"
                 row-key="id"
                 class="full-width q-mt-md"
             >

From 07cd07427e06f066afc3bca9f5c23af44e7d1e68 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 12:50:05 +0100
Subject: [PATCH 21/54] refs #6993 remove depen

---
 src/pages/Route/RouteList.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 95b876be1..4db683bf1 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,7 +2,6 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
 import { dashIfEmpty, toDate, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';

From 4c63e2f5c155df6c8c022d9fc2c7cf7a1c621a9e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 12:54:14 +0100
Subject: [PATCH 22/54] merge

---
 src/pages/Route/RouteList.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index d387e8009..4b3c63dca 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -272,9 +272,6 @@ const openTicketsDialog = (id) => {
                             flat
                             row-key="id"
                             selection="multiple"
-                            :rows-per-page-options="[0]"
-                            hide-pagination
-                            :pagination="{ sortBy: 'ID', descending: true }"
                         >
                             <template #body-cell-worker="props">
                                 <QTd :props="props">

From 6ff8b7be349f217b52dc281ddf0b1a7c31e836d1 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 12:57:16 +0100
Subject: [PATCH 23/54] refs #6993 fix conflicts

---
 src/pages/Route/RouteList.vue | 269 +++++++++++++++++++---------------
 1 file changed, 152 insertions(+), 117 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 4b3c63dca..95b876be1 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,8 +2,9 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toHour } from 'src/filters';
+import { dashIfEmpty, toDate, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
@@ -17,13 +18,10 @@ import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
-import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
-import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
-const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
 
@@ -37,7 +35,7 @@ const columns = computed(() => [
         label: t('ID'),
         field: (row) => row.id,
         sortable: true,
-        align: 'center',
+        align: 'left',
     },
     {
         name: 'worker',
@@ -72,7 +70,7 @@ const columns = computed(() => [
         label: 'm³',
         field: (row) => dashIfEmpty(row.m3),
         sortable: true,
-        align: 'center',
+        align: 'left',
     },
     {
         name: 'description',
@@ -115,6 +113,24 @@ const updateRoute = async (route) => {
     }
 };
 
+const updateVehicle = (row, vehicle) => {
+    row.vehicleFk = vehicle.id;
+    row.vehiclePlateNumber = vehicle.numberPlate;
+    updateRoute(row);
+};
+
+const updateAgency = (row, agency) => {
+    row.agencyModeFk = agency.id;
+    row.agencyName = agency.name;
+    updateRoute(row);
+};
+
+const updateWorker = (row, worker) => {
+    row.workerFk = worker.id;
+    row.workerUserName = worker.name;
+    updateRoute(row);
+};
+
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
@@ -133,7 +149,7 @@ const showRouteReport = () => {
     let url;
 
     if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
+        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
     } else {
         const params = new URLSearchParams({
             access_token: session.getToken(),
@@ -153,20 +169,6 @@ const markAsServed = () => {
     refreshKey.value++;
     startingDate.value = null;
 };
-
-const openTicketsDialog = (id) => {
-    if (!id) {
-        return;
-    }
-    quasar
-        .dialog({
-            component: RouteListTicketsDialog,
-            componentProps: {
-                id,
-            },
-        })
-        .onOk(() => refreshKey.value++);
-};
 </script>
 
 <template>
@@ -317,101 +319,154 @@ const openTicketsDialog = (id) => {
                                     </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-agency="{ row }">
-                                <QTd>
-                                    <VnSelectFilter
-                                        :label="t('Agency')"
-                                        v-model="row.agencyModeFk"
-                                        :options="agencyList"
-                                        option-value="id"
-                                        option-label="name"
-                                        hide-selected
-                                        dense
-                                        :emit-value="false"
-                                        :rules="validate('route.agencyFk')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-agency="props">
+                                <QTd :props="props">
+                                    {{ props.row?.agencyName }}
+                                    <QPopupEdit
+                                        :model-value="props.row.agencyModeFk"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="
+                                            (agency) => updateAgency(props.row, agency)
+                                        "
+                                    >
+                                        <VnSelectFilter
+                                            :label="t('Agency')"
+                                            v-model="scope.value"
+                                            :options="agencyList"
+                                            option-value="id"
+                                            option-label="name"
+                                            hide-selected
+                                            autofocus
+                                            :emit-value="false"
+                                            :rules="validate('route.agencyFk')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-vehicle="{ row }">
-                                <QTd>
-                                    <VnSelectFilter
-                                        :label="t('Vehicle')"
-                                        v-model="row.vehicleFk"
-                                        :options="vehicleList"
-                                        option-value="id"
-                                        option-label="numberPlate"
-                                        hide-selected
-                                        dense
-                                        :emit-value="false"
-                                        :rules="validate('route.vehicleFk')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-vehicle="props">
+                                <QTd :props="props">
+                                    {{ props.row?.vehiclePlateNumber }}
+                                    <QPopupEdit
+                                        :model-value="props.row.vehicleFk"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="
+                                            (vehicle) => updateVehicle(props.row, vehicle)
+                                        "
+                                    >
+                                        <VnSelectFilter
+                                            :label="t('Vehicle')"
+                                            v-model="scope.value"
+                                            :options="vehicleList"
+                                            option-value="id"
+                                            option-label="numberPlate"
+                                            hide-selected
+                                            autofocus
+                                            :emit-value="false"
+                                            :rules="validate('route.vehicleFk')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-date="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnInputDate
-                                        v-model="row.created"
-                                        hide-bottom-space
-                                        dense
-                                        :label="t('Date')"
-                                        :rules="validate('route.created')"
-                                        :is-clearable="false"
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-date="props">
+                                <QTd :props="props">
+                                    {{ toDate(props.row?.created) }}
+                                    <QPopupEdit
+                                        v-model="props.row.created"
+                                        v-slot="scope"
+                                        @update:model-value="updateRoute(props.row)"
+                                        buttons
+                                    >
+                                        <VnInputDate
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Date')"
+                                            :rules="validate('route.created')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-description="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnInput
-                                        v-model="row.description"
-                                        :label="t('Description')"
-                                        :rules="validate('route.description')"
-                                        :is-clearable="false"
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-description="props">
+                                <QTd :props="props">
+                                    {{ props.row?.description }}
+                                    <QPopupEdit
+                                        v-model="props.row.description"
+                                        v-slot="scope"
+                                        @update:model-value="updateRoute(props.row)"
+                                        buttons
+                                    >
+                                        <VnInput
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Description')"
+                                            :rules="validate('route.description')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-started="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnInputTime
-                                        v-model="row.started"
-                                        :label="t('Hour started')"
-                                        :rules="validate('route.started')"
-                                        :is-clearable="false"
-                                        hide-bottom-space
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-started="props">
+                                <QTd :props="props">
+                                    {{ toHour(props.row.started) }}
+                                    <QPopupEdit
+                                        v-model="props.row.started"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="updateRoute(props.row)"
+                                    >
+                                        <VnInputTime
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Hour started')"
+                                            :rules="validate('route.started')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-finished="{ row }">
-                                <QTd class="table-input-cell">
-                                    <VnInputTime
-                                        v-model="row.finished"
-                                        autofocus
-                                        :label="t('Hour finished')"
-                                        :rules="validate('route.finished')"
-                                        :is-clearable="false"
-                                        hide-bottom-space
-                                        dense
-                                        @update:model-value="updateRoute(row)"
-                                    />
+                            <template #body-cell-finished="props">
+                                <QTd :props="props">
+                                    {{ toHour(props.row.finished) }}
+                                    <QPopupEdit
+                                        v-model="props.row.finished"
+                                        v-slot="scope"
+                                        buttons
+                                        @update:model-value="updateRoute(props.row)"
+                                    >
+                                        <VnInputTime
+                                            v-model="scope.value"
+                                            autofocus
+                                            :label="t('Hour finished')"
+                                            :rules="validate('route.finished')"
+                                            :is-clearable="false"
+                                            @keyup.enter="scope.set"
+                                            @focus="($event) => $event.target.select()"
+                                        />
+                                    </QPopupEdit>
                                 </QTd>
                             </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
-                                    <div class="flex items-center no-wrap table-actions">
+                                    <div class="flex items-center table-actions">
                                         <QIcon
                                             name="vn:ticketAdd"
                                             size="xs"
                                             color="primary"
                                             class="cursor-pointer"
-                                            @click="openTicketsDialog(props?.row?.id)"
                                         >
                                             <QTooltip>{{ t('Add ticket') }}</QTooltip>
                                         </QIcon>
@@ -426,20 +481,6 @@ const openTicketsDialog = (id) => {
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
-                                        <RouterLink
-                                            :to="{
-                                                name: 'RouteSummary',
-                                                params: { id: props?.row?.id },
-                                            }"
-                                        >
-                                            <QIcon
-                                                name="vn:eye"
-                                                size="xs"
-                                                color="primary"
-                                            >
-                                                <QTooltip>{{ t('Summary') }}</QTooltip>
-                                            </QIcon>
-                                        </RouterLink>
                                     </div>
                                 </QTd>
                             </template>
@@ -460,13 +501,8 @@ const openTicketsDialog = (id) => {
 </template>
 
 <style lang="scss" scoped>
-.table-input-cell {
-    min-width: 150px;
-}
-
 .route-list {
     width: 100%;
-    max-height: 100%;
 }
 
 .table-actions {
@@ -495,5 +531,4 @@ es:
     Download selected routes as PDF: Descargar rutas seleccionadas como PDF
     Add ticket: Añadir tickets
     Preview: Vista previa
-    Summary: Resumen
 </i18n>

From a5441fb4a9535f69beff3562f204c7d610e0ce5e Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 13:06:31 +0100
Subject: [PATCH 24/54] refs #6993 fix test front

---
 test/vitest/__tests__/components/Paginate.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index 2a22ce438..f3bf01489 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -57,13 +57,13 @@ describe('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(3);
-            expect(vm.store.data.length).toEqual(6);
+            expect(vm.store.skip).toEqual(6);
+            expect(vm.store.data.length).toEqual(9);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(6);
-            expect(vm.store.data.length).toEqual(9);
+            expect(vm.store.skip).toEqual(9);
+            expect(vm.store.data.length).toEqual(12);
         });
     });
 

From cb4ec856fdc4bf6faa12d2cd8ceb5b2922233a0e Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 15 Mar 2024 14:08:16 +0100
Subject: [PATCH 25/54] refs #6905 fix css

---
 src/components/UserPanel.vue | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index f134de495..a75826e95 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -91,11 +91,6 @@ function logout() {
 function copyUserToken() {
     copyText(session.getToken(), { label: 'components.userPanel.copyToken' });
 }
-
-console.log('userWarehouse1', user);
-console.log('userWarehouse', user.value);
-console.log('userWarehouse', user.value.warehouseFk);
-console.log('userWarehouse', user.value.warehouseFk.name);
 </script>
 
 <template>
@@ -119,8 +114,8 @@ console.log('userWarehouse', user.value.warehouseFk.name);
     />
     <QMenu>
         <div class="row no-wrap q-pa-md">
-            <div class="column panel center">
-                <div class="text-h6 q-mb-md">
+            <div class="col column">
+                <div class="text-h6 q-ma-sm q-mb-none">
                     {{ t('components.userPanel.settings') }}
                 </div>
                 <QToggle
@@ -144,7 +139,7 @@ console.log('userWarehouse', user.value.warehouseFk.name);
 
             <QSeparator vertical inset class="q-mx-lg" />
 
-            <div class="icon column q-mb-sm q-pa-md">
+            <div class="col column items-center q-mb-sm">
                 <QAvatar size="80px">
                     <QImg
                         :src="`/api/Images/user/160x160/${user.id}/download?access_token=${token}`"

From 8ebf4be80754403bc31a928b23c8d682254baebc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 15 Mar 2024 14:09:05 +0100
Subject: [PATCH 26/54] refs: #6993 deleted useless files

---
 .gitignore                   |    6 +-
 quasar.patch                 | 2013 ----------------------------------
 quasar.patch:Zone.Identifier |    4 -
 3 files changed, 1 insertion(+), 2022 deletions(-)
 delete mode 100644 quasar.patch
 delete mode 100644 quasar.patch:Zone.Identifier

diff --git a/.gitignore b/.gitignore
index 4e055f4f2..213384ef5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,8 +30,4 @@ yarn-error.log*
 
 # Cypress directories and files
 /tests/cypress/videos
-/tests/cypress/screenshots
-
-#File's changes differences
-quasar.patch
-quasar.patch:Zone.Identifier
\ No newline at end of file
+/tests/cypress/screenshots
\ No newline at end of file
diff --git a/quasar.patch b/quasar.patch
deleted file mode 100644
index c65fce6cf..000000000
--- a/quasar.patch
+++ /dev/null
@@ -1,2013 +0,0 @@
-diff --git a/quasar.config.js b/quasar.config.js
-index 755e96bd..789b9f64 100644
---- a/quasar.config.js
-+++ b/quasar.config.js
-@@ -12,6 +12,7 @@ const { configure } = require('quasar/wrappers');
- const VueI18nPlugin = require('@intlify/unplugin-vue-i18n/vite');
- const path = require('path');
-
-+
- module.exports = configure(function (/* ctx */) {
-     return {
-         eslint: {
-@@ -29,7 +30,8 @@ module.exports = configure(function (/* ctx */) {
-         // app boot file (/src/boot)
-         // --> boot files are part of "main.js"
-         // https://v2.quasar.dev/quasar-cli/boot-files
--        boot: ['i18n', 'axios', 'vnDate', 'validations'],
-+        //
-+        boot: ['i18n', 'axios', 'vnDate','quasar','quasar.defaults','setDefaults', 'validations'],
-
-         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
-         css: ['app.scss'],
-@@ -122,6 +124,33 @@ module.exports = configure(function (/* ctx */) {
-         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework
-         framework: {
-             config: {
-+                form:{
-+mixins:[{
-+    data(d) {
-+      return {
-+        title: 'Mixins are cool',
-+        copyright: 'All rights reserved. Product of super awesome people'
-+      };
-+    },
-+    created: function(data) {
-+        console.log(this)
-+       if(this.$el){
-+
-+           console.log(this.$el
-+            )
-+            this.greetings();
-+        }
-+    },
-+    methods: {
-+        keyup:(event)=>{
-+            console.log(event)
-+        },
-+      greetings: function() {
-+        console.log('Howdy my good fellow!');
-+      }
-+    }
-+  }],
-+                },
-                 config: {
-                     brand: {
-                         primary: 'orange',
-diff --git a/src/App.vue b/src/App.vue
-index d0d8c935..6a201045 100644
---- a/src/App.vue
-+++ b/src/App.vue
-@@ -1,5 +1,5 @@
- <script setup>
--import { onMounted } from 'vue';
-+import { onMounted, getCurrentInstance, resolveComponent, h } from 'vue';
- import { useQuasar, Dark } from 'quasar';
- import { useI18n } from 'vue-i18n';
-
-@@ -34,6 +34,7 @@ quasar.iconMapFn = (iconName) => {
-         content: iconName,
-     };
- };
-+// h(resolveComponent('QBtn'), { color: 'red' }, 'Click me');
- </script>
-
- <template>
-diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
-index 106dbec3..7a2a36fb 100644
---- a/src/components/CreateBankEntityForm.vue
-+++ b/src/components/CreateBankEntityForm.vue
-@@ -77,7 +77,6 @@ const onDataSaved = (data) => {
-                         :label="t('country')"
-                         v-model="data.countryFk"
-                         :options="countriesOptions"
--                        option-value="id"
-                         option-label="country"
-                         hide-selected
-                         :required="true"
-diff --git a/src/components/CreateNewCityForm.vue b/src/components/CreateNewCityForm.vue
-index 7326ea7a..2d4d2667 100644
---- a/src/components/CreateNewCityForm.vue
-+++ b/src/components/CreateNewCityForm.vue
-@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
-                         :label="t('Province')"
-                         :options="provincesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.provinceFk"
-                         :rules="validate('city.provinceFk')"
-                     />
-diff --git a/src/components/CreateNewPostcodeForm.vue b/src/components/CreateNewPostcodeForm.vue
-index 47836c05..9572f96a 100644
---- a/src/components/CreateNewPostcodeForm.vue
-+++ b/src/components/CreateNewPostcodeForm.vue
-@@ -90,8 +90,6 @@ const onProvinceCreated = async ({ name }, formData) => {
-                         :options="townsLocationOptions"
-                         v-model="data.townFk"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         :rules="validate('postcode.city')"
-                         :roles-allowed-to-create="['deliveryAssistant']"
-                     >
-@@ -109,8 +107,6 @@ const onProvinceCreated = async ({ name }, formData) => {
-                         :label="t('Province')"
-                         :options="provincesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.provinceFk"
-                         :rules="validate('postcode.provinceFk')"
-                         :roles-allowed-to-create="['deliveryAssistant']"
-@@ -128,7 +124,6 @@ const onProvinceCreated = async ({ name }, formData) => {
-                         :options="countriesOptions"
-                         hide-selected
-                         option-label="country"
--                        option-value="id"
-                         v-model="data.countryFk"
-                         :rules="validate('postcode.countryFk')"
-                     />
-diff --git a/src/components/CreateNewProvinceForm.vue b/src/components/CreateNewProvinceForm.vue
-index b972db2c..c79513dc 100644
---- a/src/components/CreateNewProvinceForm.vue
-+++ b/src/components/CreateNewProvinceForm.vue
-@@ -52,8 +52,6 @@ const onDataSaved = (dataSaved) => {
-                         :label="t('Autonomy')"
-                         :options="autonomiesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.autonomyFk"
-                         :rules="validate('province.autonomyFk')"
-                     />
-diff --git a/src/components/CreateThermographForm.vue b/src/components/CreateThermographForm.vue
-index d4511a0e..b1dbad38 100644
---- a/src/components/CreateThermographForm.vue
-+++ b/src/components/CreateThermographForm.vue
-@@ -82,8 +82,6 @@ const onDataSaved = (dataSaved) => {
-                         :label="t('Warehouse')"
-                         :options="warehousesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.warehouseId"
-                         :required="true"
-                     />
-@@ -93,7 +91,6 @@ const onDataSaved = (dataSaved) => {
-                         :label="t('Temperature')"
-                         :options="temperaturesOptions"
-                         hide-selected
--                        option-label="name"
-                         option-value="code"
-                         v-model="data.temperatureFk"
-                         :required="true"
-diff --git a/src/components/FilterItemForm.vue b/src/components/FilterItemForm.vue
-index 4c329a8e..155d88e6 100644
---- a/src/components/FilterItemForm.vue
-+++ b/src/components/FilterItemForm.vue
-@@ -164,8 +164,6 @@ const selectItem = ({ id }) => {
-                         :label="t('entry.buys.producer')"
-                         :options="producersOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="itemFilterParams.producerFk"
-                     />
-                 </div>
-@@ -174,8 +172,6 @@ const selectItem = ({ id }) => {
-                         :label="t('entry.buys.type')"
-                         :options="ItemTypesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="itemFilterParams.typeFk"
-                     />
-                 </div>
-@@ -184,8 +180,6 @@ const selectItem = ({ id }) => {
-                         :label="t('entry.buys.color')"
-                         :options="InksOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="itemFilterParams.inkFk"
-                     />
-                 </div>
-diff --git a/src/components/FilterTravelForm.vue b/src/components/FilterTravelForm.vue
-index 499d5bc4..10282267 100644
---- a/src/components/FilterTravelForm.vue
-+++ b/src/components/FilterTravelForm.vue
-@@ -150,8 +150,6 @@ const selectTravel = ({ id }) => {
-                         :label="t('entry.basicData.agency')"
-                         :options="agenciesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="travelFilterParams.agencyModeFk"
-                     />
-                 </div>
-@@ -160,8 +158,6 @@ const selectTravel = ({ id }) => {
-                         :label="t('entry.basicData.warehouseOut')"
-                         :options="warehousesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="travelFilterParams.warehouseOutFk"
-                     />
-                 </div>
-@@ -170,8 +166,6 @@ const selectTravel = ({ id }) => {
-                         :label="t('entry.basicData.warehouseIn')"
-                         :options="warehousesOptions"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="travelFilterParams.warehouseInFk"
-                     />
-                 </div>
-diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
-index 28236be1..f59867fa 100644
---- a/src/components/RegularizeStockForm.vue
-+++ b/src/components/RegularizeStockForm.vue
-@@ -63,8 +63,6 @@ const onDataSaved = (data) => {
-                         :label="t('Warehouse')"
-                         v-model="data.warehouseFk"
-                         :options="warehousesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                     />
-                 </div>
-diff --git a/src/components/common/VnDms.vue b/src/components/common/VnDms.vue
-index d2651f5d..22fa28f2 100644
---- a/src/components/common/VnDms.vue
-+++ b/src/components/common/VnDms.vue
-@@ -122,7 +122,6 @@ function addDefaultData(data) {
-                         :label="t('globals.company')"
-                         v-model="dms.companyFk"
-                         :options="companies"
--                        option-value="id"
-                         option-label="code"
-                         input-debounce="0"
-                     />
-@@ -132,16 +131,12 @@ function addDefaultData(data) {
-                         :label="t('globals.warehouse')"
-                         v-model="dms.warehouseFk"
-                         :options="warehouses"
--                        option-value="id"
--                        option-label="name"
-                         input-debounce="0"
-                     />
-                     <VnSelectFilter
-                         :label="t('globals.type')"
-                         v-model="dms.dmsTypeFk"
-                         :options="dmsTypes"
--                        option-value="id"
--                        option-label="name"
-                         input-debounce="0"
-                     />
-                 </VnRow>
-diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
-index 6368a3e5..343bdb4b 100644
---- a/src/components/common/VnLog.vue
-+++ b/src/components/common/VnLog.vue
-@@ -693,8 +693,6 @@ setLogTree();
-                             class="full-width"
-                             :label="t('globals.user')"
-                             v-model="userSelect"
--                            option-label="name"
--                            option-value="id"
-                             :options="workers"
-                             @update:model-value="selectFilter('userSelect')"
-                             hide-selected
-diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
-index b5941239..9720d391 100644
---- a/src/components/common/VnLogFilter.vue
-+++ b/src/components/common/VnLogFilter.vue
-@@ -49,8 +49,6 @@ const workers = ref();
-                         v-model="params.userFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
-index 99710408..410e0515 100644
---- a/src/components/ui/VnSearchbar.vue
-+++ b/src/components/ui/VnSearchbar.vue
-@@ -81,8 +81,9 @@ onMounted(() => {
- });
-
- async function search() {
--    const staticParams = Object.entries(store.userParams)
--        .filter(([key, value]) => value && (props.staticParams || []).includes(key));
-+    const staticParams = Object.entries(store.userParams).filter(
-+        ([key, value]) => value && (props.staticParams || []).includes(key)
-+    );
-     await arrayData.applyFilter({
-         params: {
-             ...Object.fromEntries(staticParams),
-@@ -107,7 +108,7 @@ async function search() {
- </script>
-
- <template>
--    <QForm @submit="search">
-+    <QForm @submit="search" id="searchbarForm">
-         <VnInput
-             id="searchbar"
-             v-model="searchText"
-diff --git a/src/css/app.scss b/src/css/app.scss
-index 750439e3..37c515cb 100644
---- a/src/css/app.scss
-+++ b/src/css/app.scss
-@@ -97,3 +97,6 @@ input::-webkit-inner-spin-button {
-     -webkit-appearance: none;
-     -moz-appearance: none;
- }
-+.q-table th, .q-table td {
-+    text-align: left !important;
-+}
-diff --git a/src/filters/toCurrency.js b/src/filters/toCurrency.js
-index f820c012..d998aac3 100644
---- a/src/filters/toCurrency.js
-+++ b/src/filters/toCurrency.js
-@@ -12,7 +12,7 @@ export default function (value, symbol = 'EUR', fractionSize = 2) {
-         maximumFractionDigits: fractionSize,
-     };
-
--    const lang = locale.value == 'es' ? 'de' : locale.value;
-+    // const lang = locale.value == 'es-ES' ?  : locale.value;
-
--    return new Intl.NumberFormat(lang, options).format(value);
-+    return new Intl.NumberFormat('de-DE', options).format(value);
- }
-diff --git a/src/pages/Claim/Card/ClaimAction.vue b/src/pages/Claim/Card/ClaimAction.vue
-index ef45bf3d..3c27bd2e 100644
---- a/src/pages/Claim/Card/ClaimAction.vue
-+++ b/src/pages/Claim/Card/ClaimAction.vue
-@@ -308,7 +308,6 @@ async function importToNewRefundTicket() {
-                             v-model="row.claimDestinationFk"
-                             :options="destinationTypes"
-                             option-label="description"
--                            option-value="id"
-                             :autofocus="true"
-                             dense
-                             input-debounce="0"
-@@ -350,7 +349,6 @@ async function importToNewRefundTicket() {
-                                                 v-model="props.row.claimDestinationFk"
-                                                 :options="destinationTypes"
-                                                 option-label="description"
--                                                option-value="id"
-                                                 :autofocus="true"
-                                                 dense
-                                                 input-debounce="0"
-@@ -425,7 +423,6 @@ async function importToNewRefundTicket() {
-                     v-model="claimDestinationFk"
-                     :options="destinationTypes"
-                     option-label="description"
--                    option-value="id"
-                     :autofocus="true"
-                     dense
-                     input-debounce="0"
-diff --git a/src/pages/Claim/Card/ClaimBasicData.vue b/src/pages/Claim/Card/ClaimBasicData.vue
-index 35f93c73..41007a46 100644
---- a/src/pages/Claim/Card/ClaimBasicData.vue
-+++ b/src/pages/Claim/Card/ClaimBasicData.vue
-@@ -122,8 +122,6 @@ const statesFilter = {
-                     <QSelect
-                         v-model="data.workerFk"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         :label="t('claim.basicData.assignedTo')"
-                         map-options
-@@ -147,7 +145,6 @@ const statesFilter = {
-                     <QSelect
-                         v-model="data.claimStateFk"
-                         :options="claimStates"
--                        option-value="id"
-                         option-label="description"
-                         emit-value
-                         :label="t('claim.basicData.state')"
-diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
-index ee702ffd..761e2d9c 100644
---- a/src/pages/Claim/ClaimFilter.vue
-+++ b/src/pages/Claim/ClaimFilter.vue
-@@ -69,8 +69,6 @@ const states = ref();
-                         v-model="params.salesPersonFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -92,8 +90,6 @@ const states = ref();
-                         v-model="params.attenderFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -115,8 +111,6 @@ const states = ref();
-                         v-model="params.claimResponsibleFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -138,7 +132,6 @@ const states = ref();
-                         v-model="params.claimStateFk"
-                         @update:model-value="searchFn()"
-                         :options="states"
--                        option-value="id"
-                         option-label="description"
-                         emit-value
-                         map-options
-@@ -160,8 +153,8 @@ const states = ref();
-                                 :loading="loading"
-                                 @filter="filterFn"
-                                 @virtual-scroll="onScroll"
--                                option-value="id"
--                                option-label="name"
-+
-+
-                                 emit-value
-                                 map-options
-                             />
-diff --git a/src/pages/Customer/Card/CustomerBalance.vue b/src/pages/Customer/Card/CustomerBalance.vue
-index fe873cfa..3e9eae22 100644
---- a/src/pages/Customer/Card/CustomerBalance.vue
-+++ b/src/pages/Customer/Card/CustomerBalance.vue
-@@ -97,59 +97,50 @@ const tableColumnComponents = {
-
- const columns = computed(() => [
-     {
--        align: 'left',
-         field: 'payed',
-         format: (value) => toDate(value),
-         label: t('Date'),
-         name: 'date',
-     },
-     {
--        align: 'left',
-         field: 'created',
-         format: (value) => toDateHourMinSec(value),
-         label: t('Creation date'),
-         name: 'creationDate',
-     },
-     {
--        align: 'left',
-         field: 'userName',
-         label: t('Employee'),
-         name: 'employee',
-     },
-     {
--        align: 'left',
-         field: 'description',
-         label: t('Reference'),
-         name: 'reference',
-     },
-     {
--        align: 'left',
-         field: 'bankFk',
-         label: t('Bank'),
-         name: 'bank',
-     },
-     {
--        align: 'left',
-         field: 'debit',
-         label: t('Debit'),
-         name: 'debit',
-     },
-     {
--        align: 'left',
-         field: 'credit',
-         format: (value) => toCurrency(value),
-         label: t('Havings'),
-         name: 'havings',
-     },
-     {
--        align: 'left',
-         field: (value) => value.debit - value.credit,
-         format: (value) => toCurrency(value),
-         label: t('Balance'),
-         name: 'balance',
-     },
-     {
--        align: 'left',
-         field: 'isConciliate',
-         label: t('Conciliated'),
-         name: 'conciliated',
-@@ -219,16 +210,15 @@ const saveFieldValue = async (event) => {
-     />
-
-     <QTable
-+        name="customerBalance"
-         :columns="columns"
--        :no-data-label="t('globals.noResults')"
--        :pagination="{ rowsPerPage: 12 }"
-         :rows="rows"
-         class="full-width q-mt-md"
--        row-key="id"
-+        :class="defaultColumnsFormat"
-     >
-         <template #body-cell="props">
-             <QTd :props="props">
--                <QTr :props="props" class="cursor-pointer">
-+                <QTr :props="props" class="text-left cursor-pointer">
-                     <component
-                         :is="tableColumnComponents[props.col.name].component"
-                         class="col-content"
-@@ -284,7 +274,6 @@ const saveFieldValue = async (event) => {
-                 @update:model-value="updateCompanyId($event)"
-                 hide-selected
-                 option-label="code"
--                option-value="id"
-                 v-model="companyId"
-                 :rules="validate('entry.companyFk')"
-             />
-diff --git a/src/pages/Customer/Card/CustomerBasicData.vue b/src/pages/Customer/Card/CustomerBasicData.vue
-index 9be4643f..f80f7f12 100644
---- a/src/pages/Customer/Card/CustomerBasicData.vue
-+++ b/src/pages/Customer/Card/CustomerBasicData.vue
-@@ -67,7 +67,12 @@ const filterOptions = {
-         url="Clients"
-     />
-
--    <FormModel :url="`Clients/${route.params.id}`" auto-load model="customer">
-+    <FormModel
-+        :url="`Clients/${route.params.id}`"
-+        @keyup.enter="handleCloick"
-+        auto-load
-+        model="customer"
-+    >
-         <template #form="{ data, validate, filter }">
-             <VnRow class="row q-gutter-md q-mb-md">
-                 <div class="col">
-@@ -148,8 +153,6 @@ const filterOptions = {
-                         @filter="(value, update) => filter(value, update, filterOptions)"
-                         emit-value
-                         map-options
--                        option-label="name"
--                        option-value="id"
-                         use-input
-                         v-model="data.salesPersonFk"
-                     >
-@@ -172,8 +175,6 @@ const filterOptions = {
-                         :rules="validate('client.contactChannelFk')"
-                         emit-value
-                         map-options
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.contactChannelFk"
-                     />
-                 </div>
-@@ -187,8 +188,6 @@ const filterOptions = {
-                         :rules="validate('client.transferorFk')"
-                         emit-value
-                         map-options
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.transferorFk"
-                     >
-                         <template #append>
-diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
-index e1b12619..3a553b88 100644
---- a/src/pages/Customer/Card/CustomerBillingData.vue
-+++ b/src/pages/Customer/Card/CustomerBillingData.vue
-@@ -53,8 +53,6 @@ const getBankEntities = (data, formData) => {
-                         :label="t('Billing data')"
-                         :options="payMethods"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.payMethod"
-                     />
-                 </div>
-@@ -85,8 +83,6 @@ const getBankEntities = (data, formData) => {
-                         :roles-allowed-to-create="['salesAssistant', 'hr']"
-                         :rules="validate('Worker.bankEntity')"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.bankEntityFk"
-                     >
-                         <template #form>
-diff --git a/src/pages/Customer/Card/CustomerFiscalData.vue b/src/pages/Customer/Card/CustomerFiscalData.vue
-index f74cbc2c..f61f88cd 100644
---- a/src/pages/Customer/Card/CustomerFiscalData.vue
-+++ b/src/pages/Customer/Card/CustomerFiscalData.vue
-@@ -74,7 +74,6 @@ function handleLocation(data, location) {
-                         :options="typesTaxes"
-                         hide-selected
-                         option-label="vat"
--                        option-value="id"
-                         v-model="data.sageTaxTypeFk"
-                     />
-                 </div>
-@@ -84,7 +83,6 @@ function handleLocation(data, location) {
-                         :options="typesTransactions"
-                         hide-selected
-                         option-label="transaction"
--                        option-value="id"
-                         v-model="data.sageTransactionTypeFk"
-                     >
-                         <template #option="scope">
-diff --git a/src/pages/Customer/Card/CustomerLog.vue b/src/pages/Customer/Card/CustomerLog.vue
-index c237e5fd..02b7b745 100644
---- a/src/pages/Customer/Card/CustomerLog.vue
-+++ b/src/pages/Customer/Card/CustomerLog.vue
-@@ -144,8 +144,6 @@ const setInq = (value, status) => {
-                 :options="[]"
-                 class="q-mt-md"
-                 hide-selected
--                option-label="name"
--                option-value="id"
-             />
-
-             <div class="q-mt-lg">
-@@ -184,8 +182,6 @@ const setInq = (value, status) => {
-                 :options="[]"
-                 class="q-mt-sm"
-                 hide-selected
--                option-label="name"
--                option-value="id"
-             />
-             <VnInput :label="t('Changes')" clearable class="q-mt-sm">
-                 <template #append>
-diff --git a/src/pages/Customer/CustomerCreate.vue b/src/pages/Customer/CustomerCreate.vue
-index 4addb1d6..627908a3 100644
---- a/src/pages/Customer/CustomerCreate.vue
-+++ b/src/pages/Customer/CustomerCreate.vue
-@@ -57,8 +57,6 @@ function handleLocation(data, location) {
-                             :label="t('Salesperson')"
-                             :options="workersOptions"
-                             hide-selected
--                            option-label="name"
--                            option-value="id"
-                             v-model="data.salesPersonFk"
-                         />
-                     </div>
-diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
-index 593b4550..333951b7 100644
---- a/src/pages/Customer/CustomerFilter.vue
-+++ b/src/pages/Customer/CustomerFilter.vue
-@@ -70,8 +70,6 @@ const zones = ref();
-                         v-model="params.salesPersonFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -93,8 +91,6 @@ const zones = ref();
-                         v-model="params.provinceFk"
-                         @update:model-value="searchFn()"
-                         :options="provinces"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         hide-selected
-@@ -140,8 +136,6 @@ const zones = ref();
-                             v-model="params.zoneFk"
-                             @update:model-value="searchFn()"
-                             :options="zones"
--                            option-value="id"
--                            option-label="name"
-                             emit-value
-                             map-options
-                             hide-selected
-diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
-index 3ba7f655..c07dd5b4 100644
---- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
-+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
-@@ -56,7 +56,6 @@ const authors = ref();
-                         emit-value
-                         hide-selected
-                         map-options
--                        option-label="name"
-                         option-value="clientTypeFk"
-                         outlined
-                         rounded
-@@ -79,8 +78,6 @@ const authors = ref();
-                         emit-value
-                         hide-selected
-                         map-options
--                        option-label="name"
--                        option-value="id"
-                         outlined
-                         rounded
-                         use-input
-@@ -103,7 +100,6 @@ const authors = ref();
-                         hide-selected
-                         map-options
-                         option-label="country"
--                        option-value="id"
-                         outlined
-                         rounded
-                         use-input
-@@ -147,8 +143,6 @@ const authors = ref();
-                         emit-value
-                         hide-selected
-                         map-options
--                        option-label="name"
--                        option-value="id"
-                         outlined
-                         rounded
-                         use-input
-diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
-index df898e7c..b3191316 100644
---- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
-+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
-@@ -208,8 +208,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.salesPersonFk"
-                         @update:model-value="searchFn()"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -275,7 +273,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.countryFk"
-                         @update:model-value="searchFn()"
-                         :options="countriesOptions"
--                        option-value="id"
-                         option-label="country"
-                         map-options
-                         hide-selected
-@@ -292,8 +289,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.provinceFk"
-                         @update:model-value="searchFn()"
-                         :options="provincesOptions"
--                        option-value="id"
--                        option-label="name"
-                         map-options
-                         hide-selected
-                         dense
-@@ -368,8 +363,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.payMethodFk"
-                         :options="paymethodsOptions"
-                         @update:model-value="searchFn()"
--                        option-value="id"
--                        option-label="name"
-                         map-options
-                         hide-selected
-                         dense
-@@ -387,7 +380,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.sageTaxTypeFk"
-                         @update:model-value="searchFn()"
-                         :options="sageTaxTypesOptions"
--                        option-value="id"
-                         option-label="vat"
-                         map-options
-                         hide-selected
-@@ -408,7 +400,6 @@ const shouldRenderColumn = (colName) => {
-                         v-model="params.sageTransactionTypeFk"
-                         @update:model-value="searchFn()"
-                         :options="sageTransactionTypesOptions"
--                        option-value="id"
-                         option-label="transaction"
-                         map-options
-                         hide-selected
-diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
-index 320fc205..539b9065 100644
---- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
-+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
-@@ -85,7 +85,6 @@ const clients = ref();
-                         emit-value
-                         hide-selected
-                         map-options
--                        option-label="name"
-                         option-value="name"
-                         outlined
-                         rounded
-diff --git a/src/pages/Customer/components/CustomerAddressCreate.vue b/src/pages/Customer/components/CustomerAddressCreate.vue
-index 30d4acf8..2d379448 100644
---- a/src/pages/Customer/components/CustomerAddressCreate.vue
-+++ b/src/pages/Customer/components/CustomerAddressCreate.vue
-@@ -119,8 +119,6 @@ function handleLocation(data, location) {
-                         :options="agencyModes"
-                         :rules="validate('route.agencyFk')"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.agencyModeFk"
-                     />
-                 </div>
-@@ -138,7 +136,6 @@ function handleLocation(data, location) {
-                         :label="t('Incoterms')"
-                         :options="incoterms"
-                         hide-selected
--                        option-label="name"
-                         option-value="code"
-                         v-model="data.incotermsFk"
-                     />
-@@ -149,7 +146,6 @@ function handleLocation(data, location) {
-                         :options="customsAgents"
-                         hide-selected
-                         option-label="fiscalName"
--                        option-value="id"
-                         v-model="data.customsAgentFk"
-                     >
-                         <template #form>
-diff --git a/src/pages/Customer/components/CustomerAddressEdit.vue b/src/pages/Customer/components/CustomerAddressEdit.vue
-index 8f4be134..85e6456a 100644
---- a/src/pages/Customer/components/CustomerAddressEdit.vue
-+++ b/src/pages/Customer/components/CustomerAddressEdit.vue
-@@ -190,8 +190,6 @@ function handleLocation(data, location) {
-                         :options="agencyModes"
-                         :rules="validate('route.agencyFk')"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.agencyModeFk"
-                     />
-                 </div>
-@@ -209,7 +207,6 @@ function handleLocation(data, location) {
-                         :label="t('Incoterms')"
-                         :options="incoterms"
-                         hide-selected
--                        option-label="name"
-                         option-value="code"
-                         v-model="data.incotermsFk"
-                     />
-@@ -220,7 +217,6 @@ function handleLocation(data, location) {
-                         :options="customsAgents"
-                         hide-selected
-                         option-label="fiscalName"
--                        option-value="id"
-                         v-model="data.customsAgentFk"
-                     >
-                         <template #form>
-@@ -242,7 +238,6 @@ function handleLocation(data, location) {
-                         :options="observationTypes"
-                         hide-selected
-                         option-label="description"
--                        option-value="id"
-                         v-model="note.observationTypeFk"
-                     />
-                 </div>
-diff --git a/src/pages/Customer/components/CustomerFileManagementCreate.vue b/src/pages/Customer/components/CustomerFileManagementCreate.vue
-index 6d76c2b7..8bde9642 100644
---- a/src/pages/Customer/components/CustomerFileManagementCreate.vue
-+++ b/src/pages/Customer/components/CustomerFileManagementCreate.vue
-@@ -154,7 +154,6 @@ const toCustomerFileManagement = () => {
-                             :options="optionsCompanies"
-                             :rules="validate('entry.companyFk')"
-                             option-label="code"
--                            option-value="id"
-                             v-model="dms.companyId"
-                         />
-                     </div>
-@@ -165,8 +164,6 @@ const toCustomerFileManagement = () => {
-                         <VnSelectFilter
-                             :label="t('Warehouse')"
-                             :options="optionsWarehouses"
--                            option-label="name"
--                            option-value="id"
-                             v-model="dms.warehouseId"
-                         />
-                     </div>
-@@ -174,8 +171,6 @@ const toCustomerFileManagement = () => {
-                         <VnSelectFilter
-                             :label="t('Type')"
-                             :options="optionsDmsTypes"
--                            option-label="name"
--                            option-value="id"
-                             v-model="dms.dmsTypeId"
-                         />
-                     </div>
-diff --git a/src/pages/Customer/components/CustomerFileManagementEdit.vue b/src/pages/Customer/components/CustomerFileManagementEdit.vue
-index f1279b93..f813d1d6 100644
---- a/src/pages/Customer/components/CustomerFileManagementEdit.vue
-+++ b/src/pages/Customer/components/CustomerFileManagementEdit.vue
-@@ -132,7 +132,6 @@ const toCustomerFileManagement = () => {
-                             :options="optionsCompanies"
-                             :rules="validate('entry.companyFk')"
-                             option-label="code"
--                            option-value="id"
-                             v-model="dms.companyId"
-                         />
-                     </div>
-@@ -143,8 +142,6 @@ const toCustomerFileManagement = () => {
-                         <VnSelectFilter
-                             :label="t('Warehouse')"
-                             :options="optionsWarehouses"
--                            option-label="name"
--                            option-value="id"
-                             v-model="dms.warehouseId"
-                         />
-                     </div>
-@@ -152,8 +149,6 @@ const toCustomerFileManagement = () => {
-                         <VnSelectFilter
-                             :label="t('Type')"
-                             :options="optionsDmsTypes"
--                            option-label="name"
--                            option-value="id"
-                             v-model="dms.dmsTypeId"
-                         />
-                     </div>
-diff --git a/src/pages/Customer/components/CustomerGreugeCreate.vue b/src/pages/Customer/components/CustomerGreugeCreate.vue
-index d8915dc1..8eb67582 100644
---- a/src/pages/Customer/components/CustomerGreugeCreate.vue
-+++ b/src/pages/Customer/components/CustomerGreugeCreate.vue
-@@ -78,8 +78,6 @@ const toCustomerGreuges = () => {
-                         :label="t('Type')"
-                         :options="greugeTypes"
-                         hide-selected
--                        option-label="name"
--                        option-value="id"
-                         v-model="data.greugeTypeFk"
-                     />
-                 </div>
-diff --git a/src/pages/Customer/components/CustomerNewPayment.vue b/src/pages/Customer/components/CustomerNewPayment.vue
-index c52cc18d..322c43c8 100644
---- a/src/pages/Customer/components/CustomerNewPayment.vue
-+++ b/src/pages/Customer/components/CustomerNewPayment.vue
-@@ -150,7 +150,6 @@ const onDataSaved = async () => {
-                             :rules="validate('entry.companyFk')"
-                             hide-selected
-                             option-label="code"
--                            option-value="id"
-                             v-model="data.companyFk"
-                         />
-                     </div>
-@@ -165,7 +164,6 @@ const onDataSaved = async () => {
-                             @update:model-value="setPaymentType($event)"
-                             hide-selected
-                             option-label="bank"
--                            option-value="id"
-                             v-model="data.bankFk"
-                         >
-                             <template #option="scope">
-diff --git a/src/pages/Customer/components/CustomerSamplesCreate.vue b/src/pages/Customer/components/CustomerSamplesCreate.vue
-index 7b0d34bd..ad7f98cd 100644
---- a/src/pages/Customer/components/CustomerSamplesCreate.vue
-+++ b/src/pages/Customer/components/CustomerSamplesCreate.vue
-@@ -189,7 +189,6 @@ const toCustomerSamples = () => {
-                         @update:model-value="setSampleType"
-                         hide-selected
-                         option-label="description"
--                        option-value="id"
-                         required="true"
-                         v-model="data.typeFk"
-                     />
-@@ -242,7 +241,6 @@ const toCustomerSamples = () => {
-                         :rules="validate('entry.companyFk')"
-                         hide-selected
-                         option-label="code"
--                        option-value="id"
-                         required="true"
-                         v-model="data.companyFk"
-                         v-if="sampleType.hasCompany"
-@@ -254,7 +252,6 @@ const toCustomerSamples = () => {
-                         :options="optionsClientsAddressess"
-                         hide-selected
-                         option-label="nickname"
--                        option-value="id"
-                         required="true"
-                         v-model="data.addressId"
-                         v-if="sampleType.id === 20"
-diff --git a/src/pages/Department/Card/DepartmentBasicData.vue b/src/pages/Department/Card/DepartmentBasicData.vue
-index 3b30a97e..819d6a2c 100644
---- a/src/pages/Department/Card/DepartmentBasicData.vue
-+++ b/src/pages/Department/Card/DepartmentBasicData.vue
-@@ -72,8 +72,6 @@ const clientsOptions = ref([]);
-                         :label="t('department.bossDepartment')"
-                         v-model="data.workerFk"
-                         :options="workersOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         map-options
-                         :rules="validate('department.workerFk')"
-@@ -84,8 +82,6 @@ const clientsOptions = ref([]);
-                         :label="t('department.selfConsumptionCustomer')"
-                         v-model="data.clientFk"
-                         :options="clientsOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         map-options
-                         :rules="validate('department.clientFk')"
-diff --git a/src/pages/Entry/Card/EntryBasicData.vue b/src/pages/Entry/Card/EntryBasicData.vue
-index a98a1227..57b29651 100644
---- a/src/pages/Entry/Card/EntryBasicData.vue
-+++ b/src/pages/Entry/Card/EntryBasicData.vue
-@@ -69,7 +69,6 @@ const onFilterTravelSelected = (formData, id) => {
-                         :label="t('entry.basicData.supplier')"
-                         v-model="data.supplierFk"
-                         :options="suppliersOptions"
--                        option-value="id"
-                         option-label="nickname"
-                         hide-selected
-                         :required="true"
-@@ -92,7 +91,6 @@ const onFilterTravelSelected = (formData, id) => {
-                         :label="t('entry.basicData.travel')"
-                         v-model="data.travelFk"
-                         :options="travelsOptions"
--                        option-value="id"
-                         option-label="warehouseInName"
-                         map-options
-                         hide-selected
-@@ -141,7 +139,6 @@ const onFilterTravelSelected = (formData, id) => {
-                         :label="t('entry.basicData.company')"
-                         v-model="data.companyFk"
-                         :options="companiesOptions"
--                        option-value="id"
-                         option-label="code"
-                         map-options
-                         hide-selected
-@@ -155,7 +152,6 @@ const onFilterTravelSelected = (formData, id) => {
-                         :label="t('entry.basicData.currency')"
-                         v-model="data.currencyFk"
-                         :options="currenciesOptions"
--                        option-value="id"
-                         option-label="code"
-                     />
-                 </div>
-diff --git a/src/pages/Entry/Card/EntryNotes.vue b/src/pages/Entry/Card/EntryNotes.vue
-index 0d2e5e51..846b891a 100644
---- a/src/pages/Entry/Card/EntryNotes.vue
-+++ b/src/pages/Entry/Card/EntryNotes.vue
-@@ -57,7 +57,6 @@ onMounted(() => {
-                             :options="entryObservationsOptions"
-                             :disable="!!row.id"
-                             option-label="description"
--                            option-value="id"
-                             hide-selected
-                         />
-                     </div>
-diff --git a/src/pages/Entry/EntryCreate.vue b/src/pages/Entry/EntryCreate.vue
-index 8c434217..0f9dad2a 100644
---- a/src/pages/Entry/EntryCreate.vue
-+++ b/src/pages/Entry/EntryCreate.vue
-@@ -85,7 +85,6 @@ const redirectToEntryBasicData = (_, { id }) => {
-                             class="full-width"
-                             v-model="data.supplierFk"
-                             :options="suppliersOptions"
--                            option-value="id"
-                             option-label="nickname"
-                             hide-selected
-                             :required="true"
-@@ -111,7 +110,6 @@ const redirectToEntryBasicData = (_, { id }) => {
-                             class="full-width"
-                             v-model="data.travelFk"
-                             :options="travelsOptions"
--                            option-value="id"
-                             option-label="warehouseInName"
-                             map-options
-                             hide-selected
-@@ -143,7 +141,6 @@ const redirectToEntryBasicData = (_, { id }) => {
-                             class="full-width"
-                             v-model="data.companyFk"
-                             :options="companiesOptions"
--                            option-value="id"
-                             option-label="code"
-                             map-options
-                             hide-selected
-diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
-index 22ddf0bb..ccef9b4e 100644
---- a/src/pages/Entry/EntryFilter.vue
-+++ b/src/pages/Entry/EntryFilter.vue
-@@ -97,7 +97,6 @@ const suppliersOptions = ref([]);
-                         v-model="params.companyFk"
-                         @update:model-value="searchFn()"
-                         :options="companiesOptions"
--                        option-value="id"
-                         option-label="code"
-                         hide-selected
-                         dense
-@@ -113,8 +112,6 @@ const suppliersOptions = ref([]);
-                         v-model="params.currencyFk"
-                         @update:model-value="searchFn()"
-                         :options="currenciesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -129,8 +126,6 @@ const suppliersOptions = ref([]);
-                         v-model="params.supplierFk"
-                         @update:model-value="searchFn()"
-                         :options="suppliersOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
-index f557c8ef..5dd0aa15 100644
---- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
-+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
-@@ -186,7 +186,6 @@ async function upsert() {
-                     <VnSelectFilter
-                         :label="t('supplierFk')"
-                         v-model="data.supplierFk"
--                        option-value="id"
-                         option-label="nickname"
-                         url="Suppliers"
-                         :fields="['id', 'nickname']"
-@@ -405,7 +404,6 @@ async function upsert() {
-                         :label="t('Currency')"
-                         v-model="data.currencyFk"
-                         :options="currencies"
--                        option-value="id"
-                         option-label="code"
-                     />
-                 </div>
-@@ -415,7 +413,6 @@ async function upsert() {
-                         :label="t('Company')"
-                         v-model="data.companyFk"
-                         :options="companies"
--                        option-value="id"
-                         option-label="code"
-                     />
-                 </div>
-@@ -456,7 +453,6 @@ async function upsert() {
-                         :label="`${t('Company')}*`"
-                         v-model="dms.companyId"
-                         :options="companies"
--                        option-value="id"
-                         option-label="code"
-                         :rules="[requiredFieldRule]"
-                     />
-@@ -467,8 +463,6 @@ async function upsert() {
-                         :label="`${t('Warehouse')}*`"
-                         v-model="dms.warehouseId"
-                         :options="warehouses"
--                        option-value="id"
--                        option-label="name"
-                         :rules="[requiredFieldRule]"
-                     />
-                     <VnSelectFilter
-@@ -476,8 +470,6 @@ async function upsert() {
-                         :label="`${t('Type')}*`"
-                         v-model="dms.dmsTypeId"
-                         :options="dmsTypes"
--                        option-value="id"
--                        option-label="name"
-                         :rules="[requiredFieldRule]"
-                     />
-                 </QItem>
-@@ -565,7 +557,6 @@ async function upsert() {
-                         :label="`${t('Company')}*`"
-                         v-model="dms.companyId"
-                         :options="companies"
--                        option-value="id"
-                         option-label="code"
-                         :rules="[requiredFieldRule]"
-                     />
-@@ -576,8 +567,6 @@ async function upsert() {
-                         :label="`${t('Warehouse')}*`"
-                         v-model="dms.warehouseId"
-                         :options="warehouses"
--                        option-value="id"
--                        option-label="name"
-                         :rules="[requiredFieldRule]"
-                     />
-                     <VnSelectFilter
-@@ -585,8 +574,6 @@ async function upsert() {
-                         :label="`${t('Type')}*`"
-                         v-model="dms.dmsTypeId"
-                         :options="dmsTypes"
--                        option-value="id"
--                        option-label="name"
-                         :rules="[requiredFieldRule]"
-                     />
-                 </QItem>
-diff --git a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
-index 5adaeca9..280c194d 100644
---- a/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
-+++ b/src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
-@@ -484,7 +484,6 @@ const createInvoiceInCorrection = async () => {
-                             :label="`${useCapitalize(t('globals.class'))}*`"
-                             v-model="correctionFormData.invoiceClass"
-                             :options="siiTypeInvoiceOuts"
--                            option-value="id"
-                             option-label="code"
-                             :rules="[requiredFieldRule]"
-                         />
-@@ -494,7 +493,6 @@ const createInvoiceInCorrection = async () => {
-                             :label="`${useCapitalize(t('globals.type'))}*`"
-                             v-model="correctionFormData.invoiceType"
-                             :options="cplusRectificationTypes"
--                            option-value="id"
-                             option-label="description"
-                             :rules="[requiredFieldRule]"
-                         />
-@@ -502,7 +500,6 @@ const createInvoiceInCorrection = async () => {
-                             :label="`${useCapitalize(t('globals.reason'))}*`"
-                             v-model="correctionFormData.invoiceReason"
-                             :options="invoiceCorrectionTypes"
--                            option-value="id"
-                             option-label="description"
-                             :rules="[requiredFieldRule]"
-                         />
-diff --git a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
-index e240e9a8..5cca5ee3 100644
---- a/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
-+++ b/src/pages/InvoiceIn/Card/InvoiceInDueDay.vue
-@@ -235,7 +235,6 @@ async function insert() {
-                                         class="full-width"
-                                         v-model="props.row['bankFk']"
-                                         :options="banks"
--                                        option-value="id"
-                                         option-label="bank"
-                                     >
-                                         <template #option="scope">
-diff --git a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
-index 58f52153..a6ccd8b0 100644
---- a/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
-+++ b/src/pages/InvoiceIn/Card/InvoiceInIntrastat.vue
-@@ -151,7 +151,6 @@ function getTotal(type) {
-                             <VnSelectFilter
-                                 v-model="row[col.model]"
-                                 :options="col.options"
--                                option-value="id"
-                                 option-label="description"
-                                 :filter-options="['id', 'description']"
-                             >
-@@ -168,7 +167,6 @@ function getTotal(type) {
-                             <VnSelectFilter
-                                 v-model="row[col.model]"
-                                 :options="col.options"
--                                option-value="id"
-                                 option-label="code"
-                             />
-                         </QTd>
-@@ -187,7 +185,6 @@ function getTotal(type) {
-                                             class="full-width"
-                                             v-model="props.row['intrastatFk']"
-                                             :options="intrastats"
--                                            option-value="id"
-                                             option-label="description"
-                                             :filter-options="['id', 'description']"
-                                         >
-@@ -222,7 +219,6 @@ function getTotal(type) {
-                                             class="full-width"
-                                             v-model="props.row['countryFk']"
-                                             :options="countries"
--                                            option-value="id"
-                                             option-label="code"
-                                         />
-                                     </QItem>
-diff --git a/src/pages/InvoiceIn/Card/InvoiceInVat.vue b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
-index d8e74270..e94c2c98 100644
---- a/src/pages/InvoiceIn/Card/InvoiceInVat.vue
-+++ b/src/pages/InvoiceIn/Card/InvoiceInVat.vue
-@@ -316,8 +316,6 @@ async function addExpense() {
-                                         class="full-width"
-                                         v-model="props.row['expenseFk']"
-                                         :options="expenses"
--                                        option-value="id"
--                                        option-label="name"
-                                         :filter-options="['id', 'name']"
-                                     >
-                                         <template #option="scope">
-@@ -352,7 +350,6 @@ async function addExpense() {
-                                         class="full-width"
-                                         v-model="props.row['taxTypeSageFk']"
-                                         :options="sageTaxTypes"
--                                        option-value="id"
-                                         option-label="vat"
-                                         :filter-options="['id', 'vat']"
-                                     >
-@@ -375,7 +372,6 @@ async function addExpense() {
-                                         class="full-width"
-                                         v-model="props.row['transactionTypeSageFk']"
-                                         :options="sageTransactionTypes"
--                                        option-value="id"
-                                         option-label="transaction"
-                                         :filter-options="['id', 'transaction']"
-                                     >
-diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
-index 8bf00723..4576f313 100644
---- a/src/pages/InvoiceIn/InvoiceInFilter.vue
-+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
-@@ -83,7 +83,6 @@ const suppliersRef = ref();
-                         :label="t('params.supplierFk')"
-                         v-model="params.supplierFk"
-                         :options="suppliers"
--                        option-value="id"
-                         option-label="nickname"
-                         @input-value="suppliersRef.fetch()"
-                         dense
-diff --git a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
-index c61b9f7f..5822c0ce 100644
---- a/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
-+++ b/src/pages/InvoiceOut/InvoiceOutGlobalForm.vue
-@@ -99,8 +99,6 @@ onMounted(async () => {
-                 :label="t('client')"
-                 v-model="formData.clientId"
-                 :options="clientsOptions"
--                option-value="id"
--                option-label="name"
-                 hide-selected
-                 dense
-                 outlined
-@@ -120,7 +118,6 @@ onMounted(async () => {
-                 :label="t('company')"
-                 v-model="formData.companyFk"
-                 :options="companiesOptions"
--                option-value="id"
-                 option-label="code"
-                 hide-selected
-                 dense
-@@ -131,8 +128,6 @@ onMounted(async () => {
-                 :label="t('printer')"
-                 v-model="formData.printer"
-                 :options="printersOptions"
--                option-value="id"
--                option-label="name"
-                 hide-selected
-                 dense
-                 outlined
-diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
-index 760c4872..aadb53b7 100644
---- a/src/pages/Order/Card/OrderCatalogFilter.vue
-+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
-@@ -242,8 +242,6 @@ const getCategoryClass = (category, params) => {
-                         :label="t('params.type')"
-                         v-model="params.typeFk"
-                         :options="typeList"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-@@ -278,7 +276,6 @@ const getCategoryClass = (category, params) => {
-                         v-model="selectedOrder"
-                         :options="orderList || []"
-                         option-value="way"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-@@ -298,7 +295,6 @@ const getCategoryClass = (category, params) => {
-                         v-model="selectedOrderField"
-                         :options="OrderFields || []"
-                         option-value="field"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-@@ -318,8 +314,6 @@ const getCategoryClass = (category, params) => {
-                         :label="t('params.tag')"
-                         v-model="selectedTag"
-                         :options="props.tags || []"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
-index 62bfe0e0..78c153f2 100644
---- a/src/pages/Order/Card/OrderFilter.vue
-+++ b/src/pages/Order/Card/OrderFilter.vue
-@@ -79,8 +79,6 @@ const sourceList = ref(null);
-                         :label="t('agency')"
-                         v-model="params.agencyModeFk"
-                         :options="agencyList"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-@@ -100,8 +98,6 @@ const sourceList = ref(null);
-                         :label="t('salesPerson')"
-                         v-model="params.workerFk"
-                         :options="salesPersonList"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-diff --git a/src/pages/Order/Card/OrderForm.vue b/src/pages/Order/Card/OrderForm.vue
-index 6a4ae6aa..afcd0180 100644
---- a/src/pages/Order/Card/OrderForm.vue
-+++ b/src/pages/Order/Card/OrderForm.vue
-@@ -149,8 +149,6 @@ const orderFilter = {
-                             :label="t('order.form.clientFk')"
-                             v-model="data.clientFk"
-                             :options="clientList"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                             @update:model-value="
-                                 (client) => fetchAddressList(client.defaultAddressFk)
-@@ -172,7 +170,6 @@ const orderFilter = {
-                             :label="t('order.form.addressFk')"
-                             v-model="data.addressFk"
-                             :options="addressList"
--                            option-value="id"
-                             option-label="nickname"
-                             hide-selected
-                             :disable="!addressList?.length"
-diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
-index 4be1981a..93605b8d 100644
---- a/src/pages/Route/Card/RouteFilter.vue
-+++ b/src/pages/Route/Card/RouteFilter.vue
-@@ -67,7 +67,6 @@ const warehouseList = ref([]);
-                         :label="t('Worker')"
-                         v-model="params.workerFk"
-                         :options="workerList"
--                        option-value="id"
-                         option-label="nickname"
-                         dense
-                         outlined
-@@ -96,8 +95,6 @@ const warehouseList = ref([]);
-                         :label="t('Agency')"
-                         v-model="params.agencyModeFk"
-                         :options="agencyList"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-@@ -152,7 +149,6 @@ const warehouseList = ref([]);
-                         :label="t('Vehicle')"
-                         v-model="params.vehicleFk"
-                         :options="vehicleList"
--                        option-value="id"
-                         option-label="numberPlate"
-                         dense
-                         outlined
-@@ -175,8 +171,6 @@ const warehouseList = ref([]);
-                         :label="t('Warehouse')"
-                         v-model="params.warehouseFk"
-                         :options="warehouseList"
--                        option-value="id"
--                        option-label="name"
-                         dense
-                         outlined
-                         rounded
-diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
-index 604f0435..a08efae6 100644
---- a/src/pages/Route/Card/RouteForm.vue
-+++ b/src/pages/Route/Card/RouteForm.vue
-@@ -119,7 +119,6 @@ const onSave = (data, response) => {
-                         :label="t('Worker')"
-                         v-model="data.workerFk"
-                         :options="workerList"
--                        option-value="id"
-                         option-label="nickname"
-                         emit-value
-                         map-options
-@@ -143,7 +142,6 @@ const onSave = (data, response) => {
-                         :label="t('Vehicle')"
-                         v-model="data.vehicleFk"
-                         :options="vehicleList"
--                        option-value="id"
-                         option-label="numberPlate"
-                         emit-value
-                         map-options
-@@ -158,8 +156,6 @@ const onSave = (data, response) => {
-                         :label="t('Agency')"
-                         v-model="data.agencyModeFk"
-                         :options="agencyList"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
-index 0f5403ba..4eeff3f1 100644
---- a/src/pages/Route/RouteList.vue
-+++ b/src/pages/Route/RouteList.vue
-@@ -294,8 +294,6 @@ const markAsServed = () => {
-                                             :label="t('Worker')"
-                                             v-model="scope.value"
-                                             :options="workers"
--                                            option-value="id"
--                                            option-label="name"
-                                             hide-selected
-                                             autofocus
-                                             :emit-value="false"
-@@ -338,8 +336,6 @@ const markAsServed = () => {
-                                             :label="t('Agency')"
-                                             v-model="scope.value"
-                                             :options="agencyList"
--                                            option-value="id"
--                                            option-label="name"
-                                             hide-selected
-                                             autofocus
-                                             :emit-value="false"
-@@ -366,7 +362,6 @@ const markAsServed = () => {
-                                             :label="t('Vehicle')"
-                                             v-model="scope.value"
-                                             :options="vehicleList"
--                                            option-value="id"
-                                             option-label="numberPlate"
-                                             hide-selected
-                                             autofocus
-diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
-index abc91373..baf83861 100644
---- a/src/pages/Shelving/Card/ShelvingFilter.vue
-+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
-@@ -65,7 +65,6 @@ function setParkings(data) {
-                         :label="t('params.parkingFk')"
-                         v-model="params.parkingFk"
-                         :options="parkings"
--                        option-value="id"
-                         option-label="code"
-                         emit-value
-                         map-options
-@@ -86,8 +85,6 @@ function setParkings(data) {
-                         :label="t('params.userFk')"
-                         v-model="params.userFk"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-diff --git a/src/pages/Shelving/Card/ShelvingForm.vue b/src/pages/Shelving/Card/ShelvingForm.vue
-index 238879bd..d5e70fc2 100644
---- a/src/pages/Shelving/Card/ShelvingForm.vue
-+++ b/src/pages/Shelving/Card/ShelvingForm.vue
-@@ -97,7 +97,6 @@ const onSave = (shelving, newShelving) => {
-                     <QSelect
-                         v-model="data.parkingFk"
-                         :options="parkingList"
--                        option-value="id"
-                         option-label="code"
-                         emit-value
-                         :label="t('shelving.basicData.parking')"
-diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
-index 302e0321..7b902585 100644
---- a/src/pages/Supplier/Card/SupplierAccounts.vue
-+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
-@@ -114,8 +114,6 @@ onMounted(() => {
-                             :label="t('worker.create.bankEntity')"
-                             v-model="row.bankEntityFk"
-                             :options="bankEntitiesOptions"
--                            option-label="name"
--                            option-value="id"
-                             hide-selected
-                         >
-                             <template #form>
-diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
-index 17786c1e..bcb281d2 100644
---- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
-+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
-@@ -51,8 +51,6 @@ const onDataSaved = () => {
-                             :label="t('supplier.agencyTerms.agencyFk')"
-                             v-model="data.agencyFk"
-                             :options="agenciesOptions"
--                            option-label="name"
--                            option-value="id"
-                             hide-selected
-                             rounded
-                         />
-diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
-index bc50deb9..4152d8fd 100644
---- a/src/pages/Supplier/Card/SupplierBasicData.vue
-+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
-@@ -42,8 +42,6 @@ const workersOptions = ref([]);
-                         :label="t('supplier.basicData.workerFk')"
-                         v-model="data.workerFk"
-                         :options="workersOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         map-options
-                         :rules="validate('supplier.workerFk')"
-diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
-index bf5ccb11..9a49214a 100644
---- a/src/pages/Supplier/Card/SupplierBillingData.vue
-+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
-@@ -41,8 +41,6 @@ const formatPayDems = (data) => {
-                         :label="t('supplier.billingData.payMethodFk')"
-                         v-model="data.payMethodFk"
-                         :options="paymethodsOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         :rules="validate('supplier.payMethodFk')"
-                     />
-@@ -52,7 +50,6 @@ const formatPayDems = (data) => {
-                         :label="t('supplier.billingData.payDemFk')"
-                         v-model="data.payDemFk"
-                         :options="payDemsOptions"
--                        option-value="id"
-                         option-label="payDem"
-                         hide-selected
-                         :rules="validate('supplier.payDemFk')"
-diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
-index 339a9d0d..783f3ef8 100644
---- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
-+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
-@@ -83,7 +83,6 @@ const itemCategoriesOptions = ref([]);
-                         v-model="params.buyerId"
-                         @update:model-value="searchFn()"
-                         :options="buyersOptions"
--                        option-value="id"
-                         option-label="nickname"
-                         hide-selected
-                         dense
-@@ -99,8 +98,6 @@ const itemCategoriesOptions = ref([]);
-                         v-model="params.typeId"
-                         @update:model-value="searchFn()"
-                         :options="itemTypesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -126,8 +123,6 @@ const itemCategoriesOptions = ref([]);
-                         v-model="params.categoryId"
-                         @update:model-value="searchFn()"
-                         :options="itemCategoriesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-diff --git a/src/pages/Supplier/Card/SupplierFiscalData.vue b/src/pages/Supplier/Card/SupplierFiscalData.vue
-index becf6d81..53648754 100644
---- a/src/pages/Supplier/Card/SupplierFiscalData.vue
-+++ b/src/pages/Supplier/Card/SupplierFiscalData.vue
-@@ -84,7 +84,6 @@ function handleLocation(data, location) {
-                         :label="t('supplier.fiscalData.sageTaxTypeFk')"
-                         v-model="data.sageTaxTypeFk"
-                         :options="sageTaxTypesOptions"
--                        option-value="id"
-                         option-label="vat"
-                         hide-selected
-                         map-options
-@@ -97,7 +96,6 @@ function handleLocation(data, location) {
-                         :label="t('supplier.fiscalData.sageWithholdingFk')"
-                         v-model="data.sageWithholdingFk"
-                         :options="sageWithholdingsOptions"
--                        option-value="id"
-                         option-label="withholding"
-                         hide-selected
-                         map-options
-@@ -108,7 +106,6 @@ function handleLocation(data, location) {
-                         :label="t('supplier.fiscalData.sageTransactionTypeFk')"
-                         v-model="data.sageTransactionTypeFk"
-                         :options="sageTransactionTypesOptions"
--                        option-value="id"
-                         option-label="transaction"
-                         hide-selected
-                         map-options
-@@ -122,7 +119,6 @@ function handleLocation(data, location) {
-                         v-model="data.supplierActivityFk"
-                         :options="supplierActivitiesOptions"
-                         option-value="code"
--                        option-label="name"
-                         hide-selected
-                         map-options
-                     />
-diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
-index ff90df6e..5c4c2c78 100644
---- a/src/pages/Supplier/SupplierListFilter.vue
-+++ b/src/pages/Supplier/SupplierListFilter.vue
-@@ -75,8 +75,6 @@ const countriesOptions = ref([]);
-                         v-model="params.provinceFk"
-                         @update:model-value="searchFn()"
-                         :options="provincesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -91,7 +89,6 @@ const countriesOptions = ref([]);
-                         v-model="params.countryFk"
-                         @update:model-value="searchFn()"
-                         :options="countriesOptions"
--                        option-value="id"
-                         option-label="country"
-                         hide-selected
-                         dense
-diff --git a/src/pages/Ticket/TicketCreate.vue b/src/pages/Ticket/TicketCreate.vue
-index 3fb9c008..9a844956 100644
---- a/src/pages/Ticket/TicketCreate.vue
-+++ b/src/pages/Ticket/TicketCreate.vue
-@@ -138,8 +138,6 @@ const redirectToTicketList = (_, { id }) => {
-                             :label="t('ticket.create.client')"
-                             v-model="data.clientId"
-                             :options="clientOptions"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                             @update:model-value="(client) => onClientSelected(data)"
-                         >
-@@ -164,7 +162,6 @@ const redirectToTicketList = (_, { id }) => {
-                             :label="t('ticket.create.address')"
-                             v-model="data.addressId"
-                             :options="addressesOptions"
--                            option-value="id"
-                             option-label="nickname"
-                             hide-selected
-                             :disable="!data.clientId"
-@@ -201,8 +198,6 @@ const redirectToTicketList = (_, { id }) => {
-                             :label="t('ticket.create.warehouse')"
-                             v-model="data.warehouseId"
-                             :options="warehousesOptions"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                             @update:model-value="() => fetchAvailableAgencies(data)"
-                         />
-diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
-index 7b74117b..30432057 100644
---- a/src/pages/Ticket/TicketFilter.vue
-+++ b/src/pages/Ticket/TicketFilter.vue
-@@ -89,8 +89,6 @@ const warehouses = ref();
-                         :label="t('Salesperson')"
-                         v-model="params.salesPersonFk"
-                         :options="workers"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
-@@ -111,8 +109,6 @@ const warehouses = ref();
-                         v-model="params.stateFk"
-                         @update:model-value="searchFn()"
-                         :options="states"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         dense
-@@ -188,8 +184,6 @@ const warehouses = ref();
-                             v-model="params.provinceFk"
-                             @update:model-value="searchFn()"
-                             :options="provinces"
--                            option-value="id"
--                            option-label="name"
-                             emit-value
-                             map-options
-                             dense
-@@ -208,8 +202,6 @@ const warehouses = ref();
-                             v-model="params.agencyModeFk"
-                             @update:model-value="searchFn()"
-                             :options="agencies"
--                            option-value="id"
--                            option-label="name"
-                             emit-value
-                             map-options
-                             dense
-@@ -228,8 +220,6 @@ const warehouses = ref();
-                             v-model="params.warehouseFk"
-                             @update:model-value="searchFn()"
-                             :options="warehouses"
--                            option-value="id"
--                            option-label="name"
-                             emit-value
-                             map-options
-                             dense
-diff --git a/src/pages/Travel/Card/TravelBasicData.vue b/src/pages/Travel/Card/TravelBasicData.vue
-index 2edaac85..6b0ed81e 100644
---- a/src/pages/Travel/Card/TravelBasicData.vue
-+++ b/src/pages/Travel/Card/TravelBasicData.vue
-@@ -40,8 +40,6 @@ const agenciesOptions = ref([]);
-                         :label="t('travel.basicData.agency')"
-                         v-model="data.agencyModeFk"
-                         :options="agenciesOptions"
--                        option-value="id"
--                        option-label="name"
-                         map-options
-                         hide-selected
-                     />
-@@ -67,8 +65,6 @@ const agenciesOptions = ref([]);
-                         :label="t('travel.basicData.warehouseOut')"
-                         v-model="data.warehouseOutFk"
-                         :options="agenciesOptions"
--                        option-value="id"
--                        option-label="name"
-                         map-options
-                         hide-selected
-                     />
-@@ -78,8 +74,6 @@ const agenciesOptions = ref([]);
-                         :label="t('travel.basicData.warehouseIn')"
-                         v-model="data.warehouseInFk"
-                         :options="agenciesOptions"
--                        option-value="id"
--                        option-label="name"
-                         map-options
-                         hide-selected
-                     />
-diff --git a/src/pages/Travel/Card/TravelThermographsForm.vue b/src/pages/Travel/Card/TravelThermographsForm.vue
-index 4462846c..6a46c36a 100644
---- a/src/pages/Travel/Card/TravelThermographsForm.vue
-+++ b/src/pages/Travel/Card/TravelThermographsForm.vue
-@@ -272,8 +272,6 @@ const onThermographCreated = async (data) => {
-                             :label="t('travel.thermographs.type')"
-                             v-model="thermographForm.dmsTypeId"
-                             :options="dmsTypesOptions"
--                            option-value="id"
--                            option-label="name"
-                         />
-                     </div>
-                 </VnRow>
-@@ -283,7 +281,6 @@ const onThermographCreated = async (data) => {
-                             :label="t('travel.thermographs.company')"
-                             v-model="thermographForm.companyId"
-                             :options="companiesOptions"
--                            option-value="id"
-                             option-label="code"
-                         />
-                     </div>
-@@ -292,8 +289,6 @@ const onThermographCreated = async (data) => {
-                             :label="t('travel.thermographs.warehouse')"
-                             v-model="thermographForm.warehouseId"
-                             :options="warehousesOptions"
--                            option-value="id"
--                            option-label="name"
-                         />
-                     </div>
-                 </VnRow>
-diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
-index 0b897516..19e24388 100644
---- a/src/pages/Travel/ExtraCommunityFilter.vue
-+++ b/src/pages/Travel/ExtraCommunityFilter.vue
-@@ -119,7 +119,6 @@ const decrement = (paramsObj, key) => {
-                         @update:model-value="searchFn()"
-                         :options="agenciesOptions"
-                         option-value="agencyFk"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -154,8 +153,6 @@ const decrement = (paramsObj, key) => {
-                         v-model="params.warehouseOutFk"
-                         @update:model-value="searchFn()"
-                         :options="warehousesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -170,8 +167,6 @@ const decrement = (paramsObj, key) => {
-                         v-model="params.warehouseInFk"
-                         @update:model-value="searchFn()"
-                         :options="warehousesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -186,8 +181,6 @@ const decrement = (paramsObj, key) => {
-                         v-model="params.cargoSupplierFk"
-                         @update:model-value="searchFn()"
-                         :options="suppliersOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -203,7 +196,6 @@ const decrement = (paramsObj, key) => {
-                         @update:model-value="searchFn()"
-                         :options="continentsOptions"
-                         option-value="code"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-diff --git a/src/pages/Travel/TravelCreate.vue b/src/pages/Travel/TravelCreate.vue
-index abee0356..0a707871 100644
---- a/src/pages/Travel/TravelCreate.vue
-+++ b/src/pages/Travel/TravelCreate.vue
-@@ -77,7 +77,6 @@ const redirectToTravelBasicData = (_, { id }) => {
-                             v-model="data.agencyModeFk"
-                             :options="agenciesOptions"
-                             option-value="agencyFk"
--                            option-label="name"
-                             hide-selected
-                         />
-                     </div>
-@@ -99,8 +98,6 @@ const redirectToTravelBasicData = (_, { id }) => {
-                             :label="t('globals.wareHouseOut')"
-                             v-model="data.warehouseOutFk"
-                             :options="warehousesOptions"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                         />
-                     </div>
-@@ -109,8 +106,6 @@ const redirectToTravelBasicData = (_, { id }) => {
-                             :label="t('globals.wareHouseIn')"
-                             v-model="data.warehouseInFk"
-                             :options="warehousesOptions"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                         />
-                     </div>
-diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
-index c1c0d1be..6c2cf21e 100644
---- a/src/pages/Travel/TravelFilter.vue
-+++ b/src/pages/Travel/TravelFilter.vue
-@@ -77,7 +77,6 @@ const decrement = (paramsObj, key) => {
-                         @update:model-value="searchFn()"
-                         :options="agenciesOptions"
-                         option-value="agencyFk"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -92,8 +91,6 @@ const decrement = (paramsObj, key) => {
-                         v-model="params.warehouseOutFk"
-                         @update:model-value="searchFn()"
-                         :options="warehousesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -108,8 +105,6 @@ const decrement = (paramsObj, key) => {
-                         v-model="params.warehouseInFk"
-                         @update:model-value="searchFn()"
-                         :options="warehousesOptions"
--                        option-value="id"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-@@ -173,7 +168,6 @@ const decrement = (paramsObj, key) => {
-                         @update:model-value="searchFn()"
-                         :options="continentsOptions"
-                         option-value="code"
--                        option-label="name"
-                         hide-selected
-                         dense
-                         outlined
-diff --git a/src/pages/Wagon/WagonCreate.vue b/src/pages/Wagon/WagonCreate.vue
-index cf6bc3ff..5642a238 100644
---- a/src/pages/Wagon/WagonCreate.vue
-+++ b/src/pages/Wagon/WagonCreate.vue
-@@ -132,8 +132,6 @@ function filterType(val, update) {
-                             fill-input
-                             hide-selected
-                             input-debounce="0"
--                            option-label="name"
--                            option-value="id"
-                             emit-value
-                             map-options
-                             :label="t('wagon.create.type')"
-diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
-index eef29a8a..a61c8fb2 100644
---- a/src/pages/Worker/WorkerCreate.vue
-+++ b/src/pages/Worker/WorkerCreate.vue
-@@ -198,7 +198,6 @@ onMounted(async () => {
-                             :label="t('worker.create.company')"
-                             v-model="data.companyFk"
-                             :options="companiesOptions"
--                            option-value="id"
-                             option-label="code"
-                             hide-selected
-                             :rules="validate('Worker.company')"
-@@ -209,8 +208,6 @@ onMounted(async () => {
-                             :label="t('worker.create.boss')"
-                             v-model="data.bossFk"
-                             :options="workersOptions"
--                            option-value="id"
--                            option-label="name"
-                             hide-selected
-                             :rules="validate('Worker.boss')"
-                         >
-@@ -234,8 +231,6 @@ onMounted(async () => {
-                             :label="t('worker.create.payMethods')"
-                             v-model="data.payMethodFk"
-                             :options="payMethodsOptions"
--                            option-value="id"
--                            option-label="name"
-                             map-options
-                             hide-selected
-                             :rules="validate('Worker.payMethodFk')"
-@@ -261,8 +256,6 @@ onMounted(async () => {
-                         :label="t('worker.create.bankEntity')"
-                         v-model="data.bankEntityFk"
-                         :options="bankEntitiesOptions"
--                        option-label="name"
--                        option-value="id"
-                         hide-selected
-                         :roles-allowed-to-create="['salesAssistant', 'hr']"
-                         :rules="validate('Worker.bankEntity')"
-diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
-index 0853791e..e2477372 100644
---- a/src/pages/Worker/WorkerFilter.vue
-+++ b/src/pages/Worker/WorkerFilter.vue
-@@ -72,8 +72,6 @@ const departments = ref();
-                         v-model="params.departmentFk"
-                         @update:model-value="searchFn()"
-                         :options="departments"
--                        option-value="id"
--                        option-label="name"
-                         emit-value
-                         map-options
-                         use-input
diff --git a/quasar.patch:Zone.Identifier b/quasar.patch:Zone.Identifier
deleted file mode 100644
index 99d1c88d1..000000000
--- a/quasar.patch:Zone.Identifier
+++ /dev/null
@@ -1,4 +0,0 @@
-[ZoneTransfer]
-ZoneId=3
-ReferrerUrl=https://chat.verdnatura.es/direct/4MYAaHTayrgLirGvuFzY9RyDvyg99NzPu5
-HostUrl=https://chat.verdnatura.es/file-upload/9whFtRhkNT95CdJud/quasar.patch?download

From 5803b8392b6821bb1fa1a9168aff7fea5fe505be Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 15 Mar 2024 16:30:12 +0100
Subject: [PATCH 27/54] feat: refs #6951 clone ticket

---
 .../Ticket/Card/TicketDescriptorMenu.vue      | 90 ++++++++++++-------
 .../ticket/ticketDescriptor.spec.js           | 27 ++++++
 2 files changed, 87 insertions(+), 30 deletions(-)
 create mode 100644 test/cypress/integration/ticket/ticketDescriptor.spec.js

diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 95f6a94d9..61167d722 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -3,7 +3,7 @@ import axios from 'axios';
 import { ref } from 'vue';
 import { useQuasar } from 'quasar';
 import { useI18n } from 'vue-i18n';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { usePrintService } from 'composables/usePrintService';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
@@ -17,13 +17,14 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
-const route = useRoute();
-const quasar = useQuasar();
+const { push, currentRoute } = useRouter();
+const { dialog, notify } = useQuasar();
 const { t } = useI18n();
 const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
+const ticketId = currentRoute.value.params.id;
+const actions = { remove: remove, clone: clone };
 
 function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
     const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
@@ -35,7 +36,7 @@ function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
 
 function sendDeliveryNoteConfirmation(type = 'deliveryNote', documentType = 'pdf') {
     const customer = ticket.value.client;
-    quasar.dialog({
+    dialog({
         component: SendEmailDialog,
         componentProps: {
             data: {
@@ -67,7 +68,7 @@ function showSmsDialog(template, customData) {
     const address = ticket.value.address;
     const client = ticket.value.client;
     const phone =
-        route.params.phone ||
+        currentRoute.value.params.phone ||
         address.mobile ||
         address.phone ||
         client.mobile ||
@@ -82,7 +83,7 @@ function showSmsDialog(template, customData) {
         Object.assign(data, customData);
     }
 
-    quasar.dialog({
+    dialog({
         component: VnSmsDialog,
         componentProps: {
             phone: phone,
@@ -95,43 +96,63 @@ function showSmsDialog(template, customData) {
 }
 
 async function showSmsDialogWithChanges() {
-    const query = `TicketLogs/${route.params.id}/getChanges`;
+    const query = `TicketLogs/${ticketId}/getChanges`;
     const response = await axios.get(query);
 
     showSmsDialog('orderChanges', { changes: response.data });
 }
 
 async function sendSms(body) {
-    await axios.post(`Tickets/${route.params.id}/sendSms`, body);
-    quasar.notify({
+    await axios.post(`Tickets/${ticketId}/sendSms`, body);
+    notify({
         message: 'Notification sent',
         type: 'positive',
     });
 }
 
-function confirmDelete() {
-    quasar
-        .dialog({
-            component: VnConfirm,
-            componentProps: {
-                promise: remove,
-            },
-        })
-        .onOk(async () => await router.push({ name: 'TicketList' }));
+function openConfirmDialog(callback) {
+    dialog({
+        component: VnConfirm,
+        componentProps: {
+            promise: actions[callback],
+        },
+    });
+}
+
+async function clone() {
+    const opts = { message: t('Ticket cloned'), type: 'positive' };
+    let clonedTicketId;
+
+    try {
+        const { data } = await axios.post(`Tickets/${ticketId}/clone`, {
+            shipped: ticket.value.shipped,
+        });
+        clonedTicketId = data;
+    } catch (e) {
+        opts.message = t('It was not able to clone the ticket');
+        opts.type = 'negative';
+    } finally {
+        notify(opts);
+
+        if (clonedTicketId)
+            push({ name: 'TicketSummary', params: { id: clonedTicketId } });
+    }
 }
 
 async function remove() {
-    const id = route.params.id;
-    await axios.post(`Tickets/${id}/setDeleted`);
+    try {
+        await axios.post(`Tickets/${ticketId}/setDeleted`);
 
-    quasar.notify({
-        message: t('Ticket deleted'),
-        type: 'positive',
-    });
-    quasar.notify({
-        message: t('You can undo this action within the first hour'),
-        icon: 'info',
-    });
+        notify({ message: t('Ticket deleted'), type: 'positive' });
+        notify({
+            message: t('You can undo this action within the first hour'),
+            icon: 'info',
+        });
+
+        push({ name: 'TicketList' });
+    } catch (e) {
+        notify({ message: e.message, type: 'negative' });
+    }
 }
 </script>
 <template>
@@ -227,9 +248,15 @@ async function remove() {
             </QList>
         </QMenu>
     </QItem>
+    <QItem @click="openConfirmDialog('clone')" v-ripple clickable>
+        <QItemSection avatar>
+            <QIcon name="content_copy" />
+        </QItemSection>
+        <QItemSection>{{ t('To clone ticket') }}</QItemSection>
+    </QItem>
     <template v-if="!ticket.isDeleted">
         <QSeparator />
-        <QItem @click="confirmDelete()" v-ripple clickable>
+        <QItem @click="openConfirmDialog('remove')" v-ripple clickable>
             <QItemSection avatar>
                 <QIcon name="delete" />
             </QItemSection>
@@ -253,4 +280,7 @@ es:
     Order changes: Cambios del pedido
     Ticket deleted: Ticket eliminado
     You can undo this action within the first hour: Puedes deshacer esta acción dentro de la primera hora
+    To clone ticket: Clonar ticket
+    Ticket cloned: Ticked clonado
+    It was not able to clone the ticket: No se pudo clonar el ticket
 </i18n>
diff --git a/test/cypress/integration/ticket/ticketDescriptor.spec.js b/test/cypress/integration/ticket/ticketDescriptor.spec.js
new file mode 100644
index 000000000..c212d3b4a
--- /dev/null
+++ b/test/cypress/integration/ticket/ticketDescriptor.spec.js
@@ -0,0 +1,27 @@
+/// <reference types="cypress" />
+describe('Ticket descriptor', () => {
+    const toCloneOpt = '.q-list > :nth-child(5)';
+    const warehouseValue = '.summaryBody > :nth-child(2) > :nth-child(6) > .value > span';
+    const summaryHeader = '.summaryHeader > div';
+
+    beforeEach(() => {
+        const ticketId = 1;
+
+        cy.login('developer');
+        cy.visit(`/#/ticket/${ticketId}/summary`);
+    });
+
+    it('should clone the ticket without warehouse', () => {
+        cy.openLeftMenu();
+        cy.openActionsDescriptor();
+        cy.get(toCloneOpt).click();
+        cy.clickConfirm();
+        cy.get(warehouseValue).contains('-');
+        cy.get(summaryHeader)
+            .invoke('text')
+            .then((text) => {
+                const [, owner] = text.split('-');
+                cy.wrap(owner.trim()).should('eq', 'Bruce Wayne (1101)');
+            });
+    });
+});

From fe7d370a0a722524250fc257ed929a6a143c68fc Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Mar 2024 09:48:27 +0100
Subject: [PATCH 28/54] refactor: refs #6837 move travel search like other
 sections

---
 src/pages/Travel/TravelFilter.vue |  9 ---------
 src/pages/Travel/TravelList.vue   | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index c1c0d1bee..7e8d19405 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -60,15 +60,6 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QItem>
-                <QItemSection>
-                    <VnInput
-                        v-model="params.search"
-                        :label="t('params.search')"
-                        is-outlined
-                    />
-                </QItemSection>
-            </QItem>
             <QItem>
                 <QItemSection>
                     <VnSelectFilter
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index edcfbac52..9de353510 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -8,6 +8,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import TravelSummary from './Card/TravelSummary.vue';
 import TravelFilter from './TravelFilter.vue';
 import FetchData from 'components/FetchData.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 import { toDate } from 'src/filters/index';
@@ -17,6 +18,12 @@ const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
 
 const warehouses = ref([]);
 
@@ -59,6 +66,15 @@ onMounted(async () => {
 </script>
 
 <template>
+    <template v-if="stateStore.isHeaderMounted()">
+        <Teleport to="#searchbar">
+            <VnSearchbar
+                data-key="TravelList"
+                :limit="20"
+                :label="t('searchByIdOrReference')"
+            />
+        </Teleport>
+    </template>
     <FetchData
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
@@ -172,7 +188,9 @@ onMounted(async () => {
 <i18n>
 en:
     addEntry: Add entry
+    searchByIdOrReference: Search by ID or reference
 
 es:
     addEntry: Añadir entrada
+    searchByIdOrReference: Buscar por ID o por referencia
 </i18n>

From d365a36c7e22c204108cb816ec25f71162ad4b6c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 18 Mar 2024 09:51:30 +0100
Subject: [PATCH 29/54] fixed useless variable

---
 src/pages/Travel/TravelList.vue | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 9de353510..a642ce242 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -18,12 +18,6 @@ const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 const { viewSummary } = useSummaryDialog();
-const props = defineProps({
-    dataKey: {
-        type: String,
-        required: true,
-    },
-});
 
 const warehouses = ref([]);
 

From cf25476a5d73aa422a641b40310078c17e754971 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 18 Mar 2024 21:04:52 -0300
Subject: [PATCH 30/54] Create worker log

---
 src/i18n/en/index.js                |  1 +
 src/i18n/es/index.js                |  1 +
 src/pages/Worker/Card/WorkerLog.vue |  6 ++++++
 src/router/modules/worker.js        | 11 ++++++++++-
 4 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Worker/Card/WorkerLog.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 4fe31cd2c..bbfccf719 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -836,6 +836,7 @@ export default {
             workerCreate: 'New worker',
             department: 'Department',
             pda: 'PDA',
+            log: 'Log',
         },
         list: {
             name: 'Name',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 96303e856..b1baa0c0b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -836,6 +836,7 @@ export default {
             workerCreate: 'Nuevo trabajador',
             department: 'Departamentos',
             pda: 'PDA',
+            log: 'Historial',
         },
         list: {
             name: 'Nombre',
diff --git a/src/pages/Worker/Card/WorkerLog.vue b/src/pages/Worker/Card/WorkerLog.vue
new file mode 100644
index 000000000..ef5a2e0d8
--- /dev/null
+++ b/src/pages/Worker/Card/WorkerLog.vue
@@ -0,0 +1,6 @@
+<script setup>
+import VnLog from 'src/components/common/VnLog.vue';
+</script>
+<template>
+    <VnLog model="Worker" url="/WorkerLogs" />
+</template>
diff --git a/src/router/modules/worker.js b/src/router/modules/worker.js
index 1c722afe8..448aab79c 100644
--- a/src/router/modules/worker.js
+++ b/src/router/modules/worker.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'WorkerMain' },
     menus: {
         main: ['WorkerList', 'WorkerDepartment'],
-        card: ['WorkerNotificationsManager', 'WorkerPda'],
+        card: ['WorkerNotificationsManager', 'WorkerPda', 'WorkerLog'],
         departmentCard: ['BasicData'],
     },
     children: [
@@ -85,6 +85,15 @@ export default {
                     },
                     component: () => import('src/pages/Worker/Card/WorkerPda.vue'),
                 },
+                {
+                    name: 'WorkerLog',
+                    path: 'log',
+                    meta: {
+                        title: 'log',
+                        icon: 'vn:History',
+                    },
+                    component: () => import('src/pages/Worker/Card/WorkerLog.vue'),
+                },
             ],
         },
     ],

From 89fc147ad8b593b0c6c6dff0b0a14c42ab116834 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Mar 2024 09:38:11 +0100
Subject: [PATCH 31/54] refs #6905 fix traduction

---
 src/components/UserPanel.vue | 2 --
 src/i18n/en/index.js         | 2 ++
 src/i18n/es/index.js         | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 6037b6405..e7226df07 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -258,8 +258,6 @@ console.log('userWarehouse', user.value.warehouseFk.name);
         userCompany: User company
     es:
         New province: Nueva provincia
-        Please, ensure you put the correct data!: ¡Por favor, asegúrese de poner los datos correctos!
-        Name: Nombre
         Autonomy: Autonomía
         localWarehouse: Almacén local
         localBank: Banco local
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 94d552be3..43b7c7b89 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -83,6 +83,8 @@ export default {
         selectFile: 'Select a file',
         copyClipboard: 'Copy on clipboard',
         salesPerson: 'SalesPerson',
+        Name: 'Name',
+        ensureCorrectData: 'Please, ensure you put the correct data!',
     },
     errors: {
         statusUnauthorized: 'Access denied',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index bcd780f5b..97b02f2d6 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -83,6 +83,8 @@ export default {
         selectFile: 'Seleccione un fichero',
         copyClipboard: 'Copiar en portapapeles',
         salesPerson: 'Comercial',
+        Name: 'Nombre',
+        ensureCorrectData: '¡Por favor, asegúrese de poner los datos correctos!',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',

From 798ffa7de357be96bb7b931df9f6cdd25fa0280c Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 20 Mar 2024 10:20:05 +0100
Subject: [PATCH 32/54] refs #6905 fix

---
 src/components/UserPanel.vue | 16 ----------------
 src/i18n/en/index.js         |  6 ++----
 src/i18n/es/index.js         |  6 ++----
 3 files changed, 4 insertions(+), 24 deletions(-)

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index c4e41eee1..f929caef7 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -222,25 +222,11 @@ function copyUserToken() {
 </template>
 
 <style lang="scss" scoped>
-.panel {
-    width: 150px;
-}
-
 .copyText {
     &:hover {
         cursor: alias;
     }
 }
-
-.icon {
-    align-items: center;
-    padding-left: 7.5%;
-}
-
-.center {
-    display: flex;
-    flex: 0.96;
-}
 </style>
 
 <i18n>
@@ -251,8 +237,6 @@ function copyUserToken() {
         userWarehouse: User warehouse
         userCompany: User company
     es:
-        New province: Nueva provincia
-        Autonomy: Autonomía
         localWarehouse: Almacén local
         localBank: Banco local
         localCompany: Empresa local
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 429e75a34..d5461748c 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -85,8 +85,6 @@ export default {
         selectFile: 'Select a file',
         copyClipboard: 'Copy on clipboard',
         salesPerson: 'SalesPerson',
-        Name: 'Name',
-        ensureCorrectData: 'Please, ensure you put the correct data!',
     },
     errors: {
         statusUnauthorized: 'Access denied',
@@ -956,7 +954,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     roadmap: {
@@ -964,7 +962,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     route: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index fb97ff817..9e5570a8a 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -85,8 +85,6 @@ export default {
         selectFile: 'Seleccione un fichero',
         copyClipboard: 'Copiar en portapapeles',
         salesPerson: 'Comercial',
-        Name: 'Nombre',
-        ensureCorrectData: '¡Por favor, asegúrese de poner los datos correctos!',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',
@@ -956,7 +954,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     roadmap: {
@@ -964,7 +962,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     route: {

From d7d83fd886fedb8eb09f03fd49ae7bbd6a99b3ca Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 21 Mar 2024 14:56:39 +0100
Subject: [PATCH 33/54] refs #7124 feat: autofocus without property

---
 quasar.config.js                  |  2 +-
 src/boot/qformMixin.js            | 32 +++++++++++++++++++++++++++++++
 src/boot/quasar.js                |  6 ++++++
 src/components/ui/VnSearchbar.vue |  2 +-
 4 files changed, 40 insertions(+), 2 deletions(-)
 create mode 100644 src/boot/qformMixin.js
 create mode 100644 src/boot/quasar.js

diff --git a/quasar.config.js b/quasar.config.js
index 2d8289508..80ddc3759 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -29,7 +29,7 @@ module.exports = configure(function (/* ctx */) {
         // app boot file (/src/boot)
         // --> boot files are part of "main.js"
         // https://v2.quasar.dev/quasar-cli/boot-files
-        boot: ['i18n', 'axios', 'vnDate', 'validations'],
+        boot: ['i18n', 'axios', 'vnDate', 'validations', 'quasar'],
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#css
         css: ['app.scss'],
diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
new file mode 100644
index 000000000..37beda4f0
--- /dev/null
+++ b/src/boot/qformMixin.js
@@ -0,0 +1,32 @@
+import { QForm } from 'quasar';
+import { getCurrentInstance } from 'vue';
+
+export default {
+    inject: { QForm },
+    component: { QForm },
+    components: { QForm },
+    extends: { QForm },
+    mounted: function () {
+        const vm = getCurrentInstance();
+        if (vm.type.name === 'QForm')
+            if (![ 'searchbarForm'].includes(this.$el?.id)) {
+                let that = this;
+
+                // AUTOFOCUS
+                const elementsArray = Array.from(this.$el.elements);
+                const index = elementsArray.findIndex(element => element.classList.contains('q-field__native'));
+
+                if (index !== -1) {
+                    const firstInputElement = elementsArray[index];
+                    firstInputElement.focus();
+                }
+
+                // KEYUP Event
+                document.addEventListener('keyup', function (evt) {
+                    if (evt.keyCode === 13) {
+                        that.onSubmit();
+                    }
+                });
+            }
+    },
+};
diff --git a/src/boot/quasar.js b/src/boot/quasar.js
new file mode 100644
index 000000000..a8d9b7ad9
--- /dev/null
+++ b/src/boot/quasar.js
@@ -0,0 +1,6 @@
+import { boot } from 'quasar/wrappers';
+import qFormMixin from './qformMixin';
+
+export default boot(({ app }) => {
+    app.mixin(qFormMixin);
+});
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 143efcd0f..d86b02166 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -108,7 +108,7 @@ async function search() {
 </script>
 
 <template>
-    <QForm @submit="search">
+    <QForm @submit="search" id="searchbarForm">
         <VnInput
             id="searchbar"
             v-model="searchText"

From 561a7a52869ffb8cdd86603d82051047aea7c5bb Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Thu, 21 Mar 2024 15:03:48 +0100
Subject: [PATCH 34/54] refs #7124 perf: whitespace

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

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 37beda4f0..a3e2543c4 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -9,7 +9,7 @@ export default {
     mounted: function () {
         const vm = getCurrentInstance();
         if (vm.type.name === 'QForm')
-            if (![ 'searchbarForm'].includes(this.$el?.id)) {
+            if (!['searchbarForm'].includes(this.$el?.id)) {
                 let that = this;
 
                 // AUTOFOCUS

From f86c331afaf408a63f36e29616e0f7e1ee17f07e Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Thu, 21 Mar 2024 16:38:49 +0100
Subject: [PATCH 35/54] feat: refs #5186 use arrayData in descriptor

---
 src/components/LeftMenuItem.vue              | 21 +++++++++------
 src/components/common/VnBreadcrumbs.vue      |  5 ++--
 src/components/ui/CardDescriptor.vue         | 25 +++++++++--------
 src/pages/Parking/Card/ParkingCard.vue       | 10 ++++---
 src/pages/Parking/Card/ParkingDescriptor.vue | 28 ++++++--------------
 5 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index 7e7a7fe72..cf12157e1 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -11,25 +11,30 @@ const props = defineProps({
     },
 });
 
-const item = computed(() => {
+const itemComputed = computed(() => {
     const item = JSON.parse(JSON.stringify(props.item));
     const [, , section] = item.title.split('.');
 
     if (!te(item.title)) item.title = t(`globals.pageTitles.${section}`);
     return item;
-}); // eslint-disable-line vue/no-dupe-keys
+});
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
-        <QItemSection avatar v-if="item.icon">
-            <QIcon :name="item.icon" />
+    <QItem
+        active-class="text-primary"
+        :to="{ name: itemComputed.name }"
+        clickable
+        v-ripple
+    >
+        <QItemSection avatar v-if="itemComputed.icon">
+            <QIcon :name="itemComputed.icon" />
         </QItemSection>
-        <QItemSection avatar v-if="!item.icon">
+        <QItemSection avatar v-if="!itemComputed.icon">
             <QIcon name="disabled_by_default" />
         </QItemSection>
-        <QItemSection>{{ t(item.title) }}</QItemSection>
+        <QItemSection>{{ t(itemComputed.title) }}</QItemSection>
         <QItemSection side>
-            <slot name="side" :item="item" />
+            <slot name="side" :item="itemComputed" />
         </QItemSection>
     </QItem>
 </template>
diff --git a/src/components/common/VnBreadcrumbs.vue b/src/components/common/VnBreadcrumbs.vue
index 82a534cc8..337507233 100644
--- a/src/components/common/VnBreadcrumbs.vue
+++ b/src/components/common/VnBreadcrumbs.vue
@@ -34,6 +34,7 @@ function getBreadcrumb(param) {
         icon: param.meta.icon,
         path: param.path,
         root: root.value,
+        locale: t(`globals.pageTitles.${param.meta.title}`),
     };
 
     if (screen.gt.sm) {
@@ -42,9 +43,7 @@ function getBreadcrumb(param) {
     }
 
     const moduleLocale = `${breadcrumb.root}.pageTitles.${breadcrumb.title}`;
-    breadcrumb.locale = te(moduleLocale)
-        ? t(moduleLocale)
-        : t(`globals.pageTitles.${breadcrumb.title}`);
+    if (te(moduleLocale)) breadcrumb.locale = t(moduleLocale);
 
     return breadcrumb;
 }
diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 85e0a7857..4a08daaf5 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { onMounted, useSlots, watch, computed, ref } from 'vue';
+import { onBeforeMount, useSlots, watch, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import SkeletonDescriptor from 'components/ui/SkeletonDescriptor.vue';
 import { useArrayData } from 'composables/useArrayData';
@@ -41,21 +41,24 @@ const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const entity = computed(() => useArrayData($props.dataKey).store.data);
+const { store } = useArrayData($props.dataKey);
+const entity = computed(() => store.data);
 const isLoading = ref(false);
 
 defineExpose({
     getData,
 });
-onMounted(async () => {
-    await getData();
-    watch(
-        () => $props.url,
-        async (newUrl, lastUrl) => {
-            if (newUrl == lastUrl) return;
-            await getData();
-        }
-    );
+onBeforeMount(async () => {
+    if ($props.url) {
+        await getData();
+        watch(
+            () => $props.url,
+            async (newUrl, lastUrl) => {
+                if (newUrl == lastUrl) return;
+                await getData();
+            }
+        );
+    }
 });
 
 async function getData() {
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 74d021fff..1c428591b 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -8,26 +8,28 @@ import LeftMenu from 'components/LeftMenu.vue';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import ParkingDescriptor from 'pages/Parking/Card/ParkingDescriptor.vue';
 
-const stateStore = useStateStore();
 const { t } = useI18n();
+const route = useRoute();
+const stateStore = useStateStore();
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 
-const route = useRoute();
 const arrayData = useArrayData('Parking', {
     url: `Parkings/${route.params.id}`,
     filter,
 });
+const { store } = arrayData;
 
 onMounted(async () => await arrayData.fetch({ append: false }));
 watch(
     () => route.params.id,
     async (newId) => {
         if (newId) {
-            arrayData.store.url = `Parkings/${newId}`;
+            store.url = `Parkings/${newId}`;
+            store.filter = filter;
             await arrayData.fetch({ append: false });
         }
     }
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index e130fbd06..5558af360 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -1,12 +1,11 @@
 <script setup>
-import { ref, computed } from 'vue';
-import { useRoute } from 'vue-router';
+import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
-import useCardDescription from 'composables/useCardDescription';
 
-const props = defineProps({
+defineProps({
     id: {
         type: Number,
         required: false,
@@ -14,28 +13,17 @@ const props = defineProps({
     },
 });
 
-const route = useRoute();
 const { t } = useI18n();
-
-const entityId = computed(() => props.id || route.params.id);
-
-const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
-    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
-};
-const header = ref(useCardDescription());
-const setHeader = (entity) => (header.value = useCardDescription(entity.code, entity.id));
+const { store } = useArrayData('Parking');
+const card = computed(() => store.data);
 </script>
 
 <template>
     <CardDescriptor
         module="Parking"
-        :url="`Parkings/${entityId}`"
-        :filter="filter"
-        :title="header.title"
-        :subtitle="header.subtitle"
-        data-key="ParkingData"
-        @on-fetch="setHeader"
+        data-key="Parking"
+        :title="card?.code"
+        :subtitle="card?.id"
     >
         <template #body="{ entity: parking }">
             <VnLv :label="t('globals.code')" :value="parking.code" />

From c4f7b5e7c0659468487c86d5b9221193f8dfaae0 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 22 Mar 2024 07:32:21 +0100
Subject: [PATCH 36/54] refs #7124 perf: use find instead findIndex

---
 src/boot/qformMixin.js | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index a3e2543c4..71f5e9f6d 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -1,11 +1,6 @@
-import { QForm } from 'quasar';
 import { getCurrentInstance } from 'vue';
 
 export default {
-    inject: { QForm },
-    component: { QForm },
-    components: { QForm },
-    extends: { QForm },
     mounted: function () {
         const vm = getCurrentInstance();
         if (vm.type.name === 'QForm')
@@ -14,19 +9,11 @@ export default {
 
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const index = elementsArray.findIndex(element => element.classList.contains('q-field__native'));
+                const firstInputElement = elementsArray.find(element => element.classList.contains('q-field__native'));
 
-                if (index !== -1) {
-                    const firstInputElement = elementsArray[index];
+                if (firstInputElement) {
                     firstInputElement.focus();
                 }
-
-                // KEYUP Event
-                document.addEventListener('keyup', function (evt) {
-                    if (evt.keyCode === 13) {
-                        that.onSubmit();
-                    }
-                });
             }
     },
 };

From b11462e244d61b7857345233155284044845857b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 22 Mar 2024 07:32:33 +0100
Subject: [PATCH 37/54] refs #7124 perf: avoid focus in VnFilterPanel

---
 src/boot/qformMixin.js              | 4 +---
 src/components/ui/VnFilterPanel.vue | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 71f5e9f6d..66e3de4f5 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -4,9 +4,7 @@ export default {
     mounted: function () {
         const vm = getCurrentInstance();
         if (vm.type.name === 'QForm')
-            if (!['searchbarForm'].includes(this.$el?.id)) {
-                let that = this;
-
+            if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
                 const firstInputElement = elementsArray.find(element => element.classList.contains('q-field__native'));
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 722462d4a..96d097191 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -164,7 +164,7 @@ function formatValue(value) {
 </script>
 
 <template>
-    <QForm @submit="search">
+    <QForm @submit="search" id="filterPanelForm">
         <QList dense>
             <QItem class="q-mt-xs">
                 <QItemSection top>

From 0c8f5f488893597f1a2156dde929bfa35be464e6 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 08:15:00 +0100
Subject: [PATCH 38/54] refactor: refs #6971 moved correct button + unmade
 previous changes

---
 src/pages/Route/RouteAutonomous.vue | 28 ++++++++++++++++------------
 src/pages/Route/RouteList.vue       | 23 ++++++++++++++---------
 2 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 6fd4d3f90..43dfac340 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -205,6 +205,17 @@ function navigateToRouteSummary(event, row) {
         <div class="route-list">
             <div class="q-pa-md">
                 <QCard class="vn-one q-py-sm q-px-lg">
+                    <QBtn
+                        icon="vn:invoice-in-create"
+                        color="primary"
+                        :disable="!selectedRows?.length"
+                        @click="openDmsUploadDialog"
+                        class="createInvoiceIn"
+                    >
+                        <QTooltip>
+                            {{ t('Create invoiceIn') }}
+                        </QTooltip>
+                    </QBtn>
                     <VnLv class="flex">
                         <template #label>
                             <span class="text-h6">{{ t('Total') }}</span>
@@ -289,18 +300,6 @@ function navigateToRouteSummary(event, row) {
                 </template>
             </VnPaginate>
         </div>
-        <QPageSticky :offset="[20, 20]" v-if="selectedRows?.length">
-            <QBtn
-                fab
-                icon="vn:invoice-in-create"
-                color="primary"
-                @click="openDmsUploadDialog"
-            >
-                <QTooltip>
-                    {{ t('Create invoiceIn') }}
-                </QTooltip>
-            </QBtn>
-        </QPageSticky>
     </QPage>
     <QDialog v-model="dmsDialog.show">
         <VnDms
@@ -326,6 +325,11 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
+
+.createInvoiceIn {
+    float: right;
+    margin-top: -0.2%;
+}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 241b34d78..cefdf20b8 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -253,15 +253,6 @@ const openTicketsDialog = (id) => {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-                <RouterLink :to="{ name: 'RouteCreate' }">
-                    <QBtn
-                        icon="add"
-                        color="primary" 
-                        :disable="!selectedRows?.length"
-                        @click="{ navigate }"
-                    />
-                    <QTooltip>{{ t('newRoute') }}</QTooltip>
-                </RouterLink>
             </template>
         </VnSubToolbar>
         <div class="route-list">
@@ -452,6 +443,20 @@ const openTicketsDialog = (id) => {
             </VnPaginate>
         </div>
         <QPageSticky :offset="[20, 20]">
+            <RouterLink :to="{ name: 'RouteCreate' }">
+                <QBtn
+                    fab
+                    icon="add"
+                    color="primary"
+                    :disable="!selectedRows?.length"
+                    @click="
+                        {
+                            navigate;
+                        }
+                    "
+                />
+                <QTooltip>{{ t('newRoute') }}</QTooltip>
+            </RouterLink>
         </QPageSticky>
     </QPage>
 </template>

From 8a82b7ab38a27925842c69dd771beb7bf40a0007 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 22 Mar 2024 09:55:16 +0100
Subject: [PATCH 39/54] refs #7124 perf: avoid focus in disabled fields

---
 src/boot/qformMixin.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/boot/qformMixin.js b/src/boot/qformMixin.js
index 66e3de4f5..8c89c9202 100644
--- a/src/boot/qformMixin.js
+++ b/src/boot/qformMixin.js
@@ -1,5 +1,9 @@
 import { getCurrentInstance } from 'vue';
 
+const filterAvailableInput = element => element.classList.contains('q-field__native') && !element.disabled
+const filterAvailableText = element => element.__vueParentComponent.type.name === 'QInput' && element.__vueParentComponent?.attrs?.class !== 'vn-input-date';
+
+
 export default {
     mounted: function () {
         const vm = getCurrentInstance();
@@ -7,7 +11,7 @@ export default {
             if (!['searchbarForm','filterPanelForm'].includes(this.$el?.id)) {
                 // AUTOFOCUS
                 const elementsArray = Array.from(this.$el.elements);
-                const firstInputElement = elementsArray.find(element => element.classList.contains('q-field__native'));
+                const firstInputElement = elementsArray.filter(filterAvailableInput).find(filterAvailableText);
 
                 if (firstInputElement) {
                     firstInputElement.focus();

From a284f5ce5f3acf440ee10a696e927e17701302e0 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Fri, 22 Mar 2024 11:56:44 +0100
Subject: [PATCH 40/54] refs #6905 fix

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

diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index ffb49df04..8b3731478 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -184,7 +184,7 @@ function copyUserToken() {
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
-                    option-label="name"
+                    option-label="bank"
                     option-value="id"
                 ></VnSelectFilter>
             </VnRow>

From 17145b7fe8d33f12ad06aa4b471a1343b3cb510b Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Fri, 22 Mar 2024 13:36:31 +0100
Subject: [PATCH 41/54] fix: refs #6988 fix style

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

diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index c0c271bfc..93c9fa081 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,10 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <a class="header header-link" :href="ticketUrl + 'basic-data/step-one'">
-                    {{ t('Summary') }}
-                    <QIcon name="open_in_new" />
-                </a>
+                <VnTitle :text="t('Summary')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -452,30 +449,12 @@ async function changeState(value) {
 .notes {
     width: max-content;
 }
-.cardSummary .summaryBody > .q-card > .taxes {
-    margin-right: 90px;
-    padding: 0;
-    & > .vn-label-value {
-        text-align: left;
-        display: flex;
-        flex-direction: row;
-        margin-top: 5px;
-        justify-content: flex-start;
-        padding-left: 10px;
-    }
-}
 
 .q-card.q-card--dark.q-dark.vn-one {
     & > .bodyCard {
         padding: 1%;
-        margin-right: 40%;
     }
 }
-
-.cardSummary .summaryBody > .q-card:has(.taxes) {
-    margin-top: 2px;
-    padding: 0%;
-}
 </style>
 
 <i18n>

From d2efbb204ff5d3397c10cc4a54b4daefb05d3c66 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 22 Mar 2024 14:57:36 +0100
Subject: [PATCH 42/54] feat: refs #5186 use arrayData in summary

---
 src/components/ui/CardDescriptor.vue          | 28 ++++++-------
 src/components/ui/CardSummary.vue             | 42 ++++++++++---------
 src/i18n/en/index.js                          |  7 ++--
 src/i18n/es/index.js                          |  7 ++--
 src/pages/InvoiceIn/Card/InvoiceInSummary.vue |  2 +-
 src/pages/Parking/Card/ParkingCard.vue        |  3 +-
 src/pages/Parking/Card/ParkingDescriptor.vue  | 12 +++++-
 src/pages/Parking/Card/ParkingSummary.vue     |  9 ++--
 src/pages/Parking/ParkingList.vue             |  4 +-
 src/router/modules/parking.js                 |  1 +
 .../integration/parking/parkingList.spec.js   |  2 +-
 11 files changed, 61 insertions(+), 56 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 4a08daaf5..97aa91728 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -41,7 +41,12 @@ const state = useState();
 const slots = useSlots();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
-const { store } = useArrayData($props.dataKey);
+const arrayData = useArrayData($props.dataKey || $props.module, {
+    url: $props.url,
+    filter: $props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
 const entity = computed(() => store.data);
 const isLoading = ref(false);
 
@@ -49,24 +54,15 @@ defineExpose({
     getData,
 });
 onBeforeMount(async () => {
-    if ($props.url) {
-        await getData();
-        watch(
-            () => $props.url,
-            async (newUrl, lastUrl) => {
-                if (newUrl == lastUrl) return;
-                await getData();
-            }
-        );
-    }
+    await getData();
+    watch(
+        () => $props.url,
+        async () => await getData()
+    );
 });
 
 async function getData() {
-    const arrayData = useArrayData($props.dataKey, {
-        url: $props.url,
-        filter: $props.filter,
-        skip: 0,
-    });
+    store.url = $props.url;
     isLoading.value = true;
     try {
         const { data } = await arrayData.fetch({ append: false, updateRouter: false });
diff --git a/src/components/ui/CardSummary.vue b/src/components/ui/CardSummary.vue
index f5f61155c..cdf19d492 100644
--- a/src/components/ui/CardSummary.vue
+++ b/src/components/ui/CardSummary.vue
@@ -1,11 +1,10 @@
 <script setup>
-import { onMounted, ref, watch } from 'vue';
+import { ref, computed, watch, onBeforeMount } from 'vue';
 import { useRoute } from 'vue-router';
-import axios from 'axios';
 import SkeletonSummary from 'components/ui/SkeletonSummary.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+import { useArrayData } from 'src/composables/useArrayData';
 
-const entity = ref();
 const props = defineProps({
     url: {
         type: String,
@@ -19,43 +18,48 @@ const props = defineProps({
         type: Number,
         default: null,
     },
+    dataKey: {
+        type: String,
+        default: '',
+    },
 });
 const emit = defineEmits(['onFetch']);
 const route = useRoute();
 const isSummary = ref();
+const arrayData = useArrayData(props.dataKey || route.meta.moduleName, {
+    url: props.url,
+    filter: props.filter,
+    skip: 0,
+});
+const { store } = arrayData;
+const entity = computed(() => store.data);
+const isLoading = ref(false);
 
 defineExpose({
     entity,
     fetch,
 });
 
-onMounted(() => {
+onBeforeMount(async () => {
     isSummary.value = String(route.path).endsWith('/summary');
-    fetch();
+    await fetch();
+    watch(props, async () => await fetch());
 });
 
 async function fetch() {
-    const params = {};
-
-    if (props.filter) params.filter = JSON.stringify(props.filter);
-
-    const { data } = await axios.get(props.url, { params });
-    entity.value = data;
-
+    store.url = props.url;
+    isLoading.value = true;
+    const { data } = await arrayData.fetch({ append: false, updateRouter: false });
     emit('onFetch', data);
+    isLoading.value = false;
 }
-
-watch(props, async () => {
-    entity.value = null;
-    fetch();
-});
 </script>
 
 <template>
     <div class="summary container">
         <QCard class="cardSummary">
-            <SkeletonSummary v-if="!entity" />
-            <template v-if="entity">
+            <SkeletonSummary v-if="!entity || isLoading" />
+            <template v-if="entity && !isLoading">
                 <div class="summaryHeader bg-primary q-pa-sm text-weight-bolder">
                     <slot name="header-left">
                         <router-link
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 3c54b3f78..c92ceb230 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -90,6 +90,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic data',
             log: 'Logs',
+            parkingList: 'Parkings list',
         },
     },
     errors: {
@@ -672,7 +673,6 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             log: 'Logs',
-            parkingList: 'Parking list',
         },
         list: {
             parking: 'Parking',
@@ -700,7 +700,6 @@ export default {
         column: 'Column',
         pageTitles: {
             parking: 'Parking',
-            parkingList: 'Parkings list',
         },
         searchBar: {
             info: 'You can search by parking code',
@@ -976,7 +975,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     roadmap: {
@@ -984,7 +983,7 @@ export default {
             roadmap: 'Roadmap',
             summary: 'Summary',
             basicData: 'Basic Data',
-            stops: 'Stops'
+            stops: 'Stops',
         },
     },
     route: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index a7a49bcd3..47efc4adf 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -90,6 +90,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Historial',
+            parkingList: 'Listado de parkings',
         },
     },
     errors: {
@@ -730,7 +731,6 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             log: 'Historial',
-            parkingList: 'Listado de parkings',
         },
         list: {
             parking: 'Parking',
@@ -757,7 +757,6 @@ export default {
         column: 'Columna',
         pageTitles: {
             parking: 'Parking',
-            parkingList: 'Listado de parkings',
         },
         searchBar: {
             info: 'Puedes buscar por código de parking',
@@ -975,7 +974,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     roadmap: {
@@ -983,7 +982,7 @@ export default {
             roadmap: 'Troncales',
             summary: 'Resumen',
             basicData: 'Datos básicos',
-            stops: 'Paradas'
+            stops: 'Paradas',
         },
     },
     route: {
diff --git a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
index fc15d3bd9..f30552d71 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInSummary.vue
@@ -199,7 +199,7 @@ function getLink(param) {
 
 <template>
     <CardSummary
-        ref="summary"
+        data-key="InvoiceInSummary"
         :url="`InvoiceIns/${entityId}/summary`"
         @on-fetch="(data) => setData(data)"
     >
diff --git a/src/pages/Parking/Card/ParkingCard.vue b/src/pages/Parking/Card/ParkingCard.vue
index 1c428591b..621680985 100644
--- a/src/pages/Parking/Card/ParkingCard.vue
+++ b/src/pages/Parking/Card/ParkingCard.vue
@@ -13,7 +13,7 @@ const route = useRoute();
 const stateStore = useStateStore();
 
 const filter = {
-    fields: ['id', 'sectorFk', 'code', 'pickingOrder'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 
@@ -22,7 +22,6 @@ const arrayData = useArrayData('Parking', {
     filter,
 });
 const { store } = arrayData;
-
 onMounted(async () => await arrayData.fetch({ append: false }));
 watch(
     () => route.params.id,
diff --git a/src/pages/Parking/Card/ParkingDescriptor.vue b/src/pages/Parking/Card/ParkingDescriptor.vue
index 5558af360..3ff0a5d17 100644
--- a/src/pages/Parking/Card/ParkingDescriptor.vue
+++ b/src/pages/Parking/Card/ParkingDescriptor.vue
@@ -1,11 +1,12 @@
 <script setup>
 import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
 import { useArrayData } from 'src/composables/useArrayData';
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'components/ui/VnLv.vue';
 
-defineProps({
+const props = defineProps({
     id: {
         type: Number,
         required: false,
@@ -14,16 +15,23 @@ defineProps({
 });
 
 const { t } = useI18n();
+const { params } = useRoute();
+const entityId = computed(() => props.id || params.id);
 const { store } = useArrayData('Parking');
 const card = computed(() => store.data);
+const filter = {
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
+};
 </script>
-
 <template>
     <CardDescriptor
         module="Parking"
         data-key="Parking"
+        :url="`Parkings/${entityId}`"
         :title="card?.code"
         :subtitle="card?.id"
+        :filter="filter"
     >
         <template #body="{ entity: parking }">
             <VnLv :label="t('globals.code')" :value="parking.code" />
diff --git a/src/pages/Parking/Card/ParkingSummary.vue b/src/pages/Parking/Card/ParkingSummary.vue
index fe733f56c..a30705068 100644
--- a/src/pages/Parking/Card/ParkingSummary.vue
+++ b/src/pages/Parking/Card/ParkingSummary.vue
@@ -11,20 +11,19 @@ const $props = defineProps({
         default: 0,
     },
 });
-const route = useRoute();
+const { params } = useRoute();
 const { t } = useI18n();
-
-const entityId = computed(() => $props.id || route.params.id);
+const entityId = computed(() => $props.id || params.id);
 
 const filter = {
-    fields: ['sectorFk', 'code', 'pickingOrder', 'row', 'column'],
+    fields: ['id', 'sectorFk', 'code', 'pickingOrder', 'row', 'column'],
     include: [{ relation: 'sector', scope: { fields: ['id', 'description'] } }],
 };
 </script>
 
 <template>
     <div class="q-pa-md">
-        <CardSummary ref="summary" :url="`Parkings/${entityId}`" :filter="filter">
+        <CardSummary :url="`Parkings/${entityId}`" :filter="filter">
             <template #header="{ entity: parking }">{{ parking.code }}</template>
             <template #body="{ entity: parking }">
                 <QCard class="vn-one">
diff --git a/src/pages/Parking/ParkingList.vue b/src/pages/Parking/ParkingList.vue
index 2a1873d5a..7bf6cfdab 100644
--- a/src/pages/Parking/ParkingList.vue
+++ b/src/pages/Parking/ParkingList.vue
@@ -12,7 +12,7 @@ import ParkingFilter from './ParkingFilter.vue';
 import ParkingSummary from './Card/ParkingSummary.vue';
 
 const stateStore = useStateStore();
-const router = useRouter();
+const { push } = useRouter();
 const { t } = useI18n();
 const { viewSummary } = useSummaryDialog();
 
@@ -83,7 +83,7 @@ function exprBuilder(param, value) {
                         :key="row.id"
                         :id="row.id"
                         :title="row.code"
-                        @click="router.push({ path: `/parking/${row.id}` })"
+                        @click="push({ path: `/parking/${row.id}` })"
                     >
                         <template #list-items>
                             <VnLv label="Sector" :value="row.sector?.description" />
diff --git a/src/router/modules/parking.js b/src/router/modules/parking.js
index 993400f75..51ea200c6 100644
--- a/src/router/modules/parking.js
+++ b/src/router/modules/parking.js
@@ -6,6 +6,7 @@ export default {
     meta: {
         title: 'parking',
         icon: 'garage_home',
+        moduleName: 'Parking',
     },
     component: RouterView,
     redirect: { name: 'ParkingCard' },
diff --git a/test/cypress/integration/parking/parkingList.spec.js b/test/cypress/integration/parking/parkingList.spec.js
index b4e706736..3ac46f8cd 100644
--- a/test/cypress/integration/parking/parkingList.spec.js
+++ b/test/cypress/integration/parking/parkingList.spec.js
@@ -13,7 +13,7 @@ describe('ParkingList', () => {
         cy.closeSideMenu();
     });
 
-    it('should redirect on clicking a invoice', () => {
+    it('should redirect on clicking a parking', () => {
         cy.get(firstChipId)
             .invoke('text')
             .then((content) => {

From 2bb95fa56816ac4dd603908ab73ee0dd3d983806 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 22 Mar 2024 16:31:10 +0100
Subject: [PATCH 43/54] rafactor: refs #6951 actions descriptor & update
 changelog

---
 CHANGELOG.md                                  |  2 +
 .../Ticket/Card/TicketDescriptorMenu.vue      | 73 +++++++++----------
 2 files changed, 38 insertions(+), 37 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dbf6bdcc3..51dd2010c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 
+-   (Tickets) => Se añade la opción de clonar ticket. #6951
+
 ### Changed
 
 ### Fixed
diff --git a/src/pages/Ticket/Card/TicketDescriptorMenu.vue b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
index 61167d722..c7784bc2a 100644
--- a/src/pages/Ticket/Card/TicketDescriptorMenu.vue
+++ b/src/pages/Ticket/Card/TicketDescriptorMenu.vue
@@ -24,7 +24,42 @@ const { openReport, sendEmail } = usePrintService();
 
 const ticket = ref(props.ticket);
 const ticketId = currentRoute.value.params.id;
-const actions = { remove: remove, clone: clone };
+const actions = {
+    clone: async () => {
+        const opts = { message: t('Ticket cloned'), type: 'positive' };
+        let clonedTicketId;
+
+        try {
+            const { data } = await axios.post(`Tickets/${ticketId}/clone`, {
+                shipped: ticket.value.shipped,
+            });
+            clonedTicketId = data;
+        } catch (e) {
+            opts.message = t('It was not able to clone the ticket');
+            opts.type = 'negative';
+        } finally {
+            notify(opts);
+
+            if (clonedTicketId)
+                push({ name: 'TicketSummary', params: { id: clonedTicketId } });
+        }
+    },
+    remove: async () => {
+        try {
+            await axios.post(`Tickets/${ticketId}/setDeleted`);
+
+            notify({ message: t('Ticket deleted'), type: 'positive' });
+            notify({
+                message: t('You can undo this action within the first hour'),
+                icon: 'info',
+            });
+
+            push({ name: 'TicketList' });
+        } catch (e) {
+            notify({ message: e.message, type: 'negative' });
+        }
+    },
+};
 
 function openDeliveryNote(type = 'deliveryNote', documentType = 'pdf') {
     const path = `Tickets/${ticket.value.id}/delivery-note-${documentType}`;
@@ -118,42 +153,6 @@ function openConfirmDialog(callback) {
         },
     });
 }
-
-async function clone() {
-    const opts = { message: t('Ticket cloned'), type: 'positive' };
-    let clonedTicketId;
-
-    try {
-        const { data } = await axios.post(`Tickets/${ticketId}/clone`, {
-            shipped: ticket.value.shipped,
-        });
-        clonedTicketId = data;
-    } catch (e) {
-        opts.message = t('It was not able to clone the ticket');
-        opts.type = 'negative';
-    } finally {
-        notify(opts);
-
-        if (clonedTicketId)
-            push({ name: 'TicketSummary', params: { id: clonedTicketId } });
-    }
-}
-
-async function remove() {
-    try {
-        await axios.post(`Tickets/${ticketId}/setDeleted`);
-
-        notify({ message: t('Ticket deleted'), type: 'positive' });
-        notify({
-            message: t('You can undo this action within the first hour'),
-            icon: 'info',
-        });
-
-        push({ name: 'TicketList' });
-    } catch (e) {
-        notify({ message: e.message, type: 'negative' });
-    }
-}
 </script>
 <template>
     <QItem v-ripple clickable>

From bf0e2d3bf661d0d9fc08b029bce745b2a6227edb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 09:52:04 +0100
Subject: [PATCH 44/54] refactor: refs #6971 fixed request changes

---
 src/pages/Route/RouteAutonomous.vue | 28 +++++++++++-----------------
 src/pages/Route/RouteList.vue       | 16 ++++------------
 2 files changed, 15 insertions(+), 29 deletions(-)

diff --git a/src/pages/Route/RouteAutonomous.vue b/src/pages/Route/RouteAutonomous.vue
index 43dfac340..0ecf0a971 100644
--- a/src/pages/Route/RouteAutonomous.vue
+++ b/src/pages/Route/RouteAutonomous.vue
@@ -204,18 +204,7 @@ function navigateToRouteSummary(event, row) {
     <QPage class="column items-center">
         <div class="route-list">
             <div class="q-pa-md">
-                <QCard class="vn-one q-py-sm q-px-lg">
-                    <QBtn
-                        icon="vn:invoice-in-create"
-                        color="primary"
-                        :disable="!selectedRows?.length"
-                        @click="openDmsUploadDialog"
-                        class="createInvoiceIn"
-                    >
-                        <QTooltip>
-                            {{ t('Create invoiceIn') }}
-                        </QTooltip>
-                    </QBtn>
+                <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>
@@ -224,6 +213,16 @@ function navigateToRouteSummary(event, row) {
                             <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
@@ -325,11 +324,6 @@ function navigateToRouteSummary(event, row) {
         cursor: pointer;
     }
 }
-
-.createInvoiceIn {
-    float: right;
-    margin-top: -0.2%;
-}
 </style>
 <i18n>
 es:
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index b5d2169c6..94c05ad54 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -444,18 +444,10 @@ const openTicketsDialog = (id) => {
         </div>
         <QPageSticky :offset="[20, 20]">
             <RouterLink :to="{ name: 'RouteCreate' }">
-                <QBtn
-                    fab
-                    icon="add"
-                    color="primary"
-                    :disable="!selectedRows?.length"
-                    @click="
-                        {
-                            navigate;
-                        }
-                    "
-                />
-                <QTooltip>{{ t('newRoute') }}</QTooltip>
+                <QBtn fab icon="add" color="primary" />
+                <QTooltip>
+                    {{ t('newRoute') }}
+                </QTooltip>
             </RouterLink>
         </QPageSticky>
     </QPage>

From 84a25acf22db975eeaae12435952a0b60260bb0c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 11:42:29 +0100
Subject: [PATCH 45/54] refactor: refs #6988 used global translations

---
 src/i18n/en/index.js                    | 1 +
 src/i18n/es/index.js                    | 1 +
 src/pages/Ticket/Card/TicketSummary.vue | 7 +------
 3 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..1365d4c17 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,6 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..f5f07f543 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -491,6 +491,7 @@ export default {
             request: 'Petición de compra',
             weight: 'Peso',
             goTo: 'Ir a',
+            summaryAmount: 'Resumen',
         },
     },
     claim: {
diff --git a/src/pages/Ticket/Card/TicketSummary.vue b/src/pages/Ticket/Card/TicketSummary.vue
index 93c9fa081..5d2b62944 100644
--- a/src/pages/Ticket/Card/TicketSummary.vue
+++ b/src/pages/Ticket/Card/TicketSummary.vue
@@ -243,7 +243,7 @@ async function changeState(value) {
                 </VnLv>
             </QCard>
             <QCard class="vn-one">
-                <VnTitle :text="t('Summary')" />
+                <VnTitle :text="t('ticket.summary.summaryAmount')" />
                 <div class="bodyCard">
                     <VnLv
                         :label="t('ticket.summary.subtotal')"
@@ -456,8 +456,3 @@ async function changeState(value) {
     }
 }
 </style>
-
-<i18n>
-    es:
-        Summary: Resumen
-</i18n>

From 3e0f1515703a8deedad200aee1a48dcee17880eb Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Mon, 25 Mar 2024 12:36:50 +0100
Subject: [PATCH 46/54] refactor: refs #6988 fixed error

---
 src/i18n/en/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1365d4c17..839d768b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -492,7 +492,7 @@ export default {
             request: 'Request',
             weight: 'Weight',
             goTo: 'Go to',
-            summaryAmount: 'Resumen',
+            summaryAmount: 'Summary',
         },
     },
     claim: {

From c335accffb30731b089023bced8b94f6e762b215 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 25 Mar 2024 12:42:48 +0100
Subject: [PATCH 47/54] refs #6905 fix translation and warnings

---
 src/components/FetchData.vue             |  3 +++
 src/components/UserPanel.vue             | 25 +++++-------------------
 src/components/common/VnSelectFilter.vue |  6 +++---
 src/i18n/en/index.js                     |  5 +++++
 src/i18n/es/index.js                     |  5 +++++
 5 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 5b3dcbea7..6d4e79f24 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -60,3 +60,6 @@ async function fetch(fetchFilter = {}) {
     }
 }
 </script>
+<template>
+    <template></template>
+</template>
diff --git a/src/components/UserPanel.vue b/src/components/UserPanel.vue
index 8b3731478..5c143740e 100644
--- a/src/components/UserPanel.vue
+++ b/src/components/UserPanel.vue
@@ -173,14 +173,14 @@ function copyUserToken() {
         <div class="col q-gutter-xs q-pa-md">
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localWarehouse')"
+                    :label="t('components.userPanel.localWarehouse')"
                     v-model="user.localWarehouseFk"
                     :options="warehousesData"
                     option-label="name"
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('localBank')"
+                    :label="t('components.userPanel.localBank')"
                     hide-selected
                     v-model="user.localBankFk"
                     :options="accountBankData"
@@ -190,7 +190,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('localCompany')"
+                    :label="t('components.userPanel.localCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -198,7 +198,7 @@ function copyUserToken() {
                     option-value="id"
                 />
                 <VnSelectFilter
-                    :label="t('userWarehouse')"
+                    :label="t('components.userPanel.userWarehouse')"
                     hide-selected
                     v-model="user.warehouseFk"
                     :options="warehousesData"
@@ -208,7 +208,7 @@ function copyUserToken() {
             </VnRow>
             <VnRow>
                 <VnSelectFilter
-                    :label="t('userCompany')"
+                    :label="t('components.userPanel.userCompany')"
                     hide-selected
                     v-model="user.companyFk"
                     :options="companiesData"
@@ -228,18 +228,3 @@ function copyUserToken() {
     }
 }
 </style>
-
-<i18n>
-    en:
-        localWarehouse: Local warehouse
-        localBank: Local bank
-        localCompany: Local company
-        userWarehouse: User warehouse
-        userCompany: User company
-    es:
-        localWarehouse: Almacén local
-        localBank: Banco local
-        localCompany: Empresa local
-        userWarehouse: Almacén del usuario
-        userCompany: Empresa del usuario
-</i18n>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 4903a5327..480d36e4f 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -51,8 +51,8 @@ const $props = defineProps({
         default: null,
     },
     limit: {
-        type: Number,
-        default: 30,
+        type: [Number, String],
+        default: '30',
     },
 });
 
@@ -151,7 +151,7 @@ watch(modelValue, (newValue) => {
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
         :limit="limit"
-        :order-by="orderBy"
+        :sort-by="sortBy"
         :fields="fields"
     />
     <QSelect
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a9ce1a6ed..4e959702b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copied to clipboard',
             settings: 'Settings',
             logOut: 'Log Out',
+            localWarehouse: 'Local warehouse',
+            localBank: 'Local bank',
+            localCompany: 'Local company',
+            userWarehouse: 'User warehouse',
+            userCompany: 'User company',
         },
         smartCard: {
             downloadFile: 'Download file',
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 0977448fb..54db98f66 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1203,6 +1203,11 @@ export default {
             copyToken: 'Token copiado al portapapeles',
             settings: 'Configuración',
             logOut: 'Cerrar sesión',
+            localWarehouse: 'Almacén local',
+            localBank: 'Banco local',
+            localCompany: 'Empresa local',
+            userWarehouse: 'Almacén del usuario',
+            userCompany: 'Empresa del usuario',
         },
         smartCard: {
             downloadFile: 'Descargar archivo',

From de0166b327f95d5f28d3093f9da36b0f21f3d9c2 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 25 Mar 2024 14:33:32 +0100
Subject: [PATCH 48/54] feat: refs #6485 not open new tab on launch

---
 quasar.config.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/quasar.config.js b/quasar.config.js
index 80ddc3759..5932f48dc 100644
--- a/quasar.config.js
+++ b/quasar.config.js
@@ -117,6 +117,7 @@ module.exports = configure(function (/* ctx */) {
                     secure: false,
                 },
             },
+            open: false,
         },
 
         // https://v2.quasar.dev/quasar-cli-vite/quasar-config-js#framework

From b46760116fcfafc7c422e72493e29801a28dd415 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Mar 2024 08:34:15 +0100
Subject: [PATCH 49/54] Merge branch 'dev' of
 https://gitea.verdnatura.es/verdnatura/salix-front into 6942-improveInvoceIn

---
 src/components/ui/VnSearchbar.vue | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index d86b02166..25560cee0 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -1,11 +1,9 @@
 <script setup>
 import { onMounted, ref } from 'vue';
-import { useRouter, useRoute } from 'vue-router';
+import { useRouter } from 'vue-router';
 import { useQuasar } from 'quasar';
-
-import VnInput from 'src/components/common/VnInput.vue';
-
 import { useArrayData } from 'composables/useArrayData';
+import VnInput from 'src/components/common/VnInput.vue';
 
 const quasar = useQuasar();
 
@@ -67,8 +65,7 @@ const props = defineProps({
     },
 });
 
-const router = useRouter();
-const route = useRoute();
+const { currentRoute, push } = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
 const store = arrayData.store;
 const searchText = ref('');
@@ -92,18 +89,20 @@ async function search() {
     });
     if (!props.redirect) return;
 
-    if (props.customRouteRedirectName) {
-        router.push({
+    if (props.customRouteRedirectName)
+        return push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
-        return;
-    }
 
-    const { matched: matches } = route;
-    const { path } = matches[matches.length - 1];
-    const newRoute = path.replace(':id', searchText.value);
-    await router.push(newRoute);
+    const { matched: matches } = currentRoute.value;
+    const { path } = matches.at(-1);
+
+    let targetUrl = path.replace(':id', searchText.value);
+    if (path.endsWith('/list') && store.data.length === 1)
+        targetUrl = targetUrl.replace('/list', `/${store.data[0].id}/summary`);
+
+    await push(targetUrl);
 }
 </script>
 

From 4a7cb8fe8d9271aa2b664a65b8eb1dd9e5dab73c Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 26 Mar 2024 09:09:58 +0100
Subject: [PATCH 50/54] refactor: refs #6993 fixed conflict

---
 src/pages/Route/RouteList.vue | 269 +++++++++++++++-------------------
 1 file changed, 117 insertions(+), 152 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 95b876be1..4b3c63dca 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -2,9 +2,8 @@
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
-import { useQuasar } from 'quasar';
 import { computed, onMounted, onUnmounted, ref } from 'vue';
-import { dashIfEmpty, toDate, toHour } from 'src/filters';
+import { dashIfEmpty, toHour } from 'src/filters';
 import VnSelectFilter from 'components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import { useValidator } from 'composables/useValidator';
@@ -18,10 +17,13 @@ import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 import { useSession } from 'composables/useSession';
 import { useSummaryDialog } from 'src/composables/useSummaryDialog';
+import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue';
+import { useQuasar } from 'quasar';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
 const { validate } = useValidator();
+const quasar = useQuasar();
 const session = useSession();
 const { viewSummary } = useSummaryDialog();
 
@@ -35,7 +37,7 @@ const columns = computed(() => [
         label: t('ID'),
         field: (row) => row.id,
         sortable: true,
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'worker',
@@ -70,7 +72,7 @@ const columns = computed(() => [
         label: 'm³',
         field: (row) => dashIfEmpty(row.m3),
         sortable: true,
-        align: 'left',
+        align: 'center',
     },
     {
         name: 'description',
@@ -113,24 +115,6 @@ const updateRoute = async (route) => {
     }
 };
 
-const updateVehicle = (row, vehicle) => {
-    row.vehicleFk = vehicle.id;
-    row.vehiclePlateNumber = vehicle.numberPlate;
-    updateRoute(row);
-};
-
-const updateAgency = (row, agency) => {
-    row.agencyModeFk = agency.id;
-    row.agencyName = agency.name;
-    updateRoute(row);
-};
-
-const updateWorker = (row, worker) => {
-    row.workerFk = worker.id;
-    row.workerUserName = worker.name;
-    updateRoute(row);
-};
-
 const confirmationDialog = ref(false);
 const startingDate = ref(null);
 
@@ -149,7 +133,7 @@ const showRouteReport = () => {
     let url;
 
     if (selectedRows.value.length <= 1) {
-        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getToken()}`;
+        url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
     } else {
         const params = new URLSearchParams({
             access_token: session.getToken(),
@@ -169,6 +153,20 @@ const markAsServed = () => {
     refreshKey.value++;
     startingDate.value = null;
 };
+
+const openTicketsDialog = (id) => {
+    if (!id) {
+        return;
+    }
+    quasar
+        .dialog({
+            component: RouteListTicketsDialog,
+            componentProps: {
+                id,
+            },
+        })
+        .onOk(() => refreshKey.value++);
+};
 </script>
 
 <template>
@@ -319,154 +317,101 @@ const markAsServed = () => {
                                     </QPopupEdit>
                                 </QTd>
                             </template>
-                            <template #body-cell-agency="props">
-                                <QTd :props="props">
-                                    {{ props.row?.agencyName }}
-                                    <QPopupEdit
-                                        :model-value="props.row.agencyModeFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (agency) => updateAgency(props.row, agency)
-                                        "
-                                    >
-                                        <VnSelectFilter
-                                            :label="t('Agency')"
-                                            v-model="scope.value"
-                                            :options="agencyList"
-                                            option-value="id"
-                                            option-label="name"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('route.agencyFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-agency="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Agency')"
+                                        v-model="row.agencyModeFk"
+                                        :options="agencyList"
+                                        option-value="id"
+                                        option-label="name"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('route.agencyFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-vehicle="props">
-                                <QTd :props="props">
-                                    {{ props.row?.vehiclePlateNumber }}
-                                    <QPopupEdit
-                                        :model-value="props.row.vehicleFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (vehicle) => updateVehicle(props.row, vehicle)
-                                        "
-                                    >
-                                        <VnSelectFilter
-                                            :label="t('Vehicle')"
-                                            v-model="scope.value"
-                                            :options="vehicleList"
-                                            option-value="id"
-                                            option-label="numberPlate"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('route.vehicleFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-vehicle="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Vehicle')"
+                                        v-model="row.vehicleFk"
+                                        :options="vehicleList"
+                                        option-value="id"
+                                        option-label="numberPlate"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('route.vehicleFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-date="props">
-                                <QTd :props="props">
-                                    {{ toDate(props.row?.created) }}
-                                    <QPopupEdit
-                                        v-model="props.row.created"
-                                        v-slot="scope"
-                                        @update:model-value="updateRoute(props.row)"
-                                        buttons
-                                    >
-                                        <VnInputDate
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Date')"
-                                            :rules="validate('route.created')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-date="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputDate
+                                        v-model="row.created"
+                                        hide-bottom-space
+                                        dense
+                                        :label="t('Date')"
+                                        :rules="validate('route.created')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-description="props">
-                                <QTd :props="props">
-                                    {{ props.row?.description }}
-                                    <QPopupEdit
-                                        v-model="props.row.description"
-                                        v-slot="scope"
-                                        @update:model-value="updateRoute(props.row)"
-                                        buttons
-                                    >
-                                        <VnInput
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Description')"
-                                            :rules="validate('route.description')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-description="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInput
+                                        v-model="row.description"
+                                        :label="t('Description')"
+                                        :rules="validate('route.description')"
+                                        :is-clearable="false"
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-started="props">
-                                <QTd :props="props">
-                                    {{ toHour(props.row.started) }}
-                                    <QPopupEdit
-                                        v-model="props.row.started"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="updateRoute(props.row)"
-                                    >
-                                        <VnInputTime
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Hour started')"
-                                            :rules="validate('route.started')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-started="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputTime
+                                        v-model="row.started"
+                                        :label="t('Hour started')"
+                                        :rules="validate('route.started')"
+                                        :is-clearable="false"
+                                        hide-bottom-space
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
-                            <template #body-cell-finished="props">
-                                <QTd :props="props">
-                                    {{ toHour(props.row.finished) }}
-                                    <QPopupEdit
-                                        v-model="props.row.finished"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="updateRoute(props.row)"
-                                    >
-                                        <VnInputTime
-                                            v-model="scope.value"
-                                            autofocus
-                                            :label="t('Hour finished')"
-                                            :rules="validate('route.finished')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        />
-                                    </QPopupEdit>
+                            <template #body-cell-finished="{ row }">
+                                <QTd class="table-input-cell">
+                                    <VnInputTime
+                                        v-model="row.finished"
+                                        autofocus
+                                        :label="t('Hour finished')"
+                                        :rules="validate('route.finished')"
+                                        :is-clearable="false"
+                                        hide-bottom-space
+                                        dense
+                                        @update:model-value="updateRoute(row)"
+                                    />
                                 </QTd>
                             </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
-                                    <div class="flex items-center table-actions">
+                                    <div class="flex items-center no-wrap table-actions">
                                         <QIcon
                                             name="vn:ticketAdd"
                                             size="xs"
                                             color="primary"
                                             class="cursor-pointer"
+                                            @click="openTicketsDialog(props?.row?.id)"
                                         >
                                             <QTooltip>{{ t('Add ticket') }}</QTooltip>
                                         </QIcon>
@@ -481,6 +426,20 @@ const markAsServed = () => {
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
+                                        <RouterLink
+                                            :to="{
+                                                name: 'RouteSummary',
+                                                params: { id: props?.row?.id },
+                                            }"
+                                        >
+                                            <QIcon
+                                                name="vn:eye"
+                                                size="xs"
+                                                color="primary"
+                                            >
+                                                <QTooltip>{{ t('Summary') }}</QTooltip>
+                                            </QIcon>
+                                        </RouterLink>
                                     </div>
                                 </QTd>
                             </template>
@@ -501,8 +460,13 @@ const markAsServed = () => {
 </template>
 
 <style lang="scss" scoped>
+.table-input-cell {
+    min-width: 150px;
+}
+
 .route-list {
     width: 100%;
+    max-height: 100%;
 }
 
 .table-actions {
@@ -531,4 +495,5 @@ es:
     Download selected routes as PDF: Descargar rutas seleccionadas como PDF
     Add ticket: Añadir tickets
     Preview: Vista previa
+    Summary: Resumen
 </i18n>

From a0dcd6aee165a70e5412e7341c2ee6dd46dd1da0 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 26 Mar 2024 09:11:53 +0100
Subject: [PATCH 51/54] feat: refs #6893 replace id & redirect to Card or list

---
 src/components/ui/VnSearchbar.vue | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 25560cee0..34da7cbf5 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -97,12 +97,18 @@ async function search() {
 
     const { matched: matches } = currentRoute.value;
     const { path } = matches.at(-1);
+    const [, moduleName] = path.split('/');
 
-    let targetUrl = path.replace(':id', searchText.value);
-    if (path.endsWith('/list') && store.data.length === 1)
-        targetUrl = targetUrl.replace('/list', `/${store.data[0].id}/summary`);
+    if (!store.data.length || store.data.length > 1)
+        return push({ path: `/${moduleName}/list` });
 
-    await push(targetUrl);
+    const targetId = store.data[0].id;
+    let targetUrl;
+
+    if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
+    else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
+
+    await push({ path: targetUrl });
 }
 </script>
 

From 9f24f1f97c3e9816c5f30ab2fe5bdc9d003211a3 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 26 Mar 2024 09:44:54 +0100
Subject: [PATCH 52/54] refactor: refs #6993 merged conflicts

---
 src/pages/Route/RouteList.vue | 76 ++++++++++++++++-------------------
 1 file changed, 35 insertions(+), 41 deletions(-)

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index cad8a5cb2..94c05ad54 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -136,7 +136,7 @@ const showRouteReport = () => {
         url = `api/Routes/${idString}/driver-route-pdf?access_token=${session.getTokenMultimedia()}`;
     } else {
         const params = new URLSearchParams({
-            access_token: session.getToken(),
+            access_token: session.getTokenMultimedia(),
             id: idString,
         });
         url = `api/Routes/downloadZip?${params.toString()}`;
@@ -261,6 +261,7 @@ const openTicketsDialog = (id) => {
                 data-key="RouteList"
                 url="Routes/filter"
                 :order="['created DESC', 'id DESC']"
+                :limit="20"
                 auto-load
             >
                 <template #body="{ rows }">
@@ -272,49 +273,42 @@ const openTicketsDialog = (id) => {
                             flat
                             row-key="id"
                             selection="multiple"
+                            :rows-per-page-options="[0]"
+                            hide-pagination
+                            :pagination="{ sortBy: 'ID', descending: true }"
+                            :no-data-label="t('globals.noResults')"
                         >
-                            <template #body-cell-worker="props">
-                                <QTd :props="props">
-                                    {{ props.row?.workerUserName }}
-                                    <QPopupEdit
-                                        :model-value="props.row.workerFk"
-                                        v-slot="scope"
-                                        buttons
-                                        @update:model-value="
-                                            (worker) => updateWorker(props.row, worker)
-                                        "
+                            <template #body-cell-worker="{ row }">
+                                <QTd>
+                                    <VnSelectFilter
+                                        :label="t('Worker')"
+                                        v-model="row.workerFk"
+                                        :options="workers"
+                                        option-value="id"
+                                        option-label="nickname"
+                                        hide-selected
+                                        dense
+                                        :emit-value="false"
+                                        :rules="validate('Route.workerFk')"
+                                        :is-clearable="false"
+                                        @update:model-value="updateRoute(row)"
                                     >
-                                        <VnSelectFilter
-                                            :label="t('Worker')"
-                                            v-model="scope.value"
-                                            :options="workers"
-                                            option-value="id"
-                                            option-label="name"
-                                            hide-selected
-                                            autofocus
-                                            :emit-value="false"
-                                            :rules="validate('Route.workerFk')"
-                                            :is-clearable="false"
-                                            @keyup.enter="scope.set"
-                                            @focus="($event) => $event.target.select()"
-                                        >
-                                            <template #option="{ opt, itemProps }">
-                                                <QItem
-                                                    v-bind="itemProps"
-                                                    class="q-pa-xs row items-center"
+                                        <template #option="{ opt, itemProps }">
+                                            <QItem
+                                                v-bind="itemProps"
+                                                class="q-pa-xs row items-center"
+                                            >
+                                                <QItemSection
+                                                    class="col-9 justify-center"
                                                 >
-                                                    <QItemSection
-                                                        class="col-9 justify-center"
-                                                    >
-                                                        <span>{{ opt.name }}</span>
-                                                        <span class="text-grey">{{
-                                                            opt.nickname
-                                                        }}</span>
-                                                    </QItemSection>
-                                                </QItem>
-                                            </template>
-                                        </VnSelectFilter>
-                                    </QPopupEdit>
+                                                    <span>{{ opt.name }}</span>
+                                                    <span class="text-grey">{{
+                                                        opt.nickname
+                                                    }}</span>
+                                                </QItemSection>
+                                            </QItem>
+                                        </template>
+                                    </VnSelectFilter>
                                 </QTd>
                             </template>
                             <template #body-cell-agency="{ row }">

From 7072dc783b4bd97657daddb21c9b422cf1b08508 Mon Sep 17 00:00:00 2001
From: Jon <jon@verdnatura.es>
Date: Tue, 26 Mar 2024 09:56:33 +0100
Subject: [PATCH 53/54] refactor: refs #6993 fix test error

---
 test/vitest/__tests__/components/Paginate.spec.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/vitest/__tests__/components/Paginate.spec.js b/test/vitest/__tests__/components/Paginate.spec.js
index 7bd0c1eda..cf5e5d2ea 100644
--- a/test/vitest/__tests__/components/Paginate.spec.js
+++ b/test/vitest/__tests__/components/Paginate.spec.js
@@ -59,13 +59,13 @@ describe('VnPaginate', () => {
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(6);
-            expect(vm.store.data.length).toEqual(9);
+            expect(vm.store.skip).toEqual(3);
+            expect(vm.store.data.length).toEqual(6);
 
             await vm.paginate();
 
-            expect(vm.store.skip).toEqual(9);
-            expect(vm.store.data.length).toEqual(12);
+            expect(vm.store.skip).toEqual(6);
+            expect(vm.store.data.length).toEqual(9);
         });
     });
 

From 20102a89abbe03649e617d180255276e5519b434 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Wed, 27 Mar 2024 11:14:54 +0100
Subject: [PATCH 54/54] feat: refs #6893 improve VnSearchbar & create tests

---
 CHANGELOG.md                                  |  3 ++
 src/components/ui/VnSearchbar.vue             | 12 ++---
 test/cypress/integration/vnSearchBar.spec.js  | 45 ++++++++++++++-----
 .../components/common/VnSearchBar.spec.js     | 43 +++++++++++-------
 4 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51dd2010c..d15ad787d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,11 +10,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 -   (Tickets) => Se añade la opción de clonar ticket. #6951
+-   (Parking) => Se añade la sección Parking. #5186
 
 ### Changed
 
 ### Fixed
 
+-   (General) => Se corrige la redirección cuando hay 1 solo registro y cuando se aplica un filtro diferente al id al hacer una búsqueda general. #6893
+
 ## [2400.01] - 2024-01-04
 
 ### Added
diff --git a/src/components/ui/VnSearchbar.vue b/src/components/ui/VnSearchbar.vue
index 34da7cbf5..ddf520d0f 100644
--- a/src/components/ui/VnSearchbar.vue
+++ b/src/components/ui/VnSearchbar.vue
@@ -65,9 +65,9 @@ const props = defineProps({
     },
 });
 
-const { currentRoute, push } = useRouter();
+const router = useRouter();
 const arrayData = useArrayData(props.dataKey, { ...props });
-const store = arrayData.store;
+const { store } = arrayData;
 const searchText = ref('');
 
 onMounted(() => {
@@ -90,17 +90,17 @@ async function search() {
     if (!props.redirect) return;
 
     if (props.customRouteRedirectName)
-        return push({
+        return router.push({
             name: props.customRouteRedirectName,
             params: { id: searchText.value },
         });
 
-    const { matched: matches } = currentRoute.value;
+    const { matched: matches } = router.currentRoute.value;
     const { path } = matches.at(-1);
     const [, moduleName] = path.split('/');
 
     if (!store.data.length || store.data.length > 1)
-        return push({ path: `/${moduleName}/list` });
+        return router.push({ path: `/${moduleName}/list` });
 
     const targetId = store.data[0].id;
     let targetUrl;
@@ -108,7 +108,7 @@ async function search() {
     if (path.endsWith('/list')) targetUrl = path.replace('/list', `/${targetId}/summary`);
     else if (path.includes(':id')) targetUrl = path.replace(':id', targetId);
 
-    await push({ path: targetUrl });
+    await router.push({ path: targetUrl });
 }
 </script>
 
diff --git a/test/cypress/integration/vnSearchBar.spec.js b/test/cypress/integration/vnSearchBar.spec.js
index d6dea0780..3db789773 100644
--- a/test/cypress/integration/vnSearchBar.spec.js
+++ b/test/cypress/integration/vnSearchBar.spec.js
@@ -1,19 +1,42 @@
 /// <reference types="cypress" />
 describe('VnSearchBar', () => {
+    const employeeId = ' #1';
+    const salesPersonId = ' #18';
+    const idGap = '.q-item > .q-item__label';
+    const cardList = '.vn-card-list';
+
+    let url;
     beforeEach(() => {
         cy.login('developer');
-        cy.visit('/');
+        cy.visit('#/customer/list');
+        cy.url().then((currentUrl) => (url = currentUrl));
     });
 
-        it('should redirect to new customer', () => {
-            cy.visit('#/customer/1112/basic-data')
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1112')
-            cy.closeLeftMenu();
-            cy.clearSearchbar();
-            cy.writeSearchbar('1{enter}');
-            cy.openLeftMenu();
-            cy.get('.q-item > .q-item__label').should('have.text',' #1')
-            cy.closeLeftMenu();
+    it('should redirect to customer summary page', () => {
+        searchAndCheck('1', employeeId);
+        searchAndCheck('salesPerson', salesPersonId);
+    });
+
+    it('should stay on the list page if there are several results or none', () => {
+        cy.writeSearchbar('salesA{enter}');
+        checkCardListAndUrl(2);
+
+        cy.clearSearchbar();
+
+        cy.writeSearchbar('0{enter}');
+        checkCardListAndUrl(0);
+    });
+
+    const searchAndCheck = (searchTerm, expectedText) => {
+        cy.clearSearchbar();
+        cy.writeSearchbar(`${searchTerm}{enter}`);
+        cy.get(idGap).should('have.text', expectedText);
+    };
+
+    const checkCardListAndUrl = (expectedLength) => {
+        cy.get(cardList).then(($cardList) => {
+            expect($cardList.find('.q-card').length).to.equal(expectedLength);
+            cy.url().then((currentUrl) => expect(currentUrl).to.equal(url));
         });
+    };
 });
diff --git a/test/vitest/__tests__/components/common/VnSearchBar.spec.js b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
index fd0a026ef..0938ae9c0 100644
--- a/test/vitest/__tests__/components/common/VnSearchBar.spec.js
+++ b/test/vitest/__tests__/components/common/VnSearchBar.spec.js
@@ -1,11 +1,11 @@
-import { vi, describe, expect, it, beforeAll, beforeEach, afterEach } from 'vitest';
-import { createWrapper, axios } from 'app/test/vitest/helper';
+import { vi, describe, expect, it, beforeAll, afterEach, beforeEach } from 'vitest';
+import { createWrapper } from 'app/test/vitest/helper';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
-
-
+// Probar a importar como plugin vue-router en archivo helper
 describe('VnSearchBar', () => {
     let vm;
     let wrapper;
+    let pushSpy;
 
     beforeAll(() => {
         wrapper = createWrapper(VnSearchbar, {
@@ -16,7 +16,7 @@ describe('VnSearchBar', () => {
             },
         });
         vm = wrapper.vm;
-        vm.route.matched = [
+        vm.router.currentRoute.value.matched = [
             {
                 path: '/',
             },
@@ -30,24 +30,33 @@ describe('VnSearchBar', () => {
                 path: '/customer/:id/basic-data',
             },
         ];
+
+        pushSpy = vi.spyOn(vm.router, 'push');
+        vi.spyOn(vm.arrayData, 'applyFilter');
     });
 
-    afterEach(() => {
-        vi.clearAllMocks();
-    });
+    beforeEach(() => (vm.store.data = [{ id: 1112, name: 'Trash' }]));
+    afterEach(() => vi.clearAllMocks());
+
     it('should be defined', async () => {
         expect(vm.searchText).toBeDefined();
         expect(vm.searchText).toEqual('');
     });
-    it('should redirect', async () => {
-        vi.spyOn(vm.router,'push');
-        vm.searchText = '1';
+
+    it('should redirect to list page if there are several results', async () => {
+        vm.store.data.push({ id: 1, name: 'employee' });
         await vm.search();
-        expect(vm.router.push).toHaveBeenCalledWith('/customer/1/basic-data');
-        vm.searchText = '1112';
-        expect(vm.searchText).toEqual('1112');
-        vi.spyOn(vm.router,'push');
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
+    });
+
+    it('should redirect to list page if there is no results', async () => {
+        vm.store.data.pop();
         await vm.search();
-        expect(vm.router.push).toHaveBeenCalledWith('/customer/1112/basic-data');
-     });
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/list' });
+    });
+
+    it('should redirect to basic-data page if there is only one result', async () => {
+        await vm.search();
+        expect(pushSpy).toHaveBeenCalledWith({ path: '/customer/1112/basic-data' });
+    });
 });