From 78358673258863bc7e10574f4ab8bd90108c0dce Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Jan 2024 13:15:51 -0300
Subject: [PATCH 01/49] Delay 100ms form model watcher

---
 src/components/FormModel.vue | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 4ad566bf8..6887fcc96 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -75,9 +75,12 @@ onMounted(async () => {
         await fetch();
     }
 
-    // Disparamos el watcher del form después de que se haya cargado la data inicial, si así se desea
+    // Si así se desea disparamos el watcher del form después de 100ms, asi darle tiempo de que se haya cargado la data inicial
+    // para evitar que detecte cambios cuando es data inicial default
     if ($props.observeFormChanges) {
-        startFormWatcher();
+        setTimeout(() => {
+            startFormWatcher();
+        }, 100);
     }
 });
 
@@ -128,7 +131,7 @@ async function save() {
 
     try {
         const body = $props.mapper ? $props.mapper(formData.value) : formData.value;
-        let response
+        let response;
         if ($props.urlCreate) {
             response = await axios.post($props.urlCreate, body);
             notify('globals.dataCreated', 'positive');

From 7dcdaff0ef38bafc29b18b4254062c5d6b268d31 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 12:52:53 -0400
Subject: [PATCH 02/49] Add response data on form model save

---
 src/components/FormModel.vue       | 2 +-
 src/pages/Route/Card/RouteForm.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/components/FormModel.vue b/src/components/FormModel.vue
index 4ad566bf8..755cef77c 100644
--- a/src/components/FormModel.vue
+++ b/src/components/FormModel.vue
@@ -135,7 +135,7 @@ async function save() {
         } else {
             response = await axios.patch($props.urlUpdate || $props.url, body);
         }
-        emit('onDataSaved', formData.value, response);
+        emit('onDataSaved', formData.value, response?.data);
         originalData.value = JSON.parse(JSON.stringify(formData.value));
         hasChanges.value = false;
     } catch (err) {
diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 49a067c00..5acbcff0e 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -71,8 +71,8 @@ const routeFilter = {
 };
 const onSave = (data, response) => {
     if (isNew) {
-        axios.post(`Routes/${response.data?.id}/updateWorkCenter`);
-        router.push({ name: 'RouteSummary', params: { id: response.data?.id } });
+        axios.post(`Routes/${response?.id}/updateWorkCenter`);
+        router.push({ name: 'RouteSummary', params: { id: response?.id } });
     }
 };
 </script>

From 32b3d36a6aefd06f1232aadd13ad8f45504be442 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 13:06:23 -0400
Subject: [PATCH 03/49] Update time format

---
 src/components/common/VnInputTime.vue | 46 +++++++++++++++++++--------
 src/filters/toHour.js                 | 13 +++-----
 2 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/src/components/common/VnInputTime.vue b/src/components/common/VnInputTime.vue
index b705d91f6..597b2f9c7 100644
--- a/src/components/common/VnInputTime.vue
+++ b/src/components/common/VnInputTime.vue
@@ -1,8 +1,8 @@
 <script setup>
-import {computed, ref} from 'vue';
-import { toHour} from 'src/filters';
-import {useI18n} from "vue-i18n";
-import isValidDate from "filters/isValidDate";
+import { computed, ref } from 'vue';
+import { toHour } from 'src/filters';
+import { useI18n } from 'vue-i18n';
+import isValidDate from 'filters/isValidDate';
 
 const props = defineProps({
     modelValue: {
@@ -25,9 +25,14 @@ const value = computed({
         return props.modelValue;
     },
     set(value) {
-        const [hours, minutes] = value.split(':')
-        const date = new Date()
-        date.setUTCHours(Number.parseInt(hours) || 0, Number.parseInt(minutes) || 0, 0, 0)
+        const [hours, minutes] = value.split(':');
+        const date = new Date();
+        date.setUTCHours(
+            Number.parseInt(hours) || 0,
+            Number.parseInt(minutes) || 0,
+            0,
+            0
+        );
         emit('update:modelValue', value ? date.toISOString() : null);
     },
 });
@@ -40,14 +45,18 @@ const save = () => {
     value.value = internalValue.value;
 };
 const formatTime = (dateString) => {
-    if (!isValidDate(dateString)){
-        return ''
+    if (!isValidDate(dateString)) {
+        return '';
     }
+
     const date = new Date(dateString || '');
-    return `${date.getUTCHours().toString().padStart(2, '0')}:${date.getUTCMinutes().toString().padStart(2, '0')}`;
+    return date.toLocaleTimeString([], {
+        hour: '2-digit',
+        minute: '2-digit',
+    });
 };
 
-const internalValue = ref(formatTime(value))
+const internalValue = ref(formatTime(value));
 
 const styleAttrs = computed(() => {
     return props.isOutlined
@@ -82,8 +91,19 @@ const styleAttrs = computed(() => {
                         @update:model-value="onDateUpdate"
                     >
                         <div class="row items-center justify-end q-gutter-sm">
-                            <QBtn :label="t('Cancel')" color="primary" flat v-close-popup />
-                            <QBtn label="Ok" color="primary" flat @click="save" v-close-popup />
+                            <QBtn
+                                :label="t('Cancel')"
+                                color="primary"
+                                flat
+                                v-close-popup
+                            />
+                            <QBtn
+                                label="Ok"
+                                color="primary"
+                                flat
+                                @click="save"
+                                v-close-popup
+                            />
                         </div>
                     </QTime>
                 </QPopupProxy>
diff --git a/src/filters/toHour.js b/src/filters/toHour.js
index f24f81949..40821e237 100644
--- a/src/filters/toHour.js
+++ b/src/filters/toHour.js
@@ -4,13 +4,8 @@ export default function toHour(date) {
     if (!isValidDate(date)) {
         return '--:--';
     }
-    const dateHour = new Date(date);
-    let hours = dateHour.getUTCHours();
-    hours = hours % 12;
-    hours = hours ? hours : 12;
-
-    let minutes = dateHour.getUTCMinutes();
-    minutes = minutes < 10 ? minutes.toString().padStart(2, '0') : minutes;
-
-    return `${hours}:${minutes} ${dateHour.getUTCHours() >= 12 ? 'PM' : 'AM'}`;
+    return (new Date(date || '')).toLocaleTimeString([], {
+        hour: '2-digit',
+        minute: '2-digit',
+    });
 }

From e9e7cf56162a7fb453cc978855fbaa574c6a1758 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 13:14:04 -0400
Subject: [PATCH 04/49] Update route list styles

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 591f723e9..c64ed3e75 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -458,11 +458,12 @@ function previewRoute(id) {
                             </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
-                                    <div class="table-actions">
+                                    <div class="flex items-center table-actions">
                                         <QIcon
                                             name="vn:ticketAdd"
                                             size="xs"
                                             color="primary"
+                                            class="cursor-pointer"
                                         >
                                             <QTooltip>{{ t('Add ticket') }}</QTooltip>
                                         </QIcon>
@@ -471,6 +472,7 @@ function previewRoute(id) {
                                             size="xs"
                                             color="primary"
                                             @click="previewRoute(props?.row?.id)"
+                                            class="cursor-pointer"
                                         >
                                             <QTooltip>{{ t('Preview') }}</QTooltip>
                                         </QIcon>
@@ -499,13 +501,7 @@ function previewRoute(id) {
 }
 
 .table-actions {
-    display: flex;
-    align-items: center;
     gap: 12px;
-
-    i {
-        cursor: pointer;
-    }
 }
 </style>
 <i18n>

From 5bb50300ce6d5043bf8cd54a8d765d61f32a0474 Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 13:27:27 -0400
Subject: [PATCH 05/49] Update route form i18n

---
 src/pages/Route/Card/RouteForm.vue | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/pages/Route/Card/RouteForm.vue b/src/pages/Route/Card/RouteForm.vue
index 5acbcff0e..604f04357 100644
--- a/src/pages/Route/Card/RouteForm.vue
+++ b/src/pages/Route/Card/RouteForm.vue
@@ -198,6 +198,13 @@ const onSave = (data, response) => {
                             clearable
                         />
                     </div>
+                    <div class="col flex items-center">
+                        <QCheckbox
+                            size="sm"
+                            v-model="data.isOk"
+                            :label="t('Is served')"
+                        />
+                    </div>
                 </VnRow>
             </template>
             <VnRow class="row q-gutter-md q-mb-md">
@@ -212,3 +219,15 @@ const onSave = (data, response) => {
         </template>
     </FormModel>
 </template>
+<i18n>
+es:
+    Worker: Trabajador
+    Vehicle: Vehículo
+    Agency: Agencia
+    Km Start: Km de inicio
+    Km End: Km de fin
+    Hour started: Hora inicio
+    Hour finished: Hora fin
+    Description: Descripción
+    Is served: Se ha servido
+</i18n>

From 9f826ebe1d1e8aa1e46a870c8dee5f7c0e9096af Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Mon, 22 Jan 2024 15:06:02 -0400
Subject: [PATCH 06/49] Add spanish labels on router list

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index c64ed3e75..7b78181b7 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -523,4 +523,6 @@ es:
     Cancel: Cancelar
     Clone: Clonar
     Mark as served: Marcar como servidas
+    Add ticket: Añadir tickets
+    Preview: Vista previa
 </i18n>

From bc9ac631a52c4592c5215c7b4aadbc9eeaca533a Mon Sep 17 00:00:00 2001
From: Kevin Martinez <kevin.martinez@mindshore.io>
Date: Tue, 23 Jan 2024 07:16:25 -0400
Subject: [PATCH 07/49] Add route sorting based on Id

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

diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 7b78181b7..e7f011a03 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -271,6 +271,7 @@ function previewRoute(id) {
                             selection="multiple"
                             :rows-per-page-options="[0]"
                             hide-pagination
+                            :pagination="{ sortBy: 'ID', descending: true }"
                         >
                             <template #body-cell-worker="props">
                                 <QTd :props="props">

From f1ff128f4aeaea51c4dadd511c37c4a2a0b2baf2 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 23 Jan 2024 10:15:08 -0300
Subject: [PATCH 08/49] Create supplier consumption filter and fix search bar
 bug

---
 src/pages/Entry/EntryFilter.vue               |   9 -
 src/pages/Supplier/Card/SupplierCard.vue      |   1 +
 .../Supplier/Card/SupplierConsumption.vue     |  43 +++--
 .../Card/SupplierConsumptionFilter.vue        | 180 ++++++++++++++++++
 4 files changed, 210 insertions(+), 23 deletions(-)
 create mode 100644 src/pages/Supplier/Card/SupplierConsumptionFilter.vue

diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 4b326c572..f137b05e8 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -201,15 +201,6 @@ const suppliersOptions = ref([]);
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Supplier/Card/SupplierCard.vue b/src/pages/Supplier/Card/SupplierCard.vue
index 1b9b858d3..ddac988e7 100644
--- a/src/pages/Supplier/Card/SupplierCard.vue
+++ b/src/pages/Supplier/Card/SupplierCard.vue
@@ -14,6 +14,7 @@ const { t } = useI18n();
         <Teleport to="#searchbar">
             <VnSearchbar
                 data-key="SuppliersList"
+                url="Suppliers/filter"
                 :limit="20"
                 :label="t('Search suppliers')"
             />
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 714499f63..0cf66fe25 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -1,26 +1,35 @@
 <script setup>
 import { useRoute } from 'vue-router';
-import { ref, computed } from 'vue';
+import { computed, onMounted } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 
-import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
+import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
 
 import { toDate, toDateString } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
+import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'composables/useArrayData';
 
+const stateStore = useStateStore();
 const { t } = useI18n();
 const route = useRoute();
 const { openReport, sendEmail } = usePrintService();
 const quasar = useQuasar();
 const { notify } = useNotify();
 
-const suppliersConsumption = ref();
+const arrayData = useArrayData('SupplierConsumption', {
+    url: 'Suppliers/consumption',
+    order: ['itemTypeFk', 'itemName', 'itemSize'],
+    userFilter: { where: { supplierFk: route.params.id } },
+});
+
+const store = arrayData.store;
 
 const userParams = computed(() => {
     const minDate = Date.vnNew();
@@ -41,7 +50,11 @@ const reportParams = computed(() => ({
     ...userParams.value,
 }));
 
-const rows = computed(() => suppliersConsumption.value || []);
+async function getSupplierConsumptionData() {
+    await arrayData.fetch({ append: false });
+}
+
+const rows = computed(() => store.data || []);
 
 const openReportPdf = () => {
     openReport(`Suppliers/${route.params.id}/campaign-metrics-pdf`, reportParams.value);
@@ -89,21 +102,17 @@ const sendCampaignMetricsEmail = ({ address }) => {
 };
 
 const calculateTotal = (buysArray) => {
+    if (!buysArray || !buysArray.length > 0) return;
     return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 };
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    await getSupplierConsumptionData();
+});
 </script>
 
 <template>
-    <FetchData
-        url="Suppliers/consumption"
-        @on-fetch="(data) => (suppliersConsumption = data)"
-        :filter="{
-            where: { supplierFk: route.params.id },
-            order: ['itemTypeFk', 'itemName', 'itemSize'],
-        }"
-        :params="userParams"
-        auto-load
-    />
     <QToolbar class="bg-vn-dark justify-end">
         <div id="st-data">
             <QBtn
@@ -133,7 +142,13 @@ const calculateTotal = (buysArray) => {
         <QSpace />
         <div id="st-actions"></div>
     </QToolbar>
+
     <QPage class="column items-center q-pa-md">
+        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+            <QScrollArea class="fit text-grey-8">
+                <SupplierConsumptionFilter data-key="SupplierConsumption" />
+            </QScrollArea>
+        </QDrawer>
         <QTable
             :rows="rows"
             hide-bottom
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
new file mode 100644
index 000000000..4835b7663
--- /dev/null
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -0,0 +1,180 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+import VnInputDate from 'src/components/common/VnInputDate.vue';
+
+const { t } = useI18n();
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const buyersOptions = ref([]);
+const itemTypesOptions = ref([]);
+const itemCategoriesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="TicketRequests/getItemTypeWorker"
+        :filter="{
+            fields: ['id', 'nickname'],
+            order: 'nickname ASC',
+        }"
+        @on-fetch="(data) => (buyersOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="ItemTypes"
+        :filter="{
+            fields: ['id', 'name', 'categoryFk'],
+            include: 'category',
+            order: 'name ASC',
+        }"
+        @on-fetch="(data) => (itemTypesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="ItemCategories"
+        :filter="{
+            fields: ['id', 'name'],
+            order: 'name ASC',
+        }"
+        @on-fetch="(data) => (itemCategoriesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :unremovable-params="['supplierFk']"
+    >
+        <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
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.itemId"
+                        :label="t('params.itemId')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.buyerId')"
+                        v-model="params.buyerId"
+                        :options="buyersOptions"
+                        option-value="id"
+                        option-label="nickname"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.typeId')"
+                        v-model="params.typeId"
+                        :options="itemTypesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ scope.opt?.name }}</QItemLabel>
+                                    <QItemLabel caption>{{
+                                        scope.opt?.category?.name
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.categoryId')"
+                        v-model="params.categoryId"
+                        :options="itemCategoriesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        is-outlined
+                        v-model="params.from"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        is-outlined
+                        v-model="params.to"
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        search: General search
+        itemId: Item id
+        buyerId: Buyer
+        typeId: Type
+        categoryId: Category
+        from: From
+        to: To
+es:
+    params:
+        search: Búsqueda general
+        itemId: Id Artículo
+        buyerId: Comprador
+        typeId: Tipo
+        categoryId: Reino
+        from: Desde
+        to: Hasta
+</i18n>

From 78f37f57c4e7a7c2ef570a2a0f00af0f0aa6ef16 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Jan 2024 12:11:51 -0300
Subject: [PATCH 09/49] move QList element and classes inside VnFilterPanel

---
 src/components/common/VnLogFilter.vue         |  42 +-
 src/components/common/VnSelectFilter.vue      |   6 +
 src/components/ui/VnFilterPanel.vue           |  10 +-
 src/pages/Claim/ClaimFilter.vue               | 263 +++---
 src/pages/Customer/CustomerFilter.vue         | 237 +++--
 .../Defaulter/CustomerDefaulterFilter.vue     | 275 +++---
 .../CustomerExtendedListFilter.vue            | 830 +++++++++---------
 .../CustomerNotificationsFilter.vue           | 143 ++-
 .../Payments/CustomerPaymentsFilter.vue       | 117 ++-
 src/pages/Entry/EntryFilter.vue               | 288 +++---
 src/pages/InvoiceIn/InvoiceInFilter.vue       | 281 +++---
 src/pages/InvoiceOut/InvoiceOutFilter.vue     | 138 ++-
 .../InvoiceOutNegativeBasesFilter.vue         | 148 ++--
 src/pages/Order/Card/OrderCatalogFilter.vue   | 330 ++++---
 src/pages/Order/Card/OrderFilter.vue          | 294 +++----
 src/pages/Route/Card/RouteFilter.vue          | 274 +++---
 src/pages/Route/Cmr/CmrFilter.vue             | 192 ++--
 src/pages/Shelving/Card/ShelvingFilter.vue    | 110 +--
 src/pages/Ticket/TicketFilter.vue             | 322 ++++---
 src/pages/Travel/ExtraCommunityFilter.vue     | 285 +++---
 src/pages/Travel/TravelFilter.vue             | 401 +++++----
 src/pages/Worker/WorkerFilter.vue             | 134 ++-
 22 files changed, 2476 insertions(+), 2644 deletions(-)

diff --git a/src/components/common/VnLogFilter.vue b/src/components/common/VnLogFilter.vue
index 5f4dbf717..b5941239c 100644
--- a/src/components/common/VnLogFilter.vue
+++ b/src/components/common/VnLogFilter.vue
@@ -38,28 +38,26 @@ const workers = ref();
                 minimal
             >
             </QDate>
-            <QList dense>
-                <QSeparator />
-                <QItem>
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <QSelect
-                            :label="t('User')"
-                            v-model="params.userFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QSeparator />
+            <QItem>
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        :label="t('User')"
+                        v-model="params.userFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..377a39a0e 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -116,3 +116,9 @@ watch(options, (newValue) => {
         </template>
     </QSelect>
 </template>
+
+<style scoped lang="scss">
+.q-field--outlined {
+    max-width: 100%;
+}
+</style>
diff --git a/src/components/ui/VnFilterPanel.vue b/src/components/ui/VnFilterPanel.vue
index 0a306dc5f..708a170a2 100644
--- a/src/components/ui/VnFilterPanel.vue
+++ b/src/components/ui/VnFilterPanel.vue
@@ -216,7 +216,9 @@ function formatValue(value) {
             </QItem>
             <QSeparator />
         </QList>
-        <slot name="body" :params="userParams" :search-fn="search"></slot>
+        <QList dense class="list q-gutter-y-sm q-mt-sm">
+            <slot name="body" :params="userParams" :search-fn="search"></slot>
+        </QList>
         <template v-if="props.searchButton">
             <QItem>
                 <QItemSection class="q-py-sm">
@@ -242,6 +244,12 @@ function formatValue(value) {
     />
 </template>
 
+<style scoped lang="scss">
+.list {
+    width: 256px;
+}
+</style>
+
 <i18n>
 es:
     No filters applied: No se han aplicado filtros
diff --git a/src/pages/Claim/ClaimFilter.vue b/src/pages/Claim/ClaimFilter.vue
index b06f47653..ee702ffdd 100644
--- a/src/pages/Claim/ClaimFilter.vue
+++ b/src/pages/Claim/ClaimFilter.vue
@@ -36,123 +36,122 @@ const states = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
-                            lazy-rules
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="xs"></QIcon> </template
-                        ></VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Client Name')"
-                            v-model="params.clientName"
-                            lazy-rules
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Attender')"
-                            v-model="params.attenderFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Responsible')"
-                            v-model="params.claimResponsibleFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!states">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="states">
-                        <VnSelectFilter
-                            :label="t('State')"
-                            v-model="params.claimStateFk"
-                            @update:model-value="searchFn()"
-                            :options="states"
-                            option-value="id"
-                            option-label="description"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <!-- <QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        lazy-rules
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="xs"></QIcon> </template
+                    ></VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Client Name')"
+                        v-model="params.clientName"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Attender')"
+                        v-model="params.attenderFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Responsible')"
+                        v-model="params.claimResponsibleFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!states">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="states">
+                    <VnSelectFilter
+                        :label="t('State')"
+                        v-model="params.claimStateFk"
+                        @update:model-value="searchFn()"
+                        :options="states"
+                        option-value="id"
+                        option-label="description"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
+                <!-- <QItem>
                         <QItemSection>
                             <qSelect
                                 :label="t('Item')"
@@ -168,30 +167,20 @@ const states = ref();
                             />
                         </QItemSection>
                     </QItem> -->
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.created"
-                                :label="t('Created')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="t('Created')"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/CustomerFilter.vue b/src/pages/Customer/CustomerFilter.vue
index 36a9add89..593b45509 100644
--- a/src/pages/Customer/CustomerFilter.vue
+++ b/src/pages/Customer/CustomerFilter.vue
@@ -37,153 +37,134 @@ const zones = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-my-sm">
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
+                        <template #prepend>
+                            <QIcon name="badge" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Social Name')"
+                        v-model="params.socialName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!provinces">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="provinces">
+                    <VnSelectFilter
+                        :label="t('Province')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provinces"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <VnInput :label="t('City')" v-model="params.city" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
+                <QItem>
                     <QItemSection>
-                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined>
+                        <VnInput :label="t('Phone')" v-model="params.phone" is-outlined>
                             <template #prepend>
-                                <QIcon name="badge" size="xs" />
+                                <QIcon name="phone" size="xs" />
                             </template>
                         </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
                     <QItemSection>
-                        <VnInput :label="t('Name')" v-model="params.name" is-outlined />
+                        <VnInput :label="t('Email')" v-model="params.email" is-outlined>
+                            <template #prepend>
+                                <QIcon name="email" size="sm" />
+                            </template>
+                        </VnInput>
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
+                <QItem>
+                    <QItemSection v-if="!zones">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="zones">
+                        <VnSelectFilter
+                            :label="t('Zone')"
+                            v-model="params.zoneFk"
+                            @update:model-value="searchFn()"
+                            :options="zones"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            hide-selected
+                            dense
+                            outlined
+                            rounded
+                        />
+                    </QItemSection>
+                </QItem>
+                <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('Social Name')"
-                            v-model="params.socialName"
+                            :label="t('Postcode')"
+                            v-model="params.postcode"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!provinces">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="provinces">
-                        <VnSelectFilter
-                            :label="t('Province')"
-                            v-model="params.provinceFk"
-                            @update:model-value="searchFn()"
-                            :options="provinces"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <VnInput :label="t('City')" v-model="params.city" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Phone')"
-                                v-model="params.phone"
-                                is-outlined
-                            >
-                                <template #prepend>
-                                    <QIcon name="phone" size="xs" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Email')"
-                                v-model="params.email"
-                                is-outlined
-                            >
-                                <template #prepend>
-                                    <QIcon name="email" size="sm" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!zones">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="zones">
-                            <VnSelectFilter
-                                :label="t('Zone')"
-                                v-model="params.zoneFk"
-                                @update:model-value="searchFn()"
-                                :options="zones"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                hide-selected
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('Postcode')"
-                                v-model="params.postcode"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
index 43ceb1bac..f26af5975 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulterFilter.vue
@@ -46,163 +46,148 @@ const authors = ref();
         </template>
 
         <template #body="{ params }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
-                    <QItemSection v-if="clients">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Client')"
-                            :options="clients"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="clientTypeFk"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.clientFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm q-mt-sm">
+                <QItemSection v-if="clients">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Client')"
+                        :options="clients"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="clientTypeFk"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.clientFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="salespersons">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Salesperson')"
-                            :options="salespersons"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.salesPersonFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="salespersons">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Salesperson')"
+                        :options="salespersons"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.salesPersonFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="countries">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Country')"
-                            :options="countries"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="country"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.countryFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="countries">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Country')"
+                        :options="countries"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="country"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.countryFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('P. Method')"
-                            is-outlined
-                            v-model="params.paymentMethod"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('P. Method')"
+                        is-outlined
+                        v-model="params.paymentMethod"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Balance D.')"
-                            is-outlined
-                            v-model="params.balance"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Balance D.')"
+                        is-outlined
+                        v-model="params.balance"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="authors">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Author')"
-                            :options="authors"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="id"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.workerFk"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton class="full-width" type="QInput" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="authors">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Author')"
+                        :options="authors"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="id"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.workerFk"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton class="full-width" type="QInput" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('L. O. Date')"
-                            is-outlined
-                            v-model="params.date"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('L. O. Date')" is-outlined v-model="params.date" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Credit I.')"
-                            is-outlined
-                            v-model="params.credit"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Credit I.')"
+                        is-outlined
+                        v-model="params.credit"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('From')"
-                            is-outlined
-                            v-model="params.defaulterSinced"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('From')"
+                        is-outlined
+                        v-model="params.defaulterSinced"
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
index 46b4e1e7b..df898e7c1 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedListFilter.vue
@@ -145,27 +145,26 @@ const shouldRenderColumn = (colName) => {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem v-if="shouldRenderColumn('id')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.id')"
-                            v-model="params.id"
-                            is-outlined
-                            clearable
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('name')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.name')"
-                            v-model="params.name"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <!-- <QItem class="q-mb-sm">
+            <QItem v-if="shouldRenderColumn('id')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.id')"
+                        v-model="params.id"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('name')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.name')"
+                        v-model="params.name"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <!-- <QItem class="q-mb-sm">
                     <QItemSection v-if="!clients">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
@@ -188,429 +187,384 @@ const shouldRenderColumn = (colName) => {
                         />
                     </QItemSection>
                 </QItem> -->
-                <QItem v-if="shouldRenderColumn('fi')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.fi')"
-                            v-model="params.fi"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('salesPersonFk')">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.salesPersonFk'
-                                )
-                            "
-                            v-model="params.salesPersonFk"
-                            @update:model-value="searchFn()"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('credit')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.credit')"
-                            v-model="params.credit"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('creditInsurance')">
-                    <QItemSection>
-                        <VnInput
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.creditInsurance'
-                                )
-                            "
-                            v-model="params.creditInsurance"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('phone')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.phone')"
-                            v-model="params.phone"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('mobile')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.mobile')"
-                            v-model="params.mobile"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('street')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.street')"
-                            v-model="params.street"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('countryFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.countryFk')
-                            "
-                            v-model="params.countryFk"
-                            @update:model-value="searchFn()"
-                            :options="countriesOptions"
-                            option-value="id"
-                            option-label="country"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('provinceFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.provinceFk')
-                            "
-                            v-model="params.provinceFk"
-                            @update:model-value="searchFn()"
-                            :options="provincesOptions"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('city')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.city')"
-                            v-model="params.city"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('postcode')">
-                    <QItemSection>
-                        <VnInput
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.postcode')
-                            "
-                            v-model="params.postcode"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('email')">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('customer.extendedList.tableVisibleColumns.email')"
-                            v-model="params.email"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem v-if="shouldRenderColumn('fi')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.fi')"
+                        v-model="params.fi"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('salesPersonFk')">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.salesPersonFk')
+                        "
+                        v-model="params.salesPersonFk"
+                        @update:model-value="searchFn()"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('credit')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.credit')"
+                        v-model="params.credit"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('creditInsurance')">
+                <QItemSection>
+                    <VnInput
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.creditInsurance')
+                        "
+                        v-model="params.creditInsurance"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('phone')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.phone')"
+                        v-model="params.phone"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('mobile')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.mobile')"
+                        v-model="params.mobile"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('street')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.street')"
+                        v-model="params.street"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('countryFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('customer.extendedList.tableVisibleColumns.countryFk')"
+                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="country"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('provinceFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('customer.extendedList.tableVisibleColumns.provinceFk')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provincesOptions"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('city')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.city')"
+                        v-model="params.city"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('postcode')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.postcode')"
+                        v-model="params.postcode"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('email')">
+                <QItemSection>
+                    <VnInput
+                        :label="t('customer.extendedList.tableVisibleColumns.email')"
+                        v-model="params.email"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem v-if="shouldRenderColumn('created')">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.created"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.created')
-                            "
-                            @update:model-value="searchFn()"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('businessTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.businessTypeFk'
-                                )
-                            "
-                            v-model="params.businessTypeFk"
-                            :options="businessTypesOptions"
-                            @update:model-value="searchFn()"
-                            option-value="code"
-                            option-label="description"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('payMethodFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.payMethodFk')
-                            "
-                            v-model="params.payMethodFk"
-                            :options="paymethodsOptions"
-                            @update:model-value="searchFn()"
-                            option-value="id"
-                            option-label="name"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.sageTaxTypeFk'
-                                )
-                            "
-                            v-model="params.sageTaxTypeFk"
-                            @update:model-value="searchFn()"
-                            :options="sageTaxTypesOptions"
-                            option-value="id"
-                            option-label="vat"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
-                                )
-                            "
-                            v-model="params.sageTransactionTypeFk"
-                            @update:model-value="searchFn()"
-                            :options="sageTransactionTypesOptions"
-                            option-value="id"
-                            option-label="transaction"
-                            map-options
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')"
-                >
-                    <QItemSection v-if="shouldRenderColumn('isActive')">
-                        <QCheckbox
-                            v-model="params.isActive"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.isActive')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isVies')">
-                        <QCheckbox
-                            v-model="params.isVies"
-                            @update:model-value="searchFn()"
-                            :label="t('customer.extendedList.tableVisibleColumns.isVies')"
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('isEqualizated') ||
-                        shouldRenderColumn('isTaxDataChecked')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
-                        <QCheckbox
-                            v-model="params.isTaxDataChecked"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isEqualizated')">
-                        <QCheckbox
-                            v-model="params.isEqualizated"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isEqualizated'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('hasToInvoice') ||
-                        shouldRenderColumn('isFreezed')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('isFreezed')">
-                        <QCheckbox
-                            v-model="params.isFreezed"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.isFreezed')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
-                        <QCheckbox
-                            v-model="params.hasToInvoice"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.hasToInvoice'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('isToBeMailed') ||
-                        shouldRenderColumn('hasToInvoiceByAddress')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
-                        <QCheckbox
-                            v-model="params.hasToInvoiceByAddress"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
-                        <QCheckbox
-                            v-model="params.isToBeMailed"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t(
-                                    'customer.extendedList.tableVisibleColumns.isToBeMailed'
-                                )
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-if="
-                        shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')
-                    "
-                >
-                    <QItemSection v-if="shouldRenderColumn('hasLcr')">
-                        <QCheckbox
-                            v-model="params.hasLcr"
-                            @update:model-value="searchFn()"
-                            :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                    <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
-                        <QCheckbox
-                            v-model="params.hasCoreVnl"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.hasCoreVnl')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem v-if="shouldRenderColumn('hasSepaVnl')">
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasSepaVnl"
-                            @update:model-value="searchFn()"
-                            :label="
-                                t('customer.extendedList.tableVisibleColumns.hasSepaVnl')
-                            "
-                            toggle-indeterminate
-                            :false-value="undefined"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem v-if="shouldRenderColumn('created')">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.created"
+                        :label="t('customer.extendedList.tableVisibleColumns.created')"
+                        @update:model-value="searchFn()"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('businessTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.businessTypeFk')
+                        "
+                        v-model="params.businessTypeFk"
+                        :options="businessTypesOptions"
+                        @update:model-value="searchFn()"
+                        option-value="code"
+                        option-label="description"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('payMethodFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.payMethodFk')
+                        "
+                        v-model="params.payMethodFk"
+                        :options="paymethodsOptions"
+                        @update:model-value="searchFn()"
+                        option-value="id"
+                        option-label="name"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('sageTaxTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.sageTaxTypeFk')
+                        "
+                        v-model="params.sageTaxTypeFk"
+                        @update:model-value="searchFn()"
+                        :options="sageTaxTypesOptions"
+                        option-value="id"
+                        option-label="vat"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('sageTransactionTypeFk')">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.sageTransactionTypeFk'
+                            )
+                        "
+                        v-model="params.sageTransactionTypeFk"
+                        @update:model-value="searchFn()"
+                        :options="sageTransactionTypesOptions"
+                        option-value="id"
+                        option-label="transaction"
+                        map-options
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('isActive') || shouldRenderColumn('isVies')">
+                <QItemSection v-if="shouldRenderColumn('isActive')">
+                    <QCheckbox
+                        v-model="params.isActive"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isActive')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isVies')">
+                    <QCheckbox
+                        v-model="params.isVies"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isVies')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('isEqualizated') ||
+                    shouldRenderColumn('isTaxDataChecked')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('isTaxDataChecked')">
+                    <QCheckbox
+                        v-model="params.isTaxDataChecked"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.isTaxDataChecked'
+                            )
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isEqualizated')">
+                    <QCheckbox
+                        v-model="params.isEqualizated"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.isEqualizated')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('hasToInvoice') || shouldRenderColumn('isFreezed')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('isFreezed')">
+                    <QCheckbox
+                        v-model="params.isFreezed"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.isFreezed')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('hasToInvoice')">
+                    <QCheckbox
+                        v-model="params.hasToInvoice"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.hasToInvoice')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="
+                    shouldRenderColumn('isToBeMailed') ||
+                    shouldRenderColumn('hasToInvoiceByAddress')
+                "
+            >
+                <QItemSection v-if="shouldRenderColumn('hasToInvoiceByAddress')">
+                    <QCheckbox
+                        v-model="params.hasToInvoiceByAddress"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t(
+                                'customer.extendedList.tableVisibleColumns.hasToInvoiceByAddress'
+                            )
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('isToBeMailed')">
+                    <QCheckbox
+                        v-model="params.isToBeMailed"
+                        @update:model-value="searchFn()"
+                        :label="
+                            t('customer.extendedList.tableVisibleColumns.isToBeMailed')
+                        "
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-if="shouldRenderColumn('hasLcr') || shouldRenderColumn('hasCoreVnl')"
+            >
+                <QItemSection v-if="shouldRenderColumn('hasLcr')">
+                    <QCheckbox
+                        v-model="params.hasLcr"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasLcr')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+                <QItemSection v-if="shouldRenderColumn('hasCoreVnl')">
+                    <QCheckbox
+                        v-model="params.hasCoreVnl"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasCoreVnl')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem v-if="shouldRenderColumn('hasSepaVnl')">
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasSepaVnl"
+                        @update:model-value="searchFn()"
+                        :label="t('customer.extendedList.tableVisibleColumns.hasSepaVnl')"
+                        toggle-indeterminate
+                        :false-value="undefined"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QSeparator />
-            </QList>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 es:
     Social name: Razón social
diff --git a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
index 650158278..957abb7a3 100644
--- a/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
+++ b/src/pages/Customer/Notifications/CustomerNotificationsFilter.vue
@@ -36,91 +36,80 @@ const clients = ref();
         </template>
 
         <template #body="{ params, searchFn }">
-            <QList dense class="list">
-                <QItem class="q-mb-sm q-mt-sm">
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Identifier')"
-                            is-outlined
-                            v-model="params.identifier"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm q-mt-sm">
+                <QItemSection>
+                    <VnInput
+                        :label="t('Identifier')"
+                        is-outlined
+                        v-model="params.identifier"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!clients">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="clients">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('Social name')"
-                            :options="clients"
-                            @update:model-value="searchFn()"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="socialName"
-                            option-value="socialName"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.socialName"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!clients">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="clients">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('Social name')"
+                        :options="clients"
+                        @update:model-value="searchFn()"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="socialName"
+                        option-value="socialName"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.socialName"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!cities">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="cities">
-                        <VnSelectFilter
-                            :input-debounce="0"
-                            :label="t('City')"
-                            :options="cities"
-                            @update:model-value="searchFn()"
-                            dense
-                            emit-value
-                            hide-selected
-                            map-options
-                            option-label="name"
-                            option-value="name"
-                            outlined
-                            rounded
-                            use-input
-                            v-model="params.city"
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!cities">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="cities">
+                    <VnSelectFilter
+                        :input-debounce="0"
+                        :label="t('City')"
+                        :options="cities"
+                        @update:model-value="searchFn()"
+                        dense
+                        emit-value
+                        hide-selected
+                        map-options
+                        option-label="name"
+                        option-value="name"
+                        outlined
+                        rounded
+                        use-input
+                        v-model="params.city"
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
-                    </QItemSection>
-                </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Phone')" is-outlined v-model="params.phone" />
+                </QItemSection>
+            </QItem>
 
-                <QItem class="q-mb-sm">
-                    <QItemSection>
-                        <VnInput :label="t('Email')" is-outlined v-model="params.email" />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+            <QItem class="q-mb-sm">
+                <QItemSection>
+                    <VnInput :label="t('Email')" is-outlined v-model="params.email" />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
index a19b35a20..74ea2c203 100644
--- a/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
+++ b/src/pages/Customer/Payments/CustomerPaymentsFilter.vue
@@ -27,71 +27,60 @@ function isValidNumber(value) {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Order ID')"
-                            v-model="params.orderFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:basket" size="xs" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="xs" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
-                            is-outlined
-                            @update:model-value="
-                                (value) => {
-                                    if (value.includes(','))
-                                        params.amount = params.amount.replace(',', '.');
-                                }
-                            "
-                            :rules="[
-                                (val) =>
-                                    isValidNumber(val) || !val || 'Please type a number',
-                            ]"
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="euro" size="sm" />
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Order ID')" v-model="params.orderFk" is-outlined>
+                        <template #prepend>
+                            <QIcon name="vn:basket" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="xs" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                        @update:model-value="
+                            (value) => {
+                                if (value.includes(','))
+                                    params.amount = params.amount.replace(',', '.');
+                            }
+                        "
+                        :rules="[
+                            (val) => isValidNumber(val) || !val || 'Please type a number',
+                        ]"
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="euro" size="sm" />
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
 
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Entry/EntryFilter.vue b/src/pages/Entry/EntryFilter.vue
index 59ce06a00..f137b05e8 100644
--- a/src/pages/Entry/EntryFilter.vue
+++ b/src/pages/Entry/EntryFilter.vue
@@ -54,151 +54,149 @@ const suppliersOptions = ref([]);
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.search"
-                            :label="t('params.search')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.reference"
-                            :label="t('params.reference')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.invoiceNumber"
-                            :label="t('params.invoiceNumber')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.travelFk"
-                            :label="t('params.travelFk')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.companyFk')"
-                            v-model="params.companyFk"
-                            :options="companiesOptions"
-                            option-value="id"
-                            option-label="code"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.currencyFk')"
-                            v-model="params.currencyFk"
-                            :options="currenciesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.supplierFk')"
-                            v-model="params.supplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        >
-                            <template #option="scope">
-                                <QItem v-bind="scope.itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{
-                                            scope.opt?.name + ': ' + scope.opt?.nickname
-                                        }}</QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.created')"
-                            is-outlined
-                            v-model="params.created"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.from')"
-                            is-outlined
-                            v-model="params.from"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            :label="t('params.to')"
-                            is-outlined
-                            v-model="params.to"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isBooked')"
-                            v-model="params.isBooked"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isConfirmed')"
-                            v-model="params.isConfirmed"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isOrdered')"
-                            v-model="params.isOrdered"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.reference"
+                        :label="t('params.reference')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.invoiceNumber"
+                        :label="t('params.invoiceNumber')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.travelFk"
+                        :label="t('params.travelFk')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.companyFk')"
+                        v-model="params.companyFk"
+                        :options="companiesOptions"
+                        option-value="id"
+                        option-label="code"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.currencyFk')"
+                        v-model="params.currencyFk"
+                        :options="currenciesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #option="scope">
+                            <QItem v-bind="scope.itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{
+                                        scope.opt?.name + ': ' + scope.opt?.nickname
+                                    }}</QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.created')"
+                        is-outlined
+                        v-model="params.created"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.from')"
+                        is-outlined
+                        v-model="params.from"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        :label="t('params.to')"
+                        is-outlined
+                        v-model="params.to"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isBooked')"
+                        v-model="params.isBooked"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isConfirmed')"
+                        v-model="params.isConfirmed"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isOrdered')"
+                        v-model="params.isOrdered"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/InvoiceIn/InvoiceInFilter.vue b/src/pages/InvoiceIn/InvoiceInFilter.vue
index f8198d237..dec798906 100644
--- a/src/pages/InvoiceIn/InvoiceInFilter.vue
+++ b/src/pages/InvoiceIn/InvoiceInFilter.vue
@@ -36,55 +36,121 @@ const suppliersRef = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Id or Supplier')"
+                        v-model="params.search"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.supplierRef')"
+                        v-model="params.supplierRef"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.supplierFk')"
+                        v-model="params.supplierFk"
+                        :options="suppliers"
+                        option-value="id"
+                        option-label="nickname"
+                        @input-value="suppliersRef.fetch()"
+                        dense
+                        outlined
+                        rounded
+                    >
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.fi')"
+                        v-model="params.fi"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.serialNumber')"
+                        v-model="params.serialNumber"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.serial')"
+                        v-model="params.serial"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Amount')"
+                        v-model="params.amount"
+                        is-outlined
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="euro" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('params.isBooked')"
+                        v-model="params.isBooked"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('Id or Supplier')"
-                            v-model="params.search"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.supplierRef')"
-                            v-model="params.supplierRef"
-                            is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.supplierFk')"
-                            v-model="params.supplierFk"
-                            :options="suppliers"
-                            option-value="id"
-                            option-label="nickname"
-                            @input-value="suppliersRef.fetch()"
-                            dense
-                            outlined
-                            rounded
-                        >
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.fi')"
-                            v-model="params.fi"
+                            :label="t('params.awb')"
+                            v-model="params.awbCode"
                             is-outlined
                             lazy-rules
                         >
@@ -97,126 +163,45 @@ const suppliersRef = ref();
                 <QItem>
                     <QItemSection>
                         <VnInput
-                            :label="t('params.serialNumber')"
-                            v-model="params.serialNumber"
+                            :label="t('params.account')"
+                            v-model="params.account"
                             is-outlined
                             lazy-rules
                         >
                             <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
+                                <QIcon name="person" size="sm" />
                             </template>
                         </VnInput>
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInput
-                            :label="t('params.serial')"
-                            v-model="params.serial"
+                        <VnInputDate
+                            :label="t('From')"
+                            v-model="params.from"
                             is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
-                            is-outlined
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="euro" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('params.isBooked')"
-                            v-model="params.isBooked"
-                            @update:model-value="searchFn()"
-                            toggle-indeterminate
                         />
                     </QItemSection>
                 </QItem>
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('params.awb')"
-                                v-model="params.awbCode"
-                                is-outlined
-                                lazy-rules
-                            >
-                                <template #prepend>
-                                    <QIcon name="badge" size="sm"></QIcon>
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInput
-                                :label="t('params.account')"
-                                v-model="params.account"
-                                is-outlined
-                                lazy-rules
-                            >
-                                <template #prepend>
-                                    <QIcon name="person" size="sm" />
-                                </template>
-                            </VnInput>
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('From')"
-                                v-model="params.from"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('To')"
-                                v-model="params.to"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                :label="t('Issued')"
-                                v-model="params.issued"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate :label="t('To')" v-model="params.to" is-outlined />
+                    </QItemSection>
+                </QItem>
+                <QItem>
+                    <QItemSection>
+                        <VnInputDate
+                            :label="t('Issued')"
+                            v-model="params.issued"
+                            is-outlined
+                        />
+                    </QItemSection>
+                </QItem>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/InvoiceOut/InvoiceOutFilter.vue b/src/pages/InvoiceOut/InvoiceOutFilter.vue
index 124ea00d1..f8a430b51 100644
--- a/src/pages/InvoiceOut/InvoiceOutFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutFilter.vue
@@ -41,95 +41,89 @@ function setWorkers(data) {
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Customer ID')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.fi" :label="t('FI')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('Amount')" v-model="params.amount" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        :label="t('Min')"
+                        dense
+                        lazy-rules
+                        outlined
+                        rounded
+                        type="number"
+                        v-model.number="params.min"
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QInput
+                        :label="t('Max')"
+                        dense
+                        lazy-rules
+                        outlined
+                        rounded
+                        type="number"
+                        v-model.number="params.max"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('Has PDF')"
+                        @update:model-value="searchFn()"
+                        toggle-indeterminate
+                        v-model="params.hasPdf"
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
                     <QItemSection>
-                        <VnInput
-                            :label="t('Customer ID')"
-                            v-model="params.clientFk"
+                        <VnInputDate
+                            v-model="params.issued"
+                            :label="t('Issued')"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <VnInput v-model="params.fi" :label="t('FI')" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Amount')"
-                            v-model="params.amount"
+                        <VnInputDate
+                            v-model="params.created"
+                            :label="t('Created')"
                             is-outlined
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
                     <QItemSection>
-                        <QInput
-                            :label="t('Min')"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
-                            type="number"
-                            v-model.number="params.min"
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QInput
-                            :label="t('Max')"
-                            dense
-                            lazy-rules
-                            outlined
-                            rounded
-                            type="number"
-                            v-model.number="params.max"
+                        <VnInputDate
+                            v-model="params.dued"
+                            :label="t('Dued')"
+                            is-outlined
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('Has PDF')"
-                            @update:model-value="searchFn()"
-                            toggle-indeterminate
-                            v-model="params.hasPdf"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.issued"
-                                :label="t('Issued')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.created"
-                                :label="t('Created')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection>
-                            <VnInputDate
-                                v-model="params.dued"
-                                :label="t('Dued')"
-                                is-outlined
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
index 028246aeb..3adfa1d13 100644
--- a/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
+++ b/src/pages/InvoiceOut/InvoiceOutNegativeBasesFilter.vue
@@ -27,87 +27,83 @@ const props = defineProps({
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('invoiceOut.negativeBases.from')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('invoiceOut.negativeBases.to')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.company"
-                            :label="t('invoiceOut.negativeBases.company')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.country"
-                            :label="t('invoiceOut.negativeBases.country')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('invoiceOut.negativeBases.from')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('invoiceOut.negativeBases.to')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.company"
+                        :label="t('invoiceOut.negativeBases.company')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.country"
+                        :label="t('invoiceOut.negativeBases.country')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
 
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientId"
-                            :label="t('invoiceOut.negativeBases.clientId')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientSocialName"
-                            :label="t('invoiceOut.negativeBases.client')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.amount"
-                            :label="t('invoiceOut.negativeBases.amount')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.comercialName"
-                            :label="t('invoiceOut.negativeBases.comercial')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientId"
+                        :label="t('invoiceOut.negativeBases.clientId')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientSocialName"
+                        :label="t('invoiceOut.negativeBases.client')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.amount"
+                        :label="t('invoiceOut.negativeBases.amount')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.comercialName"
+                        :label="t('invoiceOut.negativeBases.comercial')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style scoped></style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Order/Card/OrderCatalogFilter.vue b/src/pages/Order/Card/OrderCatalogFilter.vue
index c325a9b05..760c48726 100644
--- a/src/pages/Order/Card/OrderCatalogFilter.vue
+++ b/src/pages/Order/Card/OrderCatalogFilter.vue
@@ -219,183 +219,181 @@ const getCategoryClass = (category, params) => {
             </template>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense style="max-width: 256px">
-                <QItem class="category-filter q-mt-md">
-                    <div
-                        v-for="category in categoryList"
-                        :key="category.name"
-                        :class="['category', getCategoryClass(category, params)]"
-                    >
-                        <QIcon
-                            :name="category.icon"
-                            class="category-icon"
-                            @click="selectCategory(params, category, searchFn)"
-                        >
-                            <QTooltip>
-                                {{ t(category.name) }}
-                            </QTooltip>
-                        </QIcon>
-                    </div>
-                </QItem>
-                <QItem class="q-my-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.type')"
-                            v-model="params.typeFk"
-                            :options="typeList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            use-input
-                            :disable="!selectedCategoryFk"
-                            @update:model-value="
-                                (value) => {
-                                    selectedTypeFk = value;
-                                    searchFn();
-                                }
-                            "
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.categoryName }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QItem class="q-my-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.order')"
-                            v-model="selectedOrder"
-                            :options="orderList || []"
-                            option-value="way"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                            :is-clearable="false"
-                            @update:model-value="
-                                (value) => onOrderChange(value, params, searchFn)
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.order')"
-                            v-model="selectedOrderField"
-                            :options="OrderFields || []"
-                            option-value="field"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                            :is-clearable="false"
-                            @update:model-value="
-                                (value) => onOrderFieldChange(value, params, searchFn)
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QItem class="q-mt-md">
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.tag')"
-                            v-model="selectedTag"
-                            :options="props.tags || []"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            :emit-value="false"
-                            use-input
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem
-                    v-for="(value, index) in tagValues"
-                    :key="value"
-                    class="q-mt-md filter-value"
+            <QItem class="category-filter q-mt-md">
+                <div
+                    v-for="category in categoryList"
+                    :key="category.name"
+                    :class="['category', getCategoryClass(category, params)]"
                 >
-                    <VnInput
-                        v-if="selectedTag?.isFree"
-                        v-model="value.value"
-                        :label="t('params.value')"
-                        is-outlined
-                        class="filter-input"
-                    />
+                    <QIcon
+                        :name="category.icon"
+                        class="category-icon"
+                        @click="selectCategory(params, category, searchFn)"
+                    >
+                        <QTooltip>
+                            {{ t(category.name) }}
+                        </QTooltip>
+                    </QIcon>
+                </div>
+            </QItem>
+            <QItem class="q-my-md">
+                <QItemSection>
                     <VnSelectFilter
-                        v-else
-                        :label="t('params.value')"
-                        v-model="value.value"
-                        :options="tagOptions || []"
-                        option-value="value"
-                        option-label="value"
+                        :label="t('params.type')"
+                        v-model="params.typeFk"
+                        :options="typeList"
+                        option-value="id"
+                        option-label="name"
                         dense
                         outlined
                         rounded
                         emit-value
                         use-input
-                        :disable="!selectedTag"
-                        class="filter-input"
+                        :disable="!selectedCategoryFk"
+                        @update:model-value="
+                            (value) => {
+                                selectedTypeFk = value;
+                                searchFn();
+                            }
+                        "
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.categoryName }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QItem class="q-my-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.order')"
+                        v-model="selectedOrder"
+                        :options="orderList || []"
+                        option-value="way"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            (value) => onOrderChange(value, params, searchFn)
+                        "
                     />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.order')"
+                        v-model="selectedOrderField"
+                        :options="OrderFields || []"
+                        option-value="field"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                        :is-clearable="false"
+                        @update:model-value="
+                            (value) => onOrderFieldChange(value, params, searchFn)
+                        "
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QItem class="q-mt-md">
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.tag')"
+                        v-model="selectedTag"
+                        :options="props.tags || []"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        :emit-value="false"
+                        use-input
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem
+                v-for="(value, index) in tagValues"
+                :key="value"
+                class="q-mt-md filter-value"
+            >
+                <VnInput
+                    v-if="selectedTag?.isFree"
+                    v-model="value.value"
+                    :label="t('params.value')"
+                    is-outlined
+                    class="filter-input"
+                />
+                <VnSelectFilter
+                    v-else
+                    :label="t('params.value')"
+                    v-model="value.value"
+                    :options="tagOptions || []"
+                    option-value="value"
+                    option-label="value"
+                    dense
+                    outlined
+                    rounded
+                    emit-value
+                    use-input
+                    :disable="!selectedTag"
+                    class="filter-input"
+                />
 
-                    <FetchData
-                        v-if="selectedTag && !selectedTag.isFree"
-                        :url="`Tags/${selectedTag?.id}/filterValue`"
-                        limit="30"
-                        auto-load
-                        @on-fetch="(data) => (tagOptions = data)"
-                    />
+                <FetchData
+                    v-if="selectedTag && !selectedTag.isFree"
+                    :url="`Tags/${selectedTag?.id}/filterValue`"
+                    limit="30"
+                    auto-load
+                    @on-fetch="(data) => (tagOptions = data)"
+                />
 
-                    <QIcon
-                        name="delete"
-                        class="filter-icon"
-                        @click="(tagValues || []).splice(index, 1)"
+                <QIcon
+                    name="delete"
+                    class="filter-icon"
+                    @click="(tagValues || []).splice(index, 1)"
+                />
+            </QItem>
+            <QItem class="q-mt-lg">
+                <QIcon
+                    name="add_circle"
+                    class="filter-icon"
+                    @click="tagValues.push({})"
+                />
+            </QItem>
+            <QItem>
+                <QItemSection class="q-py-sm">
+                    <QBtn
+                        :label="t('Search')"
+                        class="full-width"
+                        color="primary"
+                        dense
+                        icon="search"
+                        rounded
+                        type="button"
+                        unelevated
+                        :disable="isButtonDisabled"
+                        @click.stop="applyTagFilter(params, searchFn)"
                     />
-                </QItem>
-                <QItem class="q-mt-lg">
-                    <QIcon
-                        name="add_circle"
-                        class="filter-icon"
-                        @click="tagValues.push({})"
-                    />
-                </QItem>
-                <QItem>
-                    <QItemSection class="q-py-sm">
-                        <QBtn
-                            :label="t('Search')"
-                            class="full-width"
-                            color="primary"
-                            dense
-                            icon="search"
-                            rounded
-                            type="button"
-                            unelevated
-                            :disable="isButtonDisabled"
-                            @click.stop="applyTagFilter(params, searchFn)"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-            </QList>
+                </QItemSection>
+            </QItem>
+            <QSeparator />
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Order/Card/OrderFilter.vue b/src/pages/Order/Card/OrderFilter.vue
index b49f0b115..62bfe0e02 100644
--- a/src/pages/Order/Card/OrderFilter.vue
+++ b/src/pages/Order/Card/OrderFilter.vue
@@ -59,162 +59,152 @@ const sourceList = ref(null);
             </div>
         </template>
         <template #body="{ params }">
-            <QList id="orderFilter" dense>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            is-outlined
-                            :label="t('customerId')"
-                            v-model="params.clientFk"
-                            lazy-rules
-                        >
-                            <template #prepend>
-                                <QIcon name="badge" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="agencyList">
-                        <VnSelectFilter
-                            :label="t('agency')"
-                            v-model="params.agencyModeFk"
-                            :options="agencyList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="salesPersonList">
-                        <VnSelectFilter
-                            :label="t('salesPerson')"
-                            v-model="params.workerFk"
-                            :options="salesPersonList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.nickname }},{{ opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('fromLanded')"
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('toLanded')"
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('orderId')"
-                            v-model="params.orderFk"
-                            lazy-rules
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="sourceList">
-                        <VnSelectFilter
-                            :label="t('application')"
-                            v-model="params.sourceApp"
-                            :options="sourceList"
-                            option-label="value"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                    <QItemSection v-else>
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.myTeam"
-                            :label="t('myTeam')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.isConfirmed"
-                            :label="t('isConfirmed')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox v-model="params.showEmpty" :label="t('showEmpty')" />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        is-outlined
+                        :label="t('customerId')"
+                        v-model="params.clientFk"
+                        lazy-rules
+                    >
+                        <template #prepend>
+                            <QIcon name="badge" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="agencyList">
+                    <VnSelectFilter
+                        :label="t('agency')"
+                        v-model="params.agencyModeFk"
+                        :options="agencyList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="salesPersonList">
+                    <VnSelectFilter
+                        :label="t('salesPerson')"
+                        v-model="params.workerFk"
+                        :options="salesPersonList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('fromLanded')"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('toLanded')"
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('orderId')"
+                        v-model="params.orderFk"
+                        lazy-rules
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="sourceList">
+                    <VnSelectFilter
+                        :label="t('application')"
+                        v-model="params.sourceApp"
+                        :options="sourceList"
+                        option-label="value"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+                <QItemSection v-else>
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        :label="t('myTeam')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isConfirmed"
+                        :label="t('isConfirmed')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox v-model="params.showEmpty" :label="t('showEmpty')" />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
-<style lang="scss">
-#orderFilter {
-    .q-item {
-        padding-top: 8px;
-    }
-}
-</style>
-
 <i18n>
 en:
     params:
diff --git a/src/pages/Route/Card/RouteFilter.vue b/src/pages/Route/Card/RouteFilter.vue
index 45580d913..4be1981ab 100644
--- a/src/pages/Route/Card/RouteFilter.vue
+++ b/src/pages/Route/Card/RouteFilter.vue
@@ -61,144 +61,142 @@ const warehouseList = ref([]);
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="workerList">
-                        <VnSelectFilter
-                            :label="t('Worker')"
-                            v-model="params.workerFk"
-                            :options="workerList"
-                            option-value="id"
-                            option-label="nickname"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        >
-                            <template #option="{ itemProps, opt }">
-                                <QItem v-bind="itemProps">
-                                    <QItemSection>
-                                        <QItemLabel>{{ opt.name }}</QItemLabel>
-                                        <QItemLabel caption>
-                                            {{ opt.nickname }},{{ opt.code }}
-                                        </QItemLabel>
-                                    </QItemSection>
-                                </QItem>
-                            </template>
-                        </VnSelectFilter>
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="agencyList">
-                        <VnSelectFilter
-                            :label="t('Agency')"
-                            v-model="params.agencyModeFk"
-                            :options="agencyList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                            :disable="Boolean(params.scopeDays)"
-                            @update:model-value="params.scopeDays = null"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.to"
-                            :label="t('To')"
-                            is-outlined
-                            :disable="Boolean(params.scopeDays)"
-                            @update:model-value="params.scopeDays = null"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.scopeDays"
-                            type="number"
-                            :label="t('Days Onward')"
-                            is-outlined
-                            clearable
-                            :disable="Boolean(params.from || params.to)"
-                            @update:model-value="
-                                params.to = null;
-                                params.from = null;
-                            "
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="vehicleList">
-                        <VnSelectFilter
-                            :label="t('Vehicle')"
-                            v-model="params.vehicleFk"
-                            :options="vehicleList"
-                            option-value="id"
-                            option-label="numberPlate"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput v-model="params.m3" label="m³" is-outlined clearable />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="vehicleList">
-                        <VnSelectFilter
-                            :label="t('Warehouse')"
-                            v-model="params.warehouseFk"
-                            :options="warehouseList"
-                            option-value="id"
-                            option-label="name"
-                            dense
-                            outlined
-                            rounded
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-my-sm">
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.description"
-                            :label="t('Description')"
-                            is-outlined
-                            clearable
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="workerList">
+                    <VnSelectFilter
+                        :label="t('Worker')"
+                        v-model="params.workerFk"
+                        :options="workerList"
+                        option-value="id"
+                        option-label="nickname"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    >
+                        <template #option="{ itemProps, opt }">
+                            <QItem v-bind="itemProps">
+                                <QItemSection>
+                                    <QItemLabel>{{ opt.name }}</QItemLabel>
+                                    <QItemLabel caption>
+                                        {{ opt.nickname }},{{ opt.code }}
+                                    </QItemLabel>
+                                </QItemSection>
+                            </QItem>
+                        </template>
+                    </VnSelectFilter>
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="agencyList">
+                    <VnSelectFilter
+                        :label="t('Agency')"
+                        v-model="params.agencyModeFk"
+                        :options="agencyList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.from"
+                        :label="t('From')"
+                        is-outlined
+                        :disable="Boolean(params.scopeDays)"
+                        @update:model-value="params.scopeDays = null"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.to"
+                        :label="t('To')"
+                        is-outlined
+                        :disable="Boolean(params.scopeDays)"
+                        @update:model-value="params.scopeDays = null"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.scopeDays"
+                        type="number"
+                        :label="t('Days Onward')"
+                        is-outlined
+                        clearable
+                        :disable="Boolean(params.from || params.to)"
+                        @update:model-value="
+                            params.to = null;
+                            params.from = null;
+                        "
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="vehicleList">
+                    <VnSelectFilter
+                        :label="t('Vehicle')"
+                        v-model="params.vehicleFk"
+                        :options="vehicleList"
+                        option-value="id"
+                        option-label="numberPlate"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput v-model="params.m3" label="m³" is-outlined clearable />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="vehicleList">
+                    <VnSelectFilter
+                        :label="t('Warehouse')"
+                        v-model="params.warehouseFk"
+                        :options="warehouseList"
+                        option-value="id"
+                        option-label="name"
+                        dense
+                        outlined
+                        rounded
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-my-sm">
+                <QItemSection>
+                    <VnInput
+                        v-model="params.description"
+                        :label="t('Description')"
+                        is-outlined
+                        clearable
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Route/Cmr/CmrFilter.vue b/src/pages/Route/Cmr/CmrFilter.vue
index a5bf5513b..553f19431 100644
--- a/src/pages/Route/Cmr/CmrFilter.vue
+++ b/src/pages/Route/Cmr/CmrFilter.vue
@@ -28,103 +28,101 @@ const countries = ref();
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.cmrFk')"
-                            v-model="params.cmrFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="article" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            :label="t('route.cmr.list.hasCmrDms')"
-                            v-model="params.hasCmrDms"
-                            lazy-rules
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.ticketFk')"
-                            v-model="params.ticketFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:ticket" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.routeFk')"
-                            v-model="params.routeFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:delivery" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('route.cmr.list.clientFk')"
-                            v-model="params.clientFk"
-                            is-outlined
-                        >
-                            <template #prepend>
-                                <QIcon name="vn:client" size="sm"></QIcon>
-                            </template>
-                        </VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!countries">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="countries" class="q-mb-sm">
-                        <QSelect
-                            :label="t('route.cmr.list.country')"
-                            v-model="params.country"
-                            :options="countries"
-                            option-value="country"
-                            option-label="country"
-                            transition-show="jump-down"
-                            transition-hide="jump-up"
-                            emit-value
-                            map-options
-                            dense
-                            outlined
-                            rounded
-                        >
-                            <template #prepend>
-                                <QIcon name="flag" size="sm"></QIcon>
-                            </template>
-                        </QSelect>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.shipped"
-                            :label="t('route.cmr.list.shipped')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.cmrFk')"
+                        v-model="params.cmrFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="article" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        :label="t('route.cmr.list.hasCmrDms')"
+                        v-model="params.hasCmrDms"
+                        lazy-rules
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.ticketFk')"
+                        v-model="params.ticketFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:ticket" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.routeFk')"
+                        v-model="params.routeFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:delivery" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('route.cmr.list.clientFk')"
+                        v-model="params.clientFk"
+                        is-outlined
+                    >
+                        <template #prepend>
+                            <QIcon name="vn:client" size="sm"></QIcon>
+                        </template>
+                    </VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!countries">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="countries" class="q-mb-sm">
+                    <QSelect
+                        :label="t('route.cmr.list.country')"
+                        v-model="params.country"
+                        :options="countries"
+                        option-value="country"
+                        option-label="country"
+                        transition-show="jump-down"
+                        transition-hide="jump-up"
+                        emit-value
+                        map-options
+                        dense
+                        outlined
+                        rounded
+                    >
+                        <template #prepend>
+                            <QIcon name="flag" size="sm"></QIcon>
+                        </template>
+                    </QSelect>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.shipped"
+                        :label="t('route.cmr.list.shipped')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Shelving/Card/ShelvingFilter.vue b/src/pages/Shelving/Card/ShelvingFilter.vue
index 423402f89..6767f6d97 100644
--- a/src/pages/Shelving/Card/ShelvingFilter.vue
+++ b/src/pages/Shelving/Card/ShelvingFilter.vue
@@ -41,7 +41,11 @@ function setParkings(data) {
         @on-fetch="setWorkers"
         auto-load
     />
-    <VnFilterPanel :data-key="props.dataKey" :search-button="true" @search="emit('search')">
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        @search="emit('search')"
+    >
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
@@ -49,59 +53,57 @@ function setParkings(data) {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense>
-                <QItem class="q-my-sm">
-                    <QItemSection v-if="!parkings">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="parkings">
-                        <QSelect
-                            dense
-                            outlined
-                            rounded
-                            :label="t('params.parkingFk')"
-                            v-model="params.parkingFk"
-                            :options="parkings"
-                            option-value="id"
-                            option-label="code"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-sm">
-                    <QItemSection v-if="!workers">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="workers">
-                        <QSelect
-                            dense
-                            outlined
-                            rounded
-                            :label="t('params.userFk')"
-                            v-model="params.userFk"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem class="q-mb-md">
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.isRecyclable"
-                            :label="t('params.isRecyclable')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem class="q-my-sm">
+                <QItemSection v-if="!parkings">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="parkings">
+                    <QSelect
+                        dense
+                        outlined
+                        rounded
+                        :label="t('params.parkingFk')"
+                        v-model="params.parkingFk"
+                        :options="parkings"
+                        option-value="id"
+                        option-label="code"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-sm">
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        dense
+                        outlined
+                        rounded
+                        :label="t('params.userFk')"
+                        v-model="params.userFk"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem class="q-mb-md">
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isRecyclable"
+                        :label="t('params.isRecyclable')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Ticket/TicketFilter.vue b/src/pages/Ticket/TicketFilter.vue
index b0b584257..7b74117bb 100644
--- a/src/pages/Ticket/TicketFilter.vue
+++ b/src/pages/Ticket/TicketFilter.vue
@@ -56,66 +56,138 @@ const warehouses = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.clientFk"
+                        :label="t('Customer ID')"
+                        is-outlined
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.orderFk"
+                        :label="t('Order ID')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate v-model="params.from" :label="t('From')" is-outlined />
+                </QItemSection>
+                <QItemSection>
+                    <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!workers">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="workers">
+                    <QSelect
+                        :label="t('Salesperson')"
+                        v-model="params.salesPersonFk"
+                        :options="workers"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!states">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="states">
+                    <QSelect
+                        :label="t('State')"
+                        v-model="params.stateFk"
+                        @update:model-value="searchFn()"
+                        :options="states"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.refFk"
+                        :label="t('Invoice Ref.')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.myTeam"
+                        @update:model-value="searchFn()"
+                        :label="t('My team')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.pending"
+                        @update:model-value="searchFn()"
+                        :label="t('Pending')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasInvoice"
+                        @update:model-value="searchFn()"
+                        :label="t('Invoiced')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.hasRoute"
+                        @update:model-value="searchFn()"
+                        :label="t('Routed')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.problems"
+                        @update:model-value="searchFn()"
+                        :label="t('With problems')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
+            <QSeparator />
+            <QExpansionItem :label="t('More options')" expand-separator>
                 <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.clientFk"
-                            :label="t('Customer ID')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.orderFk"
-                            :label="t('Order ID')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.from"
-                            :label="t('From')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <VnInputDate v-model="params.to" :label="t('To')" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!workers">
+                    <QItemSection v-if="!provinces">
                         <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
-                    <QItemSection v-if="workers">
+                    <QItemSection v-if="provinces">
                         <QSelect
-                            :label="t('Salesperson')"
-                            v-model="params.salesPersonFk"
-                            :options="workers"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!states">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="states">
-                        <QSelect
-                            :label="t('State')"
-                            v-model="params.stateFk"
+                            :label="t('Province')"
+                            v-model="params.provinceFk"
                             @update:model-value="searchFn()"
-                            :options="states"
+                            :options="provinces"
                             option-value="id"
                             option-label="name"
                             emit-value
@@ -127,124 +199,46 @@ const warehouses = ref();
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.refFk"
-                            :label="t('Invoice Ref.')"
-                            is-outlined
+                    <QItemSection v-if="!agencies">
+                        <QSkeleton type="QInput" class="full-width" />
+                    </QItemSection>
+                    <QItemSection v-if="agencies">
+                        <QSelect
+                            :label="t('Agency')"
+                            v-model="params.agencyModeFk"
+                            @update:model-value="searchFn()"
+                            :options="agencies"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
                 <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.myTeam"
-                            @update:model-value="searchFn()"
-                            :label="t('My team')"
-                            toggle-indeterminate
-                        />
+                    <QItemSection v-if="!warehouses">
+                        <QSkeleton type="QInput" class="full-width" />
                     </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.pending"
+                    <QItemSection v-if="warehouses">
+                        <QSelect
+                            :label="t('Warehouse')"
+                            v-model="params.warehouseFk"
                             @update:model-value="searchFn()"
-                            :label="t('Pending')"
-                            toggle-indeterminate
+                            :options="warehouses"
+                            option-value="id"
+                            option-label="name"
+                            emit-value
+                            map-options
+                            dense
+                            outlined
+                            rounded
                         />
                     </QItemSection>
                 </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasInvoice"
-                            @update:model-value="searchFn()"
-                            :label="t('Invoiced')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.hasRoute"
-                            @update:model-value="searchFn()"
-                            :label="t('Routed')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QCheckbox
-                            v-model="params.problems"
-                            @update:model-value="searchFn()"
-                            :label="t('With problems')"
-                            toggle-indeterminate
-                        />
-                    </QItemSection>
-                </QItem>
-                <QSeparator />
-                <QExpansionItem :label="t('More options')" expand-separator>
-                    <QItem>
-                        <QItemSection v-if="!provinces">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="provinces">
-                            <QSelect
-                                :label="t('Province')"
-                                v-model="params.provinceFk"
-                                @update:model-value="searchFn()"
-                                :options="provinces"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!agencies">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="agencies">
-                            <QSelect
-                                :label="t('Agency')"
-                                v-model="params.agencyModeFk"
-                                @update:model-value="searchFn()"
-                                :options="agencies"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                    <QItem>
-                        <QItemSection v-if="!warehouses">
-                            <QSkeleton type="QInput" class="full-width" />
-                        </QItemSection>
-                        <QItemSection v-if="warehouses">
-                            <QSelect
-                                :label="t('Warehouse')"
-                                v-model="params.warehouseFk"
-                                @update:model-value="searchFn()"
-                                :options="warehouses"
-                                option-value="id"
-                                option-label="name"
-                                emit-value
-                                map-options
-                                dense
-                                outlined
-                                rounded
-                            />
-                        </QItemSection>
-                    </QItem>
-                </QExpansionItem>
-            </QList>
+            </QExpansionItem>
         </template>
     </VnFilterPanel>
 </template>
diff --git a/src/pages/Travel/ExtraCommunityFilter.vue b/src/pages/Travel/ExtraCommunityFilter.vue
index 260b0fb42..cac8e093d 100644
--- a/src/pages/Travel/ExtraCommunityFilter.vue
+++ b/src/pages/Travel/ExtraCommunityFilter.vue
@@ -66,158 +66,149 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput label="id" v-model="params.id" is-outlined />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('params.reference')"
-                            v-model="params.reference"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.totalEntries"
-                            type="number"
-                            :label="t('params.totalEntries')"
-                            dense
-                            outlined
-                            rounded
-                            min="0"
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'totalEntries')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'totalEntries')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.agencyModeFk')"
-                            v-model="params.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.shippedFrom"
-                            :label="t('params.shippedFrom')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInputDate
-                            v-model="params.landedTo"
-                            :label="t('params.landedTo')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseOutFk')"
-                            v-model="params.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseInFk')"
-                            v-model="params.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('supplier.pageTitles.supplier')"
-                            v-model="params.cargoSupplierFk"
-                            :options="suppliersOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.continent')"
-                            v-model="params.continent"
-                            :options="continentsOptions"
-                            option-value="code"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput label="id" v-model="params.id" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('params.reference')"
+                        v-model="params.reference"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.totalEntries"
+                        type="number"
+                        :label="t('params.totalEntries')"
+                        dense
+                        outlined
+                        rounded
+                        min="0"
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'totalEntries')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'totalEntries')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.agencyModeFk')"
+                        v-model="params.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.shippedFrom"
+                        :label="t('params.shippedFrom')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInputDate
+                        v-model="params.landedTo"
+                        :label="t('params.landedTo')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseInFk')"
+                        v-model="params.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('supplier.pageTitles.supplier')"
+                        v-model="params.cargoSupplierFk"
+                        :options="suppliersOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.continent')"
+                        v-model="params.continent"
+                        :options="continentsOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
 <style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-
 .input-number >>> input[type='number'] {
     -moz-appearance: textfield;
 }
diff --git a/src/pages/Travel/TravelFilter.vue b/src/pages/Travel/TravelFilter.vue
index 52a755c34..62439a2e4 100644
--- a/src/pages/Travel/TravelFilter.vue
+++ b/src/pages/Travel/TravelFilter.vue
@@ -61,216 +61,207 @@ const decrement = (paramsObj, key) => {
             </div>
         </template>
         <template #body="{ params }">
-            <QList dense class="list q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            v-model="params.search"
-                            :label="t('params.search')"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.agencyModeFk')"
-                            v-model="params.agencyModeFk"
-                            :options="agenciesOptions"
-                            option-value="agencyFk"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseOutFk')"
-                            v-model="params.warehouseOutFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.warehouseInFk')"
-                            v-model="params.warehouseInFk"
-                            :options="warehousesOptions"
-                            option-value="id"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.scopeDays"
-                            type="number"
-                            :label="t('params.scopeDays')"
-                            dense
-                            outlined
-                            rounded
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'scopeDays')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'scopeDays')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            dense
-                            outlined
-                            rounded
-                            placeholder="dd-mm-aaa"
-                            :label="t('params.landedFrom')"
-                            :model-value="toDate(params.landedFrom)"
-                        >
-                            <template #append>
-                                <QIcon name="event" class="cursor-pointer">
-                                    <QPopupProxy
-                                        cover
-                                        transition-show="scale"
-                                        transition-hide="scale"
-                                    >
-                                        <QDate v-model="params.landedFrom">
-                                            <div class="row items-center justify-end">
-                                                <QBtn
-                                                    v-close-popup
-                                                    :label="t('globals.close')"
-                                                    color="primary"
-                                                    flat
-                                                />
-                                            </div>
-                                        </QDate>
-                                    </QPopupProxy>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            dense
-                            outlined
-                            rounded
-                            placeholder="dd-mm-aaa"
-                            :model-value="toDate(params.landedTo)"
-                            :label="t('params.landedTo')"
-                        >
-                            <template #append>
-                                <QIcon name="event" class="cursor-pointer">
-                                    <QPopupProxy
-                                        cover
-                                        transition-show="scale"
-                                        transition-hide="scale"
-                                    >
-                                        <QDate v-model="params.landedTo">
-                                            <div class="row items-center justify-end">
-                                                <QBtn
-                                                    v-close-popup
-                                                    :label="t('globals.close')"
-                                                    color="primary"
-                                                    flat
-                                                />
-                                            </div>
-                                        </QDate>
-                                    </QPopupProxy>
-                                </QIcon>
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnSelectFilter
-                            :label="t('params.continent')"
-                            v-model="params.continent"
-                            :options="continentsOptions"
-                            option-value="code"
-                            option-label="name"
-                            hide-selected
-                            dense
-                            outlined
-                            rounded
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <QInput
-                            v-model="params.totalEntries"
-                            type="number"
-                            :label="t('params.totalEntries')"
-                            dense
-                            outlined
-                            rounded
-                            min="0"
-                            class="input-number"
-                        >
-                            <template #append>
-                                <QBtn
-                                    icon="add"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="add(params, 'totalEntries')"
-                                />
-                                <QBtn
-                                    icon="remove"
-                                    flat
-                                    dense
-                                    size="12px"
-                                    @click="decrement(params, 'totalEntries')"
-                                />
-                            </template>
-                        </QInput>
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.agencyModeFk')"
+                        v-model="params.agencyModeFk"
+                        :options="agenciesOptions"
+                        option-value="agencyFk"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseOutFk')"
+                        v-model="params.warehouseOutFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.warehouseInFk')"
+                        v-model="params.warehouseInFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.scopeDays"
+                        type="number"
+                        :label="t('params.scopeDays')"
+                        dense
+                        outlined
+                        rounded
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'scopeDays')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'scopeDays')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        dense
+                        outlined
+                        rounded
+                        placeholder="dd-mm-aaa"
+                        :label="t('params.landedFrom')"
+                        :model-value="toDate(params.landedFrom)"
+                    >
+                        <template #append>
+                            <QIcon name="event" class="cursor-pointer">
+                                <QPopupProxy
+                                    cover
+                                    transition-show="scale"
+                                    transition-hide="scale"
+                                >
+                                    <QDate v-model="params.landedFrom">
+                                        <div class="row items-center justify-end">
+                                            <QBtn
+                                                v-close-popup
+                                                :label="t('globals.close')"
+                                                color="primary"
+                                                flat
+                                            />
+                                        </div>
+                                    </QDate>
+                                </QPopupProxy>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        dense
+                        outlined
+                        rounded
+                        placeholder="dd-mm-aaa"
+                        :model-value="toDate(params.landedTo)"
+                        :label="t('params.landedTo')"
+                    >
+                        <template #append>
+                            <QIcon name="event" class="cursor-pointer">
+                                <QPopupProxy
+                                    cover
+                                    transition-show="scale"
+                                    transition-hide="scale"
+                                >
+                                    <QDate v-model="params.landedTo">
+                                        <div class="row items-center justify-end">
+                                            <QBtn
+                                                v-close-popup
+                                                :label="t('globals.close')"
+                                                color="primary"
+                                                flat
+                                            />
+                                        </div>
+                                    </QDate>
+                                </QPopupProxy>
+                            </QIcon>
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.continent')"
+                        v-model="params.continent"
+                        :options="continentsOptions"
+                        option-value="code"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <QInput
+                        v-model="params.totalEntries"
+                        type="number"
+                        :label="t('params.totalEntries')"
+                        dense
+                        outlined
+                        rounded
+                        min="0"
+                        class="input-number"
+                    >
+                        <template #append>
+                            <QBtn
+                                icon="add"
+                                flat
+                                dense
+                                size="12px"
+                                @click="add(params, 'totalEntries')"
+                            />
+                            <QBtn
+                                icon="remove"
+                                flat
+                                dense
+                                size="12px"
+                                @click="decrement(params, 'totalEntries')"
+                            />
+                        </template>
+                    </QInput>
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
 
 <style scoped>
-.list {
-    width: 256px;
-}
-.list * {
-    max-width: 100%;
-}
-
 .input-number >>> input[type='number'] {
     -moz-appearance: textfield;
 }
diff --git a/src/pages/Worker/WorkerFilter.vue b/src/pages/Worker/WorkerFilter.vue
index 680a17937..0853791ef 100644
--- a/src/pages/Worker/WorkerFilter.vue
+++ b/src/pages/Worker/WorkerFilter.vue
@@ -27,74 +27,72 @@ const departments = ref();
             </div>
         </template>
         <template #body="{ params, searchFn }">
-            <QList dense class="q-gutter-y-sm q-mt-sm">
-                <QItem>
-                    <QItemSection>
-                        <VnInput :label="t('FI')" v-model="params.fi" is-outlined
-                            ><template #prepend>
-                                <QIcon name="badge" size="xs"></QIcon> </template
-                        ></VnInput>
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('First Name')"
-                            v-model="params.firstName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Last Name')"
-                            v-model="params.lastName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('User Name')"
-                            v-model="params.userName"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection v-if="!departments">
-                        <QSkeleton type="QInput" class="full-width" />
-                    </QItemSection>
-                    <QItemSection v-if="departments">
-                        <QSelect
-                            :label="t('Department')"
-                            v-model="params.departmentFk"
-                            @update:model-value="searchFn()"
-                            :options="departments"
-                            option-value="id"
-                            option-label="name"
-                            emit-value
-                            map-options
-                            use-input
-                            dense
-                            outlined
-                            rounded
-                            :input-debounce="0"
-                        />
-                    </QItemSection>
-                </QItem>
-                <QItem>
-                    <QItemSection>
-                        <VnInput
-                            :label="t('Extension')"
-                            v-model="params.extension"
-                            is-outlined
-                        />
-                    </QItemSection>
-                </QItem>
-            </QList>
+            <QItem>
+                <QItemSection>
+                    <VnInput :label="t('FI')" v-model="params.fi" is-outlined
+                        ><template #prepend>
+                            <QIcon name="badge" size="xs"></QIcon> </template
+                    ></VnInput>
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('First Name')"
+                        v-model="params.firstName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Last Name')"
+                        v-model="params.lastName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('User Name')"
+                        v-model="params.userName"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection v-if="!departments">
+                    <QSkeleton type="QInput" class="full-width" />
+                </QItemSection>
+                <QItemSection v-if="departments">
+                    <QSelect
+                        :label="t('Department')"
+                        v-model="params.departmentFk"
+                        @update:model-value="searchFn()"
+                        :options="departments"
+                        option-value="id"
+                        option-label="name"
+                        emit-value
+                        map-options
+                        use-input
+                        dense
+                        outlined
+                        rounded
+                        :input-debounce="0"
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        :label="t('Extension')"
+                        v-model="params.extension"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>

From 41605db45413b51f2ea0b947ed9007242b9a5c6e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 22 Jan 2024 12:25:59 -0300
Subject: [PATCH 10/49] Make card-list a global class

---
 src/css/app.scss                              |  5 +++++
 src/pages/Claim/ClaimList.vue                 |  9 +-------
 src/pages/Claim/ClaimRmaList.vue              |  3 +--
 src/pages/Customer/CustomerList.vue           |  9 +-------
 .../Customer/Payments/CustomerPayments.vue    | 21 +++++++------------
 src/pages/Entry/EntryList.vue                 |  9 +-------
 src/pages/InvoiceIn/InvoiceInList.vue         |  9 +-------
 src/pages/InvoiceOut/InvoiceOutList.vue       |  9 +-------
 src/pages/Order/OrderCatalog.vue              | 12 ++++-------
 src/pages/Order/OrderLines.vue                |  7 +------
 src/pages/Order/OrderList.vue                 | 13 +++---------
 src/pages/Order/OrderVolume.vue               |  7 +------
 src/pages/Shelving/ShelvingList.vue           |  9 +-------
 src/pages/Supplier/Card/SupplierAddresses.vue |  9 +-------
 src/pages/Supplier/SupplierList.vue           |  9 +-------
 src/pages/Ticket/TicketList.vue               |  9 +-------
 src/pages/Travel/TravelList.vue               |  9 +-------
 src/pages/Wagon/Type/WagonTypeList.vue        |  9 +-------
 src/pages/Wagon/WagonList.vue                 |  9 +-------
 src/pages/Worker/WorkerList.vue               |  9 +-------
 20 files changed, 36 insertions(+), 149 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index f11ab865c..b742dae2f 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -58,6 +58,11 @@ body.body--dark {
     border-radius: 8px;
 }
 
+.vn-card-list {
+    width: 100%;
+    max-width: 60em;
+}
+
 /* Estilo para el asterisco en campos requeridos */
 .q-field.required .q-field__label:after {
     content: ' *';
diff --git a/src/pages/Claim/ClaimList.vue b/src/pages/Claim/ClaimList.vue
index b33854959..a0e38079d 100644
--- a/src/pages/Claim/ClaimList.vue
+++ b/src/pages/Claim/ClaimList.vue
@@ -71,7 +71,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ClaimList"
                 url="Claims/filter"
@@ -145,13 +145,6 @@ function viewSummary(id) {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search claim: Buscar reclamación
diff --git a/src/pages/Claim/ClaimRmaList.vue b/src/pages/Claim/ClaimRmaList.vue
index 3774932e3..b906e32fa 100644
--- a/src/pages/Claim/ClaimRmaList.vue
+++ b/src/pages/Claim/ClaimRmaList.vue
@@ -84,7 +84,7 @@ async function remove({ id }) {
                 </QForm>
             </QCard>
         </QPageSticky>
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ClaimRmaList"
                 url="ClaimRmas"
@@ -160,7 +160,6 @@ async function remove({ id }) {
     padding-top: 156px;
 }
 
-.card-list,
 .card {
     width: 100%;
     max-width: 60em;
diff --git a/src/pages/Customer/CustomerList.vue b/src/pages/Customer/CustomerList.vue
index 540afcc4c..a78720d03 100644
--- a/src/pages/Customer/CustomerList.vue
+++ b/src/pages/Customer/CustomerList.vue
@@ -65,7 +65,7 @@ const redirectToCreateView = () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 auto-load
                 data-key="CustomerList"
@@ -116,13 +116,6 @@ const redirectToCreateView = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search customer: Buscar cliente
diff --git a/src/pages/Customer/Payments/CustomerPayments.vue b/src/pages/Customer/Payments/CustomerPayments.vue
index de774e63e..eedaaf137 100644
--- a/src/pages/Customer/Payments/CustomerPayments.vue
+++ b/src/pages/Customer/Payments/CustomerPayments.vue
@@ -122,7 +122,7 @@ function stateColor(row) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md customer-payments">
-        <div class="card-list">
+        <div class="vn-card-list">
             <QToolbar class="q-pa-none justify-end">
                 <QBtn
                     @click="arrayData.refresh()"
@@ -278,18 +278,13 @@ function stateColor(row) {
 
 <style lang="scss">
 .customer-payments {
-    .card-list {
-        width: 100%;
-        max-width: 60em;
-
-        .q-table--dense .q-table th:first-child {
-            padding-left: 0;
-        }
-        td {
-            max-width: 130px;
-            overflow: hidden;
-            text-overflow: ellipsis;
-        }
+    .q-table--dense .q-table th:first-child {
+        padding-left: 0;
+    }
+    td {
+        max-width: 130px;
+        overflow: hidden;
+        text-overflow: ellipsis;
     }
 }
 </style>
diff --git a/src/pages/Entry/EntryList.vue b/src/pages/Entry/EntryList.vue
index 40747178c..0cf707efa 100644
--- a/src/pages/Entry/EntryList.vue
+++ b/src/pages/Entry/EntryList.vue
@@ -47,7 +47,7 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="EntryList"
                 url="Entries/filter"
@@ -128,13 +128,6 @@ onMounted(async () => {
     </QPageSticky>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search entries: Buscar entradas
diff --git a/src/pages/InvoiceIn/InvoiceInList.vue b/src/pages/InvoiceIn/InvoiceInList.vue
index bf791c10e..2f508ec34 100644
--- a/src/pages/InvoiceIn/InvoiceInList.vue
+++ b/src/pages/InvoiceIn/InvoiceInList.vue
@@ -71,7 +71,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="InvoiceInList"
                 url="InvoiceIns/filter"
@@ -157,13 +157,6 @@ function viewSummary(id) {
     </QPageSticky>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search invoice: Buscar factura emitida
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 292fa2e0a..36d1d3aad 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -181,7 +181,7 @@ const downloadCsv = () => {
                     </div>
                 </QToolbar>
                 <div class="flex flex-center q-pa-md">
-                    <div class="card-list">
+                    <div class="vn-card-list">
                         <CardList
                             :element="row"
                             :id="row.id"
@@ -246,13 +246,6 @@ const downloadCsv = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     searchInvoice: Search issued invoice
diff --git a/src/pages/Order/OrderCatalog.vue b/src/pages/Order/OrderCatalog.vue
index 55f5e7da1..21442d10d 100644
--- a/src/pages/Order/OrderCatalog.vue
+++ b/src/pages/Order/OrderCatalog.vue
@@ -1,7 +1,7 @@
 <script setup>
 import { useStateStore } from 'stores/useStateStore';
 import { useRoute } from 'vue-router';
-import {onMounted, onUnmounted, ref} from 'vue';
+import { onMounted, onUnmounted, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
@@ -20,7 +20,7 @@ const catalogParams = {
     orderBy: JSON.stringify({ field: 'relevancy DESC, name', way: 'ASC', isTag: false }),
 };
 
-const tags = ref([])
+const tags = ref([]);
 
 function extractTags(items) {
     const resultTags = [];
@@ -34,7 +34,7 @@ function extractTags(items) {
             }
         });
     });
-    tags.value = resultTags
+    tags.value = resultTags;
 }
 </script>
 
@@ -70,7 +70,7 @@ function extractTags(items) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="full-width">
             <VnPaginate
                 data-key="OrderCatalogList"
                 url="Orders/CatalogFilter"
@@ -93,10 +93,6 @@ function extractTags(items) {
 </template>
 
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-}
-
 .catalog-list {
     display: flex;
     align-items: flex-start;
diff --git a/src/pages/Order/OrderLines.vue b/src/pages/Order/OrderLines.vue
index 0dce70831..a2ee42481 100644
--- a/src/pages/Order/OrderLines.vue
+++ b/src/pages/Order/OrderLines.vue
@@ -83,7 +83,7 @@ async function confirmOrder() {
         auto-load
     />
     <QPage :key="componentKey" class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <div v-if="!orderSummary.total" class="no-result">
                 {{ t('globals.noResults') }}
             </div>
@@ -228,11 +228,6 @@ async function confirmOrder() {
 }
 </style>
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-
 .header {
     color: $primary;
     font-weight: bold;
diff --git a/src/pages/Order/OrderList.vue b/src/pages/Order/OrderList.vue
index 362a68b4d..8b6b53fbe 100644
--- a/src/pages/Order/OrderList.vue
+++ b/src/pages/Order/OrderList.vue
@@ -4,7 +4,7 @@ import { onMounted, onUnmounted } from 'vue';
 import { useRouter } from 'vue-router';
 import { useStateStore } from 'stores/useStateStore';
 import { toCurrency, toDate } from 'src/filters';
-import {useQuasar} from "quasar";
+import { useQuasar } from 'quasar';
 import CardList from 'components/ui/CardList.vue';
 import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
 import CustomerDescriptorProxy from 'pages/Customer/Card/CustomerDescriptorProxy.vue';
@@ -12,7 +12,7 @@ import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnLv from 'components/ui/VnLv.vue';
 import OrderSearchbar from 'pages/Order/Card/OrderSearchbar.vue';
 import OrderFilter from 'pages/Order/Card/OrderFilter.vue';
-import OrderSummaryDialog from "pages/Order/Card/OrderSummaryDialog.vue";
+import OrderSummaryDialog from 'pages/Order/Card/OrderSummaryDialog.vue';
 
 const stateStore = useStateStore();
 const quasar = useQuasar();
@@ -63,7 +63,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="OrderList"
                 url="Orders/filter"
@@ -153,10 +153,3 @@ function viewSummary(id) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Order/OrderVolume.vue b/src/pages/Order/OrderVolume.vue
index 4f4c269f6..5bb106edc 100644
--- a/src/pages/Order/OrderVolume.vue
+++ b/src/pages/Order/OrderVolume.vue
@@ -35,7 +35,7 @@ const loadVolumes = async (rows) => {
         auto-load
     />
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <div
                 v-if="!volumeSummary?.totalVolume && !volumeSummary?.totalBoxes"
                 class="no-result"
@@ -121,11 +121,6 @@ const loadVolumes = async (rows) => {
 }
 </style>
 <style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-
 .header {
     color: $primary;
     font-weight: bold;
diff --git a/src/pages/Shelving/ShelvingList.vue b/src/pages/Shelving/ShelvingList.vue
index 71b3a6ccf..c884dc5f4 100644
--- a/src/pages/Shelving/ShelvingList.vue
+++ b/src/pages/Shelving/ShelvingList.vue
@@ -74,7 +74,7 @@ function exprBuilder(param, value) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="ShelvingList"
                 url="Shelvings"
@@ -129,10 +129,3 @@ function exprBuilder(param, value) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Supplier/Card/SupplierAddresses.vue b/src/pages/Supplier/Card/SupplierAddresses.vue
index df7cff932..c6b08075f 100644
--- a/src/pages/Supplier/Card/SupplierAddresses.vue
+++ b/src/pages/Supplier/Card/SupplierAddresses.vue
@@ -47,7 +47,7 @@ const redirectToUpdateView = (addressData) => {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="SupplierAddress"
                 :url="`Suppliers/${route.params.id}/addresses`"
@@ -88,10 +88,3 @@ const redirectToUpdateView = (addressData) => {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index ea7bc3cb0..d504e127a 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -44,7 +44,7 @@ const viewSummary = (id) => {
     </template>
 
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
                 <template #body="{ rows }">
                     <CardList
@@ -95,13 +95,6 @@ const viewSummary = (id) => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     Search suppliers: Search suppliers
diff --git a/src/pages/Ticket/TicketList.vue b/src/pages/Ticket/TicketList.vue
index 9186eb6ad..6f57ad0b9 100644
--- a/src/pages/Ticket/TicketList.vue
+++ b/src/pages/Ticket/TicketList.vue
@@ -74,7 +74,7 @@ function viewSummary(id) {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="TicketList"
                 url="Tickets/filter"
@@ -134,13 +134,6 @@ function viewSummary(id) {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search ticket: Buscar ticket
diff --git a/src/pages/Travel/TravelList.vue b/src/pages/Travel/TravelList.vue
index 889f096aa..dbbdaca93 100644
--- a/src/pages/Travel/TravelList.vue
+++ b/src/pages/Travel/TravelList.vue
@@ -56,7 +56,7 @@ onMounted(async () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="TravelList"
                 url="Travels/filter"
@@ -132,13 +132,6 @@ onMounted(async () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 en:
     addEntry: Add entry
diff --git a/src/pages/Wagon/Type/WagonTypeList.vue b/src/pages/Wagon/Type/WagonTypeList.vue
index 8e4ace744..a7c713039 100644
--- a/src/pages/Wagon/Type/WagonTypeList.vue
+++ b/src/pages/Wagon/Type/WagonTypeList.vue
@@ -42,7 +42,7 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonTypeList"
                 url="/WagonTypes"
@@ -80,10 +80,3 @@ async function remove(row) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Wagon/WagonList.vue b/src/pages/Wagon/WagonList.vue
index 77d9da0bf..18417f433 100644
--- a/src/pages/Wagon/WagonList.vue
+++ b/src/pages/Wagon/WagonList.vue
@@ -48,7 +48,7 @@ async function remove(row) {
 
 <template>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WagonList"
                 url="/Wagons"
@@ -99,10 +99,3 @@ async function remove(row) {
         </QPageSticky>
     </QPage>
 </template>
-
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
diff --git a/src/pages/Worker/WorkerList.vue b/src/pages/Worker/WorkerList.vue
index e7e86d16e..0e9868a04 100644
--- a/src/pages/Worker/WorkerList.vue
+++ b/src/pages/Worker/WorkerList.vue
@@ -64,7 +64,7 @@ const redirectToCreateView = () => {
         </QScrollArea>
     </QDrawer>
     <QPage class="column items-center q-pa-md">
-        <div class="card-list">
+        <div class="vn-card-list">
             <VnPaginate
                 data-key="WorkerList"
                 url="Workers/filter"
@@ -114,13 +114,6 @@ const redirectToCreateView = () => {
     </QPage>
 </template>
 
-<style lang="scss" scoped>
-.card-list {
-    width: 100%;
-    max-width: 60em;
-}
-</style>
-
 <i18n>
 es:
     Search worker: Buscar trabajador

From 8f870f8d6714dbbfcfc2bb76b35c6fb30f545d80 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Wed, 24 Jan 2024 08:43:50 +0100
Subject: [PATCH 11/49] refs #6677 dataRef

---
 src/components/common/VnSelectFilter.vue      | 17 +++++++++++++++++
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 19 ++++++++-----------
 2 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 244fb50bb..a50ce1236 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,6 +1,8 @@
 <script setup>
+import FetchData from 'src/components/FetchData.vue';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
+const dataRef = ref();
 
 const $props = defineProps({
     modelValue: {
@@ -15,6 +17,14 @@ const $props = defineProps({
         type: String,
         default: '',
     },
+    optionValue: {
+        type: String,
+        default: '',
+    },
+    url: {
+        type: String,
+        default: '',
+    },
     filterOptions: {
         type: Array,
         default: () => [],
@@ -89,7 +99,14 @@ watch(options, (newValue) => {
 </script>
 
 <template>
+    <FetchData
+        ref="dataRef"
+        :url="$props.url"
+        @on-fetch="(data) => (dataRef = data)"
+        auto-load
+    />
     <QSelect
+        v-if="dataRef"
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index a46978458..55884cd04 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -6,7 +6,6 @@ import { useQuasar } from 'quasar';
 import { useArrayData } from 'src/composables/useArrayData';
 
 import { downloadFile } from 'src/composables/downloadFile';
-import FetchData from 'src/components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import axios from 'axios';
@@ -146,12 +145,12 @@ function supplierRefFilter(val) {
 }
 </script>
 <template>
-    <FetchData
+    <!-- <FetchData
         ref="suppliersRef"
         url="Suppliers"
         @on-fetch="(data) => (suppliers = data)"
-    />
-    <FetchData
+    /> -->
+    <!-- <FetchData
         ref="currenciesRef"
         url="Currencies"
         :filter="{ fields: ['id', 'code'] }"
@@ -193,21 +192,19 @@ function supplierRefFilter(val) {
         url="UserConfigs/getUserConfig"
         @on-fetch="(data) => (userConfig = data)"
         auto-load
-    />
+    /> -->
     <FormModel v-if="invoiceIn" :url="`InvoiceIns/${route.params.id}`" model="invoiceIn">
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        v-if="suppliersRef"
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        :options="suppliers"
                         option-value="id"
                         option-label="nickname"
-                        :input-debounce="100"
-                        @input-value="supplierRefFilter"
-                        :default-filter="false"
+                        url="Suppliers"
+                        :filter="{ fields: ['id', 'code'], order: 'code' }"
+                        @update-options="(data) => (suppliersRef = data)"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -418,7 +415,7 @@ function supplierRefFilter(val) {
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        v-if="currenciesRef"
+                        url="Currencies"
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"

From 899633171d0e8830e71481fa165b92ad925269cc Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 24 Jan 2024 10:47:48 -0300
Subject: [PATCH 12/49] Suppliers corrections

---
 src/pages/Supplier/Card/SupplierBasicData.vue |  12 ++
 .../Supplier/Card/SupplierBillingData.vue     |  11 +-
 .../Supplier/Card/SupplierConsumption.vue     |  35 ++---
 .../Card/SupplierConsumptionFilter.vue        |  17 +--
 .../Supplier/Card/SupplierDescriptor.vue      |  72 ++++++++++-
 src/pages/Supplier/SupplierCreate.vue         |   8 ++
 src/pages/Supplier/SupplierList.vue           |  14 +-
 src/pages/Supplier/SupplierListFilter.vue     | 122 ++++++++++++++++++
 8 files changed, 259 insertions(+), 32 deletions(-)
 create mode 100644 src/pages/Supplier/SupplierListFilter.vue

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index b73ce9346..747784943 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -48,6 +48,13 @@ const workersOptions = ref([]);
                         map-options
                         :rules="validate('supplier.workerFk')"
                     >
+                        <template #append>
+                            <QIcon name="info" class="cursor-pointer">
+                                <QTooltip>{{
+                                    t('Responsible for approving invoices')
+                                }}</QTooltip>
+                            </QIcon>
+                        </template>
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
                                 <QItemSection>
@@ -95,3 +102,8 @@ const workersOptions = ref([]);
         </template>
     </FormModel>
 </template>
+
+<i18n>
+es:
+    Responsible for approving invoices: Responsable de aprobar las facturas
+</i18n>
diff --git a/src/pages/Supplier/Card/SupplierBillingData.vue b/src/pages/Supplier/Card/SupplierBillingData.vue
index 1237a0403..bf5ccb115 100644
--- a/src/pages/Supplier/Card/SupplierBillingData.vue
+++ b/src/pages/Supplier/Card/SupplierBillingData.vue
@@ -13,6 +13,13 @@ const { t } = useI18n();
 
 const paymethodsOptions = ref([]);
 const payDemsOptions = ref([]);
+
+const formatPayDems = (data) => {
+    payDemsOptions.value = data.map(({ id, payDem }) => ({
+        id: id,
+        payDem: payDem || '0',
+    }));
+};
 </script>
 <template>
     <FetchData
@@ -20,7 +27,7 @@ const payDemsOptions = ref([]);
         @on-fetch="(data) => (paymethodsOptions = data)"
         auto-load
     />
-    <FetchData url="PayDems" @on-fetch="(data) => (payDemsOptions = data)" auto-load />
+    <FetchData url="PayDems" @on-fetch="(data) => formatPayDems(data)" auto-load />
     <FormModel
         :url="`Suppliers/${route.params.id}`"
         :url-update="`Suppliers/${route.params.id}`"
@@ -37,7 +44,6 @@ const payDemsOptions = ref([]);
                         option-value="id"
                         option-label="name"
                         hide-selected
-                        map-options
                         :rules="validate('supplier.payMethodFk')"
                     />
                 </div>
@@ -49,7 +55,6 @@ const payDemsOptions = ref([]);
                         option-value="id"
                         option-label="payDem"
                         hide-selected
-                        map-options
                         :rules="validate('supplier.payDemFk')"
                     />
                 </div>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 0cf66fe25..7baa8ded5 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -8,7 +8,7 @@ import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
 
-import { toDate, toDateString } from 'src/filters';
+import { toDate } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import useNotify from 'src/composables/useNotify.js';
@@ -31,23 +31,26 @@ const arrayData = useArrayData('SupplierConsumption', {
 
 const store = arrayData.store;
 
-const userParams = computed(() => {
-    const minDate = Date.vnNew();
-    minDate.setHours(0, 0, 0, 0);
-    minDate.setMonth(minDate.getMonth() - 2);
-
-    const maxDate = Date.vnNew();
-    maxDate.setHours(23, 59, 59, 59);
-
-    return {
-        from: toDateString(minDate),
-        to: toDateString(maxDate),
+const dateRanges = computed(() => {
+    const ranges = {
+        from: null,
+        to: null,
     };
+
+    if (route.query && route.query.params) {
+        const params = JSON.parse(route.query.params);
+        if (params.from && params.to) {
+            ranges.from = params.from;
+            ranges.to = params.to;
+        }
+    }
+
+    return ranges;
 });
 
 const reportParams = computed(() => ({
     recipientId: Number(route.params.id),
-    ...userParams.value,
+    ...dateRanges.value,
 }));
 
 async function getSupplierConsumptionData() {
@@ -113,10 +116,10 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
+    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
         <div id="st-data">
             <QBtn
-                v-if="userParams.from && userParams.to"
+                :disabled="!dateRanges.from && !dateRanges.to"
                 color="primary"
                 icon-right="picture_as_pdf"
                 no-caps
@@ -128,7 +131,7 @@ onMounted(async () => {
                 </QTooltip>
             </QBtn>
             <QBtn
-                v-if="userParams.from && userParams.to"
+                :disabled="!dateRanges.from && !dateRanges.to"
                 color="primary"
                 icon-right="email"
                 no-caps
diff --git a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
index 4835b7663..339a9d0d9 100644
--- a/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
+++ b/src/pages/Supplier/Card/SupplierConsumptionFilter.vue
@@ -50,18 +50,14 @@ const itemCategoriesOptions = ref([]);
         @on-fetch="(data) => (itemCategoriesOptions = data)"
         auto-load
     />
-    <VnFilterPanel
-        :data-key="props.dataKey"
-        :search-button="true"
-        :unremovable-params="['supplierFk']"
-    >
+    <VnFilterPanel :data-key="props.dataKey" :search-button="true">
         <template #tags="{ tag, formatFn }">
             <div class="q-gutter-x-xs">
                 <strong>{{ t(`params.${tag.label}`) }}: </strong>
                 <span>{{ formatFn(tag.value) }}</span>
             </div>
         </template>
-        <template #body="{ params }">
+        <template #body="{ params, searchFn }">
             <QItem>
                 <QItemSection>
                     <VnInput
@@ -85,6 +81,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.buyerId')"
                         v-model="params.buyerId"
+                        @update:model-value="searchFn()"
                         :options="buyersOptions"
                         option-value="id"
                         option-label="nickname"
@@ -100,6 +97,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.typeId')"
                         v-model="params.typeId"
+                        @update:model-value="searchFn()"
                         :options="itemTypesOptions"
                         option-value="id"
                         option-label="name"
@@ -126,6 +124,7 @@ const itemCategoriesOptions = ref([]);
                     <VnSelectFilter
                         :label="t('params.categoryId')"
                         v-model="params.categoryId"
+                        @update:model-value="searchFn()"
                         :options="itemCategoriesOptions"
                         option-value="id"
                         option-label="name"
@@ -140,8 +139,9 @@ const itemCategoriesOptions = ref([]);
                 <QItemSection>
                     <VnInputDate
                         :label="t('params.from')"
-                        is-outlined
                         v-model="params.from"
+                        @update:model-value="searchFn()"
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
@@ -149,8 +149,9 @@ const itemCategoriesOptions = ref([]);
                 <QItemSection>
                     <VnInputDate
                         :label="t('params.to')"
-                        is-outlined
                         v-model="params.to"
+                        @update:model-value="searchFn()"
+                        is-outlined
                     />
                 </QItemSection>
             </QItem>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 43857fd1e..5187708e4 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -1,10 +1,14 @@
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed, onMounted } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+
 import CardDescriptor from 'components/ui/CardDescriptor.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
+
+import { toDateString } from 'src/filters';
 import useCardDescription from 'src/composables/useCardDescription';
+import { getUrl } from 'src/composables/getUrl';
 
 const $props = defineProps({
     id: {
@@ -16,6 +20,7 @@ const $props = defineProps({
 
 const route = useRoute();
 const { t } = useI18n();
+const url = ref();
 
 const filter = {
     fields: [
@@ -53,6 +58,10 @@ const filter = {
     ],
 };
 
+onMounted(async () => {
+    url.value = await getUrl('');
+});
+
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
@@ -61,6 +70,27 @@ const data = ref(useCardDescription());
 const setData = (entity) => {
     data.value = useCardDescription(entity.ref, entity.id);
 };
+
+const getEntryQueryParams = (supplier) => {
+    if (!supplier) return null;
+
+    const date = Date.vnNew();
+    date.setHours(0, 0, 0, 0);
+
+    const from = new Date(date.getTime());
+    from.setDate(from.getDate() - 10);
+
+    const to = new Date(date.getTime());
+    to.setDate(to.getDate() + 10);
+
+    const params = {
+        supplierFk: supplier.id,
+        from: toDateString(from),
+        to: toDateString(to),
+    };
+
+    return params;
+};
 </script>
 
 <template>
@@ -87,8 +117,46 @@ const setData = (entity) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
+        <template #actions="{ entity }">
+            <QCardActions>
+                <QBtn
+                    :to="{
+                        name: 'EntryList',
+                        query: { params: JSON.stringify(getEntryQueryParams(entity)) },
+                    }"
+                    size="md"
+                    icon="vn:entry"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('All entries with current supplier') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :to="{
+                        name: 'CustomerCard',
+                        params: { id: entity.client?.id },
+                    }"
+                    size="md"
+                    icon="vn:Person"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Go to client') }}</QTooltip>
+                </QBtn>
+                <QBtn
+                    :href="`${url}invoice-in/create`"
+                    size="md"
+                    icon="vn:invoice-in-create"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('Create invoiceIn') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
     </CardDescriptor>
 </template>
-<i18n>
 
+<i18n>
+es:
+    All entries with current supplier: Todas las entradas con proveedor actual
+    Go to client: Ir a cliente
+    Create invoiceIn: Crear factura recibida
 </i18n>
diff --git a/src/pages/Supplier/SupplierCreate.vue b/src/pages/Supplier/SupplierCreate.vue
index ebe0518f2..8424ae68c 100644
--- a/src/pages/Supplier/SupplierCreate.vue
+++ b/src/pages/Supplier/SupplierCreate.vue
@@ -1,6 +1,8 @@
 <script setup>
 import { reactive } from 'vue';
 import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
 import VnSearchbar from 'components/ui/VnSearchbar.vue';
 import FormModel from 'components/FormModel.vue';
 import VnRow from 'components/ui/VnRow.vue';
@@ -9,12 +11,17 @@ import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useStateStore } from 'stores/useStateStore';
 
+const router = useRouter();
 const { t } = useI18n();
 const stateStore = useStateStore();
 
 const newSupplierForm = reactive({
     name: null,
 });
+
+const redirectToSupplierFiscalData = (_, responseData) => {
+    router.push({ name: 'SupplierFiscalData', params: { id: responseData.id } });
+};
 </script>
 
 <template>
@@ -34,6 +41,7 @@ const newSupplierForm = reactive({
             url-create="Suppliers/newSupplier"
             model="supplier"
             :form-initial-data="newSupplierForm"
+            @on-data-saved="redirectToSupplierFiscalData"
         >
             <template #form="{ data }">
                 <VnRow class="row q-gutter-md q-mb-md">
diff --git a/src/pages/Supplier/SupplierList.vue b/src/pages/Supplier/SupplierList.vue
index d504e127a..f4875fc99 100644
--- a/src/pages/Supplier/SupplierList.vue
+++ b/src/pages/Supplier/SupplierList.vue
@@ -1,13 +1,16 @@
 <script setup>
 import { useI18n } from 'vue-i18n';
-import { useStateStore } from 'stores/useStateStore';
+import { useQuasar } from 'quasar';
 import { useRouter } from 'vue-router';
+
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import CardList from 'src/components/ui/CardList.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
-import { useQuasar } from 'quasar';
 import SupplierSummaryDialog from './Card/SupplierSummaryDialog.vue';
+import SupplierListFilter from './SupplierListFilter.vue';
+
+import { useStateStore } from 'stores/useStateStore';
 
 const stateStore = useStateStore();
 const router = useRouter();
@@ -44,6 +47,11 @@ const viewSummary = (id) => {
     </template>
 
     <QPage class="column items-center q-pa-md">
+        <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
+            <QScrollArea class="fit text-grey-8">
+                <SupplierListFilter data-key="SuppliersList" />
+            </QScrollArea>
+        </QDrawer>
         <div class="vn-card-list">
             <VnPaginate data-key="SuppliersList" url="Suppliers/filter" auto-load>
                 <template #body="{ rows }">
@@ -56,7 +64,7 @@ const viewSummary = (id) => {
                     >
                         <template #list-items>
                             <VnLv label="NIF/CIF" :value="row.nif" />
-                            <VnLv label="Alias" :value="row.nickname" />
+                            <VnLv label="Alias" :value="row.alias" />
                             <VnLv
                                 :label="t('supplier.list.payMethod')"
                                 :value="row.payMethod"
diff --git a/src/pages/Supplier/SupplierListFilter.vue b/src/pages/Supplier/SupplierListFilter.vue
new file mode 100644
index 000000000..ff90df6e1
--- /dev/null
+++ b/src/pages/Supplier/SupplierListFilter.vue
@@ -0,0 +1,122 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnFilterPanel from 'src/components/ui/VnFilterPanel.vue';
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import FetchData from 'components/FetchData.vue';
+
+const props = defineProps({
+    dataKey: {
+        type: String,
+        required: true,
+    },
+});
+
+const { t } = useI18n();
+
+const provincesOptions = ref([]);
+const countriesOptions = ref([]);
+</script>
+
+<template>
+    <FetchData
+        url="Provinces"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC', limit: 30 }"
+        @on-fetch="(data) => (provincesOptions = data)"
+        auto-load
+    />
+    <FetchData
+        url="countries"
+        :filter="{ fields: ['id', 'country'], order: 'country ASC', limit: 30 }"
+        @on-fetch="(data) => (countriesOptions = data)"
+        auto-load
+    />
+    <VnFilterPanel
+        :data-key="props.dataKey"
+        :search-button="true"
+        :unremovable-params="['supplierFk']"
+    >
+        <template #tags="{ tag, formatFn }">
+            <div class="q-gutter-x-xs">
+                <strong>{{ t(`params.${tag.label}`) }}: </strong>
+                <span>{{ formatFn(tag.value) }}</span>
+            </div>
+        </template>
+        <template #body="{ params, searchFn }">
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.search"
+                        :label="t('params.search')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput
+                        v-model="params.nickname"
+                        :label="t('params.nickname')"
+                        is-outlined
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnInput v-model="params.nif" :label="t('params.nif')" is-outlined />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.provinceFk')"
+                        v-model="params.provinceFk"
+                        @update:model-value="searchFn()"
+                        :options="provincesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+            <QItem>
+                <QItemSection>
+                    <VnSelectFilter
+                        :label="t('params.countryFk')"
+                        v-model="params.countryFk"
+                        @update:model-value="searchFn()"
+                        :options="countriesOptions"
+                        option-value="id"
+                        option-label="country"
+                        hide-selected
+                        dense
+                        outlined
+                        rounded
+                    />
+                </QItemSection>
+            </QItem>
+        </template>
+    </VnFilterPanel>
+</template>
+
+<i18n>
+en:
+    params:
+        search: General search
+        nickname: Alias
+        nif: Tax number
+        provinceFk: Province
+        countryFk: Country
+es:
+    params:
+        search: Búsqueda general
+        nickname: Alias
+        nif: NIF/CIF
+        provinceFk: Provincia
+        countryFk: País
+</i18n>

From 33332a5c044ec597da5485d8275954e60424fd33 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Thu, 25 Jan 2024 12:21:41 +0100
Subject: [PATCH 13/49] refs #6677 url

---
 src/components/common/VnSelectFilter.vue        | 5 +++--
 src/pages/InvoiceIn/Card/InvoiceInBasicData.vue | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index a50ce1236..182ec8e16 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -81,6 +81,7 @@ const filter = (val, options) => {
 const filterHandler = (val, update) => {
     update(
         () => {
+            if ($props.url) return;
             if ($props.defaultFilter)
                 myOptions.value = filter(val, myOptionsOriginal.value);
         },
@@ -100,13 +101,13 @@ watch(options, (newValue) => {
 
 <template>
     <FetchData
+        v-if="$props.url"
         ref="dataRef"
         :url="$props.url"
-        @on-fetch="(data) => (dataRef = data)"
+        @on-fetch="(data) => setOptions(data)"
         auto-load
     />
     <QSelect
-        v-if="dataRef"
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 55884cd04..75c93694d 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -200,7 +200,8 @@ function supplierRefFilter(val) {
                     <VnSelectFilter
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        option-value="id"
+                        option-value="id
+                        "
                         option-label="nickname"
                         url="Suppliers"
                         :filter="{ fields: ['id', 'code'], order: 'code' }"

From d86ac6f31bbe2a91e34ea5b23911d626ba201cdc Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Fri, 26 Jan 2024 16:08:49 +0100
Subject: [PATCH 14/49] feat: refs #6654 sticky class

---
 src/components/ui/VnSubToolbar.vue            | 20 +++++++++++++++----
 .../Customer/Defaulter/CustomerDefaulter.vue  | 12 +++++------
 .../ExtendedList/CustomerExtendedList.vue     | 12 +++++------
 src/pages/InvoiceOut/InvoiceOutList.vue       |  9 +++++----
 src/pages/Travel/ExtraCommunity.vue           | 11 +++++-----
 5 files changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 81a1820f1..7f30c9921 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -1,6 +1,7 @@
 <script setup>
-import { onMounted, onUnmounted, ref } from 'vue';
+import { onMounted, onUnmounted } from 'vue';
 import { useStateStore } from 'stores/useStateStore';
+
 const stateStore = useStateStore();
 
 onMounted(() => {
@@ -13,9 +14,20 @@ onUnmounted(() => {
 </script>
 
 <template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
+    <QToolbar class="bg-vn-dark justify-end sticky">
+        <slot name="st-data">
+            <div id="st-data"></div>
+        </slot>
         <QSpace />
-        <div id="st-actions"></div>
+        <slot name="st-actions">
+            <div id="st-actions"></div>
+        </slot>
     </QToolbar>
 </template>
+<style scoped>
+.sticky {
+    position: sticky;
+    top: 60px;
+    z-index: 1;
+}
+</style>
diff --git a/src/pages/Customer/Defaulter/CustomerDefaulter.vue b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
index d54d5df35..3ab1cfa66 100644
--- a/src/pages/Customer/Defaulter/CustomerDefaulter.vue
+++ b/src/pages/Customer/Defaulter/CustomerDefaulter.vue
@@ -12,6 +12,7 @@ import CustomerNotificationsFilter from './CustomerDefaulterFilter.vue';
 import CustomerBalanceDueTotal from './CustomerBalanceDueTotal.vue';
 import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const stateStore = useStateStore();
@@ -188,14 +189,11 @@ const selectWorkerId = (id) => {
             <CustomerNotificationsFilter data-key="CustomerDefaulter" />
         </QScrollArea>
     </QDrawer>
-
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-data>
             <CustomerBalanceDueTotal :amount="balanceDueTotal" />
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
         <QTable
diff --git a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
index caee06d60..993b84022 100644
--- a/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
+++ b/src/pages/Customer/ExtendedList/CustomerExtendedList.vue
@@ -9,6 +9,7 @@ import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorP
 import CustomerExtendedListActions from './CustomerExtendedListActions.vue';
 import CustomerExtendedListFilter from './CustomerExtendedListFilter.vue';
 import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
@@ -500,9 +501,8 @@ const selectSalesPersonId = (id) => {
             />
         </QScrollArea>
     </QDrawer>
-
-    <QToolbar class="bg-vn-dark">
-        <div id="st-data">
+    <VnSubToolbar>
+        <template #st-actions>
             <TableVisibleColumns
                 :all-columns="allColumnNames"
                 table-code="clientsDetail"
@@ -511,10 +511,8 @@ const selectSalesPersonId = (id) => {
                     visibleColumns = ['customerStatus', ...$event, 'actions']
                 "
             />
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
 
     <QPage class="column items-center q-pa-md">
         <QTable
diff --git a/src/pages/InvoiceOut/InvoiceOutList.vue b/src/pages/InvoiceOut/InvoiceOutList.vue
index 292fa2e0a..974847dff 100644
--- a/src/pages/InvoiceOut/InvoiceOutList.vue
+++ b/src/pages/InvoiceOut/InvoiceOutList.vue
@@ -11,6 +11,7 @@ import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import InvoiceOutFilter from './InvoiceOutFilter.vue';
 import VnLv from 'src/components/ui/VnLv.vue';
 import CardList from 'src/components/ui/CardList.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const { t } = useI18n();
 const selectedCards = ref(new Map());
@@ -129,8 +130,8 @@ const downloadCsv = () => {
             url="InvoiceOuts/filter"
         >
             <template #body="{ rows }">
-                <QToolbar class="bg-vn-dark justify-end">
-                    <div id="st-actions">
+                <VnSubToolbar class="bg-vn-dark justify-end">
+                    <template #st-actions>
                         <QBtn
                             @click="downloadCsv()"
                             class="q-mr-xl"
@@ -178,8 +179,8 @@ const downloadCsv = () => {
                             :model-value="selectedCards.size === rows.length"
                             class="q-mr-md"
                         />
-                    </div>
-                </QToolbar>
+                    </template>
+                </VnSubToolbar>
                 <div class="flex flex-center q-pa-md">
                     <div class="card-list">
                         <CardList
diff --git a/src/pages/Travel/ExtraCommunity.vue b/src/pages/Travel/ExtraCommunity.vue
index 62292f115..99a97bb5d 100644
--- a/src/pages/Travel/ExtraCommunity.vue
+++ b/src/pages/Travel/ExtraCommunity.vue
@@ -16,6 +16,7 @@ import { useArrayData } from 'composables/useArrayData';
 import { toDate } from 'src/filters';
 import { usePrintService } from 'composables/usePrintService';
 import travelService from 'src/services/travel.service';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const router = useRouter();
 const stateStore = useStateStore();
@@ -258,13 +259,11 @@ onMounted(async () => {
             />
         </Teleport>
     </template>
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data"></div>
-        <QSpace />
-        <div id="st-actions">
+    <VnSubToolbar>
+        <template #st-actions>
             <QBtn color="primary" icon-right="archive" no-caps @click="openReportPdf()" />
-        </div>
-    </QToolbar>
+        </template>
+    </VnSubToolbar>
     <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>
         <QScrollArea class="fit text-grey-8">
             <ExtraCommunityFilter data-key="ExtraCommunity" />

From 4fae8e633b91f17dc5d74529d45990cd91aba208 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Jan 2024 16:36:27 -0300
Subject: [PATCH 15/49] Create items module base structure, item descriptor and
 add it to supplier consumption

---
 src/components/RegularizeStockForm.vue        |  81 ++++++
 src/composables/useState.js                   |   2 +
 src/composables/useUserConfig.js              |   1 +
 src/i18n/en/index.js                          |  19 ++
 src/i18n/es/index.js                          |  19 ++
 src/pages/Item/Card/ItemCard.vue              |  25 ++
 src/pages/Item/Card/ItemDescriptor.vue        | 260 ++++++++++++++++++
 src/pages/Item/Card/ItemDescriptorProxy.vue   |  26 ++
 src/pages/Item/Card/ItemDiary.vue             |   1 +
 src/pages/Item/Card/ItemSummary.vue           |   1 +
 src/pages/Item/Card/ItemSummaryDialog.vue     |   5 +
 src/pages/Item/Card/ItemTags.vue              |   1 +
 src/pages/Item/ItemList.vue                   |   1 +
 src/pages/Item/ItemMain.vue                   |  18 ++
 .../Supplier/Card/SupplierConsumption.vue     |   6 +-
 src/router/modules/index.js                   |   2 +
 src/router/modules/item.js                    |  70 +++++
 src/router/routes.js                          |   2 +
 src/stores/useNavigationStore.js              |  20 +-
 19 files changed, 549 insertions(+), 11 deletions(-)
 create mode 100644 src/components/RegularizeStockForm.vue
 create mode 100644 src/pages/Item/Card/ItemCard.vue
 create mode 100644 src/pages/Item/Card/ItemDescriptor.vue
 create mode 100644 src/pages/Item/Card/ItemDescriptorProxy.vue
 create mode 100644 src/pages/Item/Card/ItemDiary.vue
 create mode 100644 src/pages/Item/Card/ItemSummary.vue
 create mode 100644 src/pages/Item/Card/ItemSummaryDialog.vue
 create mode 100644 src/pages/Item/Card/ItemTags.vue
 create mode 100644 src/pages/Item/ItemList.vue
 create mode 100644 src/pages/Item/ItemMain.vue
 create mode 100644 src/router/modules/item.js

diff --git a/src/components/RegularizeStockForm.vue b/src/components/RegularizeStockForm.vue
new file mode 100644
index 000000000..28236be17
--- /dev/null
+++ b/src/components/RegularizeStockForm.vue
@@ -0,0 +1,81 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const props = defineProps({
+    itemFk: {
+        type: Number,
+        default: null,
+    },
+    warehouseFk: {
+        type: Boolean,
+        default: null,
+    },
+});
+
+const { t } = useI18n();
+
+const regularizeFormData = reactive({
+    itemFk: props.itemFk,
+    warehouseFk: props.warehouseFk,
+    quantity: null,
+});
+
+const warehousesOptions = ref([]);
+
+const onDataSaved = (data) => {
+    emit('onDataSaved', data);
+};
+</script>
+
+<template>
+    <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    />
+    <FormModelPopup
+        url-create="Items/regularize"
+        model="Items"
+        :title="t('Regularize stock')"
+        :form-initial-data="regularizeFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QInput
+                        :label="t('Type the visible quantity')"
+                        v-model.number="data.quantity"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <VnSelectFilter
+                        :label="t('Warehouse')"
+                        v-model="data.warehouseFk"
+                        :options="warehousesOptions"
+                        option-value="id"
+                        option-label="name"
+                        hide-selected
+                    />
+                </div>
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Warehouse: Almacén
+    Type the visible quantity: Introduce la cantidad visible
+    Regularize stock: Regularizar stock
+</i18n>
diff --git a/src/composables/useState.js b/src/composables/useState.js
index 1c797e992..6ad8eb22c 100644
--- a/src/composables/useState.js
+++ b/src/composables/useState.js
@@ -25,6 +25,7 @@ export function useState() {
                 lang: user.value.lang,
                 darkMode: user.value.darkMode,
                 companyFk: user.value.companyFk,
+                warehouseFk: user.value.warehouseFk,
             };
         });
     }
@@ -37,6 +38,7 @@ export function useState() {
             lang: data.lang,
             darkMode: data.darkMode,
             companyFk: data.companyFk,
+            warehouseFk: data.warehouseFk,
         };
     }
 
diff --git a/src/composables/useUserConfig.js b/src/composables/useUserConfig.js
index e05d7fb5c..a33779be7 100644
--- a/src/composables/useUserConfig.js
+++ b/src/composables/useUserConfig.js
@@ -12,6 +12,7 @@ export function useUserConfig() {
             const user = state.getUser().value;
             user.darkMode = data.darkMode;
             user.companyFk = data.companyFk;
+            user.warehouseFk = data.warehouseFk;
             state.setUser(user);
 
             return data;
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 1a7a4c27e..ea8769c58 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1060,6 +1060,25 @@ export default {
             totalEntries: 'Total entries',
         },
     },
+    item: {
+        pageTitles: {
+            items: 'Items',
+            list: 'List',
+            diary: 'Diary',
+            tags: 'Tags',
+        },
+        descriptor: {
+            item: 'Item',
+            buyer: 'Buyer',
+            color: 'Color',
+            category: 'Category',
+            stems: 'Stems',
+            visible: 'Visible',
+            available: 'Available',
+            warehouseText: 'Calculated on the warehouse of { warehouseName }',
+            itemDiary: 'Item diary',
+        },
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 83de42ee0..9f407ab0b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1060,6 +1060,25 @@ export default {
             totalEntries: 'Ent. totales',
         },
     },
+    item: {
+        pageTitles: {
+            items: 'Artículos',
+            list: 'Listado',
+            diary: 'Histórico',
+            tags: 'Etiquetas',
+        },
+        descriptor: {
+            item: 'Artículo',
+            buyer: 'Comprador',
+            color: 'Color',
+            category: 'Categoría',
+            stems: 'Tallos',
+            visible: 'Visible',
+            available: 'Disponible',
+            warehouseText: 'Calculado sobre el almacén de { warehouseName }',
+            itemDiary: 'Registro de compra-venta',
+        },
+    },
     components: {
         topbar: {},
         userPanel: {
diff --git a/src/pages/Item/Card/ItemCard.vue b/src/pages/Item/Card/ItemCard.vue
new file mode 100644
index 000000000..57c3a434d
--- /dev/null
+++ b/src/pages/Item/Card/ItemCard.vue
@@ -0,0 +1,25 @@
+<script setup>
+import LeftMenu from 'components/LeftMenu.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import ItemDescriptor from './ItemDescriptor.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+const stateStore = useStateStore();
+</script>
+<template>
+    <QDrawer v-model="stateStore.leftDrawer" show-if-above :width="256">
+        <QScrollArea class="fit">
+            <ItemDescriptor />
+            <QSeparator />
+            <LeftMenu source="card" />
+        </QScrollArea>
+    </QDrawer>
+    <QPageContainer>
+        <QPage>
+            <VnSubToolbar />
+
+            <div class="q-pa-md"><RouterView></RouterView></div>
+        </QPage>
+    </QPageContainer>
+</template>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
new file mode 100644
index 000000000..e5183779b
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -0,0 +1,260 @@
+<script setup>
+import { computed, ref, onMounted } from 'vue';
+import { useRoute, useRouter } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+import { useQuasar } from 'quasar';
+
+import CardDescriptor from 'src/components/ui/CardDescriptor.vue';
+import VnLv from 'src/components/ui/VnLv.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnConfirm from 'components/ui/VnConfirm.vue';
+import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+
+import { useState } from 'src/composables/useState';
+import useCardDescription from 'src/composables/useCardDescription';
+import { useSession } from 'src/composables/useSession';
+import axios from 'axios';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: false,
+        default: null,
+    },
+    summary: {
+        type: Object,
+        default: null,
+    },
+    dated: {
+        type: String,
+        default: null,
+    },
+});
+
+const quasar = useQuasar();
+const route = useRoute();
+const router = useRouter();
+const { t } = useI18n();
+const { getToken } = useSession();
+const state = useState();
+const user = state.getUser();
+
+const entityId = computed(() => {
+    return $props.id || route.params.id;
+});
+const regularizeStockFormDialog = ref(null);
+const item = ref(null);
+const available = ref(null);
+const visible = ref(null);
+const _warehouseFk = ref(null);
+const warehouseText = ref(null);
+const warehouseFk = computed({
+    get() {
+        return _warehouseFk.value;
+    },
+    set(val) {
+        _warehouseFk.value = val;
+        if (val) {
+            updateStock();
+            getWarehouseName(val);
+        }
+    },
+});
+const showWarehouseIconTooltip = ref(true);
+
+onMounted(() => {
+    warehouseFk.value = user.value.warehouseFk;
+});
+
+function getItemAvatar() {
+    const token = getToken();
+    return `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}`;
+}
+
+const data = ref(useCardDescription());
+const setData = (entity) => {
+    if (!entity) return;
+    data.value = useCardDescription(entity.name, entity.id);
+};
+
+const getWarehouseName = async (warehouseFk) => {
+    try {
+        showWarehouseIconTooltip.value = false;
+
+        const filter = {
+            where: { id: warehouseFk },
+        };
+
+        const { data } = await axios.get('Warehouses/findOne', { filter });
+
+        warehouseText.value = t('item.descriptor.warehouseText', {
+            warehouseName: data.name,
+        });
+
+        showWarehouseIconTooltip.value = true;
+    } catch (err) {
+        console.error('Error finding warehouse');
+    }
+};
+
+const updateStock = async () => {
+    try {
+        available.value = null;
+        visible.value = null;
+
+        const params = {
+            warehouseFk: warehouseFk.value,
+            dated: $props.dated,
+        };
+
+        const { data } = await axios.get(`Items/${entityId.value}/getVisibleAvailable`, {
+            params,
+        });
+
+        available.value = data.available;
+        visible.value = data.visible;
+    } catch (err) {
+        console.error('Error updating stock');
+    }
+};
+
+const openRegularizeStockForm = () => {
+    regularizeStockFormDialog.value.show();
+};
+
+const cloneItem = async () => {
+    try {
+        const { data } = await axios.post(`Items/${entityId.value}/clone`);
+        router.push({ name: 'ItemTags', params: { id: data.id } });
+    } catch (err) {
+        console.error('Error cloning item');
+    }
+};
+
+const openCloneDialog = async () => {
+    quasar
+        .dialog({
+            component: VnConfirm,
+            componentProps: {
+                title: t("All it's properties will be copied"),
+                message: t('Do you want to clone this item?'),
+            },
+        })
+        .onOk(async () => {
+            await cloneItem();
+        });
+};
+</script>
+
+<template>
+    <CardDescriptor
+        data-key="ItemData"
+        module="Item"
+        :title="data.title"
+        :subtitle="data.subtitle"
+        :summary="$props.summary"
+        :url="`Items/${entityId}/getCard`"
+        @on-fetch="
+            (data) => {
+                item = data;
+                setData(data);
+            }
+        "
+    >
+        <template #menu="{}">
+            <QItem v-ripple clickable @click="openRegularizeStockForm()">
+                <QItemSection>
+                    {{ t('Regularize stock') }}
+                    <QDialog ref="regularizeStockFormDialog">
+                        <RegularizeStockForm
+                            :item-fk="entityId"
+                            :warehouse-fk="warehouseFk"
+                            @on-data-saved="updateStock()"
+                        />
+                    </QDialog>
+                </QItemSection>
+            </QItem>
+            <QItem v-ripple clickable @click="openCloneDialog()">
+                <QItemSection>
+                    {{ t('Clone') }}
+                </QItemSection>
+            </QItem>
+        </template>
+        <template #before>
+            <QImg :src="getItemAvatar()" class="photo">
+                <template #error>
+                    <div
+                        class="absolute-full picture text-center q-pa-md flex flex-center"
+                    >
+                        <div>
+                            <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
+                                <QIcon name="vn:item" />
+                            </div>
+                            <div class="text-grey-5" style="opacity: 0.4">
+                                {{ t('item.descriptor.item') }}
+                            </div>
+                        </div>
+                    </div>
+                </template>
+            </QImg>
+            <div class="row justify-between full-width bg-primary">
+                <div class="col column items-center">
+                    <span class="text-uppercase">
+                        {{ t('item.descriptor.visible') }}
+                    </span>
+                    <span class="text-weight-bold text-h5">{{ visible }}</span>
+                </div>
+                <div class="col column items-center">
+                    <span class="text-uppercase">
+                        {{ t('item.descriptor.available') }}
+                    </span>
+                    <span class="text-weight-bold text-h5">{{ available }}</span>
+                </div>
+                <div class="col column items-center justify-center">
+                    <QIcon name="info" class="cursor-pointer" size="md">
+                        <QTooltip>{{ warehouseText }}</QTooltip>
+                    </QIcon>
+                </div>
+            </div>
+        </template>
+        <template #body="{ entity }">
+            <VnLv :label="t('item.descriptor.buyer')">
+                <template #value>
+                    <span class="link">
+                        {{ t('item.descriptor.buyer') }}
+                        <WorkerDescriptorProxy :id="entity.itemType?.worker?.id" />
+                    </span>
+                </template>
+            </VnLv>
+            <VnLv :label="t('item.descriptor.color')" :value="entity.value5"> </VnLv>
+            <VnLv :label="t('item.descriptor.color')" :value="entity.value6" />
+            <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
+        </template>
+        <template #actions="{}">
+            <QCardActions>
+                <QBtn
+                    :to="{ name: 'ItemDiary' }"
+                    size="md"
+                    icon="vn:transaction"
+                    color="primary"
+                >
+                    <QTooltip>{{ t('item.descriptor.itemDiary') }}</QTooltip>
+                </QBtn>
+            </QCardActions>
+        </template>
+    </CardDescriptor>
+</template>
+
+<i18n>
+es:
+    Regularize stock: Regularizar stock
+    Clone: Clonar
+    All it's properties will be copied: Todas sus propiedades serán copiadas
+    Do you want to clone this item?: ¿Desea clonar este artículo?
+</i18n>
+
+<style lang="scss" scoped>
+.photo {
+    height: 256px;
+}
+</style>
diff --git a/src/pages/Item/Card/ItemDescriptorProxy.vue b/src/pages/Item/Card/ItemDescriptorProxy.vue
new file mode 100644
index 000000000..58471dc83
--- /dev/null
+++ b/src/pages/Item/Card/ItemDescriptorProxy.vue
@@ -0,0 +1,26 @@
+<script setup>
+import ItemDescriptor from './ItemDescriptor.vue';
+import ItemSummaryDialog from './ItemSummaryDialog.vue';
+
+const $props = defineProps({
+    id: {
+        type: Number,
+        required: true,
+    },
+    dated: {
+        type: String,
+        default: null,
+    },
+});
+</script>
+
+<template>
+    <QPopupProxy>
+        <ItemDescriptor
+            v-if="$props.id"
+            :id="$props.id"
+            :summary="ItemSummaryDialog"
+            :dated="dated"
+        />
+    </QPopupProxy>
+</template>
diff --git a/src/pages/Item/Card/ItemDiary.vue b/src/pages/Item/Card/ItemDiary.vue
new file mode 100644
index 000000000..21249349f
--- /dev/null
+++ b/src/pages/Item/Card/ItemDiary.vue
@@ -0,0 +1 @@
+<template>Item diary (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
diff --git a/src/pages/Item/Card/ItemSummary.vue b/src/pages/Item/Card/ItemSummary.vue
new file mode 100644
index 000000000..567fbf32b
--- /dev/null
+++ b/src/pages/Item/Card/ItemSummary.vue
@@ -0,0 +1 @@
+<template>Item summary</template>
diff --git a/src/pages/Item/Card/ItemSummaryDialog.vue b/src/pages/Item/Card/ItemSummaryDialog.vue
new file mode 100644
index 000000000..4af617fd9
--- /dev/null
+++ b/src/pages/Item/Card/ItemSummaryDialog.vue
@@ -0,0 +1,5 @@
+<template>
+    <QDialog
+        >Item summary dialog (A DESARROLLAR CUANDO SE CREE EL MODULO DE ITEMS)</QDialog
+    >
+</template>
diff --git a/src/pages/Item/Card/ItemTags.vue b/src/pages/Item/Card/ItemTags.vue
new file mode 100644
index 000000000..95f4380e4
--- /dev/null
+++ b/src/pages/Item/Card/ItemTags.vue
@@ -0,0 +1 @@
+<template>Item tags (CREAR CUANDO SE DESARROLLE EL MODULO DE ITEMS)</template>
diff --git a/src/pages/Item/ItemList.vue b/src/pages/Item/ItemList.vue
new file mode 100644
index 000000000..49a5dbb64
--- /dev/null
+++ b/src/pages/Item/ItemList.vue
@@ -0,0 +1 @@
+<template>Item list</template>
diff --git a/src/pages/Item/ItemMain.vue b/src/pages/Item/ItemMain.vue
new file mode 100644
index 000000000..c1f2a31db
--- /dev/null
+++ b/src/pages/Item/ItemMain.vue
@@ -0,0 +1,18 @@
+<script setup>
+import LeftMenu from 'src/components/LeftMenu.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+
+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/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 7baa8ded5..06438349b 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -7,6 +7,7 @@ import { useQuasar } from 'quasar';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 import SupplierConsumptionFilter from './SupplierConsumptionFilter.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
 
 import { toDate } from 'src/filters';
 import { dashIfEmpty } from 'src/filters';
@@ -174,7 +175,10 @@ onMounted(async () => {
                     <QTd no-hover>{{ row.invoiceNumber }}</QTd>
                 </QTr>
                 <QTr v-for="(buy, index) in row.buys" :key="index">
-                    <QTd no-hover> {{ buy.itemName }}</QTd>
+                    <QTd no-hover>
+                        <QBtn flat color="blue" dense>{{ buy.itemName }}</QBtn>
+                        <ItemDescriptorProxy :id="buy.itemFk" />
+                    </QTd>
 
                     <QTd no-hover>
                         <span>{{ buy.subName }}</span>
diff --git a/src/router/modules/index.js b/src/router/modules/index.js
index cc5034959..84a26798d 100644
--- a/src/router/modules/index.js
+++ b/src/router/modules/index.js
@@ -1,3 +1,4 @@
+import Item from './item';
 import Customer from './customer';
 import Ticket from './ticket';
 import Claim from './claim';
@@ -14,6 +15,7 @@ import Department from './department';
 import Entry from './entry';
 
 export default [
+    Item,
     Customer,
     Ticket,
     Claim,
diff --git a/src/router/modules/item.js b/src/router/modules/item.js
new file mode 100644
index 000000000..d3462e15c
--- /dev/null
+++ b/src/router/modules/item.js
@@ -0,0 +1,70 @@
+import { RouterView } from 'vue-router';
+
+export default {
+    path: '/item',
+    name: 'Item',
+    meta: {
+        title: 'items',
+        icon: 'vn:item',
+    },
+    component: RouterView,
+    redirect: { name: 'ItemMain' },
+    menus: {
+        main: [],
+        card: [],
+    },
+    children: [
+        {
+            path: '',
+            name: 'ItemMain',
+            component: () => import('src/pages/Item/ItemMain.vue'),
+            redirect: { name: 'Itemlist' },
+            children: [
+                {
+                    path: 'list',
+                    name: 'ItemList',
+                    meta: {
+                        title: 'list',
+                        icon: 'view_list',
+                    },
+                    component: () => import('src/pages/Item/ItemList.vue'),
+                },
+            ],
+        },
+        {
+            name: 'ItemCard',
+            path: ':id',
+            component: () => import('src/pages/Item/Card/ItemCard.vue'),
+            redirect: { name: 'ItemSummary' },
+            children: [
+                {
+                    name: 'ItemSummary',
+                    path: 'summary',
+                    meta: {
+                        title: 'summary',
+                        icon: 'launch',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemSummary.vue'),
+                },
+                {
+                    path: 'diary',
+                    name: 'ItemDiary',
+                    meta: {
+                        title: 'diary',
+                        icon: 'vn:transaction',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemDiary.vue'),
+                },
+                {
+                    path: 'tags',
+                    name: 'ItemTags',
+                    meta: {
+                        title: 'Tags',
+                        icon: 'vn:tags',
+                    },
+                    component: () => import('src/pages/Item/Card/ItemTags.vue'),
+                },
+            ],
+        },
+    ],
+};
diff --git a/src/router/routes.js b/src/router/routes.js
index 6a2fa6a97..d1027955f 100644
--- a/src/router/routes.js
+++ b/src/router/routes.js
@@ -1,3 +1,4 @@
+import item from './modules/item';
 import customer from './modules/customer';
 import ticket from './modules/ticket';
 import claim from './modules/claim';
@@ -51,6 +52,7 @@ const routes = [
                 component: () => import('../pages/Dashboard/DashboardMain.vue'),
             },
             // Module routes
+            item,
             customer,
             ticket,
             claim,
diff --git a/src/stores/useNavigationStore.js b/src/stores/useNavigationStore.js
index 2eda6f686..568063d1d 100644
--- a/src/stores/useNavigationStore.js
+++ b/src/stores/useNavigationStore.js
@@ -7,19 +7,19 @@ import routes from 'src/router/modules';
 
 export const useNavigationStore = defineStore('navigationStore', () => {
     const modules = [
-        'customer',
-        'claim',
-        'ticket',
-        'invoiceOut',
-        'invoiceIn',
-        'worker',
         'shelving',
         'order',
-        'wagon',
-        'route',
-        'supplier',
-        'travel',
+        'customer',
         'entry',
+        'travel',
+        'invoiceOut',
+        'invoiceIn',
+        'supplier',
+        'claim',
+        'route',
+        'ticket',
+        'worker',
+        'wagon',
     ];
     const pinnedModules = ref([]);
     const role = useRole();

From 9d90a3808f0c4e41b71e474791e0b9c24e763f6b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Fri, 26 Jan 2024 16:40:59 -0300
Subject: [PATCH 16/49] apply item descriptor in OrderCatalogItem

---
 src/pages/Order/Card/OrderCatalogItem.vue | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/pages/Order/Card/OrderCatalogItem.vue b/src/pages/Order/Card/OrderCatalogItem.vue
index 140a4c349..5056e0523 100644
--- a/src/pages/Order/Card/OrderCatalogItem.vue
+++ b/src/pages/Order/Card/OrderCatalogItem.vue
@@ -1,10 +1,13 @@
 <script setup>
-import { useSession } from 'composables/useSession';
-import VnLv from 'components/ui/VnLv.vue';
-import { useI18n } from 'vue-i18n';
-import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
-import toCurrency from '../../../filters/toCurrency';
 import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnLv from 'components/ui/VnLv.vue';
+import OrderCatalogItemDialog from 'pages/Order/Card/OrderCatalogItemDialog.vue';
+import ItemDescriptorProxy from 'src/pages/Item/Card/ItemDescriptorProxy.vue';
+
+import { useSession } from 'composables/useSession';
+import toCurrency from '../../../filters/toCurrency';
 
 const DEFAULT_PRICE_KG = 0;
 
@@ -42,7 +45,10 @@ const dialog = ref(null);
                 </div>
             </div>
             <div class="content">
-                <span class="link">{{ item.name }}</span>
+                <span class="link">
+                    {{ item.name }}
+                    <ItemDescriptorProxy :id="item.id" />
+                </span>
                 <p class="subName">{{ item.subName }}</p>
                 <template v-for="index in 4" :key="`tag-${index}`">
                     <VnLv
@@ -72,7 +78,8 @@ const dialog = ref(null);
                         </QIcon>
                     </div>
                     <p v-if="item.priceKg" class="price-kg">
-                        {{ t('price-kg') }} {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
+                        {{ t('price-kg') }}
+                        {{ toCurrency(item.priceKg) || DEFAULT_PRICE_KG }}
                     </p>
                 </div>
             </div>

From 0edfe24a8588b982136c4c66c09b880b66c80270 Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Mon, 29 Jan 2024 10:25:59 +0100
Subject: [PATCH 17/49] fix: refs #6654 fix css

---
 src/components/ui/VnSubToolbar.vue | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index 7f30c9921..ba5705122 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -24,10 +24,15 @@ onUnmounted(() => {
         </slot>
     </QToolbar>
 </template>
-<style scoped>
+<style lang="scss" scoped>
 .sticky {
     position: sticky;
-    top: 60px;
+    top: 62px;
     z-index: 1;
 }
+@media (max-width: $breakpoint-xs) {
+    .sticky {
+        top: 90px;
+    }
+}
 </style>

From a89748827f45f621afae11f63345640a6ba427c3 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 11:42:08 +0100
Subject: [PATCH 18/49] refs #6677 url

---
 src/components/FetchData.vue                  |  3 +-
 src/components/common/VnSelectFilter.vue      | 72 +++++++++++++++----
 src/pages/Claim/Card/ClaimDevelopment.vue     |  4 +-
 .../InvoiceIn/Card/InvoiceInBasicData.vue     | 45 ++++--------
 4 files changed, 75 insertions(+), 49 deletions(-)

diff --git a/src/components/FetchData.vue b/src/components/FetchData.vue
index 137f751db..4f5d7a57d 100644
--- a/src/components/FetchData.vue
+++ b/src/components/FetchData.vue
@@ -45,7 +45,7 @@ onMounted(async () => {
 async function fetch(fetchFilter = {}) {
     try {
         const filter = Object.assign(fetchFilter, $props.filter); // eslint-disable-line vue/no-dupe-keys
-        if ($props.where) filter.where = $props.where;
+        if ($props.where && !fetchFilter.where) filter.where = $props.where;
         if ($props.sortBy) filter.order = $props.sortBy;
         if ($props.limit) filter.limit = $props.limit;
 
@@ -54,6 +54,7 @@ async function fetch(fetchFilter = {}) {
         });
 
         emit('onFetch', data);
+        return data;
     } catch (e) {
         //
     }
diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 182ec8e16..5735bf370 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -1,8 +1,8 @@
 <script setup>
 import FetchData from 'src/components/FetchData.vue';
+import { onMounted } from 'vue';
 import { ref, toRefs, computed, watch } from 'vue';
 const emit = defineEmits(['update:modelValue', 'update:options']);
-const dataRef = ref();
 
 const $props = defineProps({
     modelValue: {
@@ -37,12 +37,29 @@ const $props = defineProps({
         type: Boolean,
         default: true,
     },
+    fields: {
+        type: Array,
+        default: null,
+    },
+    where: {
+        type: Object,
+        default: null,
+    },
+    sortBy: {
+        type: String,
+        default: null,
+    },
+    limit: {
+        type: Number,
+        default: 30,
+    },
 });
 
-const { optionLabel, options } = toRefs($props);
+const { optionLabel, optionValue, options, modelValue } = toRefs($props);
 const myOptions = ref([]);
 const myOptionsOriginal = ref([]);
 const vnSelectRef = ref();
+const dataRef = ref();
 
 const value = computed({
     get() {
@@ -57,8 +74,12 @@ function setOptions(data) {
     myOptions.value = JSON.parse(JSON.stringify(data));
     myOptionsOriginal.value = JSON.parse(JSON.stringify(data));
 }
-setOptions(options.value);
-const filter = (val, options) => {
+onMounted(() => {
+    setOptions(options.value);
+    if ($props.url && $props.modelValue) fetchFilter($props.modelValue);
+});
+
+async function filter(val, options) {
     const search = val.toString().toLowerCase();
 
     if (!search) return options;
@@ -76,14 +97,30 @@ const filter = (val, options) => {
 
         return id == search || optionLabel.includes(search);
     });
-};
+}
 
-const filterHandler = (val, update) => {
+async function fetchFilter(val) {
+    console.log('ENTRY PA', dataRef.value);
+    if (!$props.url || !dataRef.value) return;
+
+    const { fields, sortBy, limit } = $props;
+    let key = optionLabel.value;
+
+    if (new RegExp(/\d/g).test(val)) key = optionValue.value;
+
+    const where = { [key]: { like: `%${val}%` } };
+    return dataRef.value.fetch({ fields, where, order: sortBy, limit });
+}
+
+async function filterHandler(val, update) {
     update(
-        () => {
-            if ($props.url) return;
-            if ($props.defaultFilter)
-                myOptions.value = filter(val, myOptionsOriginal.value);
+        async () => {
+            if (!$props.defaultFilter) return;
+            if ($props.url) {
+                myOptions.value = await fetchFilter(val);
+                return;
+            }
+            myOptions.value = await filter(val, myOptionsOriginal.value);
         },
         (ref) => {
             if (val !== '' && ref.options.length > 0) {
@@ -92,25 +129,34 @@ const filterHandler = (val, update) => {
             }
         }
     );
-};
+}
 
 watch(options, (newValue) => {
+    console.log(newValue);
     setOptions(newValue);
 });
+
+watch(modelValue, (newValue) => {
+    if (!myOptions.value.some((option) => option[optionValue.value] == newValue))
+        fetchFilter(newValue);
+});
 </script>
 
 <template>
     <FetchData
-        v-if="$props.url"
         ref="dataRef"
         :url="$props.url"
         @on-fetch="(data) => setOptions(data)"
-        auto-load
+        :where="where || { [optionValue]: value }"
+        :limit="limit || 30"
+        :order-by="orderBy"
+        :fields="fields"
     />
     <QSelect
         v-model="value"
         :options="myOptions"
         :option-label="optionLabel"
+        :option-value="optionValue"
         v-bind="$attrs"
         emit-value
         map-options
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index 0b740cf64..d5a20b89f 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -182,8 +182,8 @@ const columns = computed(() => [
                                         </QItemLabel>
                                     </QItemSection>
                                 </QItem>
-                            </template>
-                        </VnSelectFilter>
+                            </template> </VnSelectFilter
+                        >s
                     </QTd>
                 </template>
                 <template #item="props">
diff --git a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
index 75c93694d..2f8435166 100644
--- a/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
+++ b/src/pages/InvoiceIn/Card/InvoiceInBasicData.vue
@@ -4,10 +4,12 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useArrayData } from 'src/composables/useArrayData';
-
 import { downloadFile } from 'src/composables/downloadFile';
+
 import FormModel from 'components/FormModel.vue';
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'src/components/FetchData.vue';
+
 import axios from 'axios';
 
 const quasar = useQuasar();
@@ -20,9 +22,6 @@ const arrayData = useArrayData('InvoiceIn');
 const invoiceIn = computed(() => arrayData.store.data);
 const userConfig = ref(null);
 
-const suppliers = ref([]);
-const suppliersRef = ref();
-const suppliersRefFilter = ref({ fields: ['id', 'nickname'], limit: 30 });
 const currencies = ref([]);
 const currenciesRef = ref();
 const companies = ref([]);
@@ -130,31 +129,13 @@ async function upsert() {
         });
     }
 }
-
-function supplierRefFilter(val) {
-    let where = { limit: 30 };
-    let params = {};
-    let key = 'nickname';
-
-    if (new RegExp(/\d/g).test(val)) {
-        key = 'id';
-    }
-    params = { [key]: { like: `%${val}%` } };
-    where = Object.assign(where, params);
-    suppliersRef.value.fetch({ where });
-}
 </script>
 <template>
-    <!-- <FetchData
-        ref="suppliersRef"
-        url="Suppliers"
-        @on-fetch="(data) => (suppliers = data)"
-    /> -->
-    <!-- <FetchData
+    <FetchData
         ref="currenciesRef"
         url="Currencies"
         :filter="{ fields: ['id', 'code'] }"
-        order="code"
+        sort-by="code"
         @on-fetch="(data) => (currencies = data)"
         auto-load
     />
@@ -162,7 +143,7 @@ function supplierRefFilter(val) {
         ref="companiesRef"
         url="Companies"
         :filter="{ fields: ['id', 'code'] }"
-        order="code"
+        sort-by="code"
         @on-fetch="(data) => (companies = data)"
         auto-load
     />
@@ -170,7 +151,7 @@ function supplierRefFilter(val) {
         ref="dmsTypesRef"
         url="DmsTypes"
         :filter="{ fields: ['id', 'name'] }"
-        order="name"
+        sort-by="name"
         @on-fetch="(data) => (dmsTypes = data)"
         auto-load
     />
@@ -178,7 +159,7 @@ function supplierRefFilter(val) {
         ref="warehousesRef"
         url="Warehouses"
         :filter="{ fields: ['id', 'name'] }"
-        order="name"
+        sort-by="name"
         @on-fetch="(data) => (warehouses = data)"
         auto-load
     />
@@ -192,7 +173,7 @@ function supplierRefFilter(val) {
         url="UserConfigs/getUserConfig"
         @on-fetch="(data) => (userConfig = data)"
         auto-load
-    /> -->
+    />
     <FormModel v-if="invoiceIn" :url="`InvoiceIns/${route.params.id}`" model="invoiceIn">
         <template #form="{ data }">
             <div class="row q-gutter-md q-mb-md">
@@ -200,12 +181,11 @@ function supplierRefFilter(val) {
                     <VnSelectFilter
                         :label="t('supplierFk')"
                         v-model="data.supplierFk"
-                        option-value="id
-                        "
+                        option-value="id"
                         option-label="nickname"
                         url="Suppliers"
-                        :filter="{ fields: ['id', 'code'], order: 'code' }"
-                        @update-options="(data) => (suppliersRef = data)"
+                        :fields="['id', 'nickname']"
+                        sort-by="nickname"
                     >
                         <template #option="scope">
                             <QItem v-bind="scope.itemProps">
@@ -416,7 +396,6 @@ function supplierRefFilter(val) {
             <div class="row q-gutter-md q-mb-md">
                 <div class="col">
                     <VnSelectFilter
-                        url="Currencies"
                         :label="t('Currency')"
                         v-model="data.currencyFk"
                         :options="currencies"

From 5e296869a1a91668402dda8d6e5853fb7666362b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 29 Jan 2024 08:59:20 -0300
Subject: [PATCH 19/49] More improvements

---
 src/components/ui/CardDescriptor.vue          |  3 ++-
 .../Supplier/Card/SupplierDescriptor.vue      | 19 ++++++++++++++++++-
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9571c742e..238c12df5 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -81,6 +81,7 @@ function viewSummary(id) {
     <div class="descriptor">
         <template v-if="entity">
             <div class="header bg-primary q-pa-sm justify-between">
+                <slot name="header-extra-action" />
                 <QBtn
                     @click.stop="viewSummary(entity.id)"
                     round
@@ -118,7 +119,7 @@ function viewSummary(id) {
                     icon="more_vert"
                     round
                     size="md"
-                    v-if="slots.menu"
+                    :class="{ invisible: !slots.menu }"
                 >
                     <QTooltip>
                         {{ t('components.cardDescriptor.moreOptions') }}
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 5187708e4..104dad661 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -103,6 +103,22 @@ const getEntryQueryParams = (supplier) => {
         @on-fetch="setData"
         data-key="Supplier"
     >
+        <template #header-extra-action>
+            <QBtn
+                round
+                flat
+                dense
+                size="md"
+                icon="vn:supplier"
+                color="white"
+                class="link"
+                :to="{ name: 'SupplierList' }"
+            >
+                <QTooltip>
+                    {{ t('Go to module index') }}
+                </QTooltip>
+            </QBtn>
+        </template>
         <template #body="{ entity }">
             <VnLv :label="t('supplier.summary.taxNumber')" :value="entity.nif" />
             <VnLv label="Alias" :value="entity.nickname" />
@@ -142,7 +158,7 @@ const getEntryQueryParams = (supplier) => {
                     <QTooltip>{{ t('Go to client') }}</QTooltip>
                 </QBtn>
                 <QBtn
-                    :href="`${url}invoice-in/create`"
+                    :href="`${url}invoice-in/create?supplierFk=${entity.id}`"
                     size="md"
                     icon="vn:invoice-in-create"
                     color="primary"
@@ -159,4 +175,5 @@ es:
     All entries with current supplier: Todas las entradas con proveedor actual
     Go to client: Ir a cliente
     Create invoiceIn: Crear factura recibida
+    Go to module index: Ir al índice del módulo
 </i18n>

From 5c87cfc671306be30b26887c0d04da6b6e970531 Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Mon, 29 Jan 2024 13:54:41 +0100
Subject: [PATCH 20/49] refs #6677 fix e2e

---
 test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
index 0013df343..7617a69d1 100644
--- a/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
+++ b/test/cypress/integration/invoiceIn/invoiceInBasicData.spec.js
@@ -16,11 +16,12 @@ describe('InvoiceInBasicData', () => {
         cy.get(selects).eq(0).type('Bros');
         cy.get(selects).eq(0).type('{enter}');
 
+        cy.get('[title="Reset"]').click();
         cy.get(appendBtns).eq(0).click();
         cy.get('input').eq(2).type(4739);
         cy.saveCard();
 
-        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Bros nick');
+        cy.get(`${selects} input`).eq(0).invoke('val').should('eq', 'Plants nick');
         cy.get('input').eq(2).invoke('val').should('eq', '4739');
     });
 

From 66e119adc3e49a8f8f4a7c7f450514290cbdda8b Mon Sep 17 00:00:00 2001
From: jorgep <jorgep@verdnatura.es>
Date: Tue, 30 Jan 2024 10:30:07 +0100
Subject: [PATCH 21/49] fix: refs #6654 btn responsive & replace toolbars

---
 src/components/ui/CardDescriptor.vue          |  2 -
 src/components/ui/VnSubToolbar.vue            |  4 +-
 src/composables/tMobile.js                    |  2 +-
 src/pages/Claim/Card/ClaimCard.vue            | 14 ----
 src/pages/Claim/Card/ClaimLines.vue           | 35 ++++-----
 src/pages/Route/RouteList.vue                 |  9 ++-
 .../Supplier/Card/SupplierConsumption.vue     | 73 +++++++++----------
 7 files changed, 58 insertions(+), 81 deletions(-)

diff --git a/src/components/ui/CardDescriptor.vue b/src/components/ui/CardDescriptor.vue
index 9571c742e..f33b33717 100644
--- a/src/components/ui/CardDescriptor.vue
+++ b/src/components/ui/CardDescriptor.vue
@@ -49,7 +49,6 @@ onMounted(async () => {
         () => $props.url,
         async (newUrl, lastUrl) => {
             if (newUrl == lastUrl) return;
-            entity.value = null;
             await getData();
         }
     );
@@ -62,7 +61,6 @@ async function getData() {
         skip: 0,
     });
     const { data } = await arrayData.fetch({ append: false, updateRouter: false });
-    entity.value = data;
     emit('onFetch', data);
 }
 const emit = defineEmits(['onFetch']);
diff --git a/src/components/ui/VnSubToolbar.vue b/src/components/ui/VnSubToolbar.vue
index ba5705122..1a6549856 100644
--- a/src/components/ui/VnSubToolbar.vue
+++ b/src/components/ui/VnSubToolbar.vue
@@ -27,10 +27,10 @@ onUnmounted(() => {
 <style lang="scss" scoped>
 .sticky {
     position: sticky;
-    top: 62px;
+    top: 61px;
     z-index: 1;
 }
-@media (max-width: $breakpoint-xs) {
+@media (max-width: $breakpoint-sm) {
     .sticky {
         top: 90px;
     }
diff --git a/src/composables/tMobile.js b/src/composables/tMobile.js
index a6a000b81..61b8e87b4 100644
--- a/src/composables/tMobile.js
+++ b/src/composables/tMobile.js
@@ -4,5 +4,5 @@ import { useI18n } from 'vue-i18n';
 export function tMobile(...args) {
     const quasar = useQuasar();
     const { t } = useI18n();
-    if (!quasar.platform.is.mobile) return t(...args);
+    if (!quasar.screen.xs) return t(...args);
 }
diff --git a/src/pages/Claim/Card/ClaimCard.vue b/src/pages/Claim/Card/ClaimCard.vue
index b6c948c96..64cf736a9 100644
--- a/src/pages/Claim/Card/ClaimCard.vue
+++ b/src/pages/Claim/Card/ClaimCard.vue
@@ -1,27 +1,13 @@
 <script setup>
 import LeftMenu from 'components/LeftMenu.vue';
-import { getUrl } from 'composables/getUrl';
 import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
 import { useStateStore } from 'stores/useStateStore';
-import { computed } from 'vue';
 import { useI18n } from 'vue-i18n';
-import { useRoute } from 'vue-router';
 import ClaimDescriptor from './ClaimDescriptor.vue';
 import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
-const route = useRoute();
-const $props = defineProps({
-    id: {
-        type: Number,
-        required: false,
-        default: null,
-    },
-});
-const entityId = computed(() => {
-    return $props.id || route.params.id;
-});
 </script>
 <template>
     <Teleport to="#searchbar" v-if="stateStore.isHeaderMounted()">
diff --git a/src/pages/Claim/Card/ClaimLines.vue b/src/pages/Claim/Card/ClaimLines.vue
index e7f67bcc2..5190c9932 100644
--- a/src/pages/Claim/Card/ClaimLines.vue
+++ b/src/pages/Claim/Card/ClaimLines.vue
@@ -4,12 +4,11 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
 import { useRoute } from 'vue-router';
-import { useArrayData } from 'composables/useArrayData';
 import { useStateStore } from 'stores/useStateStore';
+import { useArrayData } from 'composables/useArrayData';
+import { toDate, toCurrency, toPercentage } from 'filters/index';
 import CrudModel from 'components/CrudModel.vue';
 import FetchData from 'components/FetchData.vue';
-
-import { toDate, toCurrency, toPercentage } from 'filters/index';
 import VnDiscount from 'components/common/vnDiscount.vue';
 import ClaimLinesImport from './ClaimLinesImport.vue';
 
@@ -158,23 +157,21 @@ function showImportDialog() {
 </script>
 <template>
     <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
-        <QToolbar>
-            <div class="row q-gutter-md">
-                <div>
-                    {{ t('Amount') }}
-                    <QChip :dense="$q.screen.lt.sm">
-                        {{ toCurrency(amount) }}
-                    </QChip>
-                </div>
-                <QSeparator dark vertical />
-                <div>
-                    {{ t('Amount Claimed') }}
-                    <QChip color="positive" :dense="$q.screen.lt.sm">
-                        {{ toCurrency(amountClaimed) }}
-                    </QChip>
-                </div>
+        <div class="row q-gutter-md">
+            <div>
+                {{ t('Amount') }}
+                <QChip :dense="$q.screen.lt.sm">
+                    {{ toCurrency(amount) }}
+                </QChip>
             </div>
-        </QToolbar>
+            <QSeparator dark vertical />
+            <div>
+                {{ t('Amount Claimed') }}
+                <QChip color="positive" :dense="$q.screen.lt.sm">
+                    {{ toCurrency(amountClaimed) }}
+                </QChip>
+            </div>
+        </div>
     </Teleport>
 
     <FetchData
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index 591f723e9..2a72a8303 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -15,6 +15,7 @@ import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
 import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
 import { useQuasar } from 'quasar';
 import RouteSummaryDialog from 'pages/Route/Card/RouteSummaryDialog.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
 
 const stateStore = useStateStore();
 const { t } = useI18n();
@@ -228,8 +229,8 @@ function previewRoute(id) {
     <FetchData url="AgencyModes" @on-fetch="(data) => (agencyList = data)" auto-load />
     <FetchData url="Vehicles" @on-fetch="(data) => (vehicleList = data)" auto-load />
     <QPage class="column items-center">
-        <QToolbar class="bg-vn-dark justify-end">
-            <div id="st-actions" class="q-pa-sm">
+        <VnSubToolbar class="bg-vn-dark justify-end">
+            <template #st-actions>
                 <QBtn
                     icon="vn:clone"
                     color="primary"
@@ -249,8 +250,8 @@ function previewRoute(id) {
                 >
                     <QTooltip>{{ t('Mark as served') }}</QTooltip>
                 </QBtn>
-            </div>
-        </QToolbar>
+            </template>
+        </VnSubToolbar>
         <div class="route-list">
             <VnPaginate
                 :key="refreshKey"
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 714499f63..e31a0e5cc 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -3,19 +3,19 @@ import { useRoute } from 'vue-router';
 import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
-
+import axios from 'axios';
+import { useStateStore } from 'stores/useStateStore';
+import { usePrintService } from 'composables/usePrintService';
+import useNotify from 'src/composables/useNotify.js';
+import { toDate, toDateString } from 'src/filters';
+import { dashIfEmpty } from 'src/filters';
 import FetchData from 'components/FetchData.vue';
 import FetchedTags from 'components/ui/FetchedTags.vue';
 import SendEmailDialog from 'components/common/SendEmailDialog.vue';
 
-import { toDate, toDateString } from 'src/filters';
-import { dashIfEmpty } from 'src/filters';
-import { usePrintService } from 'composables/usePrintService';
-import useNotify from 'src/composables/useNotify.js';
-import axios from 'axios';
-
 const { t } = useI18n();
 const route = useRoute();
+const stateStore = useStateStore();
 const { openReport, sendEmail } = usePrintService();
 const quasar = useQuasar();
 const { notify } = useNotify();
@@ -88,9 +88,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray) => {
-    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
-};
+const calculateTotal = (buysArray) =>
+    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 </script>
 
 <template>
@@ -104,35 +103,31 @@ const calculateTotal = (buysArray) => {
         :params="userParams"
         auto-load
     />
-    <QToolbar class="bg-vn-dark justify-end">
-        <div id="st-data">
-            <QBtn
-                v-if="userParams.from && userParams.to"
-                color="primary"
-                icon-right="picture_as_pdf"
-                no-caps
-                class="q-mr-md"
-                @click="openReportPdf()"
-            >
-                <QTooltip>
-                    {{ t('Open as PDF') }}
-                </QTooltip>
-            </QBtn>
-            <QBtn
-                v-if="userParams.from && userParams.to"
-                color="primary"
-                icon-right="email"
-                no-caps
-                @click="openSendEmailDialog()"
-            >
-                <QTooltip>
-                    {{ t('Send to email') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <QBtn
+            v-if="userParams.from && userParams.to"
+            color="primary"
+            icon-right="picture_as_pdf"
+            no-caps
+            class="q-mr-md"
+            @click="openReportPdf()"
+        >
+            <QTooltip>
+                {{ t('Open as PDF') }}
+            </QTooltip>
+        </QBtn>
+        <QBtn
+            v-if="userParams.from && userParams.to"
+            color="primary"
+            icon-right="email"
+            no-caps
+            @click="openSendEmailDialog()"
+        >
+            <QTooltip>
+                {{ t('Send to email') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
     <QPage class="column items-center q-pa-md">
         <QTable
             :rows="rows"

From adac3bc8953687b365d43706a1495382dba5ce8f Mon Sep 17 00:00:00 2001
From: carlossa <carlossa@verdnatura.es>
Date: Tue, 30 Jan 2024 13:34:05 +0100
Subject: [PATCH 22/49] refs #6677 fix code

---
 src/components/common/VnSelectFilter.vue  | 4 +---
 src/pages/Claim/Card/ClaimDevelopment.vue | 4 ++--
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/components/common/VnSelectFilter.vue b/src/components/common/VnSelectFilter.vue
index 5735bf370..5b794d9e9 100644
--- a/src/components/common/VnSelectFilter.vue
+++ b/src/components/common/VnSelectFilter.vue
@@ -100,7 +100,6 @@ async function filter(val, options) {
 }
 
 async function fetchFilter(val) {
-    console.log('ENTRY PA', dataRef.value);
     if (!$props.url || !dataRef.value) return;
 
     const { fields, sortBy, limit } = $props;
@@ -132,7 +131,6 @@ async function filterHandler(val, update) {
 }
 
 watch(options, (newValue) => {
-    console.log(newValue);
     setOptions(newValue);
 });
 
@@ -148,7 +146,7 @@ watch(modelValue, (newValue) => {
         :url="$props.url"
         @on-fetch="(data) => setOptions(data)"
         :where="where || { [optionValue]: value }"
-        :limit="limit || 30"
+        :limit="limit"
         :order-by="orderBy"
         :fields="fields"
     />
diff --git a/src/pages/Claim/Card/ClaimDevelopment.vue b/src/pages/Claim/Card/ClaimDevelopment.vue
index d5a20b89f..0b740cf64 100644
--- a/src/pages/Claim/Card/ClaimDevelopment.vue
+++ b/src/pages/Claim/Card/ClaimDevelopment.vue
@@ -182,8 +182,8 @@ const columns = computed(() => [
                                         </QItemLabel>
                                     </QItemSection>
                                 </QItem>
-                            </template> </VnSelectFilter
-                        >s
+                            </template>
+                        </VnSelectFilter>
                     </QTd>
                 </template>
                 <template #item="props">

From 7e1fced429c112973fe0c5ff8d2ad9b217f3da4a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 10:20:40 -0300
Subject: [PATCH 23/49] WIP

---
 src/components/EditPictureForm.vue            | 82 +++++++++++++++++++
 src/pages/Item/Card/ItemDescriptor.vue        | 79 ++++++++++++++----
 .../Supplier/Card/SupplierDescriptor.vue      | 22 +++++
 3 files changed, 165 insertions(+), 18 deletions(-)
 create mode 100644 src/components/EditPictureForm.vue

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
new file mode 100644
index 000000000..a1d994399
--- /dev/null
+++ b/src/components/EditPictureForm.vue
@@ -0,0 +1,82 @@
+<script setup>
+import { reactive, ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+
+import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
+import FetchData from 'components/FetchData.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from './FormModelPopup.vue';
+
+const emit = defineEmits(['onDataSaved']);
+
+const props = defineProps({});
+
+const { t } = useI18n();
+
+const editFormData = reactive({
+    uploadMethod: 'computer',
+    file: null,
+    quantity: null,
+});
+
+const options = [
+    { label: t('Select from computer'), value: 'computer' },
+    { label: t('Import from external URL'), value: 'URL' },
+];
+
+const onDataSaved = (data) => {
+    emit('onDataSaved', data);
+};
+</script>
+
+<template>
+    <!-- <FetchData
+        url="Warehouses"
+        @on-fetch="(data) => (warehousesOptions = data)"
+        auto-load
+    /> -->
+    <FormModelPopup
+        url-create="Items/regularize"
+        model="Items"
+        :title="t('Edit photo')"
+        :form-initial-data="editFormData"
+        @on-data-saved="onDataSaved($event)"
+    >
+        <template #form-inputs="{}">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QOptionGroup
+                        :options="options"
+                        type="radio"
+                        v-model="editFormData.uploadMethod"
+                    />
+                </div>
+            </VnRow>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <div class="col">
+                    <QFile
+                        :label="t('entry.buys.file')"
+                        :multiple="false"
+                        v-model="editFormData.file"
+                        @update:model-value="onFileChange($event)"
+                        class="required"
+                    >
+                        <template #append>
+                            <QIcon name="vn:attach" class="cursor-pointer">
+                                <QTooltip>{{ t('Select a file') }}</QTooltip>
+                            </QIcon>
+                        </template>
+                    </QFile>
+                </div>
+            </VnRow>
+            <pre>{{ editFormData }}</pre>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Edit photo: Editar foto
+    Select from computer: Seleccionar desde ordenador
+    Import from external URL: Importar desde URL externa
+</i18n>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index e5183779b..f30104303 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -9,6 +9,7 @@ import VnLv from 'src/components/ui/VnLv.vue';
 import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
 import RegularizeStockForm from 'components/RegularizeStockForm.vue';
+import EditPictureForm from 'components/EditPictureForm.vue';
 
 import { useState } from 'src/composables/useState';
 import useCardDescription from 'src/composables/useCardDescription';
@@ -43,6 +44,7 @@ const entityId = computed(() => {
     return $props.id || route.params.id;
 });
 const regularizeStockFormDialog = ref(null);
+const editPhotoFormDialog = ref(null);
 const item = ref(null);
 const available = ref(null);
 const visible = ref(null);
@@ -122,6 +124,10 @@ const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
 
+const openEditPhotoForm = () => {
+    editPhotoFormDialog.value.show();
+};
+
 const cloneItem = async () => {
     try {
         const { data } = await axios.post(`Items/${entityId.value}/clone`);
@@ -181,30 +187,54 @@ const openCloneDialog = async () => {
             </QItem>
         </template>
         <template #before>
-            <QImg :src="getItemAvatar()" class="photo">
-                <template #error>
-                    <div
-                        class="absolute-full picture text-center q-pa-md flex flex-center"
-                    >
-                        <div>
-                            <div class="text-grey-5" style="opacity: 0.4; font-size: 5vh">
-                                <QIcon name="vn:item" />
-                            </div>
-                            <div class="text-grey-5" style="opacity: 0.4">
-                                {{ t('item.descriptor.item') }}
+            <div class="relative-position">
+                <QImg :src="getItemAvatar()" class="photo" style="position: relative">
+                    <template #error>
+                        <div
+                            class="absolute-full picture text-center q-pa-md flex flex-center"
+                        >
+                            <div>
+                                <div
+                                    class="text-grey-5"
+                                    style="opacity: 0.4; font-size: 5vh"
+                                >
+                                    <QIcon name="vn:item" />
+                                </div>
+                                <div class="text-grey-5" style="opacity: 0.4">
+                                    {{ t('item.descriptor.item') }}
+                                </div>
                             </div>
                         </div>
-                    </div>
-                </template>
-            </QImg>
-            <div class="row justify-between full-width bg-primary">
+                    </template>
+                </QImg>
+                <QBtn
+                    color="primary"
+                    size="lg"
+                    round
+                    class="edit-photo-btn"
+                    @click="openEditPhotoForm()"
+                >
+                    <QIcon name="edit" size="sm" />
+                    <QDialog ref="editPhotoFormDialog">
+                        <EditPictureForm />
+                    </QDialog>
+                </QBtn>
+            </div>
+
+            <div
+                class="row justify-between items-center full-width bg-primary"
+                style="height: 54px"
+            >
                 <div class="col column items-center">
-                    <span class="text-uppercase">
+                    <span class="text-uppercase" style="font-size: 11px">
                         {{ t('item.descriptor.visible') }}
                     </span>
                     <span class="text-weight-bold text-h5">{{ visible }}</span>
                 </div>
-                <div class="col column items-center">
+                <div
+                    class="col column items-center separation-borders"
+                    style="font-size: 11px"
+                >
                     <span class="text-uppercase">
                         {{ t('item.descriptor.available') }}
                     </span>
@@ -231,7 +261,7 @@ const openCloneDialog = async () => {
             <VnLv :label="t('item.descriptor.stems')" :value="entity.value7" />
         </template>
         <template #actions="{}">
-            <QCardActions>
+            <QCardActions class="row justify-center">
                 <QBtn
                     :to="{ name: 'ItemDiary' }"
                     size="md"
@@ -257,4 +287,17 @@ es:
 .photo {
     height: 256px;
 }
+
+.edit-photo-btn {
+    position: absolute;
+    right: 12px;
+    bottom: 12px;
+    z-index: 1;
+    cursor: pointer;
+}
+
+.separation-borders {
+    border-left: 1px solid #ffffff;
+    border-right: 1px solid #ffffff;
+}
 </style>
diff --git a/src/pages/Supplier/Card/SupplierDescriptor.vue b/src/pages/Supplier/Card/SupplierDescriptor.vue
index 104dad661..83bad87d2 100644
--- a/src/pages/Supplier/Card/SupplierDescriptor.vue
+++ b/src/pages/Supplier/Card/SupplierDescriptor.vue
@@ -133,6 +133,26 @@ const getEntryQueryParams = (supplier) => {
             <VnLv :label="t('supplier.summary.payDay')" :value="entity.payDay" />
             <VnLv :label="t('supplier.summary.account')" :value="entity.account" />
         </template>
+        <template #icons="{ entity }">
+            <QCardActions class="q-gutter-x-md">
+                <QIcon
+                    v-if="!entity.isActive"
+                    name="vn:disabled"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Inactive supplier') }}</QTooltip>
+                </QIcon>
+                <QIcon
+                    v-if="!entity.isSerious"
+                    name="vn:supplierfalse"
+                    color="primary"
+                    size="xs"
+                >
+                    <QTooltip>{{ t('Unverified supplier') }}</QTooltip>
+                </QIcon>
+            </QCardActions>
+        </template>
         <template #actions="{ entity }">
             <QCardActions>
                 <QBtn
@@ -176,4 +196,6 @@ es:
     Go to client: Ir a cliente
     Create invoiceIn: Crear factura recibida
     Go to module index: Ir al índice del módulo
+    Inactive supplier: Proveedor inactivo
+    Unverified supplier: Proveedor no verificado
 </i18n>

From 3cfef87efb30cadf563bac79e5cfa99a11483bc8 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 21:54:14 -0300
Subject: [PATCH 24/49] upload file form WIP

---
 package-lock.json                  |   6 +
 package.json                       |   1 +
 src/components/EditPictureForm.vue | 344 +++++++++++++++++++++++++----
 src/i18n/en/index.js               |   3 +
 src/i18n/es/index.js               |   3 +
 5 files changed, 311 insertions(+), 46 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 6a60c95c6..ce9c4d7c1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -12,6 +12,7 @@
                 "@quasar/extras": "^1.16.4",
                 "axios": "^1.4.0",
                 "chromium": "^3.0.3",
+                "croppie": "^2.6.5",
                 "pinia": "^2.1.3",
                 "quasar": "^2.12.0",
                 "validator": "^13.9.0",
@@ -3169,6 +3170,11 @@
                 "node": ">= 10"
             }
         },
+        "node_modules/croppie": {
+            "version": "2.6.5",
+            "resolved": "https://registry.npmjs.org/croppie/-/croppie-2.6.5.tgz",
+            "integrity": "sha512-IlChnVUGG5T3w2gRZIaQgBtlvyuYnlUWs2YZIXXR3H9KrlO1PtBT3j+ykxvy9eZIWhk+V5SpBmhCQz5UXKrEKQ=="
+        },
         "node_modules/cross-spawn": {
             "version": "7.0.3",
             "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
diff --git a/package.json b/package.json
index c4f5b828a..13297aaf4 100644
--- a/package.json
+++ b/package.json
@@ -19,6 +19,7 @@
         "@quasar/extras": "^1.16.4",
         "axios": "^1.4.0",
         "chromium": "^3.0.3",
+        "croppie": "^2.6.5",
         "pinia": "^2.1.3",
         "quasar": "^2.12.0",
         "validator": "^13.9.0",
diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index a1d994399..d2b3df528 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -1,22 +1,38 @@
 <script setup>
-import { reactive, ref } from 'vue';
+import { reactive, computed, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
 import VnRow from 'components/ui/VnRow.vue';
-import FormModelPopup from './FormModelPopup.vue';
+import VnInput from 'src/components/common/VnInput.vue';
 
-const emit = defineEmits(['onDataSaved']);
+import Croppie from 'croppie/croppie';
+import 'croppie/croppie.css';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
 
 const props = defineProps({});
 
 const { t } = useI18n();
+const { notify } = useNotify();
 
-const editFormData = reactive({
+const editPhotoFormData = reactive({
     uploadMethod: 'computer',
     file: null,
-    quantity: null,
+    url: null,
+    viewportType: {
+        code: 'normal',
+        description: t('Normal'),
+        viewport: {
+            width: 400,
+            height: 400,
+        },
+        output: {
+            width: 1200,
+            height: 1200,
+        },
+    },
 });
 
 const options = [
@@ -24,59 +40,295 @@ const options = [
     { label: t('Import from external URL'), value: 'URL' },
 ];
 
-const onDataSaved = (data) => {
-    emit('onDataSaved', data);
+const viewportTypes = [
+    {
+        code: 'normal',
+        description: t('Normal'),
+        viewport: {
+            width: 400,
+            height: 400,
+        },
+        output: {
+            width: 1200,
+            height: 1200,
+        },
+    },
+    {
+        code: 'panoramic',
+        description: t('Panoramic'),
+        viewport: {
+            width: 675,
+            height: 450,
+        },
+        output: {
+            width: 1350,
+            height: 900,
+        },
+    },
+    {
+        code: 'vertical',
+        description: t('Vertical'),
+        viewport: {
+            width: 306.66,
+            height: 533.33,
+        },
+        output: {
+            width: 460,
+            height: 800,
+        },
+    },
+];
+
+const allowedContentTypes = ref('');
+const photoContainerRef = ref(null);
+const editor = ref(null);
+
+const displayEditor = () => {
+    const viewportType = editPhotoFormData.viewportType;
+    const viewport = viewportType.viewport;
+    const boundaryWidth = viewport.width + 200;
+    const boundaryHeight = viewport.height + 200;
+
+    if (editor.value) editor.value.destroy();
+    editor.value = new Croppie(photoContainerRef.value, {
+        viewport: { width: viewport.width, height: viewport.height },
+        boundary: { width: boundaryWidth, height: boundaryHeight },
+        enableOrientation: true,
+        showZoomer: true,
+    });
+};
+
+const viewportSelection = computed({
+    get() {
+        return editPhotoFormData.viewportType;
+    },
+    set(val) {
+        editPhotoFormData.viewportType = val;
+
+        const hasFile = editPhotoFormData.file || editPhotoFormData.url;
+        if (!val || !hasFile) return;
+
+        let file;
+        if (editPhotoFormData.uploadMethod == 'computer') file = editPhotoFormData.file;
+        else if (editPhotoFormData.uploadMethod == 'URL') file = editPhotoFormData.url;
+
+        updatePhotoPreview(file);
+    },
+});
+
+const updatePhotoPreview = (value) => {
+    if (value) {
+        displayEditor();
+        if (editPhotoFormData.uploadMethod == 'computer') {
+            editPhotoFormData.file = value;
+            const reader = new FileReader();
+            reader.onload = (e) => editor.value.bind({ url: e.target.result });
+            reader.readAsDataURL(value);
+        } else if (editPhotoFormData.uploadMethod == 'URL') {
+            const img = new Image();
+            img.crossOrigin = 'Anonymous';
+            img.src = value;
+            img.onload = () => editor.value.bind({ url: value });
+            img.onerror = () => {
+                notify(
+                    t("This photo provider doesn't allow remote downloads"),
+                    'negative'
+                );
+            };
+        }
+    }
+};
+
+const rotateLeft = () => {
+    editor.value.rotate(90);
+};
+
+const rotateRight = () => {
+    editor.value.rotate(-90);
+};
+
+const onUploadAccept = () => {
+    try {
+        if (!this.newPhoto.files) throw new Error(`Select an image`);
+
+        const options = {
+            type: 'blob',
+        };
+        return this.editor
+            .result(options)
+            .then((blob) => (this.newPhoto.blob = blob))
+            .then(() => this.makeRequest());
+    } catch (e) {
+        this.vnApp.showError(this.$t(e.message));
+        return false;
+    }
+};
+
+const makeRequest = async () => {
+    // const options = {
+    //     method: 'POST',
+    //     url: `Images/upload`,
+    //     params: this.newPhoto,
+    //     headers: { 'Content-Type': undefined },
+    //     timeout: this.canceler.promise,
+    //     transformRequest: ([file]) => {
+    //         const formData = new FormData();
+    //         const now = Date.vnNew();
+    //         const timestamp = now.getTime();
+    //         const fileName = `${file.name}_${timestamp}`;
+
+    //         formData.append('blob', this.newPhoto.blob, fileName);
+
+    //         return formData;
+    //     },
+    //     data: this.newPhoto.files,
+    // };
+
+    await axios.post('Images/upload');
+
+    this.$http(options)
+        .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
+        .then(() => this.emit('response'))
+        .finally(() => (this.canceler = null));
 };
 </script>
 
 <template>
-    <!-- <FetchData
-        url="Warehouses"
-        @on-fetch="(data) => (warehousesOptions = data)"
+    <FetchData
+        ref="allowTypesRef"
+        url="ImageContainers/allowedContentTypes"
+        @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
-    /> -->
-    <FormModelPopup
-        url-create="Items/regularize"
-        model="Items"
-        :title="t('Edit photo')"
-        :form-initial-data="editFormData"
-        @on-data-saved="onDataSaved($event)"
-    >
-        <template #form-inputs="{}">
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QOptionGroup
-                        :options="options"
-                        type="radio"
-                        v-model="editFormData.uploadMethod"
-                    />
-                </div>
-            </VnRow>
-            <VnRow class="row q-gutter-md q-mb-md">
-                <div class="col">
-                    <QFile
-                        :label="t('entry.buys.file')"
-                        :multiple="false"
-                        v-model="editFormData.file"
-                        @update:model-value="onFileChange($event)"
-                        class="required"
+    />
+    <QForm class="all-pointer-events">
+        <QCard class="q-pa-lg">
+            <span ref="closeButton" class="close-icon" v-close-popup>
+                <QIcon name="close" size="sm" />
+            </span>
+            <h1 class="title">{{ t('Edit photo') }}</h1>
+            <div class="row q-gutter-lg">
+                <div
+                    v-show="editPhotoFormData.file || editPhotoFormData.url"
+                    class="row q-gutter-lg items-center"
+                >
+                    <QIcon
+                        name="rotate_left"
+                        size="sm"
+                        color="primary"
+                        class="cursor-pointer"
+                        @click="rotateLeft()"
                     >
-                        <template #append>
-                            <QIcon name="vn:attach" class="cursor-pointer">
-                                <QTooltip>{{ t('Select a file') }}</QTooltip>
-                            </QIcon>
-                        </template>
-                    </QFile>
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate left') }}
+                        </QTooltip> -->
+                    </QIcon>
+                    <div>
+                        <div ref="photoContainerRef" />
+                    </div>
+                    <QIcon
+                        name="rotate_right"
+                        size="sm"
+                        color="primary"
+                        class="cursor-pointer"
+                        @click="rotateRight()"
+                    >
+                        <!-- <QTooltip class="no-pointer-events">
+                            {{ t('Rotate right') }}
+                        </QTooltip> -->
+                    </QIcon>
                 </div>
-            </VnRow>
-            <pre>{{ editFormData }}</pre>
-        </template>
-    </FormModelPopup>
+
+                <div class="column">
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QOptionGroup
+                                :options="options"
+                                type="radio"
+                                v-model="editPhotoFormData.uploadMethod"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <QFile
+                                v-if="editPhotoFormData.uploadMethod === 'computer'"
+                                :label="t('File')"
+                                :multiple="false"
+                                @update:model-value="updatePhotoPreview($event)"
+                                :accept="allowedContentTypes"
+                                class="required"
+                            >
+                                <template #append>
+                                    <QIcon
+                                        name="vn:attach"
+                                        class="cursor-pointer q-mr-sm"
+                                    >
+                                        <QTooltip>{{ t('Select a file') }}</QTooltip>
+                                    </QIcon>
+                                    <QIcon name="info" class="cursor-pointer">
+                                        <QTooltip>{{
+                                            t(
+                                                'components.editPictureForm.allowedFilesText',
+                                                {
+                                                    allowedContentTypes:
+                                                        allowedContentTypes,
+                                                }
+                                            )
+                                        }}</QTooltip>
+                                    </QIcon>
+                                </template>
+                            </QFile>
+                            <VnInput
+                                v-if="editPhotoFormData.uploadMethod === 'URL'"
+                                v-model="editPhotoFormData.url"
+                                @update:model-value="updatePhotoPreview($event)"
+                                placeholder="https://"
+                            />
+                        </div>
+                    </VnRow>
+                    <VnRow class="row q-gutter-md q-mb-md">
+                        <div class="col">
+                            <VnSelectFilter
+                                :label="t('Orientation')"
+                                :options="viewportTypes"
+                                hide-selected
+                                option-label="description"
+                                v-model="viewportSelection"
+                            />
+                        </div>
+                    </VnRow>
+                </div>
+            </div>
+        </QCard>
+    </QForm>
 </template>
 
+<style lang="scss" scoped>
+.title {
+    font-size: 17px;
+    font-weight: bold;
+    line-height: 20px;
+}
+
+.close-icon {
+    position: absolute;
+    top: 20px;
+    right: 20px;
+    cursor: pointer;
+}
+</style>
+
 <i18n>
 es:
     Edit photo: Editar foto
     Select from computer: Seleccionar desde ordenador
     Import from external URL: Importar desde URL externa
+    Vertical: Vertical
+    Normal: Normal
+    Panoramic: Panorámica
+    Orientation: Orientación
+    File: Fichero
+    This photo provider doesn't allow remote downloads: Este proveedor de fotos no permite descargas remotas
+    Rotate left: Girar a la izquierda
+    Rotate right: Girar a la derecha
 </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index ea8769c58..e8d10e8b4 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1102,5 +1102,8 @@ export default {
             addToPinned: 'Add to pinned',
             removeFromPinned: 'Remove from pinned',
         },
+        editPictureForm: {
+            allowedFilesText: 'Allowed file types: { allowedContentTypes }',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 9f407ab0b..67e3a2c29 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1102,5 +1102,8 @@ export default {
             addToPinned: 'Añadir a fijados',
             removeFromPinned: 'Eliminar de fijados',
         },
+        editPictureForm: {
+            allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
+        },
     },
 };

From 77f9cc1d805df3d787357c1f40ac10b99237fdab Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 30 Jan 2024 22:39:21 -0300
Subject: [PATCH 25/49] change white color

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

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index f30104303..ae219cdee 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -297,7 +297,7 @@ es:
 }
 
 .separation-borders {
-    border-left: 1px solid #ffffff;
-    border-right: 1px solid #ffffff;
+    border-left: 1px solid var(--vn-text);
+    border-right: 1px solid var(--vn-text);
 }
 </style>

From 6fe6cd79e876a86a40636bfdbc3b885ba64d7730 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:41:02 +0100
Subject: [PATCH 26/49] refs #5834 feat: add tooltip for iban input

---
 src/pages/Customer/Card/CustomerBillingData.vue | 11 ++++++++++-
 src/pages/Supplier/Card/SupplierAccounts.vue    | 13 +++++++++----
 src/pages/Worker/WorkerCreate.vue               | 10 +++++++++-
 3 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 1543eac7a..195783824 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,7 +70,16 @@ const getBankEntities = () => {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnInput :label="t('IBAN')" v-model="data.iban" />
+                    <QIcon name="info" class="cursor-info">
+                        <QTooltip> asd</QTooltip>
+                    </QIcon>
+                    <VnInput :label="t('IBAN')" v-model="data.iban">
+                        <template #append>
+                            <QIcon name="info" class="cursor-info">
+                                <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
+                            </QIcon>
+                        </template></VnInput
+                    >
                 </div>
                 <div class="col">
                     <VnSelectCreate
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 30edfb2fd..eec958e00 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -99,10 +99,15 @@ onMounted(() => {
                     class="row q-gutter-md q-mb-md"
                 >
                     <div class="col">
-                        <VnInput
-                            :label="t('supplier.accounts.iban')"
-                            v-model="row.iban"
-                        />
+                        <VnInput :label="t('supplier.accounts.iban')" v-model="row.iban">
+                            <template #append>
+                                <QIcon name="info" class="cursor-info">
+                                    <QTooltip>{{
+                                        t('components.iban_tooltip')
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template></VnInput
+                        >
                     </div>
                     <div class="col">
                         <VnSelectCreate
diff --git a/src/pages/Worker/WorkerCreate.vue b/src/pages/Worker/WorkerCreate.vue
index 3ded85584..34fc26445 100644
--- a/src/pages/Worker/WorkerCreate.vue
+++ b/src/pages/Worker/WorkerCreate.vue
@@ -248,7 +248,15 @@ onMounted(async () => {
                             v-model="data.iban"
                             :label="t('worker.create.iban')"
                             :rules="validate('Worker.iban')"
-                        />
+                        >
+                            <template #append>
+                                <QIcon name="info" class="cursor-info">
+                                    <QTooltip>{{
+                                        t('components.iban_tooltip')
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnInput>
                     </div>
                     <VnSelectCreate
                         :label="t('worker.create.bankEntity')"

From 40fb0c4533cfb05ce6da66bbf8650b1836a97399 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:41:21 +0100
Subject: [PATCH 27/49] refs #5834 feat: add required for country

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 2a1385945..00a540a6f 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -77,6 +77,7 @@ const onDataSaved = (data) => {
                         option-value="id"
                         option-label="country"
                         hide-selected
+                        :required="true"
                         :rules="validate('bankEntity.countryFk')"
                     />
                 </div>

From f3e7d8ceb19babfd3c15bdfb8f30f626f082770b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:54:49 +0100
Subject: [PATCH 28/49] refs #5834 feat: i18n

---
 src/components/common/VnLocation.vue | 6 ++++--
 src/i18n/en/index.js                 | 1 +
 src/i18n/es/index.js                 | 1 +
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/common/VnLocation.vue b/src/components/common/VnLocation.vue
index 0b30faaa7..17dd3d37b 100644
--- a/src/components/common/VnLocation.vue
+++ b/src/components/common/VnLocation.vue
@@ -94,7 +94,7 @@ function handleFetch( data) {
         :options="postcodesOptions"
         :label="t('Location')"
         :option-label="showLabel"
-        :placeholder="t('Search by postalCode, town, province or country')"
+        :placeholder="t('search_by_postalcode')"
         @input-value="locationFilter"
         :default-filter="false"
         :input-debounce="300"
@@ -129,7 +129,9 @@ function handleFetch( data) {
 </style>
 
 <i18n>
+en:
+    search_by_postalcode: Search by postalcode, town, province or country
 es:
     Location: Ubicación
-    Search by postalcode, town, province or country: Buscar por código postal, ciudad o país
+    search_by_postalcode: Buscar por código postal, ciudad o país
 </i18n>
diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index 2eb445680..7e3e7fe3b 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1087,5 +1087,6 @@ export default {
         VnLv: {
             copyText: '{copyValue} has been copied to the clipboard',
         },
+        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 2a9bcd615..82a24893b 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1086,5 +1086,6 @@ export default {
         VnLv: {
             copyText: '{copyValue} se ha copiado al portapepeles',
         },
+        iban_tooltip: 'IBAN: ES21 1234 5678 90 0123456789',
     },
 };

From 0287ec4932b242c4eb9c2e54b742ee4e62bcc5f9 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 08:57:05 +0100
Subject: [PATCH 29/49] refs #5834 feat: add required for code

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

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 00a540a6f..270a79d93 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -82,7 +82,7 @@ const onDataSaved = (data) => {
                     />
                 </div>
                 <div v-if="showEntityField" class="col">
-                    <QInput :label="t('id')" v-model="data.id" />
+                    <QInput :label="t('id')" v-model="data.id"/>
                 </div>
             </VnRow>
         </template>
@@ -96,12 +96,12 @@ en:
     name: Name *
     swift: Swift *
     country: Country
-    id: Entity code
+    id: Entity code *
 es:
     title: Nueva entidad bancaria
     subtitle: ¡Por favor, asegúrate de poner los datos correctos!
     name: Nombre *
     swift: Swift *
     country: País
-    id: Código de la entidad
+    id: Código de la entidad *
 </i18n>

From fea618b2133f096d3b3f4826795141cc133591ba Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:00:48 +0100
Subject: [PATCH 30/49] refs #5834 feat: replace QInput by VnInput

---
 src/components/CreateBankEntityForm.vue | 26 ++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/components/CreateBankEntityForm.vue b/src/components/CreateBankEntityForm.vue
index 270a79d93..106dbec3a 100644
--- a/src/components/CreateBankEntityForm.vue
+++ b/src/components/CreateBankEntityForm.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { reactive, ref } from 'vue';
 import { useI18n } from 'vue-i18n';
+import VnInput from 'src/components/common/VnInput.vue';
 
 import VnSelectFilter from 'src/components/common/VnSelectFilter.vue';
 import FetchData from 'components/FetchData.vue';
@@ -54,16 +55,18 @@ const onDataSaved = (data) => {
         <template #form-inputs="{ data, validate }">
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
+                    <VnInput
                         :label="t('name')"
                         v-model="data.name"
+                        :required="true"
                         :rules="validate('bankEntity.name')"
                     />
                 </div>
                 <div class="col">
-                    <QInput
+                    <VnInput
                         :label="t('swift')"
                         v-model="data.bic"
+                        :required="true"
                         :rules="validate('bankEntity.bic')"
                     />
                 </div>
@@ -82,7 +85,12 @@ const onDataSaved = (data) => {
                     />
                 </div>
                 <div v-if="showEntityField" class="col">
-                    <QInput :label="t('id')" v-model="data.id"/>
+                    <VnInput
+                        :label="t('id')"
+                        v-model="data.id"
+                        :required="true"
+                        :rules="validate('city.name')"
+                    />
                 </div>
             </VnRow>
         </template>
@@ -93,15 +101,15 @@ const onDataSaved = (data) => {
 en:
     title: New bank entity
     subtitle: Please, ensure you put the correct data!
-    name: Name *
-    swift: Swift *
+    name: Name
+    swift: Swift
     country: Country
-    id: Entity code *
+    id: Entity code
 es:
     title: Nueva entidad bancaria
     subtitle: ¡Por favor, asegúrate de poner los datos correctos!
-    name: Nombre *
-    swift: Swift *
+    name: Nombre
+    swift: Swift
     country: País
-    id: Código de la entidad *
+    id: Código de la entidad
 </i18n>

From c42d8169dc069c4e2407c8f5ba05267cfb06fe7b Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:03:44 +0100
Subject: [PATCH 31/49] refs #5834 perf: remove bad tag

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

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index 195783824..a528775d8 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -70,9 +70,6 @@ const getBankEntities = () => {
 
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QIcon name="info" class="cursor-info">
-                        <QTooltip> asd</QTooltip>
-                    </QIcon>
                     <VnInput :label="t('IBAN')" v-model="data.iban">
                         <template #append>
                             <QIcon name="info" class="cursor-info">

From 27bfd009cf2bbc6029d4ffb171bb1430703aae2e Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Wed, 31 Jan 2024 09:05:21 +0100
Subject: [PATCH 32/49] refs #5834 perf: fix bad lint

---
 src/pages/Customer/Card/CustomerBillingData.vue | 4 ++--
 src/pages/Supplier/Card/SupplierAccounts.vue    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/pages/Customer/Card/CustomerBillingData.vue b/src/pages/Customer/Card/CustomerBillingData.vue
index a528775d8..925cdd534 100644
--- a/src/pages/Customer/Card/CustomerBillingData.vue
+++ b/src/pages/Customer/Card/CustomerBillingData.vue
@@ -75,8 +75,8 @@ const getBankEntities = () => {
                             <QIcon name="info" class="cursor-info">
                                 <QTooltip>{{ t('components.iban_tooltip') }}</QTooltip>
                             </QIcon>
-                        </template></VnInput
-                    >
+                        </template>
+                    </VnInput>
                 </div>
                 <div class="col">
                     <VnSelectCreate
diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index eec958e00..e7aff1e04 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -106,8 +106,8 @@ onMounted(() => {
                                         t('components.iban_tooltip')
                                     }}</QTooltip>
                                 </QIcon>
-                            </template></VnInput
-                        >
+                            </template>
+                        </VnInput>
                     </div>
                     <div class="col">
                         <VnSelectCreate

From 588a5ff674e18c59160dfb8d3c616dd06b6ebf66 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:31:20 -0300
Subject: [PATCH 33/49] photo uplader updates

---
 src/components/EditPictureForm.vue            | 154 ++++++++++--------
 src/pages/Item/Card/ItemDescriptor.vue        |  15 +-
 .../Supplier/Card/SupplierConsumption.vue     |   2 +-
 3 files changed, 99 insertions(+), 72 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index d2b3df528..723adc0e9 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -12,30 +12,23 @@ import 'croppie/croppie.css';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const props = defineProps({});
+const emit = defineEmits(['closeForm']);
+
+const props = defineProps({
+    id: {
+        type: String,
+        default: '',
+    },
+    collection: {
+        type: String,
+        default: '',
+    },
+});
 
 const { t } = useI18n();
 const { notify } = useNotify();
 
-const editPhotoFormData = reactive({
-    uploadMethod: 'computer',
-    file: null,
-    url: null,
-    viewportType: {
-        code: 'normal',
-        description: t('Normal'),
-        viewport: {
-            width: 400,
-            height: 400,
-        },
-        output: {
-            width: 1200,
-            height: 1200,
-        },
-    },
-});
-
-const options = [
+const uploadMethodsOptions = [
     { label: t('Select from computer'), value: 'computer' },
     { label: t('Import from external URL'), value: 'URL' },
 ];
@@ -79,12 +72,22 @@ const viewportTypes = [
     },
 ];
 
+const uploadMethodSelected = ref('computer');
+const viewPortTypeSelected = ref(viewportTypes[0]);
+
 const allowedContentTypes = ref('');
 const photoContainerRef = ref(null);
 const editor = ref(null);
+const newPhoto = reactive({
+    id: props.id,
+    collection: props.collection,
+    file: null,
+    url: null,
+    blob: null,
+});
 
 const displayEditor = () => {
-    const viewportType = editPhotoFormData.viewportType;
+    const viewportType = viewPortTypeSelected.value;
     const viewport = viewportType.viewport;
     const boundaryWidth = viewport.width + 200;
     const boundaryHeight = viewport.height + 200;
@@ -100,17 +103,17 @@ const displayEditor = () => {
 
 const viewportSelection = computed({
     get() {
-        return editPhotoFormData.viewportType;
+        return viewPortTypeSelected.value;
     },
     set(val) {
-        editPhotoFormData.viewportType = val;
+        viewPortTypeSelected.value = val;
 
-        const hasFile = editPhotoFormData.file || editPhotoFormData.url;
+        const hasFile = newPhoto.files || newPhoto.url;
         if (!val || !hasFile) return;
 
         let file;
-        if (editPhotoFormData.uploadMethod == 'computer') file = editPhotoFormData.file;
-        else if (editPhotoFormData.uploadMethod == 'URL') file = editPhotoFormData.url;
+        if (uploadMethodSelected.value == 'computer') file = newPhoto.files;
+        else if (uploadMethodSelected.value == 'URL') file = newPhoto.url;
 
         updatePhotoPreview(file);
     },
@@ -119,12 +122,13 @@ const viewportSelection = computed({
 const updatePhotoPreview = (value) => {
     if (value) {
         displayEditor();
-        if (editPhotoFormData.uploadMethod == 'computer') {
-            editPhotoFormData.file = value;
+        if (uploadMethodSelected.value == 'computer') {
+            newPhoto.files = value;
             const reader = new FileReader();
             reader.onload = (e) => editor.value.bind({ url: e.target.result });
             reader.readAsDataURL(value);
-        } else if (editPhotoFormData.uploadMethod == 'URL') {
+        } else if (uploadMethodSelected.value == 'URL') {
+            newPhoto.url = value;
             const img = new Image();
             img.crossOrigin = 'Anonymous';
             img.src = value;
@@ -149,47 +153,44 @@ const rotateRight = () => {
 
 const onUploadAccept = () => {
     try {
-        if (!this.newPhoto.files) throw new Error(`Select an image`);
+        if (!newPhoto.files && !newPhoto.url) {
+            notify(t('Select an image'), 'negative');
+            return;
+        }
 
         const options = {
             type: 'blob',
         };
-        return this.editor
+
+        editor.value
             .result(options)
-            .then((blob) => (this.newPhoto.blob = blob))
-            .then(() => this.makeRequest());
-    } catch (e) {
-        this.vnApp.showError(this.$t(e.message));
-        return false;
+            .then((result) => {
+                const file = new File([result], newPhoto.files?.name || '');
+                newPhoto.blob = file;
+            })
+            .then(() => makeRequest());
+    } catch (err) {
+        console.error('Error uploading image');
+    } finally {
+        emit('closeForm');
     }
 };
 
 const makeRequest = async () => {
-    // const options = {
-    //     method: 'POST',
-    //     url: `Images/upload`,
-    //     params: this.newPhoto,
-    //     headers: { 'Content-Type': undefined },
-    //     timeout: this.canceler.promise,
-    //     transformRequest: ([file]) => {
-    //         const formData = new FormData();
-    //         const now = Date.vnNew();
-    //         const timestamp = now.getTime();
-    //         const fileName = `${file.name}_${timestamp}`;
+    const formData = new FormData();
+    const now = Date.vnNew();
+    const timestamp = now.getTime();
+    const fileName = `${newPhoto.files?.name}_${timestamp}`;
+    formData.append('blob', newPhoto.blob, fileName);
 
-    //         formData.append('blob', this.newPhoto.blob, fileName);
+    await axios.post('Images/upload', formData, {
+        params: newPhoto,
+        headers: {
+            'Content-Type': 'multipart/form-data',
+        },
+    });
 
-    //         return formData;
-    //     },
-    //     data: this.newPhoto.files,
-    // };
-
-    await axios.post('Images/upload');
-
-    this.$http(options)
-        .then(() => this.vnApp.showSuccess(this.$t('Data saved!')))
-        .then(() => this.emit('response'))
-        .finally(() => (this.canceler = null));
+    notify(t('globals.dataSaved'), 'positive');
 };
 </script>
 
@@ -200,7 +201,7 @@ const makeRequest = async () => {
         @on-fetch="(data) => (allowedContentTypes = data.join(', '))"
         auto-load
     />
-    <QForm class="all-pointer-events">
+    <QForm @submit="onUploadAccept()" class="all-pointer-events">
         <QCard class="q-pa-lg">
             <span ref="closeButton" class="close-icon" v-close-popup>
                 <QIcon name="close" size="sm" />
@@ -208,7 +209,7 @@ const makeRequest = async () => {
             <h1 class="title">{{ t('Edit photo') }}</h1>
             <div class="row q-gutter-lg">
                 <div
-                    v-show="editPhotoFormData.file || editPhotoFormData.url"
+                    v-show="newPhoto.files || newPhoto.url"
                     class="row q-gutter-lg items-center"
                 >
                     <QIcon
@@ -242,18 +243,19 @@ const makeRequest = async () => {
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
                             <QOptionGroup
-                                :options="options"
+                                :options="uploadMethodsOptions"
                                 type="radio"
-                                v-model="editPhotoFormData.uploadMethod"
+                                v-model="uploadMethodSelected"
                             />
                         </div>
                     </VnRow>
                     <VnRow class="row q-gutter-md q-mb-md">
                         <div class="col">
                             <QFile
-                                v-if="editPhotoFormData.uploadMethod === 'computer'"
+                                v-if="uploadMethodSelected === 'computer'"
                                 :label="t('File')"
                                 :multiple="false"
+                                v-model="newPhoto.files"
                                 @update:model-value="updatePhotoPreview($event)"
                                 :accept="allowedContentTypes"
                                 class="required"
@@ -279,8 +281,8 @@ const makeRequest = async () => {
                                 </template>
                             </QFile>
                             <VnInput
-                                v-if="editPhotoFormData.uploadMethod === 'URL'"
-                                v-model="editPhotoFormData.url"
+                                v-if="uploadMethodSelected === 'URL'"
+                                v-model="newPhoto.url"
                                 @update:model-value="updatePhotoPreview($event)"
                                 placeholder="https://"
                             />
@@ -297,6 +299,25 @@ const makeRequest = async () => {
                             />
                         </div>
                     </VnRow>
+                    <div class="q-mt-lg row justify-end">
+                        <QBtn
+                            :label="t('globals.save')"
+                            type="submit"
+                            color="primary"
+                            :disabled="isLoading"
+                            :loading="isLoading"
+                        />
+                        <QBtn
+                            :label="t('globals.cancel')"
+                            type="reset"
+                            color="primary"
+                            flat
+                            class="q-ml-sm"
+                            :disabled="isLoading"
+                            :loading="isLoading"
+                            v-close-popup
+                        />
+                    </div>
                 </div>
             </div>
         </QCard>
@@ -331,4 +352,5 @@ es:
     This photo provider doesn't allow remote downloads: Este proveedor de fotos no permite descargas remotas
     Rotate left: Girar a la izquierda
     Rotate right: Girar a la derecha
+    Select an image: Selecciona una imagen
 </i18n>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index ae219cdee..bd7e8c371 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -63,6 +63,7 @@ const warehouseFk = computed({
     },
 });
 const showWarehouseIconTooltip = ref(true);
+const showEditPhotoForm = ref(false);
 
 onMounted(() => {
     warehouseFk.value = user.value.warehouseFk;
@@ -124,8 +125,8 @@ const openRegularizeStockForm = () => {
     regularizeStockFormDialog.value.show();
 };
 
-const openEditPhotoForm = () => {
-    editPhotoFormDialog.value.show();
+const toggleEditPictureForm = () => {
+    showEditPhotoForm.value = !showEditPhotoForm.value;
 };
 
 const cloneItem = async () => {
@@ -212,11 +213,15 @@ const openCloneDialog = async () => {
                     size="lg"
                     round
                     class="edit-photo-btn"
-                    @click="openEditPhotoForm()"
+                    @click="toggleEditPictureForm()"
                 >
                     <QIcon name="edit" size="sm" />
-                    <QDialog ref="editPhotoFormDialog">
-                        <EditPictureForm />
+                    <QDialog ref="editPhotoFormDialog" v-model="showEditPhotoForm">
+                        <EditPictureForm
+                            collection="catalog"
+                            :id="entityId"
+                            @close-form="toggleEditPictureForm()"
+                        />
                     </QDialog>
                 </QBtn>
             </div>
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 06438349b..da14a6343 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -155,11 +155,11 @@ onMounted(async () => {
         </QDrawer>
         <QTable
             :rows="rows"
-            hide-bottom
             row-key="id"
             hide-header
             :pagination="{ rowsPerPage: 0 }"
             class="full-width q-mt-md"
+            :no-data-label="t('No results')"
         >
             <template #body="{ row }">
                 <QTr>

From ae4c80f45c235a43e5318c10e411ed27962a37c7 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:34:13 -0300
Subject: [PATCH 34/49] Make Notes a input text instead of textarea

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index 747784943..c5a6afbf0 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -90,13 +90,7 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <QInput
-                        :label="t('supplier.basicData.note')"
-                        type="textarea"
-                        v-model="data.note"
-                        fill-input
-                        autogrow
-                    />
+                    <VnInput :label="t('supplier.basicData.note')" v-model="data.note" />
                 </div>
             </VnRow>
         </template>

From 2f67fef56249dfae1548b202474929f8c1ea3693 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:37:02 -0300
Subject: [PATCH 35/49] Add tooltip to Beneficiary input in SupplierAccounts

---
 src/pages/Supplier/Card/SupplierAccounts.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index 30edfb2fd..ba115a6f4 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -135,7 +135,17 @@ onMounted(() => {
                         <VnInput
                             :label="t('supplier.accounts.beneficiary')"
                             v-model="row.beneficiary"
-                        />
+                        >
+                            <template #append>
+                                <QIcon name="info" class="cursor-pointer">
+                                    <QTooltip>{{
+                                        t(
+                                            'Name of the bank account holder if different from the provider'
+                                        )
+                                    }}</QTooltip>
+                                </QIcon>
+                            </template>
+                        </VnInput>
                     </div>
                     <div class="col-1 row justify-center items-center">
                         <QIcon
@@ -174,4 +184,5 @@ onMounted(() => {
         Do you want to change the pay method to wire transfer?: ¿Quieres modificar la forma de pago a transferencia?
         Add account: Añadir cuenta
         Remove account: Remover cuenta
+        Name of the bank account holder if different from the provider: Nombre del titular de la cuenta bancaria en caso de ser diferente del proveedor
 </i18n>

From b9dcbc18ca53629accc3783070c87f2c1b608d75 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 09:51:22 -0300
Subject: [PATCH 36/49] Change SupplierAddressesCreate inputs layout

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

diff --git a/src/pages/Supplier/Card/SupplierAddressesCreate.vue b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
index 8ad0959f5..60a803ee1 100644
--- a/src/pages/Supplier/Card/SupplierAddressesCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAddressesCreate.vue
@@ -147,8 +147,6 @@ onMounted(() => {
                             option-value="id"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnSelectFilter
                             :label="t('supplier.addresses.province')"
@@ -160,21 +158,20 @@ onMounted(() => {
                             v-model="data.provinceFk"
                         />
                     </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnInput
                             v-model="data.phone"
                             :label="t('supplier.addresses.phone')"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <VnInput
                             v-model="data.mobile"
                             :label="t('supplier.addresses.mobile')"
                         />
                     </div>
-                    <div class="col" />
                 </VnRow>
             </template>
         </FormModel>

From 0e32138714130fb577439c03e5e5aed603f07b4f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:49:29 -0300
Subject: [PATCH 37/49] Make input file clip icon work

---
 src/components/EditPictureForm.vue | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 723adc0e9..941497472 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -74,7 +74,7 @@ const viewportTypes = [
 
 const uploadMethodSelected = ref('computer');
 const viewPortTypeSelected = ref(viewportTypes[0]);
-
+const inputFileRef = ref(null);
 const allowedContentTypes = ref('');
 const photoContainerRef = ref(null);
 const editor = ref(null);
@@ -86,6 +86,10 @@ const newPhoto = reactive({
     blob: null,
 });
 
+const openInputFile = () => {
+    inputFileRef.value.pickFiles();
+};
+
 const displayEditor = () => {
     const viewportType = viewPortTypeSelected.value;
     const viewport = viewportType.viewport;
@@ -253,21 +257,26 @@ const makeRequest = async () => {
                         <div class="col">
                             <QFile
                                 v-if="uploadMethodSelected === 'computer'"
+                                ref="inputFileRef"
                                 :label="t('File')"
                                 :multiple="false"
                                 v-model="newPhoto.files"
                                 @update:model-value="updatePhotoPreview($event)"
                                 :accept="allowedContentTypes"
-                                class="required"
+                                class="required cursor-pointer"
                             >
                                 <template #append>
                                     <QIcon
                                         name="vn:attach"
-                                        class="cursor-pointer q-mr-sm"
+                                        class="cursor-pointer q-mr-sm non-selectable"
+                                        @click="openInputFile()"
                                     >
                                         <QTooltip>{{ t('Select a file') }}</QTooltip>
                                     </QIcon>
-                                    <QIcon name="info" class="cursor-pointer">
+                                    <QIcon
+                                        name="info"
+                                        class="cursor-pointer non-selectable"
+                                    >
                                         <QTooltip>{{
                                             t(
                                                 'components.editPictureForm.allowedFilesText',

From c7653088b240f6e386e5276044011065d9c6c3ad Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:50:03 -0300
Subject: [PATCH 38/49] Change bank entity input label

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

diff --git a/src/pages/Supplier/Card/SupplierAccounts.vue b/src/pages/Supplier/Card/SupplierAccounts.vue
index ba115a6f4..e88b59d4c 100644
--- a/src/pages/Supplier/Card/SupplierAccounts.vue
+++ b/src/pages/Supplier/Card/SupplierAccounts.vue
@@ -106,7 +106,7 @@ onMounted(() => {
                     </div>
                     <div class="col">
                         <VnSelectCreate
-                            :label="t('worker.create.bankEntity')"
+                            :label="t('supplier.accounts.bankEntity')"
                             v-model="row.bankEntityFk"
                             :options="bankEntitiesOptions"
                             option-label="name"

From 96af02116d31aa6954fd731b44389553dc98c783 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:52:14 -0300
Subject: [PATCH 39/49] Change SupplierAgencyTermCreate inputs layout

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

diff --git a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
index 00f0b868f..17786c1ea 100644
--- a/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
+++ b/src/pages/Supplier/Card/SupplierAgencyTermCreate.vue
@@ -80,8 +80,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.m3Price')"
@@ -89,6 +87,8 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
+                </VnRow>
+                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.routePrice')"
@@ -96,8 +96,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                </VnRow>
-                <VnRow class="row q-gutter-md q-mb-md">
                     <div class="col">
                         <QInput
                             :label="t('supplier.agencyTerms.minimumKm')"
@@ -105,7 +103,6 @@ const onDataSaved = () => {
                             type="number"
                         />
                     </div>
-                    <div class="col" />
                 </VnRow>
             </template>
         </FormModel>

From 43c621f379a74b4555b5629dd904f456b9e48555 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 10:55:55 -0300
Subject: [PATCH 40/49] remove tooltip to attach icon

---
 src/components/EditPictureForm.vue | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index 941497472..d47d60fee 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -268,15 +268,12 @@ const makeRequest = async () => {
                                 <template #append>
                                     <QIcon
                                         name="vn:attach"
-                                        class="cursor-pointer q-mr-sm non-selectable"
+                                        class="cursor-pointer q-mr-sm"
                                         @click="openInputFile()"
                                     >
-                                        <QTooltip>{{ t('Select a file') }}</QTooltip>
+                                        <!-- <QTooltip>{{ t('Select a file') }}</QTooltip> -->
                                     </QIcon>
-                                    <QIcon
-                                        name="info"
-                                        class="cursor-pointer non-selectable"
-                                    >
+                                    <QIcon name="info" class="cursor-pointer">
                                         <QTooltip>{{
                                             t(
                                                 'components.editPictureForm.allowedFilesText',

From cb51445eadba90f67ccfe7c4344d5b14dc35f66a Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:00:45 -0300
Subject: [PATCH 41/49] Change available and visible text colors in item
 descriptor

---
 src/css/app.scss                       |  4 ++++
 src/pages/Item/Card/ItemDescriptor.vue | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index b742dae2f..dbf45ce89 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -52,6 +52,10 @@ body.body--dark {
     color: var(--vn-text);
 }
 
+.color-vn-white {
+    color: $white;
+}
+
 .vn-card {
     background-color: var(--vn-gray);
     color: var(--vn-text);
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index bd7e8c371..41398bd28 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -231,22 +231,26 @@ const openCloneDialog = async () => {
                 style="height: 54px"
             >
                 <div class="col column items-center">
-                    <span class="text-uppercase" style="font-size: 11px">
+                    <span class="text-uppercase color-vn-white" style="font-size: 11px">
                         {{ t('item.descriptor.visible') }}
                     </span>
-                    <span class="text-weight-bold text-h5">{{ visible }}</span>
+                    <span class="text-weight-bold text-h5 color-vn-white">{{
+                        visible
+                    }}</span>
                 </div>
                 <div
                     class="col column items-center separation-borders"
                     style="font-size: 11px"
                 >
-                    <span class="text-uppercase">
+                    <span class="text-uppercase color-vn-white">
                         {{ t('item.descriptor.available') }}
                     </span>
-                    <span class="text-weight-bold text-h5">{{ available }}</span>
+                    <span class="text-weight-bold text-h5 color-vn-white">{{
+                        available
+                    }}</span>
                 </div>
                 <div class="col column items-center justify-center">
-                    <QIcon name="info" class="cursor-pointer" size="md">
+                    <QIcon name="info" class="cursor-pointer color-vn-white" size="md">
                         <QTooltip>{{ warehouseText }}</QTooltip>
                     </QIcon>
                 </div>
@@ -302,7 +306,7 @@ es:
 }
 
 .separation-borders {
-    border-left: 1px solid var(--vn-text);
-    border-right: 1px solid var(--vn-text);
+    border-left: 1px solid $white;
+    border-right: 1px solid $white;
 }
 </style>

From aa40a3b0f5b958c5c8ecff246b31a67152df6b96 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:27:08 -0300
Subject: [PATCH 42/49] resolve conflicts with dev

---
 src/i18n/en/index.js                          |  3 +
 src/i18n/es/index.js                          |  3 +
 .../Supplier/Card/SupplierConsumption.vue     | 60 +++++++++----------
 3 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index e8d10e8b4..baaf414d6 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Allowed file types: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} has been copied to the clipboard',
+        },
     },
 };
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 67e3a2c29..0ea506b55 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -1105,5 +1105,8 @@ export default {
         editPictureForm: {
             allowedFilesText: 'Tipos de archivo permitidos: { allowedContentTypes }',
         },
+        VnLv: {
+            copyText: '{copyValue} se ha copiado al portapepeles',
+        },
     },
 };
diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index da14a6343..3be2d7a90 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -105,10 +105,8 @@ const sendCampaignMetricsEmail = ({ address }) => {
     });
 };
 
-const calculateTotal = (buysArray) => {
-    if (!buysArray || !buysArray.length > 0) return;
-    return buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
-};
+const calculateTotal = (buysArray = []) =>
+    buysArray.reduce((accumulator, { total }) => accumulator + total, 0);
 
 onMounted(async () => {
     stateStore.rightDrawer = true;
@@ -117,35 +115,31 @@ onMounted(async () => {
 </script>
 
 <template>
-    <QToolbar v-if="rows && rows.length > 0" class="bg-vn-dark justify-end">
-        <div id="st-data">
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="picture_as_pdf"
-                no-caps
-                class="q-mr-md"
-                @click="openReportPdf()"
-            >
-                <QTooltip>
-                    {{ t('Open as PDF') }}
-                </QTooltip>
-            </QBtn>
-            <QBtn
-                :disabled="!dateRanges.from && !dateRanges.to"
-                color="primary"
-                icon-right="email"
-                no-caps
-                @click="openSendEmailDialog()"
-            >
-                <QTooltip>
-                    {{ t('Send to email') }}
-                </QTooltip>
-            </QBtn>
-        </div>
-        <QSpace />
-        <div id="st-actions"></div>
-    </QToolbar>
+    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="picture_as_pdf"
+            no-caps
+            class="q-mr-md"
+            @click="openReportPdf()"
+        >
+            <QTooltip>
+                {{ t('Open as PDF') }}
+            </QTooltip>
+        </QBtn>
+        <QBtn
+            v-if="dateRanges.from && dateRanges.to"
+            color="primary"
+            icon-right="email"
+            no-caps
+            @click="openSendEmailDialog()"
+        >
+            <QTooltip>
+                {{ t('Send to email') }}
+            </QTooltip>
+        </QBtn>
+    </Teleport>
 
     <QPage class="column items-center q-pa-md">
         <QDrawer v-model="stateStore.rightDrawer" side="right" :width="256" show-if-above>

From 71e974030607e0eb559d06e576d6354fef0e1c4b Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 31 Jan 2024 11:34:11 -0300
Subject: [PATCH 43/49] text area changes

---
 src/pages/Supplier/Card/SupplierBasicData.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/pages/Supplier/Card/SupplierBasicData.vue b/src/pages/Supplier/Card/SupplierBasicData.vue
index c5a6afbf0..bc50deb9b 100644
--- a/src/pages/Supplier/Card/SupplierBasicData.vue
+++ b/src/pages/Supplier/Card/SupplierBasicData.vue
@@ -90,7 +90,12 @@ const workersOptions = ref([]);
             </VnRow>
             <VnRow class="row q-gutter-md q-mb-md">
                 <div class="col">
-                    <VnInput :label="t('supplier.basicData.note')" v-model="data.note" />
+                    <QInput
+                        :label="t('supplier.basicData.note')"
+                        type="textarea"
+                        v-model="data.note"
+                        fill-input
+                    />
                 </div>
             </VnRow>
         </template>

From f325e3d735ea2690bd1f25f7578d7f9aec726d48 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 12:28:52 +0100
Subject: [PATCH 44/49] refs #6783 fix: correct version

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

diff --git a/package.json b/package.json
index 1d729b82f..d3fa055f7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.02.01",
+    "version": "24.04.01",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 6bfa71086412669dd79cacbdf97eb984c48bbb66 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 14:20:46 +0100
Subject: [PATCH 45/49] fix(VnLog): option-value

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

diff --git a/src/components/common/VnLog.vue b/src/components/common/VnLog.vue
index c93399e58..4265d02e9 100644
--- a/src/components/common/VnLog.vue
+++ b/src/components/common/VnLog.vue
@@ -664,6 +664,7 @@ setLogTree();
                         :label="t('globals.entity')"
                         v-model="selectedFilters.changedModel"
                         option-label="locale"
+                        option-value="value"
                         :options="actions"
                         @update:model-value="selectFilter('action')"
                         hide-selected

From 90f5d8dbf37020b8616fd00c5f094d0df1a9d799 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Thu, 1 Feb 2024 14:24:54 +0100
Subject: [PATCH 46/49] refs #6783 deploy: init version

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

diff --git a/package.json b/package.json
index d3fa055f7..67b15a693 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "salix-front",
-    "version": "24.04.01",
+    "version": "24.8.0",
     "description": "Salix frontend",
     "productName": "Salix",
     "author": "Verdnatura",

From 68260c1383472f9a76901de87691a5cc64c11118 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 1 Feb 2024 11:35:14 -0300
Subject: [PATCH 47/49] force item descriptor image upload

---
 src/components/EditPictureForm.vue     |  7 ++++---
 src/pages/Item/Card/ItemDescriptor.vue | 16 ++++++++++------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/components/EditPictureForm.vue b/src/components/EditPictureForm.vue
index d47d60fee..44d44587f 100644
--- a/src/components/EditPictureForm.vue
+++ b/src/components/EditPictureForm.vue
@@ -12,7 +12,7 @@ import 'croppie/croppie.css';
 import useNotify from 'src/composables/useNotify.js';
 import axios from 'axios';
 
-const emit = defineEmits(['closeForm']);
+const emit = defineEmits(['closeForm', 'onPhotoUploaded']);
 
 const props = defineProps({
     id: {
@@ -175,8 +175,6 @@ const onUploadAccept = () => {
             .then(() => makeRequest());
     } catch (err) {
         console.error('Error uploading image');
-    } finally {
-        emit('closeForm');
     }
 };
 
@@ -194,6 +192,9 @@ const makeRequest = async () => {
         },
     });
 
+    emit('closeForm');
+    emit('onPhotoUploaded');
+
     notify(t('globals.dataSaved'), 'positive');
 };
 </script>
diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index 41398bd28..e1cbfb638 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { computed, ref, onMounted } from 'vue';
+import { computed, ref, onMounted, onUnmounted } from 'vue';
 import { useRoute, useRouter } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { useQuasar } from 'quasar';
@@ -43,6 +43,7 @@ const user = state.getUser();
 const entityId = computed(() => {
     return $props.id || route.params.id;
 });
+const image = ref(null);
 const regularizeStockFormDialog = ref(null);
 const editPhotoFormDialog = ref(null);
 const item = ref(null);
@@ -65,14 +66,16 @@ const warehouseFk = computed({
 const showWarehouseIconTooltip = ref(true);
 const showEditPhotoForm = ref(false);
 
-onMounted(() => {
+onMounted(async () => {
+    await getItemAvatar();
     warehouseFk.value = user.value.warehouseFk;
 });
 
-function getItemAvatar() {
+const getItemAvatar = async () => {
     const token = getToken();
-    return `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}`;
-}
+    const timeStamp = `timestamp=${Date.now()}`;
+    image.value = `/api/Images/catalog/200x200/${entityId.value}/download?access_token=${token}&${timeStamp}`;
+};
 
 const data = ref(useCardDescription());
 const setData = (entity) => {
@@ -189,7 +192,7 @@ const openCloneDialog = async () => {
         </template>
         <template #before>
             <div class="relative-position">
-                <QImg :src="getItemAvatar()" class="photo" style="position: relative">
+                <QImg :src="image" spinner-color="primary">
                     <template #error>
                         <div
                             class="absolute-full picture text-center q-pa-md flex flex-center"
@@ -221,6 +224,7 @@ const openCloneDialog = async () => {
                             collection="catalog"
                             :id="entityId"
                             @close-form="toggleEditPictureForm()"
+                            @on-photo-uploaded="getItemAvatar()"
                         />
                     </QDialog>
                 </QBtn>

From 25926e666069fc74f56294b12420256ddbb9cb0f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Thu, 1 Feb 2024 11:38:16 -0300
Subject: [PATCH 48/49] Add item descriptor photo class again

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

diff --git a/src/pages/Item/Card/ItemDescriptor.vue b/src/pages/Item/Card/ItemDescriptor.vue
index e1cbfb638..362fcfc67 100644
--- a/src/pages/Item/Card/ItemDescriptor.vue
+++ b/src/pages/Item/Card/ItemDescriptor.vue
@@ -192,7 +192,7 @@ const openCloneDialog = async () => {
         </template>
         <template #before>
             <div class="relative-position">
-                <QImg :src="image" spinner-color="primary">
+                <QImg :src="image" spinner-color="primary" class="photo">
                     <template #error>
                         <div
                             class="absolute-full picture text-center q-pa-md flex flex-center"

From 565b94e91508df0e56024092375cb14cfcf0d37d Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Fri, 2 Feb 2024 07:38:06 +0100
Subject: [PATCH 49/49] refs #6762 fix(supplierConsumption): subtoolbar

---
 src/pages/Supplier/Card/SupplierConsumption.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/pages/Supplier/Card/SupplierConsumption.vue b/src/pages/Supplier/Card/SupplierConsumption.vue
index 3be2d7a90..59dd2281c 100644
--- a/src/pages/Supplier/Card/SupplierConsumption.vue
+++ b/src/pages/Supplier/Card/SupplierConsumption.vue
@@ -115,9 +115,9 @@ onMounted(async () => {
 </script>
 
 <template>
-    <Teleport to="#st-data" v-if="stateStore.isSubToolbarShown()">
+    <Teleport to="#st-actions" v-if="stateStore.isSubToolbarShown()">
         <QBtn
-            v-if="dateRanges.from && dateRanges.to"
+            :disabled="!dateRanges.from && !dateRanges.to"
             color="primary"
             icon-right="picture_as_pdf"
             no-caps
@@ -129,7 +129,7 @@ onMounted(async () => {
             </QTooltip>
         </QBtn>
         <QBtn
-            v-if="dateRanges.from && dateRanges.to"
+            :disabled="!dateRanges.from && !dateRanges.to"
             color="primary"
             icon-right="email"
             no-caps